3 # Integration between git and Debian-style archives
5 # Copyright (C)2013 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
25 use Dpkg::Control::Hash;
29 open DEBUG, ">&STDERR" or die $!;
31 our $mirror = 'http://mirror.relativity.greenend.org.uk/mirror/debian-ftp/';
39 our $aliothname = 'iwj@git.debian.org';
40 our $aliothpath = '/git/dgit-test';
41 our $alioth_git = "git+ssh://$aliothname/$aliothpath";
42 our $alioth_sshtestbodge = [$aliothname,$aliothpath];
45 our (@dget) = qw(dget);
46 our (@dput) = qw(dput);
47 our (@debsign) = qw(debsign);
50 our %opts_opt_map = ('dget' => \@dget,
52 'debsign' => \@debsign);
54 our $remotename = 'dgit';
55 our $ourdscfield = 'Vcs-Git-Master';
56 our $branchprefix = 'dgit';
58 sub uploadbranch () { return "$branchprefix/$suite"; }
59 sub lref ($) { return "refs/heads/$_[0]"; }
60 sub rref ($) { return "refs/remotes/$remotename/$_[0]"; }
61 sub debiantag ($) { return "debian/$_[0]"; }
67 $ua = LWP::UserAgent->new();
70 print DEBUG "fetching @_...\n";
71 my $r = $ua->get(@_) or die $!;
72 die "$_[0]: ".$r->status_line."; failed.\n" unless $r->is_success;
73 return $r->decoded_content();
76 our ($dscdata,$dscurl,$dsc);
80 die "@_ $! $?" if system @_;
84 open P, "-|", @_ or die $!;
87 { local $/ = undef; $d = <P>; }
89 close P or return undef;
95 my $d = cmdoutput_errok @_;
96 defined $d or die "@_ $? $!";
105 if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) {
106 print " '$_'" or die $!;
108 print " $_" or die $!;
111 print "\n" or die $!;
114 sub runcmd_ordryrun {
123 my $c = Dpkg::Control::Hash->new();
124 $c->load(@_) or return undef;
129 my $c = Dpkg::Control::Hash->new();
130 my $p = new IO::Handle;
131 open $p, '-|', qw(dpkg-parsechangelog) or die $!;
133 $?=0; $!=0; close $p or die "$! $?";
137 sub get_archive_dsc () {
138 my $rmad = cmdoutput qw(rmadison -asource),"-s$suite",$package;
139 $rmad =~ m/^ \s*( [^ \t|]+ )\s* \|
140 \s*( [^ \t|]+ )\s* \|
141 \s*( [^ \t|]+ )\s* \|
142 \s*( [^ \t|]+ )\s* /x or die "$rmad $?";
143 $1 eq $package or die "$rmad $package ?";
145 $3 eq $suite or die "$rmad $suite ?";
146 $4 eq 'source' or die "$rmad ?";
147 # fixme it does not show us the component ?
148 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
149 $dscurl = "$mirror/pool/main/$prefix/$package/${package}_$vsn.dsc";
150 #print DEBUG Dumper($pdodata, $&, $dscurl);
151 $dscdata = url_get($dscurl);
152 my $dscfh = new IO::File \$dscdata, '<' or die $!;
153 #print DEBUG Dumper($dscdata, $dscfh);
154 $dsc = Dpkg::Control::Hash->new(allow_pgp=>1);
155 $dsc->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n";
156 #print DEBUG Dumper($dsc);
157 my $fmt = $dsc->{Format};
158 die "unsupported format $fmt, sorry\n" unless $fmt eq '1.0';
161 sub check_for_git () {
164 "ssh $alioth_sshtestbodge->[0] '".
165 " set -e; cd $aliothpath;".
166 " if test -d $package.git; then echo 1; else echo 0; fi".
168 #print DEBUG "$cmd\n";
169 open P, "$cmd |" or die $!;
171 my $r = <P>; close P;
172 #print STDERR ">$r<\n";
173 die "$r $! $?" unless $r =~ m/^[01]$/;
177 our ($dsc_hash,$upload_hash);
179 our $ud = '.git/dgit/unpack';
187 sub mktree_in_ud_from_only_subdir () {
188 # changes into the subdir
191 $dirs[0] =~ m#^([^/]+)/\.$# or die;
193 chdir $dir or die "$dir $!";
195 die $! unless $!==&ENOENT;
196 runcmd qw(git init -q);
197 rmtree('.git/objects');
198 symlink '../../../../objects','.git/objects' or die $!;
199 runcmd @git, qw(add -Af);
200 my $tree = cmdoutput @git, qw(write-tree);
201 chomp $tree; $tree =~ m/^\w+$/ or die "$tree ?";
207 m/^\w+ \d+ (\S+)$/ or die "$_ ?";
209 } grep m/\S/, split /\n/, ($dsc->{'Checksums-Sha256'} || $dsc->{Files});
212 sub is_orig_file ($) {
214 m/\.orig\.tar\.\w+$/;
217 sub generate_commit_from_dsc () {
221 foreach my $f (dsc_files()) {
222 die if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
224 link "../../../$f", $f
228 runcmd @dget, qw(--), $dscurl;
229 foreach my $f (grep { is_orig_file($_) } @files) {
230 link $f, "../../../../$f"
234 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
235 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
236 my $clogp = parsecontrol('../changelog.tmp','changelog') or die;
237 my $date = cmdoutput qw(date), '+%s %z', qw(-d),$clogp->{Date};
238 my $author = $clogp->{Maintainer};
239 $author =~ s#,.*##ms;
240 my $authline = "$author $date";
241 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or die $authline;
242 open C, ">../commit.tmp" or die $!;
243 print C "tree $tree\n" or die $!;
244 print C "parent $upload_hash\n" or die $! if $upload_hash;
245 print C <<END or die $!;
251 # imported by dgit from the archive
254 print "synthesised git commit from .dsc $clogp->{Version}\n";
255 my $commithash = cmdoutput @git, qw(hash-object -w -t commit ../commit.tmp);
256 chdir '../../../..' or die $!;
257 cmdoutput @git, qw(update-ref -m),"dgit synthesise $clogp->{Version}",
258 'DGIT_ARCHIVE', $commithash;
259 cmdoutput @git, qw(log -n2), $commithash;
260 # ... gives git a chance to complain if our commit is malformed
261 my $outputhash = $commithash;
263 chdir "$ud/$dir" or die $!;
264 runcmd @git, qw(reset --hard), $upload_hash;
265 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
266 my $oldclogp = Dpkg::Control::Hash->new();
267 $oldclogp->parse('../changelogold.tmp','previous changelog') or die;
269 version_compare_string($oldclogp->{Version}, $clogp->{Version});
271 # git upload/ is earlier vsn than archive, use archive
272 } elsif ($vcmp >= 0) {
273 print STDERR <<END or die $!;
274 Version actually in archive: $clogp->{Version} (older)
275 Last allegedly pushed/uploaded: $oldclogp->{Version} (newer or same)
276 Perhaps the upload is stuck in incoming. Using the version from git.
279 die "version in archive is same as version in git".
280 " to-be-uploaded (upload/) branch but archive".
281 " version hash no commit hash?!\n";
283 chdir '../../../..' or die $!;
289 sub ensure_we_have_orig () {
290 foreach my $f (dsc_files()) {
291 next unless is_orig_file($f);
293 die "$f ?" unless -f _;
295 die "$f $!" unless $!==&ENOENT;
297 my $origurl = $dscurl;
298 $origurl =~ s{/[^/]+$}{};
300 die "$f ?" unless $f =~ m/^${package}_/;
301 die "$f ?" if $f =~ m#/#;
302 runcmd_ordryrun qw(sh -ec),'cd ..; exec "$@"','x',
308 return cmdoutput @git, qw(rev-parse), "$_[0]~0";
311 sub is_fast_fwd ($$) {
312 my ($ancestor,$child) = @_;
313 my $mb = cmdoutput @git, qw(merge-base), $dsc_hash, $upload_hash;
314 return rev_parse($mb) eq rev_parse($ancestor);
317 sub fetch_from_archive () {
318 # ensures that rref(uploadbranch()) is what is actually in the archive,
320 my $upload_ref = rref(uploadbranch());
322 cmdoutput_errok @git, qw(show-ref --heads), $upload_ref;
324 die $? unless ($?==0 && chomp $upload_hash)
325 or ($?==256 && !length $upload_hash);
328 if (defined $dsc_hash) {
329 die "missing git history even though dsc has hash"
332 ensure_we_have_orig();
334 $hash = generate_commit_from_dsc();
337 die "not fast forward on last upload branch!".
338 " (archive's version left in DGIT_ARCHIVE)"
339 unless is_fast_fwd($dsc_hash, $upload_hash);
341 if ($upload_hash ne $hash) {
342 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', $upload_ref, $hash);
346 dryrun_report @upd_cmd;
352 die "dry run makes no sense with clone" if $dryrun;
354 $dsc_hash = $dsc->{$ourdscfield};
355 if (defined $dsc_hash) {
356 $dsc_hash =~ m/\w+/ or die "$dsc_hash $?";
358 print "last upload to archive specified git hash\n";
360 print "last upload to archive has NO git hash\n";
362 my $dstdir = "$package";
363 my $branch = uploadbranch();
364 if (check_for_git()) {
365 print "cloning existing git history\n";
366 runcmd @git, qw(clone --origin),$remotename, qw(-b), $branch, '--',
367 "$alioth_git/$package.git", $dstdir;
368 chdir "$dstdir" or die "$dstdir $!";
369 fetch_from_archive();
370 runcmd @git, qw(reset --hard), rref(uploadbranch());
372 print "starting new git history\n";
373 mkdir $dstdir or die "$dstdir $!";
374 chdir "$dstdir" or die "$dstdir $!";
375 runcmd @git, qw(init -q);
376 open H, "> .git/HEAD" or die $!;
377 print H "ref: ".lref(uploadbranch())."\n" or die $!;
379 runcmd @git, qw(remote add), $remotename, "$alioth_git/$package.git";
380 runcmd "git config branch.$branch.remote $remotename";
381 runcmd "git config branch.$branch.merge ".lref(uploadbranch());
382 my $newhash = generate_commit_from_dsc();
383 runcmd @git, qw(reset --hard), $newhash;
385 print "ready for work in $dstdir\n";
390 if (check_for_git()) {
391 runcmd_ordryrun @git, qw(fetch -p),$remotename,
392 '+refs/heads/*:refs/remotes/origin/*';
394 fetch_from_archive();
399 runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
400 lref(uploadbranch());
404 runcmd @git, qw(diff --quiet HEAD);
405 my $clogp = parsechangelog();
406 $package = $clogp->{Source};
407 my $dscfn = "${package}_$clogp->{Version}.dsc";
408 stat "../$dscfn" or die "$dscfn $!";
409 $dsc = parsecontrol("../$dscfn");
412 print "checking that $dscfn corresponds to HEAD\n";
413 runcmd qw(dpkg-source -x --), "../../../../$dscfn";
414 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
415 chdir '../../../..' or die $!;
416 runcmd @git, qw(diff --exit-code), $tree;
418 #do fast forward check and maybe fake merge
419 # if (!is_fast_fwd(mainbranch
420 # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
421 # map { lref($_).":".rref($_) }
423 $dsc->{$ourdscfield} = rev_parse('HEAD');
424 $dsc->save("../$dscfn.tmp") or die $!;
425 rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
427 my $pat = "../${package}_$clogp->{Version}_*.changes";
429 die "$pat ?" unless @cs==1;
430 ($changesfile) = @cs;
433 my @tag_cmd = (@git, qw(tag -s -m),
434 "Release $dsc->{Version} for $suite [dgit]");
435 push @tag_cmd, qw(-u),$keyid if defined $keyid;
436 runcmd_ordryrun @tag_cmd;
437 my @debsign_cmd = @debsign;
438 push @debsign_cmd, "-k$keyid" if defined $keyid;
439 push @debsign_cmd, $changesfile;
440 runcmd_ordryrun @debsign_cmd;
442 runcmd_ordryrun @git, qw(push),$remotename,"HEAD:".lref(uploadbranch());
443 runcmd_ordryrun @dput, $changesfile;
450 ($package,$suite) = @ARGV;
458 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
460 if ($branch =~ m#^refs/heads/$branchprefix/([^/.]+)$#o) {
467 sub fetchpullargs () {
468 my $clogp = parsechangelog();
469 $package = $clogp->{Source};
471 $suite = branchsuite();
472 $suite ||= $clogp->{Distribution};
473 print "fetching from suite $suite\n";
492 my $clogp = parsechangelog();
493 $package = $clogp->{Source};
495 $suite = $clogp->{Distribution};
503 my $clogp = parsechangelog();
504 $suite = $clogp->{Distribution};
506 qw(git-buildpackage -us -uc --git-no-sign-tags),
507 "--git-debian-branch=".uploadbranch(),
514 last unless $ARGV[0] =~ m/^-/;
518 if (m/^--dry-run$/) {
520 } elsif (m/^--no-sign$/) {
522 } elsif (m/^--(\w+)=(.*)/s && ($om = $opts_opt_map{$1})) {
524 } elsif (m/^--(\w+):(.*)/s && ($om = $opts_opt_map{$1})) {
533 } elsif (s/^-c(.*=.*)//s) {
535 } elsif (s/^-C(.*)//s) {
537 } elsif (s/^-k(.*)//s) {
549 my $cmd = shift @ARGV;
552 { no strict qw(refs); &{"cmd_$cmd"}(); }