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;
37 our $existing_package = 'dpkg';
39 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
42 our (@dget) = qw(dget);
43 our (@dput) = qw(dput);
44 our (@debsign) = qw(debsign);
48 open DEBUG, ">/dev/null" or die $!;
50 our %opts_opt_map = ('dget' => \@dget,
52 'debsign' => \@debsign);
54 our $remotename = 'dgit';
55 our $ourdscfield = 'Vcs-Dgit-Master';
56 our $branchprefix = 'dgit';
58 sub lbranch () { return "$branchprefix/$suite"; }
59 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
60 sub lref () { return "refs/heads/".lbranch(); }
61 sub lrref () { return "refs/remotes/$remotename/$suite"; }
62 sub rrref () { return "refs/$branchprefix/$suite"; }
63 sub debiantag ($) { return "debian/$_[0]"; }
67 return "+".rrref().":".lrref();
74 $ua = LWP::UserAgent->new();
77 print "downloading @_...\n";
78 my $r = $ua->get(@_) or die $!;
79 die "$_[0]: ".$r->status_line."; failed.\n" unless $r->is_success;
80 return $r->decoded_content();
83 our ($dscdata,$dscurl,$dsc);
88 print $fh $intro or die $!;
92 if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) {
93 print $fh " '$_'" or die $!;
95 print $fh " $_" or die $!;
98 print $fh "\n" or die $!;
102 printcmd(\*DEBUG,"+",@_) if $debug>0;
104 die "@_ $! $?" if system @_;
107 sub cmdoutput_errok {
108 die Dumper(\@_)." ?" if grep { !defined } @_;
109 printcmd(\*DEBUG,"|",@_) if $debug>0;
110 open P, "-|", @_ or die $!;
113 { local $/ = undef; $d = <P>; }
115 if (!close P) { print DEBUG "=>!$?\n" if $debug>0; return undef; }
118 print DEBUG "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #';
123 my $d = cmdoutput_errok @_;
124 defined $d or die "@_ $? $!";
129 printcmd(\*STDOUT,"#",@_);
132 sub runcmd_ordryrun {
140 our %defcfg = ('dgit.default.distro' => 'debian',
141 'dgit.default.username' => '',
142 'dgit.default.archive-query-default-component' => 'main',
143 'dgit.default.ssh' => 'ssh',
144 'dgit-distro.debian.git-host' => 'git.debian.org',
145 'dgit-distro.debian.git-proto' => 'git+ssh://',
146 'dgit-distro.debian.git-path' => '/git/dgit-repos',
147 'dgit-distro.debian.git-check' => 'ssh-cmd',
148 'dgit-distro.debian.git-create' => 'ssh-cmd',
149 'dgit-distro.debian.mirror' => 'http://http.debian.net/debian/');
155 local ($debug) = $debug-1;
156 $v = cmdoutput_errok(@git, qw(config --), $c);
163 my $dv = $defcfg{$c};
164 return $dv if defined $dv;
169 sub access_distro () {
170 return cfg("dgit-suite.$suite.distro",
171 "dgit.default.distro");
176 my $distro = access_distro();
177 my $value = cfg("dgit-distro.$distro.$key",
178 "dgit.default.$key");
182 sub access_gituserhost () {
183 my $user = access_cfg('git-user');
184 my $host = access_cfg('git-host');
185 return defined($user) && length($user) ? "$user\@$host" : $host;
188 sub access_giturl () {
189 my $url = access_cfg('git-url');
192 access_cfg('git-proto').
193 access_gituserhost().
194 access_cfg('git-path');
196 return "$url/$package.git";
200 my $c = Dpkg::Control::Hash->new();
201 $c->load(@_) or return undef;
206 my $c = Dpkg::Control::Hash->new();
207 my $p = new IO::Handle;
208 open $p, '-|', qw(dpkg-parsechangelog) or die $!;
210 $?=0; $!=0; close $p or die "$! $?";
216 sub archive_query () {
217 my $query = access_cfg('archive-query');
218 $query ||= "madison:".access_distro();
219 $query =~ s/^(\w+):// or die "$query ?";
222 die unless $proto eq 'madison';
223 $rmad{$package} ||= cmdoutput
224 qw(rmadison -asource),"-s$suite","-u$url",$package;
225 my $rmad = $rmad{$package};
229 $rmad =~ m{^ \s*( [^ \t|]+ )\s* \|
230 \s*( [^ \t|]+ )\s* \|
231 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
232 \s*( [^ \t|]+ )\s* }x or die "$rmad $?";
233 $1 eq $package or die "$rmad $package ?";
236 # madison canonicalises for us
237 print "canonical suite name for $suite is $3\n";
244 $component = access_cfg('archive-query-default-component');
246 $5 eq 'source' or die "$rmad ?";
247 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
248 my $subpath = "/pool/$component/$prefix/$package/${package}_$vsn.dsc";
249 return ($vsn,$subpath);
252 sub canonicalise_suite () {
253 archive_query() or die;
256 sub get_archive_dsc () {
257 my ($vsn,$subpath) = archive_query();
258 if (!defined $vsn) { $dsc=undef; return undef; }
259 $dscurl = access_cfg('mirror').$subpath;
260 $dscdata = url_get($dscurl);
261 my $dscfh = new IO::File \$dscdata, '<' or die $!;
262 print DEBUG Dumper($dscdata) if $debug>1;
263 $dsc = Dpkg::Control::Hash->new(allow_pgp=>1);
264 $dsc->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n";
265 print DEBUG Dumper($dsc) if $debug>1;
266 my $fmt = $dsc->{Format};
267 die "unsupported format $fmt, sorry\n" unless $format_ok{$fmt};
270 sub check_for_git () {
272 my $how = access_cfg('git-check');
273 if ($how eq 'ssh-cmd') {
275 (access_cfg('ssh'),access_gituserhost(),
276 " set -e; cd ".access_cfg('git-path').";".
277 " if test -d $package.git; then echo 1; else echo 0; fi");
278 die "$r $! $?" unless $r =~ m/^[01]$/;
281 die "unknown git-check $how ?";
285 sub create_remote_git_repo () {
286 my $how = access_cfg('git-create');
287 if ($how eq 'ssh-cmd') {
289 (access_cfg('ssh'),access_gituserhost(),
290 "set -e; cd ".access_cfg('git-path').";".
291 " mkdir -p $package.git;".
293 " if ! test -d objects; then git init --bare; fi");
295 die "unknown git-create $how ?";
299 our ($dsc_hash,$upload_hash);
301 our $ud = '.git/dgit/unpack';
309 sub mktree_in_ud_from_only_subdir () {
310 # changes into the subdir
313 $dirs[0] =~ m#^([^/]+)/\.$# or die;
315 chdir $dir or die "$dir $!";
317 die $! unless $!==&ENOENT;
318 runcmd qw(git init -q);
319 rmtree('.git/objects');
320 symlink '../../../../objects','.git/objects' or die $!;
321 runcmd @git, qw(add -Af);
322 my $tree = cmdoutput @git, qw(write-tree);
323 $tree =~ m/^\w+$/ or die "$tree ?";
329 m/^\w+ \d+ (\S+)$/ or die "$_ ?";
331 } grep m/\S/, split /\n/, ($dsc->{'Checksums-Sha256'} || $dsc->{Files});
334 sub is_orig_file ($) {
336 m/\.orig(?:-\w+)?\.tar\.\w+$/;
339 sub make_commit ($) {
341 return cmdoutput @git, qw(hash-object -w -t commit), $file;
344 sub generate_commit_from_dsc () {
348 foreach my $f (dsc_files()) {
349 die if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
351 link "../../../$f", $f
355 runcmd @dget, qw(--), $dscurl;
356 foreach my $f (grep { is_orig_file($_) } @files) {
357 link $f, "../../../../$f"
361 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
362 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
363 my $clogp = parsecontrol('../changelog.tmp','changelog') or die;
364 my $date = cmdoutput qw(date), '+%s %z', qw(-d),$clogp->{Date};
365 my $author = $clogp->{Maintainer};
366 $author =~ s#,.*##ms;
367 my $authline = "$author $date";
368 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or die $authline;
369 open C, ">../commit.tmp" or die $!;
370 print C <<END or die $!;
377 # imported from the archive
380 my $outputhash = make_commit qw(../commit.tmp);
381 print "synthesised git commit from .dsc $clogp->{Version}\n";
383 runcmd @git, qw(reset --hard), $upload_hash;
384 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
385 my $oldclogp = Dpkg::Control::Hash->new();
386 $oldclogp->load('../changelogold.tmp','previous changelog') or die;
388 version_compare_string($oldclogp->{Version}, $clogp->{Version});
390 # git upload/ is earlier vsn than archive, use archive
391 open C, ">../commit2.tmp" or die $!;
392 print C <<END or die $!;
399 Record $package ($clogp->{Version}) in archive suite $suite
401 $outputhash = make_commit qw(../commit2.tmp);
402 } elsif ($vcmp > 0) {
403 print STDERR <<END or die $!;
404 Version actually in archive: $clogp->{Version} (older)
405 Last allegedly pushed/uploaded: $oldclogp->{Version} (newer or same)
406 Perhaps the upload is stuck in incoming. Using the version from git.
408 $outputhash = $upload_hash;
410 die "version in archive is same as version in git".
411 " to-be-uploaded (upload/) branch but archive".
412 " version hash no commit hash?!\n";
415 chdir '../../../..' or die $!;
416 runcmd @git, qw(update-ref -m),"dgit fetch import $clogp->{Version}",
417 'DGIT_ARCHIVE', $outputhash;
418 cmdoutput @git, qw(log -n2), $outputhash;
419 # ... gives git a chance to complain if our commit is malformed
424 sub ensure_we_have_orig () {
425 foreach my $f (dsc_files()) {
426 next unless is_orig_file($f);
428 die "$f ?" unless -f _;
430 die "$f $!" unless $!==&ENOENT;
432 my $origurl = $dscurl;
433 $origurl =~ s{/[^/]+$}{};
435 die "$f ?" unless $f =~ m/^${package}_/;
436 die "$f ?" if $f =~ m#/#;
437 runcmd_ordryrun qw(sh -ec),'cd ..; exec "$@"','x',
443 return cmdoutput @git, qw(rev-parse), "$_[0]~0";
446 sub is_fast_fwd ($$) {
447 my ($ancestor,$child) = @_;
448 my $mb = cmdoutput @git, qw(merge-base), $ancestor, $child;
449 return rev_parse($mb) eq rev_parse($ancestor);
452 sub git_fetch_us () {
453 die "cannot dry run with fetch" if $dryrun;
454 runcmd @git, qw(fetch),access_giturl(),fetchspec();
457 sub fetch_from_archive () {
458 # ensures that lrref() is what is actually in the archive,
460 get_archive_dsc() or return 0;
461 $dsc_hash = $dsc->{$ourdscfield};
462 if (defined $dsc_hash) {
463 $dsc_hash =~ m/\w+/ or die "$dsc_hash $?";
465 print "last upload to archive specified git hash\n";
467 print "last upload to archive has NO git hash\n";
470 my $lrref_fn = ".git/".lrref();
471 if (open H, $lrref_fn) {
474 die "$lrref_fn $upload_hash ?" unless $upload_hash =~ m/^\w+$/;
475 } elsif ($! == &ENOENT) {
480 print DEBUG "last upload hash $upload_hash\n";
482 if (defined $dsc_hash) {
483 die "missing git history even though dsc has hash"
486 ensure_we_have_orig();
488 $hash = generate_commit_from_dsc();
490 print DEBUG "current hash $hash\n";
492 die "not fast forward on last upload branch!".
493 " (archive's version left in DGIT_ARCHIVE)"
494 unless is_fast_fwd($upload_hash, $hash);
496 if ($upload_hash ne $hash) {
497 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
501 dryrun_report @upd_cmd;
509 die "dry run makes no sense with clone" if $dryrun;
510 mkdir $dstdir or die "$dstdir $!";
511 chdir "$dstdir" or die "$dstdir $!";
512 runcmd @git, qw(init -q);
513 runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec();
514 open H, "> .git/HEAD" or die $!;
515 print H "ref: ".lref()."\n" or die $!;
517 runcmd @git, qw(remote add), 'origin', access_giturl();
518 if (check_for_git()) {
519 print "fetching existing git history\n";
521 runcmd @git, qw(fetch origin);
523 print "starting new git history\n";
525 fetch_from_archive() or die;
526 runcmd @git, qw(reset --hard), lrref();
527 print "dgit ok: ready for work in $dstdir\n";
531 if (check_for_git()) {
534 fetch_from_archive() or die;
535 print "dgit ok: fetched into ".lrref()."\n";
540 runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
542 print "dgit ok: fetched to ".lrref()." and merged into HEAD\n";
546 runcmd @git, qw(diff --quiet HEAD);
547 my $clogp = parsechangelog();
548 $package = $clogp->{Source};
549 my $dscfn = "${package}_$clogp->{Version}.dsc";
550 stat "../$dscfn" or die "$dscfn $!";
551 $dsc = parsecontrol("../$dscfn");
554 print "checking that $dscfn corresponds to HEAD\n";
555 runcmd qw(dpkg-source -x --), "../../../../$dscfn";
556 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
557 chdir '../../../..' or die $!;
558 runcmd @git, qw(diff --exit-code), $tree;
560 #do fast forward check and maybe fake merge
561 # if (!is_fast_fwd(mainbranch
562 # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
563 # map { lref($_).":".rref($_) }
565 $dsc->{$ourdscfield} = rev_parse('HEAD');
566 $dsc->save("../$dscfn.tmp") or die $!;
568 rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
570 print "[new .dsc left in $dscfn.tmp]\n";
573 my $pat = "../${package}_$clogp->{Version}_*.changes";
575 die "$pat ?" unless @cs==1;
576 ($changesfile) = @cs;
578 my $tag = debiantag($dsc->{Version});
579 if (!check_for_git()) {
580 create_remote_git_repo();
582 runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref();
584 my @tag_cmd = (@git, qw(tag -s -m),
585 "Release $dsc->{Version} for $suite [dgit]");
586 push @tag_cmd, qw(-u),$keyid if defined $keyid;
588 runcmd_ordryrun @tag_cmd;
589 my @debsign_cmd = @debsign;
590 push @debsign_cmd, "-k$keyid" if defined $keyid;
591 push @debsign_cmd, $changesfile;
592 runcmd_ordryrun @debsign_cmd;
594 runcmd_ordryrun @git, qw(push),access_giturl(),"refs/tags/$tag";
595 my $host = access_cfg('upload-host');
596 my @hostarg = defined($host) ? ($host,) : ();
597 runcmd_ordryrun @dput, @hostarg, $changesfile;
598 print "dgit ok: pushed and uploaded $dsc->{Version}\n";
604 die if defined $package;
607 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
608 ($package,$suite) = @ARGV;
609 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
610 ($package,$dstdir) = @ARGV;
612 ($package,$suite,$dstdir) = @ARGV;
616 $dstdir ||= "$package";
621 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
622 if ($branch =~ m#$lbranch_re#o) {
629 sub fetchpullargs () {
630 if (!defined $package) {
631 my $sourcep = parsecontrol('debian/control');
632 $package = $sourcep->{Source};
635 $suite = branchsuite();
637 my $clogp = parsechangelog();
638 $suite = $clogp->{Distribution};
640 canonicalise_suite();
641 print "fetching from suite $suite\n";
644 canonicalise_suite();
664 die if defined $package;
665 my $clogp = parsechangelog();
666 $package = $clogp->{Source};
668 $suite = $clogp->{Distribution};
670 local ($package) = $existing_package; # this is a hack
671 canonicalise_suite();
676 if (fetch_from_archive()) {
677 is_fast_fwd(lrref(), 'HEAD') or die;
679 die unless $new_package;
685 # we pass further options and args to git-buildpackage
686 die if defined $package;
687 my $clogp = parsechangelog();
688 $suite = $clogp->{Distribution};
689 $package = $clogp->{Source};
691 qw(git-buildpackage -us -uc --git-no-sign-tags),
692 '--git-builder=dpkg-buildpackage -i\.git/ -I.git',
693 "--git-debian-branch=".lbranch(),
700 last unless $ARGV[0] =~ m/^-/;
704 if (m/^--dry-run$/) {
706 } elsif (m/^--no-sign$/) {
708 } elsif (m/^--new$/) {
710 } elsif (m/^--(\w+)=(.*)/s && ($om = $opts_opt_map{$1})) {
712 } elsif (m/^--(\w+):(.*)/s && ($om = $opts_opt_map{$1})) {
714 } elsif (m/^--existing-package=(.*)/s) {
715 $existing_package = $1;
724 open DEBUG, ">&STDERR" or die $!;
728 } elsif (s/^-c(.*=.*)//s) {
730 } elsif (s/^-C(.*)//s) {
732 } elsif (s/^-k(.*)//s) {
744 my $cmd = shift @ARGV;
746 { no strict qw(refs); &{"cmd_$cmd"}(); }