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;
33 our $our_version = 'UNRELEASED'; ###substituted###
35 our $isuite = 'unstable';
46 our $existing_package = 'dpkg';
47 our $cleanmode = 'dpkg-source';
48 our $we_are_responder;
50 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
53 our (@dget) = qw(dget);
54 our (@dput) = qw(dput);
55 our (@debsign) = qw(debsign);
57 our (@sbuild) = qw(sbuild -A);
59 our (@dgit) = qw(dgit);
60 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
61 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
62 our (@dpkggenchanges) = qw(dpkg-genchanges);
63 our (@mergechanges) = qw(mergechanges -f);
64 our (@changesopts) = ('');
66 our %opts_opt_map = ('dget' => \@dget,
68 'debsign' => \@debsign,
73 'dpkg-source' => \@dpkgsource,
74 'dpkg-buildpackage' => \@dpkgbuildpackage,
75 'dpkg-genchanges' => \@dpkggenchanges,
76 'ch' => \@changesopts,
77 'mergechanges' => \@mergechanges);
79 our %opts_opt_cmdonly = ('gpg' => 1);
84 open DEBUG, ">/dev/null" or die $!;
86 our $remotename = 'dgit';
87 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
88 our $branchprefix = 'dgit';
91 sub lbranch () { return "$branchprefix/$csuite"; }
92 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
93 sub lref () { return "refs/heads/".lbranch(); }
94 sub lrref () { return "refs/remotes/$remotename/$branchprefix/$csuite"; }
95 sub rrref () { return "refs/$branchprefix/$csuite"; }
110 return "${package}_".(stripepoch $vsn).".dsc";
113 sub changesopts () { return @changesopts[1..$#changesopts]; }
117 sub fail { die "$us: @_\n"; }
119 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
121 sub no_such_package () {
122 print STDERR "$us: package $package does not exist in suite $isuite\n";
128 return "+".rrref().":".lrref();
131 #---------- remote protocol support, common ----------
133 # remote push initiator/responder protocol:
134 # < dgit-remote-push-ready [optional extra info ignored by old initiators]
136 # > file begin parsed-changelog
137 # [indicates that output of dpkg-parsechangelog follows]
138 # > data-block NBYTES
139 # > [NBYTES bytes of data (no newline)]
140 # [maybe some more blocks]
146 # > file begin changes
152 # [indicates that signed tag is wanted]
153 # < data-block NBYTES
154 # < [NBYTES bytes of data (no newline)]
155 # [maybe some more blocks]
159 # > want signed-dsc-changes
160 # < data-block NBYTES [transfer of signed dsc]
162 # < data-block NBYTES [transfer of signed changes]
170 fail "connection lost: $!" if $fh->error;
171 fail "connection terminated" if $fh->eof;
172 fail "protocol violation; $m not expected";
175 sub protocol_expect ($&) {
176 my ($fh, $match) = @_;
179 defined && chomp or badproto $fh, "eof";
181 badproto $fh, "\`$_'";
184 sub protocol_send_file ($$) {
185 my ($fh, $ourfn) = @_;
186 open PF, "<", $ourfn or die "$ourfn: $!";
189 my $got = read PF, $d, 65536;
190 die "$ourfn: $!" unless defined $got;
192 print $fh "data-block ".length($d)."\n" or die $!;
195 print $fh "data-end\n" or die $!;
199 sub protocol_read_bytes ($$) {
200 my ($fh, $nbytes) = @_;
201 $nbytes =~ m/^\d{1,6}$/ or badproto \*RO, "bad byte count";
203 my $got = read $fh, $d, $nbytes;
204 $got==$nbytes or badproto $fh, "eof during data block";
208 sub protocol_receive_file ($$) {
209 my ($fh, $ourfn) = @_;
210 open PF, ">", $ourfn or die "$ourfn: $!";
212 protocol_expect \*STDIN, { m/^data-block (.*})$|data-end$/ };
214 my $d = protocol_read_bytes \*STDIN, $1;
215 print PF $d or die $!;
219 #---------- remote protocol support, responder ----------
221 sub responder_send_command ($) {
223 return unless $we_are_responder;
224 # called even without $we_are_responder
225 print DEBUG "<< $command\n";
226 print $command, "\n" or die $!;
229 sub responder_send_file ($$) {
230 my ($keyword, $ourfn) = @_;
231 return unless $we_are_responder;
232 responder_send_command "file-begin $keyword";
233 protocol_send_file \*STDOUT, $ourfn;
236 sub responder_receive_files ($@) {
237 my ($keyword, @ourfns) = @_;
238 die unless $we_are_responder;
239 responder_send_command "want $keyword";
240 foreach my $fn (@ourfns) {
241 protocol_receive_file \*STDIN, $fn;
243 protocol_expect \*STDIN, { m/^files-end$/ };
246 #---------- remote protocol support, initiator ----------
248 sub initiator_expect (&) {
250 protocol_expect \*RO, &$match;
253 #---------- end remote code ----------
256 if ($we_are_responder) {
258 responder_send_command "progress ".length($m) or die $!;
269 $ua = LWP::UserAgent->new();
273 progress "downloading $what...";
274 my $r = $ua->get(@_) or die $!;
275 return undef if $r->code == 404;
276 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
277 return $r->decoded_content();
280 our ($dscdata,$dscurl,$dsc,$skew_warning_vsn);
287 if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) {
293 return join '', @out;
298 my $intro = shift @_;
299 print $fh $intro or die $!;
300 print $fh shellquote @_ or die $!;
301 print $fh "\n" or die $!;
305 { local ($!); printcmd \*STDERR, "$_[0]: failed command:", @_ or die $!; };
307 fail "failed to fork/exec: $!";
308 } elsif (!($? & 0xff)) {
309 fail "subprocess failed with error exit status ".($?>>8);
311 fail "subprocess crashed (wait status $?)";
313 fail "subprocess produced invalid output";
318 printcmd(\*DEBUG,"+",@_) if $debug>0;
320 failedcmd @_ if system @_;
325 progress "dgit ok: @_";
327 progress "would be ok: @_ (but dry run only)";
331 sub cmdoutput_errok {
332 die Dumper(\@_)." ?" if grep { !defined } @_;
333 printcmd(\*DEBUG,"|",@_) if $debug>0;
334 open P, "-|", @_ or die $!;
337 { local $/ = undef; $d = <P>; }
339 if (!close P) { print DEBUG "=>!$?\n" if $debug>0; return undef; }
342 print DEBUG "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #';
347 my $d = cmdoutput_errok @_;
348 defined $d or failedcmd @_;
353 printcmd(\*STDERR,"#",@_);
356 sub runcmd_ordryrun {
365 my ($first_shell, @cmd) = @_;
366 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
369 our $helpmsg = <<END;
371 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
372 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
373 dgit [dgit-opts] build [git-buildpackage-opts|dpkg-buildpackage-opts]
374 dgit [dgit-opts] push [dgit-opts] [suite]
375 important dgit options:
376 -k<keyid> sign tag and package with <keyid> instead of default
377 --dry-run -n do not change anything, but go through the motions
378 --new -N allow introducing a new package
379 --debug -D increase debug level
380 -c<name>=<value> set git config option (used directly by dgit too)
383 our $later_warning_msg = <<END;
384 Perhaps the upload is stuck in incoming. Using the version from git.
388 print STDERR "$us: @_\n", $helpmsg or die $!;
393 @ARGV or badusage "too few arguments";
394 return scalar shift @ARGV;
398 print $helpmsg or die $!;
402 our %defcfg = ('dgit.default.distro' => 'debian',
403 'dgit.default.username' => '',
404 'dgit.default.archive-query-default-component' => 'main',
405 'dgit.default.ssh' => 'ssh',
406 'dgit-distro.debian.git-host' => 'git.debian.org',
407 'dgit-distro.debian.git-proto' => 'git+ssh://',
408 'dgit-distro.debian.git-path' => '/git/dgit-repos/repos',
409 'dgit-distro.debian.git-check' => 'ssh-cmd',
410 'dgit-distro.debian.git-create' => 'ssh-cmd',
411 'dgit-distro.debian.sshdakls-host' => 'coccia.debian.org',
412 'dgit-distro.debian.sshdakls-dir' =>
413 '/srv/ftp-master.debian.org/ftp/dists',
414 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
415 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/');
419 return undef if $c =~ /RETURN-UNDEF/;
420 my @cmd = (@git, qw(config --), $c);
423 local ($debug) = $debug-1;
424 $v = cmdoutput_errok @cmd;
431 my $dv = $defcfg{$c};
432 return $dv if defined $dv;
434 badcfg "need value for one of: @_";
437 sub access_distro () {
438 return cfg("dgit-suite.$isuite.distro",
439 "dgit.default.distro");
444 my $distro = $idistro || access_distro();
445 my $value = cfg(map { ("dgit-distro.$distro.$_",
446 "dgit.default.$_") } @keys);
450 sub access_someuserhost ($) {
452 my $user = access_cfg("$some-user",'username');
453 my $host = access_cfg("$some-host");
454 return length($user) ? "$user\@$host" : $host;
457 sub access_gituserhost () {
458 return access_someuserhost('git');
461 sub access_giturl () {
462 my $url = access_cfg('git-url','RETURN-UNDEF');
465 access_cfg('git-proto').
466 access_gituserhost().
467 access_cfg('git-path');
469 return "$url/$package.git";
472 sub parsecontrolfh ($$@) {
473 my ($fh, $desc, @opts) = @_;
474 my %opts = ('name' => $desc, @opts);
475 my $c = Dpkg::Control::Hash->new(%opts);
476 $c->parse($fh) or die "parsing of $desc failed";
481 my ($file, $desc) = @_;
482 my $fh = new IO::Handle;
483 open $fh, '<', $file or die "$file: $!";
484 my $c = parsecontrolfh($fh,$desc);
485 $fh->error and die $!;
491 my ($dctrl,$field) = @_;
492 my $v = $dctrl->{$field};
493 return $v if defined $v;
494 fail "missing field $field in ".$v->get_option('name');
498 my $c = Dpkg::Control::Hash->new();
499 my $p = new IO::Handle;
500 my @cmd = (qw(dpkg-parsechangelog), @_);
501 open $p, '-|', @cmd or die $!;
503 $?=0; $!=0; close $p or failedcmd @cmd;
509 sub archive_query ($) {
511 my $query = access_cfg('archive-query','RETURN-UNDEF');
512 if (!defined $query) {
513 my $distro = access_distro();
514 if ($distro eq 'debian') {
515 $query = "sshdakls:".
516 access_someuserhost('sshdakls').':'.
517 access_cfg('sshdakls-dir');
519 $query = "madison:$distro";
522 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
525 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
528 sub archive_query_madison ($$) {
529 my ($proto,$data) = @_;
530 die unless $proto eq 'madison';
531 $rmad{$package} ||= cmdoutput
532 qw(rmadison -asource),"-s$isuite","-u$data",$package;
533 my $rmad = $rmad{$package};
534 return madison_parse($rmad);
537 sub archive_query_sshdakls ($$) {
538 my ($proto,$data) = @_;
539 $data =~ s/:.*// or badcfg "invalid sshdakls method string \`$data'";
540 my $dakls = cmdoutput
541 access_cfg('ssh'), $data, qw(dak ls -asource),"-s$isuite",$package;
542 return madison_parse($dakls);
545 sub canonicalise_suite_sshdakls ($$) {
546 my ($proto,$data) = @_;
547 $data =~ m/:/ or badcfg "invalid sshdakls method string \`$data'";
549 (access_cfg('ssh'), $`,
551 " if test -h $isuite; then readlink $isuite; exit 0; fi;".
552 " if test -d $isuite; then echo $isuite; exit 0; fi;".
554 my $dakls = cmdoutput @cmd;
555 failedcmd @cmd unless $dakls =~ m/^\w/;
559 sub madison_parse ($) {
562 foreach my $l (split /\n/, $rmad) {
563 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
564 \s*( [^ \t|]+ )\s* \|
565 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
566 \s*( [^ \t|]+ )\s* }x or die "$rmad $?";
567 $1 eq $package or die "$rmad $package ?";
574 $component = access_cfg('archive-query-default-component');
576 $5 eq 'source' or die "$rmad ?";
577 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
578 my $subpath = "/pool/$component/$prefix/$package/".dscfn($vsn);
579 push @out, [$vsn,$subpath,$newsuite];
581 return sort { -version_compare_string($a->[0],$b->[0]); } @out;
584 sub canonicalise_suite_madison ($$) {
585 my @r = archive_query_madison($_[0],$_[1]);
587 "unable to canonicalise suite using package $package".
588 " which does not appear to exist in suite $isuite;".
589 " --existing-package may help";
593 sub canonicalise_suite () {
594 return if defined $csuite;
595 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
596 $csuite = archive_query('canonicalise_suite');
597 if ($isuite ne $csuite) {
598 # madison canonicalises for us
599 progress "canonical suite name for $isuite is $csuite";
603 sub get_archive_dsc () {
604 canonicalise_suite();
605 my @vsns = archive_query('archive_query');
606 foreach my $vinfo (@vsns) {
607 my ($vsn,$subpath) = @$vinfo;
608 $dscurl = access_cfg('mirror').$subpath;
609 $dscdata = url_get($dscurl);
611 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
614 my $dscfh = new IO::File \$dscdata, '<' or die $!;
615 print DEBUG Dumper($dscdata) if $debug>1;
616 $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
617 print DEBUG Dumper($dsc) if $debug>1;
618 my $fmt = getfield $dsc, 'Format';
619 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
625 sub check_for_git () {
627 my $how = access_cfg('git-check');
628 if ($how eq 'ssh-cmd') {
630 (access_cfg('ssh'),access_gituserhost(),
631 " set -e; cd ".access_cfg('git-path').";".
632 " if test -d $package.git; then echo 1; else echo 0; fi");
633 my $r= cmdoutput @cmd;
634 failedcmd @cmd unless $r =~ m/^[01]$/;
637 badcfg "unknown git-check \`$how'";
641 sub create_remote_git_repo () {
642 my $how = access_cfg('git-create');
643 if ($how eq 'ssh-cmd') {
645 (access_cfg('ssh'),access_gituserhost(),
646 "set -e; cd ".access_cfg('git-path').";".
647 " cp -a _template $package.git");
649 badcfg "unknown git-create \`$how'";
653 our ($dsc_hash,$lastpush_hash);
655 our $ud = '.git/dgit/unpack';
663 sub mktree_in_ud_from_only_subdir () {
664 # changes into the subdir
667 $dirs[0] =~ m#^([^/]+)/\.$# or die;
669 chdir $dir or die "$dir $!";
670 fail "source package contains .git directory" if stat '.git';
671 die $! unless $!==&ENOENT;
672 runcmd qw(git init -q);
673 rmtree('.git/objects');
674 symlink '../../../../objects','.git/objects' or die $!;
675 runcmd @git, qw(add -Af);
676 my $tree = cmdoutput @git, qw(write-tree);
677 $tree =~ m/^\w+$/ or die "$tree ?";
681 sub dsc_files_info () {
682 foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
683 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
684 ['Files', 'Digest::MD5', 'new()']) {
685 my ($fname, $module, $method) = @$csumi;
686 my $field = $dsc->{$fname};
687 next unless defined $field;
688 eval "use $module; 1;" or die $@;
690 foreach (split /\n/, $field) {
692 m/^(\w+) (\d+) (\S+)$/ or
693 fail "could not parse .dsc $fname line \`$_'";
694 my $digester = eval "$module"."->$method;" or die $@;
699 Digester => $digester,
704 fail "missing any supported Checksums-* or Files field in ".
705 $dsc->get_option('name');
709 map { $_->{Filename} } dsc_files_info();
712 sub is_orig_file ($) {
714 m/\.orig(?:-\w+)?\.tar\.\w+$/;
717 sub make_commit ($) {
719 return cmdoutput @git, qw(hash-object -w -t commit), $file;
722 sub clogp_authline ($) {
724 my $author = getfield $clogp, 'Maintainer';
725 $author =~ s#,.*##ms;
726 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
727 my $authline = "$author $date";
728 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
729 fail "unexpected commit author line format \`$authline'".
730 " (was generated from changelog Maintainer field)";
734 sub generate_commit_from_dsc () {
738 foreach my $f (dsc_files()) {
739 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
741 link "../../../$f", $f
745 runcmd @dget, qw(--), $dscurl;
746 foreach my $f (grep { is_orig_file($_) } @files) {
747 link $f, "../../../../$f"
751 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
752 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
753 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
754 my $authline = clogp_authline $clogp;
755 my $changes = getfield $clogp, 'Changes';
756 open C, ">../commit.tmp" or die $!;
757 print C <<END or die $!;
764 # imported from the archive
767 my $outputhash = make_commit qw(../commit.tmp);
768 my $cversion = getfield $clogp, 'Version';
769 progress "synthesised git commit from .dsc $cversion";
770 if ($lastpush_hash) {
771 runcmd @git, qw(reset --hard), $lastpush_hash;
772 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
773 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
774 my $oversion = getfield $oldclogp, 'Version';
776 version_compare_string($oversion, $cversion);
778 # git upload/ is earlier vsn than archive, use archive
779 open C, ">../commit2.tmp" or die $!;
780 print C <<END or die $!;
782 parent $lastpush_hash
787 Record $package ($cversion) in archive suite $csuite
789 $outputhash = make_commit qw(../commit2.tmp);
790 } elsif ($vcmp > 0) {
791 print STDERR <<END or die $!;
793 Version actually in archive: $cversion (older)
794 Last allegedly pushed/uploaded: $oversion (newer or same)
797 $outputhash = $lastpush_hash;
799 $outputhash = $lastpush_hash;
802 chdir '../../../..' or die $!;
803 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
804 'DGIT_ARCHIVE', $outputhash;
805 cmdoutput @git, qw(log -n2), $outputhash;
806 # ... gives git a chance to complain if our commit is malformed
811 sub ensure_we_have_orig () {
812 foreach my $fi (dsc_files_info()) {
813 my $f = $fi->{Filename};
814 next unless is_orig_file($f);
815 if (open F, "<", "../$f") {
816 $fi->{Digester}->reset();
817 $fi->{Digester}->addfile(*F);
819 my $got = $fi->{Digester}->hexdigest();
820 $got eq $fi->{Hash} or
821 fail "existing file $f has hash $got but .dsc".
822 " demands hash $fi->{Hash}".
823 " (perhaps you should delete this file?)";
824 progress "using existing $f";
827 die "$f $!" unless $!==&ENOENT;
829 my $origurl = $dscurl;
830 $origurl =~ s{/[^/]+$}{};
832 die "$f ?" unless $f =~ m/^${package}_/;
833 die "$f ?" if $f =~ m#/#;
834 runcmd_ordryrun shell_cmd 'cd ..', @dget,'--',$origurl;
839 return cmdoutput @git, qw(rev-parse), "$_[0]~0";
842 sub is_fast_fwd ($$) {
843 my ($ancestor,$child) = @_;
844 my @cmd = (@git, qw(merge-base), $ancestor, $child);
845 my $mb = cmdoutput_errok @cmd;
847 return rev_parse($mb) eq rev_parse($ancestor);
849 $?==256 or failedcmd @cmd;
854 sub git_fetch_us () {
855 runcmd_ordryrun @git, qw(fetch),access_giturl(),fetchspec();
858 sub fetch_from_archive () {
859 # ensures that lrref() is what is actually in the archive,
864 foreach my $field (@ourdscfield) {
865 $dsc_hash = $dsc->{$field};
866 last if defined $dsc_hash;
868 if (defined $dsc_hash) {
869 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
871 progress "last upload to archive specified git hash";
873 progress "last upload to archive has NO git hash";
876 progress "no version available from the archive";
879 my $lrref_fn = ".git/".lrref();
880 if (open H, $lrref_fn) {
881 $lastpush_hash = <H>;
882 chomp $lastpush_hash;
883 die "$lrref_fn $lastpush_hash ?" unless $lastpush_hash =~ m/^\w+$/;
884 } elsif ($! == &ENOENT) {
889 print DEBUG "previous reference hash=$lastpush_hash\n";
891 if (defined $dsc_hash) {
892 fail "missing git history even though dsc has hash -".
893 " could not find commit $dsc_hash".
894 " (should be in ".access_giturl()."#".rrref().")"
895 unless $lastpush_hash;
897 ensure_we_have_orig();
898 if ($dsc_hash eq $lastpush_hash) {
899 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
900 print STDERR <<END or die $!;
902 Git commit in archive is behind the last version allegedly pushed/uploaded.
903 Commit referred to by archive: $dsc_hash
904 Last allegedly pushed/uploaded: $lastpush_hash
907 $hash = $lastpush_hash;
909 fail "archive's .dsc refers to ".$dsc_hash.
910 " but this is an ancestor of ".$lastpush_hash;
913 $hash = generate_commit_from_dsc();
914 } elsif ($lastpush_hash) {
915 # only in git, not in the archive yet
916 $hash = $lastpush_hash;
917 print STDERR <<END or die $!;
919 Package not found in the archive, but has allegedly been pushed using dgit.
923 print DEBUG "nothing found!\n";
924 if (defined $skew_warning_vsn) {
925 print STDERR <<END or die $!;
927 Warning: relevant archive skew detected.
928 Archive allegedly contains $skew_warning_vsn
929 But we were not able to obtain any version from the archive or git.
935 print DEBUG "current hash=$hash\n";
936 if ($lastpush_hash) {
937 fail "not fast forward on last upload branch!".
938 " (archive's version left in DGIT_ARCHIVE)"
939 unless is_fast_fwd($lastpush_hash, $hash);
941 if (defined $skew_warning_vsn) {
943 print DEBUG "SKEW CHECK WANT $skew_warning_vsn\n";
944 my $clogf = ".git/dgit/changelog.tmp";
945 runcmd shell_cmd "exec >$clogf",
946 @git, qw(cat-file blob), "$hash:debian/changelog";
947 my $gotclogp = parsechangelog("-l$clogf");
948 my $got_vsn = getfield $gotclogp, 'Version';
949 print DEBUG "SKEW CHECK GOT $got_vsn\n";
950 if (version_compare_string($got_vsn, $skew_warning_vsn) < 0) {
951 print STDERR <<END or die $!;
953 Warning: archive skew detected. Using the available version:
954 Archive allegedly contains $skew_warning_vsn
955 We were able to obtain only $got_vsn
960 if ($lastpush_hash ne $hash) {
961 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
965 dryrun_report @upd_cmd;
973 canonicalise_suite();
974 badusage "dry run makes no sense with clone" if $dryrun;
975 mkdir $dstdir or die "$dstdir $!";
976 chdir "$dstdir" or die "$dstdir $!";
977 runcmd @git, qw(init -q);
978 runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec();
979 open H, "> .git/HEAD" or die $!;
980 print H "ref: ".lref()."\n" or die $!;
982 runcmd @git, qw(remote add), 'origin', access_giturl();
983 if (check_for_git()) {
984 progress "fetching existing git history";
986 runcmd_ordryrun @git, qw(fetch origin);
988 progress "starting new git history";
990 fetch_from_archive() or no_such_package;
991 runcmd @git, qw(reset --hard), lrref();
992 printdone "ready for work in $dstdir";
996 if (check_for_git()) {
999 fetch_from_archive() or no_such_package();
1000 printdone "fetched into ".lrref();
1005 runcmd_ordryrun @git, qw(merge -m),"Merge from $csuite [dgit]",
1007 printdone "fetched to ".lrref()." and merged into HEAD";
1010 sub check_not_dirty () {
1011 return if $ignoredirty;
1012 my @cmd = (@git, qw(diff --quiet HEAD));
1013 printcmd(\*DEBUG,"+",@cmd) if $debug>0;
1014 $!=0; $?=0; system @cmd;
1015 return if !$! && !$?;
1016 if (!$! && $?==256) {
1017 fail "working tree is dirty (does not match HEAD)";
1023 sub commit_quilty_patch () {
1024 my $output = cmdoutput @git, qw(status --porcelain);
1027 foreach my $l (split /\n/, $output) {
1028 next unless $l =~ m/\S/;
1029 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
1032 print STDERR "git status: $l\n";
1036 fail "unexpected output from git status (is tree clean?)" if $bad;
1038 progress "nothing quilty to commit, ok.";
1041 runcmd_ordryrun @git, qw(add), sort keys %adds;
1042 my $m = "Commit Debian 3.0 (quilt) metadata";
1044 runcmd_ordryrun @git, qw(commit -m), $m;
1049 return 0 unless $format eq '3.0 (quilt)';
1050 progress "Format \`$format', urgh";
1052 progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
1058 sub push_parse_changelog ($) {
1061 my $clogp = Dpkg::Control::Hash->new();
1062 $clogp->load($clogpfn);
1064 $package = getfield $clogp, 'Source';
1065 my $cversion = getfield $clogp, 'Version';
1066 my $tag = debiantag($cversion);
1067 runcmd @git, qw(check-ref-format), $tag;
1069 my $dscfn = dscfn($cversion);
1071 return ($clogp, $cversion, $tag, $dscfn);
1074 sub push_parse_dsc ($$) {
1075 my ($dscfn,$dscfnwhat, $cversion) = @_;
1076 $dsc = parsecontrol($dscfn,$dscfnwhat);
1077 my $dversion = getfield $dsc, 'Version';
1078 my $dscpackage = getfield $dsc, 'Source';
1079 ($dscpackage eq $package && $dversion eq $cversion) or
1080 fail "$dsc is for $dscpackage $dversion".
1081 " but debian/changelog is for $package $cversion";
1084 sub push_mktag ($$$$$$$$) {
1085 my ($head,$clogp,$tag,
1087 $changesfile,$changesfilewhat,
1090 $dsc->{$ourdscfield[0]} = $head;
1091 $dsc->save("$dscfn.tmp") or die $!;
1093 my $changes = parsecontrol($changesfile,$changesfilewhat);
1094 foreach my $field (qw(Source Distribution Version)) {
1095 $changes->{$field} eq $clogp->{$field} or
1096 fail "changes field $field \`$changes->{$field}'".
1097 " does not match changelog \`$clogp->{$field}'";
1100 # We make the git tag by hand because (a) that makes it easier
1101 # to control the "tagger" (b) we can do remote signing
1102 my $authline = clogp_authline $clogp;
1103 open TO, '>', $tfn->('.tmp') or die $!;
1104 print TO <<END or die $!;
1110 $package release $cversion for $csuite [dgit]
1114 my $tagobjfn = $tfn->('.tmp');
1116 if (!defined $keyid) {
1117 $keyid = access_cfg('keyid','RETURN-UNDEF');
1119 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
1120 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
1121 push @sign_cmd, qw(-u),$keyid if defined $keyid;
1122 push @sign_cmd, $tfn->('.tmp');
1123 runcmd_ordryrun @sign_cmd;
1125 $tagobjfn = $tfn->('.signed.tmp');
1126 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
1127 $tfn->('.tmp'), $tfn->('.tmp.asc');
1134 sub sign_changes ($) {
1135 my ($changesfile) = @_;
1137 my @debsign_cmd = @debsign;
1138 push @debsign_cmd, "-k$keyid" if defined $keyid;
1139 push @debsign_cmd, "-p$pgp[0]" if $pgp[0] ne 'gpg';
1140 push @debsign_cmd, $changesfile;
1141 runcmd_ordryrun @debsign_cmd;
1146 print DEBUG "actually entering push\n";
1149 my $clogpfn = ".git/dgit/changelog.822.tmp";
1150 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
1152 responder_send_file('parsed-changelog', $clogpfn);
1154 my ($clogp, $cversion, $tag, $dscfn) =
1155 push_parse_changelog("$clogpfn");
1158 fail "looked for .dsc $dscfn, but $!;".
1159 " maybe you forgot to build";
1161 responder_send_file('dsc', "../$dscfn");
1163 push_parse_dsc("../$dscfn", $dscfn, $cversion);
1165 my $format = getfield $dsc, 'Format';
1166 print DEBUG "format $format\n";
1167 if (madformat($format)) {
1168 commit_quilty_patch();
1171 chdir $ud or die $!;
1172 progress "checking that $dscfn corresponds to HEAD";
1173 runcmd qw(dpkg-source -x --), "../../../../$dscfn";
1174 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1175 chdir '../../../..' or die $!;
1176 printcmd \*DEBUG,"+",@_;
1177 my @diffcmd = (@git, qw(diff --exit-code), $tree);
1179 if (system @diffcmd) {
1180 if ($! && $?==256) {
1181 fail "$dscfn specifies a different tree to your HEAD commit;".
1182 " perhaps you forgot to build";
1188 #do fast forward check and maybe fake merge
1189 # if (!is_fast_fwd(mainbranch
1190 # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
1191 # map { lref($_).":".rref($_) }
1193 my $head = rev_parse('HEAD');
1194 if (!$changesfile) {
1195 my $multi = "../${package}_".(stripepoch $cversion)."_multi.changes";
1196 if (stat "$multi") {
1197 $changesfile = $multi;
1199 $!==&ENOENT or die "$multi: $!";
1200 my $pat = "${package}_".(stripepoch $cversion)."_*.changes";
1201 my @cs = glob "../$pat";
1202 fail "failed to find unique changes file".
1203 " (looked for $pat in .., or $multi);".
1204 " perhaps you need to use dgit -C"
1206 ($changesfile) = @cs;
1210 responder_send_file('changes',$changesfn);
1212 my $tfn = sub { ".git/dgit/tag$_[0]"; };
1215 ? responder_receive_files('signed-tag', $tfn->('.signed.tmp'))
1216 : push_mktag($head,$clogp,$tag,
1218 $changesfile,$changesfile,
1221 my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
1222 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
1223 runcmd_ordryrun @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
1224 runcmd_ordryrun @git, qw(tag -v --), $tag;
1226 if (!check_for_git()) {
1227 create_remote_git_repo();
1229 runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref();
1230 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
1232 if (!$we_are_responder) {
1234 rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
1236 progress "[new .dsc left in $dscfn.tmp]";
1240 if ($we_are_responder) {
1241 my $dryrunsuffix = $dryrun ? ".tmp" : "";
1242 responder_receive_files('signed-dsc-changes',
1243 "../$dscfn$dryrunsuffix",
1244 "$changesfile$dryrupnsuffix");
1246 sign_changes $changesfile;
1249 runcmd_ordryrun @git, qw(push),access_giturl(),"refs/tags/$tag";
1250 my $host = access_cfg('upload-host','RETURN-UNDEF');
1251 my @hostarg = defined($host) ? ($host,) : ();
1252 runcmd_ordryrun @dput, @hostarg, $changesfile;
1253 printdone "pushed and uploaded $cversion";
1255 responder_send_command("complete");
1261 badusage "-p is not allowed with clone; specify as argument instead"
1262 if defined $package;
1265 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
1266 ($package,$isuite) = @ARGV;
1267 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
1268 ($package,$dstdir) = @ARGV;
1269 } elsif (@ARGV==3) {
1270 ($package,$isuite,$dstdir) = @ARGV;
1272 badusage "incorrect arguments to dgit clone";
1274 $dstdir ||= "$package";
1278 sub branchsuite () {
1279 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
1280 if ($branch =~ m#$lbranch_re#o) {
1287 sub fetchpullargs () {
1288 if (!defined $package) {
1289 my $sourcep = parsecontrol('debian/control','debian/control');
1290 $package = getfield $sourcep, 'Source';
1293 # $isuite = branchsuite(); # this doesn't work because dak hates canons
1295 my $clogp = parsechangelog();
1296 $isuite = getfield $clogp, 'Distribution';
1298 canonicalise_suite();
1299 progress "fetching from suite $csuite";
1300 } elsif (@ARGV==1) {
1302 canonicalise_suite();
1304 badusage "incorrect arguments to dgit fetch or dgit pull";
1322 badusage "-p is not allowed with dgit push" if defined $package;
1324 my $clogp = parsechangelog();
1325 $package = getfield $clogp, 'Source';
1328 } elsif (@ARGV==1) {
1329 ($specsuite) = (@ARGV);
1331 badusage "incorrect arguments to dgit push";
1333 $isuite = getfield $clogp, 'Distribution';
1335 local ($package) = $existing_package; # this is a hack
1336 canonicalise_suite();
1338 if (defined $specsuite && $specsuite ne $isuite) {
1339 canonicalise_suite();
1340 $csuite eq $specsuite or
1341 fail "dgit push: changelog specifies $isuite ($csuite)".
1342 " but command line specifies $specsuite";
1344 if (check_for_git()) {
1347 if (fetch_from_archive()) {
1348 is_fast_fwd(lrref(), 'HEAD') or
1349 fail "dgit push: HEAD is not a descendant".
1350 " of the archive's version.\n".
1351 "$us: To overwrite it, use git-merge -s ours ".lrref().".";
1354 fail "package appears to be new in this suite;".
1355 " if this is intentional, use --new";
1360 #---------- remote commands' implementation ----------
1362 sub cmd_remote_push_responder {
1363 my ($nrargs) = shift @ARGV;
1364 my (@rargs) = @ARGV[0..$nrargs-1];
1365 @ARGV = @ARGV[$nrargs..$#ARGV];
1368 chdir $dir or die "$dir: $!";
1371 responder_send_command("dgit-remote-push-ready");
1379 return unless defined $i_tmp;
1380 chdir "/" or die $!;
1381 eval { rmtree $i_tmp; };
1385 my ($base,$selector,@args) = @_;
1386 $selector =~ s/\-/_/g;
1387 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
1393 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
1403 push @rdgit, @ropts;
1404 push @rdgit, (scalar @rargs), @rargs;
1406 my @cmd = (@ssh, $host, shellquote @rdgit);
1407 my $pid = open2(\*RO, \*RI, @cmd);
1410 chdir $i_tmp or die "$i_tmp $!";
1411 initiator_expect { m/^dgit-remote-push-ready/ };
1413 initiator_expect { m/^(\S+)(?: (.*))?$/ };
1414 my ($icmd,$iargs) = ($1, $2);
1415 i_method "i_resp_", $icmd, $iargs;
1422 sub i_resp_progress ($) {
1424 my $msg = protocol_read_bytes \*RO, $rhs;
1428 sub i_resp_complete {
1433 sub i_resp_file ($) {
1435 my $localname = i_method "i_localname_", $keyword;
1436 my $localpath = "$i_tmp/$localname";
1437 stat $localpath and badproto \*RO, "file $keyword ($localpath) twice";
1438 protocol_receive_file \*RO, $localpath;
1444 $_[0] =~ m/^(\S+) (.*)$/;
1450 sub i_resp_want ($) {
1452 die "$keyword ?" if $i_wanted{$keyword}++;
1453 my @localpaths = i_method "i_want_", $keyword;
1454 foreach my $localpath (@localpaths) {
1455 protocol_send_file \*RI, $localpath;
1457 print RI "end-files\n" or die $!;
1460 our ($i_clogp, $i_version, $i_tag, $i_dscfn);
1462 sub i_localname_parsed_changelog { return "remote-changelog.822"; }
1463 sub i_localname_changes { return "remote.changes"; }
1464 sub i_localname_dsc {
1465 ($i_clogp, $i_version, $i_tag, $i_dscfn) =
1466 push_parse_changelog 'remote-changelog.822';
1467 die if $i_dscfn =~ m#/|^\W#;
1471 sub i_want_signed_tag {
1472 defined $i_param{'head'} && defined $dscfn
1473 or badproto \*RO, "sequencing error";
1474 my $head = $i_param{'head'};
1475 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
1477 push_parse_dsc $i_dscfn, 'remote dsc',
1479 push_mktag $head, $i_clogp, $i_tag,
1481 'remote.changes', 'remote changes',
1487 sub i_want_signed_dsc_changes {
1488 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
1489 sign_changes 'remote.changes';
1490 return ($i_dscfn, 'remote.changes');
1493 #---------- building etc. ----------
1499 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
1501 sub build_maybe_quilt_fixup () {
1502 if (!open F, "debian/source/format") {
1503 die $! unless $!==&ENOENT;
1507 F->error and die $!;
1509 return unless madformat($_);
1511 my $clogp = parsechangelog();
1512 my $version = getfield $clogp, 'Version';
1513 my $author = getfield $clogp, 'Maintainer';
1514 my $headref = rev_parse('HEAD');
1517 my $patchname = "auto-$version-$headref-$time";
1518 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
1520 my $descfn = ".git/dgit/quilt-description.tmp";
1521 open O, '>', $descfn or die "$descfn: $!";
1523 $msg =~ s/^\s+$/ ./mg;
1524 print O <<END or die $!;
1525 Description: Automatically generated patch ($clogp->{Version})
1526 Last (up to) $ncommits git changes, FYI:
1536 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
1537 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
1538 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
1539 runcmd_ordryrun @dpkgsource, qw(--commit .), $patchname;
1542 if (!open P, '>>', ".pc/applied-patches") {
1543 $!==&ENOENT or die $!;
1548 commit_quilty_patch();
1551 sub quilt_fixup_editor () {
1552 my $descfn = $ENV{$fakeeditorenv};
1553 my $editing = $ARGV[$#ARGV];
1554 open I1, '<', $descfn or die "$descfn: $!";
1555 open I2, '<', $editing or die "$editing: $!";
1556 unlink $editing or die "$editing: $!";
1557 open O, '>', $editing or die "$editing: $!";
1558 while (<I1>) { print O or die $!; } I1->error and die $!;
1561 $copying ||= m/^\-\-\- /;
1562 next unless $copying;
1565 I2->error and die $!;
1571 badusage "-p is not allowed when building" if defined $package;
1573 my $clogp = parsechangelog();
1574 $isuite = getfield $clogp, 'Distribution';
1575 $package = getfield $clogp, 'Source';
1576 $version = getfield $clogp, 'Version';
1577 build_maybe_quilt_fixup();
1581 badusage "dgit build implies --clean=dpkg-source"
1582 if $cleanmode ne 'dpkg-source';
1584 runcmd_ordryrun @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
1585 printdone "build successful\n";
1589 badusage "dgit git-build implies --clean=dpkg-source"
1590 if $cleanmode ne 'dpkg-source';
1593 (qw(git-buildpackage -us -uc --git-no-sign-tags),
1594 "--git-builder=@dpkgbuildpackage");
1595 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
1596 canonicalise_suite();
1597 push @cmd, "--git-debian-branch=".lbranch();
1599 push @cmd, changesopts();
1600 runcmd_ordryrun @cmd, @ARGV;
1601 printdone "build successful\n";
1606 $sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
1607 $dscfn = dscfn($version);
1608 if ($cleanmode eq 'dpkg-source') {
1609 runcmd_ordryrun (@dpkgbuildpackage, qw(-us -uc -S)), changesopts();
1611 if ($cleanmode eq 'git') {
1612 runcmd_ordryrun @git, qw(clean -xdf);
1613 } elsif ($cleanmode eq 'none') {
1617 my $pwd = cmdoutput qw(env - pwd);
1618 my $leafdir = basename $pwd;
1619 chdir ".." or die $!;
1620 runcmd_ordryrun @dpkgsource, qw(-b --), $leafdir;
1621 chdir $pwd or die $!;
1622 runcmd_ordryrun qw(sh -ec),
1623 'exec >$1; shift; exec "$@"','x',
1624 "../$sourcechanges",
1625 @dpkggenchanges, qw(-S), changesopts();
1629 sub cmd_build_source {
1630 badusage "build-source takes no additional arguments" if @ARGV;
1632 printdone "source built, results in $dscfn and $sourcechanges";
1637 chdir ".." or die $!;
1638 my $pat = "${package}_".(stripepoch $version)."_*.changes";
1640 stat $dscfn or fail "$dscfn (in parent directory): $!";
1641 stat $sourcechanges or fail "$sourcechanges (in parent directory): $!";
1642 foreach my $cf (glob $pat) {
1643 next if $cf eq $sourcechanges;
1644 unlink $cf or fail "remove $cf: $!";
1647 runcmd_ordryrun @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
1648 runcmd_ordryrun @mergechanges, glob $pat;
1649 my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
1651 stat $multichanges or fail "$multichanges: $!";
1653 printdone "build successful, results in $multichanges\n" or die $!;
1656 sub cmd_quilt_fixup {
1657 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
1658 my $clogp = parsechangelog();
1659 $version = getfield $clogp, 'Version';
1660 build_maybe_quilt_fixup();
1663 #---------- argument parsing and main program ----------
1666 print "dgit version $our_version\n" or die $!;
1673 last unless $ARGV[0] =~ m/^-/;
1677 if (m/^--dry-run$/) {
1680 } elsif (m/^--no-sign$/) {
1683 } elsif (m/^--help$/) {
1685 } elsif (m/^--version$/) {
1687 } elsif (m/^--new$/) {
1690 } elsif (m/^--(\w+)=(.*)/s &&
1691 ($om = $opts_opt_map{$1}) &&
1695 } elsif (m/^--(\w+):(.*)/s &&
1696 !$opts_opt_cmdonly{$1} &&
1697 ($om = $opts_opt_map{$1})) {
1700 } elsif (m/^--existing-package=(.*)/s) {
1702 $existing_package = $1;
1703 } elsif (m/^--distro=(.*)/s) {
1706 } elsif (m/^--clean=(dpkg-source|git|none)$/s) {
1709 } elsif (m/^--clean=(.*)$/s) {
1710 badusage "unknown cleaning mode \`$1'";
1711 } elsif (m/^--ignore-dirty$/s) {
1714 } elsif (m/^--no-quilt-fixup$/s) {
1718 badusage "unknown long option \`$_'";
1725 } elsif (s/^-h/-/) {
1727 } elsif (s/^-D/-/) {
1729 open DEBUG, ">&STDERR" or die $!;
1731 } elsif (s/^-N/-/) {
1734 } elsif (m/^-[vm]/) {
1736 push @changesopts, $_;
1738 } elsif (s/^-c(.*=.*)//s) {
1740 push @git, '-c', $1;
1741 } elsif (s/^-d(.*)//s) {
1744 } elsif (s/^-C(.*)//s) {
1747 } elsif (s/^-k(.*)//s) {
1749 } elsif (s/^-wn//s) {
1751 $cleanmode = 'none';
1752 } elsif (s/^-wg//s) {
1755 } elsif (s/^-wd//s) {
1757 $cleanmode = 'dpkg-source';
1759 badusage "unknown short option \`$_'";
1766 if ($ENV{$fakeeditorenv}) {
1767 quilt_fixup_editor();
1770 delete $ENV{'DGET_UNPACK'};
1773 print STDERR "DRY RUN ONLY\n" if $dryrun;
1775 print STDERR $helpmsg or die $!;
1778 my $cmd = shift @ARGV;
1780 { no strict qw(refs); &{"cmd_$cmd"}(); }