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-repos';
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 "$! $?";
140 $rmad ||= cmdoutput qw(rmadison -asource),"-s$suite",$package;
141 $rmad =~ m/^ \s*( [^ \t|]+ )\s* \|
142 \s*( [^ \t|]+ )\s* \|
143 \s*( [^ \t|]+ )\s* \|
144 \s*( [^ \t|]+ )\s* /x or die "$rmad $?";
145 $1 eq $package or die "$rmad $package ?";
148 # madison canonicalises for us
149 print "canonical suite name for $suite is $3\n";
152 $4 eq 'source' or die "$rmad ?";
156 sub canonicalise_suite () {
160 sub get_archive_dsc () {
161 my $vsn = askmadison();
162 # fixme madison does not show us the component
163 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
164 $dscurl = "$mirror/pool/main/$prefix/$package/${package}_$vsn.dsc";
165 #print DEBUG Dumper($pdodata, $&, $dscurl);
166 $dscdata = url_get($dscurl);
167 my $dscfh = new IO::File \$dscdata, '<' or die $!;
168 #print DEBUG Dumper($dscdata, $dscfh);
169 $dsc = Dpkg::Control::Hash->new(allow_pgp=>1);
170 $dsc->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n";
171 #print DEBUG Dumper($dsc);
172 my $fmt = $dsc->{Format};
173 die "unsupported format $fmt, sorry\n" unless $fmt eq '1.0';
176 sub check_for_git () {
179 "ssh $alioth_sshtestbodge->[0] '".
180 " set -e; cd $alioth_sshtestbodge->[1];".
181 " if test -d $package.git; then echo 1; else echo 0; fi".
183 #print DEBUG "$cmd\n";
184 open P, "$cmd |" or die $!;
186 my $r = <P>; close P;
187 #print STDERR ">$r<\n";
188 die "$r $! $?" unless $r =~ m/^[01]$/;
192 our ($dsc_hash,$upload_hash);
194 our $ud = '.git/dgit/unpack';
202 sub mktree_in_ud_from_only_subdir () {
203 # changes into the subdir
206 $dirs[0] =~ m#^([^/]+)/\.$# or die;
208 chdir $dir or die "$dir $!";
210 die $! unless $!==&ENOENT;
211 runcmd qw(git init -q);
212 rmtree('.git/objects');
213 symlink '../../../../objects','.git/objects' or die $!;
214 runcmd @git, qw(add -Af);
215 my $tree = cmdoutput @git, qw(write-tree);
216 chomp $tree; $tree =~ m/^\w+$/ or die "$tree ?";
222 m/^\w+ \d+ (\S+)$/ or die "$_ ?";
224 } grep m/\S/, split /\n/, ($dsc->{'Checksums-Sha256'} || $dsc->{Files});
227 sub is_orig_file ($) {
229 m/\.orig\.tar\.\w+$/;
232 sub generate_commit_from_dsc () {
236 foreach my $f (dsc_files()) {
237 die if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
239 link "../../../$f", $f
243 runcmd @dget, qw(--), $dscurl;
244 foreach my $f (grep { is_orig_file($_) } @files) {
245 link $f, "../../../../$f"
249 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
250 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
251 my $clogp = parsecontrol('../changelog.tmp','changelog') or die;
252 my $date = cmdoutput qw(date), '+%s %z', qw(-d),$clogp->{Date};
253 my $author = $clogp->{Maintainer};
254 $author =~ s#,.*##ms;
255 my $authline = "$author $date";
256 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or die $authline;
257 open C, ">../commit.tmp" or die $!;
258 print C "tree $tree\n" or die $!;
259 print C "parent $upload_hash\n" or die $! if $upload_hash;
260 print C <<END or die $!;
266 # imported by dgit from the archive
269 print "synthesised git commit from .dsc $clogp->{Version}\n";
270 my $commithash = cmdoutput @git, qw(hash-object -w -t commit ../commit.tmp);
271 chdir '../../../..' or die $!;
272 cmdoutput @git, qw(update-ref -m),"dgit synthesise $clogp->{Version}",
273 'DGIT_ARCHIVE', $commithash;
274 cmdoutput @git, qw(log -n2), $commithash;
275 # ... gives git a chance to complain if our commit is malformed
276 my $outputhash = $commithash;
278 chdir "$ud/$dir" or die $!;
279 runcmd @git, qw(reset --hard), $upload_hash;
280 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
281 my $oldclogp = Dpkg::Control::Hash->new();
282 $oldclogp->parse('../changelogold.tmp','previous changelog') or die;
284 version_compare_string($oldclogp->{Version}, $clogp->{Version});
286 # git upload/ is earlier vsn than archive, use archive
287 } elsif ($vcmp >= 0) {
288 print STDERR <<END or die $!;
289 Version actually in archive: $clogp->{Version} (older)
290 Last allegedly pushed/uploaded: $oldclogp->{Version} (newer or same)
291 Perhaps the upload is stuck in incoming. Using the version from git.
294 die "version in archive is same as version in git".
295 " to-be-uploaded (upload/) branch but archive".
296 " version hash no commit hash?!\n";
298 chdir '../../../..' or die $!;
304 sub ensure_we_have_orig () {
305 foreach my $f (dsc_files()) {
306 next unless is_orig_file($f);
308 die "$f ?" unless -f _;
310 die "$f $!" unless $!==&ENOENT;
312 my $origurl = $dscurl;
313 $origurl =~ s{/[^/]+$}{};
315 die "$f ?" unless $f =~ m/^${package}_/;
316 die "$f ?" if $f =~ m#/#;
317 runcmd_ordryrun qw(sh -ec),'cd ..; exec "$@"','x',
323 return cmdoutput @git, qw(rev-parse), "$_[0]~0";
326 sub is_fast_fwd ($$) {
327 my ($ancestor,$child) = @_;
328 my $mb = cmdoutput @git, qw(merge-base), $dsc_hash, $upload_hash;
329 return rev_parse($mb) eq rev_parse($ancestor);
332 sub fetch_from_archive () {
333 # ensures that rref(uploadbranch()) is what is actually in the archive,
335 my $upload_ref = rref(uploadbranch());
337 cmdoutput_errok @git, qw(show-ref --heads), $upload_ref;
339 die $? unless ($?==0 && chomp $upload_hash)
340 or ($?==256 && !length $upload_hash);
343 if (defined $dsc_hash) {
344 die "missing git history even though dsc has hash"
347 ensure_we_have_orig();
349 $hash = generate_commit_from_dsc();
352 die "not fast forward on last upload branch!".
353 " (archive's version left in DGIT_ARCHIVE)"
354 unless is_fast_fwd($dsc_hash, $upload_hash);
356 if ($upload_hash ne $hash) {
357 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', $upload_ref, $hash);
361 dryrun_report @upd_cmd;
367 die "dry run makes no sense with clone" if $dryrun;
369 $dsc_hash = $dsc->{$ourdscfield};
370 if (defined $dsc_hash) {
371 $dsc_hash =~ m/\w+/ or die "$dsc_hash $?";
373 print "last upload to archive specified git hash\n";
375 print "last upload to archive has NO git hash\n";
377 my $dstdir = "$package";
378 my $branch = uploadbranch();
379 if (check_for_git()) {
380 print "cloning existing git history\n";
381 runcmd @git, qw(clone --origin),$remotename, qw(-b), $branch, '--',
382 "$alioth_git/$package.git", $dstdir;
383 chdir "$dstdir" or die "$dstdir $!";
384 fetch_from_archive();
385 runcmd @git, qw(reset --hard), rref(uploadbranch());
387 print "starting new git history\n";
388 mkdir $dstdir or die "$dstdir $!";
389 chdir "$dstdir" or die "$dstdir $!";
390 runcmd @git, qw(init -q);
391 open H, "> .git/HEAD" or die $!;
392 print H "ref: ".lref(uploadbranch())."\n" or die $!;
394 runcmd @git, qw(remote add), $remotename, "$alioth_git/$package.git";
395 runcmd "git config branch.$branch.remote $remotename";
396 runcmd "git config branch.$branch.merge ".lref(uploadbranch());
397 my $newhash = generate_commit_from_dsc();
398 runcmd @git, qw(reset --hard), $newhash;
400 print "ready for work in $dstdir\n";
405 if (check_for_git()) {
406 runcmd_ordryrun @git, qw(fetch -p),$remotename,
407 '+refs/heads/*:refs/remotes/origin/*';
409 fetch_from_archive();
414 runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
415 lref(uploadbranch());
419 runcmd @git, qw(diff --quiet HEAD);
420 my $clogp = parsechangelog();
421 $package = $clogp->{Source};
422 my $dscfn = "${package}_$clogp->{Version}.dsc";
423 stat "../$dscfn" or die "$dscfn $!";
424 $dsc = parsecontrol("../$dscfn");
427 print "checking that $dscfn corresponds to HEAD\n";
428 runcmd qw(dpkg-source -x --), "../../../../$dscfn";
429 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
430 chdir '../../../..' or die $!;
431 runcmd @git, qw(diff --exit-code), $tree;
433 #do fast forward check and maybe fake merge
434 # if (!is_fast_fwd(mainbranch
435 # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
436 # map { lref($_).":".rref($_) }
438 $dsc->{$ourdscfield} = rev_parse('HEAD');
439 $dsc->save("../$dscfn.tmp") or die $!;
440 rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
442 my $pat = "../${package}_$clogp->{Version}_*.changes";
444 die "$pat ?" unless @cs==1;
445 ($changesfile) = @cs;
447 my $tag = debiantag($dsc->{Version});
448 if (!check_for_git()) {
449 runcmd_ordryrun qw(ssh),$alioth_sshtestbodge->[0],
450 "set -e; cd $alioth_sshtestbodge->[1];".
451 " mkdir -p $package.git;".
453 " if ! test -d objects; then git init --bare; fi";
455 runcmd_ordryrun @git, qw(push),$remotename,"HEAD:".lref(uploadbranch());
457 my @tag_cmd = (@git, qw(tag -s -m),
458 "Release $dsc->{Version} for $suite [dgit]");
459 push @tag_cmd, qw(-u),$keyid if defined $keyid;
461 runcmd_ordryrun @tag_cmd;
462 my @debsign_cmd = @debsign;
463 push @debsign_cmd, "-k$keyid" if defined $keyid;
464 push @debsign_cmd, $changesfile;
465 runcmd_ordryrun @debsign_cmd;
467 runcmd_ordryrun @git, qw(push),$remotename,"refs/tags/$tag";
468 runcmd_ordryrun @dput, $changesfile;
475 ($package,$suite) = @ARGV;
483 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
485 if ($branch =~ m#^refs/heads/$branchprefix/([^/.]+)$#o) {
492 sub fetchpullargs () {
493 my $clogp = parsechangelog();
494 $package = $clogp->{Source};
496 $suite = branchsuite();
497 $suite ||= $clogp->{Distribution};
498 canonicalise_suite();
499 print "fetching from suite $suite\n";
502 canonicalise_suite();
519 my $clogp = parsechangelog();
520 $package = $clogp->{Source};
522 $suite = $clogp->{Distribution};
523 canonicalise_suite();
531 my $clogp = parsechangelog();
532 $suite = $clogp->{Distribution};
533 $package = $clogp->{Source};
534 canonicalise_suite();
536 qw(git-buildpackage -us -uc --git-no-sign-tags),
537 "--git-debian-branch=".uploadbranch(),
544 last unless $ARGV[0] =~ m/^-/;
548 if (m/^--dry-run$/) {
550 } elsif (m/^--no-sign$/) {
552 } elsif (m/^--(\w+)=(.*)/s && ($om = $opts_opt_map{$1})) {
554 } elsif (m/^--(\w+):(.*)/s && ($om = $opts_opt_map{$1})) {
563 } elsif (s/^-c(.*=.*)//s) {
565 } elsif (s/^-C(.*)//s) {
567 } elsif (s/^-k(.*)//s) {
579 my $cmd = shift @ARGV;
582 { no strict qw(refs); &{"cmd_$cmd"}(); }