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;
27 use File::Temp qw(tempdir);
33 our $our_version = 'UNRELEASED'; ###substituted###
35 our $isuite = 'unstable';
41 our $dryrun_level = 0;
43 our $buildproductsdir = '..';
48 our $existing_package = 'dpkg';
49 our $cleanmode = 'dpkg-source';
50 our $changes_since_version;
51 our $we_are_responder;
52 our $initiator_tempdir;
54 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
56 our $suite_re = '[-+.0-9a-z]+';
59 our (@dget) = qw(dget);
60 our (@dput) = qw(dput);
61 our (@debsign) = qw(debsign);
63 our (@sbuild) = qw(sbuild -A);
65 our (@dgit) = qw(dgit);
66 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
67 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
68 our (@dpkggenchanges) = qw(dpkg-genchanges);
69 our (@mergechanges) = qw(mergechanges -f);
70 our (@changesopts) = ('');
72 our %opts_opt_map = ('dget' => \@dget,
74 'debsign' => \@debsign,
79 'dpkg-source' => \@dpkgsource,
80 'dpkg-buildpackage' => \@dpkgbuildpackage,
81 'dpkg-genchanges' => \@dpkggenchanges,
82 'ch' => \@changesopts,
83 'mergechanges' => \@mergechanges);
85 our %opts_opt_cmdonly = ('gpg' => 1);
90 open DEBUG, ">/dev/null" or die $!;
94 our $remotename = 'dgit';
95 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
96 our $branchprefix = 'dgit';
99 sub lbranch () { return "$branchprefix/$csuite"; }
100 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
101 sub lref () { return "refs/heads/".lbranch(); }
102 sub lrref () { return "refs/remotes/$remotename/$branchprefix/$csuite"; }
103 sub rrref () { return "refs/$branchprefix/$csuite"; }
118 return "${package}_".(stripepoch $vsn).".dsc";
122 our $debugprefix = '';
127 foreach my $f (@end) {
129 warn "$us: cleanup: $@" if length $@;
133 sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
136 die $us.($we_are_responder ? " (build host)" : "").": @_\n";
139 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
141 sub no_such_package () {
142 print STDERR "$us: package $package does not exist in suite $isuite\n";
148 return "+".rrref().":".lrref();
153 printdebug "CD $newdir\n";
154 chdir $newdir or die "chdir: $newdir: $!";
157 #---------- remote protocol support, common ----------
159 # remote push initiator/responder protocol:
160 # < dgit-remote-push-ready [optional extra info ignored by old initiators]
162 # > file parsed-changelog
163 # [indicates that output of dpkg-parsechangelog follows]
164 # > data-block NBYTES
165 # > [NBYTES bytes of data (no newline)]
166 # [maybe some more blocks]
178 # [indicates that signed tag is wanted]
179 # < data-block NBYTES
180 # < [NBYTES bytes of data (no newline)]
181 # [maybe some more blocks]
185 # > want signed-dsc-changes
186 # < data-block NBYTES [transfer of signed dsc]
188 # < data-block NBYTES [transfer of signed changes]
196 fail "connection lost: $!" if $fh->error;
197 fail "protocol violation; $m not expected";
200 sub protocol_expect (&$) {
201 my ($match, $fh) = @_;
204 defined && chomp or badproto $fh, "eof";
212 badproto $fh, "\`$_'";
215 sub protocol_send_file ($$) {
216 my ($fh, $ourfn) = @_;
217 open PF, "<", $ourfn or die "$ourfn: $!";
220 my $got = read PF, $d, 65536;
221 die "$ourfn: $!" unless defined $got;
223 print $fh "data-block ".length($d)."\n" or die $!;
224 print $fh $d or die $!;
226 PF->error and die "$ourfn $!";
227 print $fh "data-end\n" or die $!;
231 sub protocol_read_bytes ($$) {
232 my ($fh, $nbytes) = @_;
233 $nbytes =~ m/^[1-9]\d{0,5}$/ or badproto \*RO, "bad byte count";
235 my $got = read $fh, $d, $nbytes;
236 $got==$nbytes or badproto $fh, "eof during data block";
240 sub protocol_receive_file ($$) {
241 my ($fh, $ourfn) = @_;
242 printdebug "() $ourfn\n";
243 open PF, ">", $ourfn or die "$ourfn: $!";
245 my ($y,$l) = protocol_expect {
246 m/^data-block (.*)$/ ? (1,$1) :
247 m/^data-end$/ ? (0,) :
251 my $d = protocol_read_bytes $fh, $l;
252 print PF $d or die $!;
257 #---------- remote protocol support, responder ----------
259 sub responder_send_command ($) {
261 return unless $we_are_responder;
262 # called even without $we_are_responder
263 printdebug ">> $command\n";
264 print PO $command, "\n" or die $!;
267 sub responder_send_file ($$) {
268 my ($keyword, $ourfn) = @_;
269 return unless $we_are_responder;
270 printdebug "]] $keyword $ourfn\n";
271 responder_send_command "file $keyword";
272 protocol_send_file \*PO, $ourfn;
275 sub responder_receive_files ($@) {
276 my ($keyword, @ourfns) = @_;
277 die unless $we_are_responder;
278 printdebug "[[ $keyword @ourfns\n";
279 responder_send_command "want $keyword";
280 foreach my $fn (@ourfns) {
281 protocol_receive_file \*PI, $fn;
284 protocol_expect { m/^files-end$/ } \*PI;
287 #---------- remote protocol support, initiator ----------
289 sub initiator_expect (&) {
291 protocol_expect { &$match } \*RO;
294 #---------- end remote code ----------
297 if ($we_are_responder) {
299 responder_send_command "progress ".length($m) or die $!;
300 print PO $m or die $!;
310 $ua = LWP::UserAgent->new();
314 progress "downloading $what...";
315 my $r = $ua->get(@_) or die $!;
316 return undef if $r->code == 404;
317 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
318 return $r->decoded_content();
321 our ($dscdata,$dscurl,$dsc,$skew_warning_vsn);
328 if (m{[^-=_./0-9a-z]}i) {
335 return join ' ', @out;
340 my $intro = shift @_;
341 print $fh $intro," " or die $!;
342 print $fh shellquote @_ or die $!;
343 print $fh "\n" or die $!;
347 { local ($!); printcmd \*STDERR, "$us: failed command:", @_ or die $!; };
349 fail "failed to fork/exec: $!";
350 } elsif (!($? & 0xff)) {
351 fail "subprocess failed with error exit status ".($?>>8);
353 fail "subprocess crashed (wait status $?)";
355 fail "subprocess produced invalid output";
360 printcmd(\*DEBUG,$debugprefix."+",@_) if $debug>0;
362 failedcmd @_ if system @_;
365 sub act_local () { return $dryrun_level <= 1; }
366 sub act_scary () { return !$dryrun_level; }
369 if (!$dryrun_level) {
370 progress "dgit ok: @_";
372 progress "would be ok: @_ (but dry run only)";
376 sub cmdoutput_errok {
377 die Dumper(\@_)." ?" if grep { !defined } @_;
378 printcmd(\*DEBUG,$debugprefix."|",@_) if $debug>0;
379 open P, "-|", @_ or die $!;
382 { local $/ = undef; $d = <P>; }
384 if (!close P) { printdebug "=>!$?\n" if $debug>0; return undef; }
387 printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #';
392 my $d = cmdoutput_errok @_;
393 defined $d or failedcmd @_;
398 printcmd(\*STDERR,$debugprefix."#",@_);
401 sub runcmd_ordryrun {
409 sub runcmd_ordryrun_local {
418 my ($first_shell, @cmd) = @_;
419 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
422 our $helpmsg = <<END;
424 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
425 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
426 dgit [dgit-opts] build [git-buildpackage-opts|dpkg-buildpackage-opts]
427 dgit [dgit-opts] push [dgit-opts] [suite]
428 dgit [dgit-opts] rpush build-host:build-dir ...
429 important dgit options:
430 -k<keyid> sign tag and package with <keyid> instead of default
431 --dry-run -n do not change anything, but go through the motions
432 --damp-run -L like --dry-run but make local changes, without signing
433 --new -N allow introducing a new package
434 --debug -D increase debug level
435 -c<name>=<value> set git config option (used directly by dgit too)
438 our $later_warning_msg = <<END;
439 Perhaps the upload is stuck in incoming. Using the version from git.
443 print STDERR "$us: @_\n", $helpmsg or die $!;
448 @ARGV or badusage "too few arguments";
449 return scalar shift @ARGV;
453 print $helpmsg or die $!;
457 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
459 our %defcfg = ('dgit.default.distro' => 'debian',
460 'dgit.default.username' => '',
461 'dgit.default.archive-query-default-component' => 'main',
462 'dgit.default.ssh' => 'ssh',
463 'dgit-distro.debian.git-host' => 'git.debian.org',
464 'dgit-distro.debian.git-proto' => 'git+ssh://',
465 'dgit-distro.debian.git-path' => '/git/dgit-repos/repos',
466 'dgit-distro.debian.git-check' => 'ssh-cmd',
467 'dgit-distro.debian.git-create' => 'ssh-cmd',
468 'dgit-distro.debian.sshpsql-host' => 'coccia.debian.org',
469 'dgit-distro.debian.sshpsql-dbname' => 'service=projectb',
470 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
471 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
472 'dgit-distro.debian.backports-quirk' => '%-backports*',
473 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
474 'dgit-distro.test-dummy.ssh' => "$td/ssh",
475 'dgit-distro.test-dummy.username' => "alice",
476 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
477 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
478 'dgit-distro.test-dummy.git-url' => "$td/git",
479 'dgit-distro.test-dummy.git-host' => "git",
480 'dgit-distro.test-dummy.git-path' => "$td/git",
481 'dgit-distro.test-dummy.archive-query' => "dummycat:$td/aq",
482 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
483 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
488 return undef if $c =~ /RETURN-UNDEF/;
489 my @cmd = (@git, qw(config --), $c);
492 local ($debug) = $debug-1;
493 $v = cmdoutput_errok @cmd;
500 my $dv = $defcfg{$c};
501 return $dv if defined $dv;
503 badcfg "need value for one of: @_";
506 sub access_basedistro () {
507 return cfg("dgit-suite.$isuite.distro",
508 "dgit.default.distro");
511 sub access_quirk () {
512 # returns (quirk name, distro to use instead, quirk-specific info)
513 my $basedistro = access_basedistro();
514 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
516 if (defined $backports_quirk) {
517 my $re = $backports_quirk;
518 $re =~ s/[^-0-9a-z_\%*]/\\$&/ig;
520 $re =~ s/\%/([-0-9a-z_]+)/ or badcfg "backports-quirk needs \%";
521 if ($isuite =~ m/^$re$/) {
522 return ('backports',"$basedistro-backports",$1);
525 return ('none',$basedistro);
528 sub access_distro () {
529 return (access_quirk())[1];
534 my $basedistro = access_basedistro();
535 my $distro = $idistro || access_distro();
536 my $value = cfg(map {
537 ("dgit-distro.$distro.$_",
538 "dgit-distro.$basedistro.$_",
544 sub string_to_ssh ($) {
546 if ($spec =~ m/\s/) {
547 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
553 sub access_cfg_ssh () {
554 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
555 if (!defined $gitssh) {
558 return string_to_ssh $gitssh;
562 sub access_someuserhost ($) {
564 my $user = access_cfg("$some-user",'username');
565 my $host = access_cfg("$some-host");
566 return length($user) ? "$user\@$host" : $host;
569 sub access_gituserhost () {
570 return access_someuserhost('git');
573 sub access_giturl () {
574 my $url = access_cfg('git-url','RETURN-UNDEF');
577 access_cfg('git-proto').
578 access_gituserhost().
579 access_cfg('git-path');
581 return "$url/$package.git";
584 sub parsecontrolfh ($$@) {
585 my ($fh, $desc, @opts) = @_;
586 my %opts = ('name' => $desc, @opts);
587 my $c = Dpkg::Control::Hash->new(%opts);
588 $c->parse($fh) or die "parsing of $desc failed";
593 my ($file, $desc) = @_;
594 my $fh = new IO::Handle;
595 open $fh, '<', $file or die "$file: $!";
596 my $c = parsecontrolfh($fh,$desc);
597 $fh->error and die $!;
603 my ($dctrl,$field) = @_;
604 my $v = $dctrl->{$field};
605 return $v if defined $v;
606 fail "missing field $field in ".$v->get_option('name');
610 my $c = Dpkg::Control::Hash->new();
611 my $p = new IO::Handle;
612 my @cmd = (qw(dpkg-parsechangelog), @_);
613 open $p, '-|', @cmd or die $!;
615 $?=0; $!=0; close $p or failedcmd @cmd;
619 sub git_get_ref ($) {
621 my $got = cmdoutput_errok @git, qw(show-ref --), $refname;
623 $?==256 or fail "git show-ref failed (status $?)";
624 printdebug "ref $refname= [show-ref exited 1]\n";
627 if ($got =~ m/^(\w+) \Q$refname\E$/m) {
628 printdebug "ref $refname=$1\n";
631 printdebug "ref $refname= [no match]\n";
638 defined $d or fail "getcwd failed: $!";
644 sub archive_query ($) {
646 my $query = access_cfg('archive-query','RETURN-UNDEF');
647 if (!defined $query) {
648 my $distro = access_basedistro();
649 if ($distro eq 'debian') {
651 access_someuserhost('sshpsql').':'.
652 access_cfg('sshpsql-dbname');
654 $query = "madison:$distro";
657 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
660 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
663 sub pool_dsc_subpath ($$) {
664 my ($vsn,$component) = @_; # $package is implict arg
665 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
666 return "/pool/$component/$prefix/$package/".dscfn($vsn);
669 sub archive_query_madison ($$) {
670 my ($proto,$data) = @_;
671 die unless $proto eq 'madison';
672 $rmad{$package} ||= cmdoutput
673 qw(rmadison -asource),"-s$isuite","-u$data",$package;
674 my $rmad = $rmad{$package};
675 return madison_parse($rmad);
678 sub madison_parse ($) {
681 foreach my $l (split /\n/, $rmad) {
682 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
683 \s*( [^ \t|]+ )\s* \|
684 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
685 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
686 $1 eq $package or die "$rmad $package ?";
693 $component = access_cfg('archive-query-default-component');
695 $5 eq 'source' or die "$rmad ?";
696 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
698 return sort { -version_compare_string($a->[0],$b->[0]); } @out;
701 sub canonicalise_suite_madison ($$) {
702 # madison canonicalises for us
703 my @r = archive_query_madison($_[0],$_[1]);
705 "unable to canonicalise suite using package $package".
706 " which does not appear to exist in suite $isuite;".
707 " --existing-package may help";
712 my ($data,$sql) = @_;
713 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
714 my ($userhost,$dbname) = ($`,$'); #';
716 my @cmd = (access_cfg_ssh, $userhost,
717 "export LANG=C; ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
718 printcmd(\*DEBUG,$debugprefix."|",@cmd) if $debug>0;
719 open P, "-|", @cmd or die $!;
722 printdebug("$debugprefix>|$_|\n");
725 $!=0; $?=0; close P or failedcmd @cmd;
727 my $nrows = pop @rows;
728 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
729 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
730 @rows = map { [ split /\|/, $_ ] } @rows;
731 my $ncols = scalar @{ shift @rows };
732 die if grep { scalar @$_ != $ncols } @rows;
736 sub sql_injection_check {
737 foreach (@_) { die "$_ $& ?" if m/[']/; }
740 sub archive_query_sshpsql ($$) {
741 my ($proto,$data) = @_;
742 sql_injection_check $isuite, $package;
743 my @rows = sshpsql($data, <<END);
744 SELECT source.version, component.name, files.filename
746 JOIN src_associations ON source.id = src_associations.source
747 JOIN suite ON suite.id = src_associations.suite
748 JOIN dsc_files ON dsc_files.source = source.id
749 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
750 JOIN component ON component.id = files_archive_map.component_id
751 JOIN files ON files.id = dsc_files.file
752 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
753 AND source.source='$package'
754 AND files.filename LIKE '%.dsc';
756 @rows = sort { -version_compare_string($a->[0],$b->[0]) } @rows;
758 my ($vsn,$component,$filename) = @$_;
759 [ $vsn, "/pool/$component/$filename" ];
764 sub canonicalise_suite_sshpsql ($$) {
765 my ($proto,$data) = @_;
766 sql_injection_check $isuite;
767 my @rows = sshpsql($data, <<END);
768 SELECT suite.codename
769 FROM suite where suite_name='$isuite' or codename='$isuite';
771 @rows = map { $_->[0] } @rows;
772 fail "unknown suite $isuite" unless @rows;
773 die "ambiguous $isuite: @rows ?" if @rows>1;
777 sub canonicalise_suite_dummycat ($$) {
778 my ($proto,$data) = @_;
779 my $dpath = "$data/suite.$isuite";
780 if (!open C, "<", $dpath) {
781 $!==ENOENT or die "$dpath: $!";
782 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
786 chomp or die "$dpath: $!";
788 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
792 sub archive_query_dummycat ($$) {
793 my ($proto,$data) = @_;
794 canonicalise_suite();
795 my $dpath = "$data/package.$csuite.$package";
796 if (!open C, "<", $dpath) {
797 $!==ENOENT or die "$dpath: $!";
798 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
806 printdebug "dummycat query $csuite $package $dpath | $_\n";
807 my @row = split /\s+/, $_;
808 @row==2 or die "$dpath: $_ ?";
811 C->error and die "$dpath: $!";
813 return sort { -version_compare_string($a->[0],$b->[0]); } @rows;
816 sub canonicalise_suite () {
817 return if defined $csuite;
818 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
819 $csuite = archive_query('canonicalise_suite');
820 if ($isuite ne $csuite) {
821 progress "canonical suite name for $isuite is $csuite";
825 sub get_archive_dsc () {
826 canonicalise_suite();
827 my @vsns = archive_query('archive_query');
828 foreach my $vinfo (@vsns) {
829 my ($vsn,$subpath) = @$vinfo;
830 $dscurl = access_cfg('mirror').$subpath;
831 $dscdata = url_get($dscurl);
833 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
836 my $dscfh = new IO::File \$dscdata, '<' or die $!;
837 printdebug Dumper($dscdata) if $debug>1;
838 $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
839 printdebug Dumper($dsc) if $debug>1;
840 my $fmt = getfield $dsc, 'Format';
841 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
847 sub check_for_git () {
849 my $how = access_cfg('git-check');
850 if ($how eq 'ssh-cmd') {
852 (access_cfg_ssh, access_gituserhost(),
853 " set -e; cd ".access_cfg('git-path').";".
854 " if test -d $package.git; then echo 1; else echo 0; fi");
855 my $r= cmdoutput @cmd;
856 failedcmd @cmd unless $r =~ m/^[01]$/;
858 } elsif ($how eq 'true') {
861 badcfg "unknown git-check \`$how'";
865 sub create_remote_git_repo () {
866 my $how = access_cfg('git-create');
867 if ($how eq 'ssh-cmd') {
869 (access_cfg_ssh, access_gituserhost(),
870 "set -e; cd ".access_cfg('git-path').";".
871 " cp -a _template $package.git");
872 } elsif ($how eq 'true') {
875 badcfg "unknown git-create \`$how'";
879 our ($dsc_hash,$lastpush_hash);
881 our $ud = '.git/dgit/unpack';
889 sub mktree_in_ud_from_only_subdir () {
890 # changes into the subdir
893 $dirs[0] =~ m#^([^/]+)/\.$# or die;
896 fail "source package contains .git directory" if stat '.git';
897 die $! unless $!==&ENOENT;
898 runcmd qw(git init -q);
899 rmtree('.git/objects');
900 symlink '../../../../objects','.git/objects' or die $!;
901 runcmd @git, qw(add -Af);
902 my $tree = cmdoutput @git, qw(write-tree);
903 $tree =~ m/^\w+$/ or die "$tree ?";
907 sub dsc_files_info () {
908 foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
909 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
910 ['Files', 'Digest::MD5', 'new()']) {
911 my ($fname, $module, $method) = @$csumi;
912 my $field = $dsc->{$fname};
913 next unless defined $field;
914 eval "use $module; 1;" or die $@;
916 foreach (split /\n/, $field) {
918 m/^(\w+) (\d+) (\S+)$/ or
919 fail "could not parse .dsc $fname line \`$_'";
920 my $digester = eval "$module"."->$method;" or die $@;
925 Digester => $digester,
930 fail "missing any supported Checksums-* or Files field in ".
931 $dsc->get_option('name');
935 map { $_->{Filename} } dsc_files_info();
938 sub is_orig_file ($) {
940 m/\.orig(?:-\w+)?\.tar\.\w+$/;
943 sub make_commit ($) {
945 return cmdoutput @git, qw(hash-object -w -t commit), $file;
948 sub clogp_authline ($) {
950 my $author = getfield $clogp, 'Maintainer';
951 $author =~ s#,.*##ms;
952 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
953 my $authline = "$author $date";
954 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
955 fail "unexpected commit author line format \`$authline'".
956 " (was generated from changelog Maintainer field)";
960 sub generate_commit_from_dsc () {
964 foreach my $f (dsc_files()) {
965 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
967 link "../../../$f", $f
971 runcmd @dget, qw(--), $dscurl;
972 foreach my $f (grep { is_orig_file($_) } @files) {
973 link $f, "../../../../$f"
977 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
978 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
979 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
980 my $authline = clogp_authline $clogp;
981 my $changes = getfield $clogp, 'Changes';
982 open C, ">../commit.tmp" or die $!;
983 print C <<END or die $!;
990 # imported from the archive
993 my $outputhash = make_commit qw(../commit.tmp);
994 my $cversion = getfield $clogp, 'Version';
995 progress "synthesised git commit from .dsc $cversion";
996 if ($lastpush_hash) {
997 runcmd @git, qw(reset --hard), $lastpush_hash;
998 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
999 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
1000 my $oversion = getfield $oldclogp, 'Version';
1002 version_compare_string($oversion, $cversion);
1004 # git upload/ is earlier vsn than archive, use archive
1005 open C, ">../commit2.tmp" or die $!;
1006 print C <<END or die $!;
1008 parent $lastpush_hash
1013 Record $package ($cversion) in archive suite $csuite
1015 $outputhash = make_commit qw(../commit2.tmp);
1016 } elsif ($vcmp > 0) {
1017 print STDERR <<END or die $!;
1019 Version actually in archive: $cversion (older)
1020 Last allegedly pushed/uploaded: $oversion (newer or same)
1023 $outputhash = $lastpush_hash;
1025 $outputhash = $lastpush_hash;
1028 changedir '../../../..';
1029 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
1030 'DGIT_ARCHIVE', $outputhash;
1031 cmdoutput @git, qw(log -n2), $outputhash;
1032 # ... gives git a chance to complain if our commit is malformed
1037 sub ensure_we_have_orig () {
1038 foreach my $fi (dsc_files_info()) {
1039 my $f = $fi->{Filename};
1040 next unless is_orig_file($f);
1041 if (open F, "<", "../$f") {
1042 $fi->{Digester}->reset();
1043 $fi->{Digester}->addfile(*F);
1044 F->error and die $!;
1045 my $got = $fi->{Digester}->hexdigest();
1046 $got eq $fi->{Hash} or
1047 fail "existing file $f has hash $got but .dsc".
1048 " demands hash $fi->{Hash}".
1049 " (perhaps you should delete this file?)";
1050 progress "using existing $f";
1053 die "$f $!" unless $!==&ENOENT;
1055 my $origurl = $dscurl;
1056 $origurl =~ s{/[^/]+$}{};
1058 die "$f ?" unless $f =~ m/^${package}_/;
1059 die "$f ?" if $f =~ m#/#;
1060 runcmd_ordryrun_local shell_cmd 'cd ..', @dget,'--',$origurl;
1065 return cmdoutput @git, qw(rev-parse), "$_[0]~0";
1068 sub is_fast_fwd ($$) {
1069 my ($ancestor,$child) = @_;
1070 my @cmd = (@git, qw(merge-base), $ancestor, $child);
1071 my $mb = cmdoutput_errok @cmd;
1073 return rev_parse($mb) eq rev_parse($ancestor);
1075 $?==256 or failedcmd @cmd;
1080 sub git_fetch_us () {
1081 runcmd_ordryrun_local @git, qw(fetch),access_giturl(),fetchspec();
1084 sub fetch_from_archive () {
1085 # ensures that lrref() is what is actually in the archive,
1086 # one way or another
1090 foreach my $field (@ourdscfield) {
1091 $dsc_hash = $dsc->{$field};
1092 last if defined $dsc_hash;
1094 if (defined $dsc_hash) {
1095 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
1097 progress "last upload to archive specified git hash";
1099 progress "last upload to archive has NO git hash";
1102 progress "no version available from the archive";
1105 $lastpush_hash = git_get_ref(lrref());
1106 printdebug "previous reference hash=$lastpush_hash\n";
1108 if (defined $dsc_hash) {
1109 fail "missing remote git history even though dsc has hash -".
1110 " could not find ref ".lrref().
1111 " (should have been fetched from ".access_giturl()."#".rrref().")"
1112 unless $lastpush_hash;
1114 ensure_we_have_orig();
1115 if ($dsc_hash eq $lastpush_hash) {
1116 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
1117 print STDERR <<END or die $!;
1119 Git commit in archive is behind the last version allegedly pushed/uploaded.
1120 Commit referred to by archive: $dsc_hash
1121 Last allegedly pushed/uploaded: $lastpush_hash
1124 $hash = $lastpush_hash;
1126 fail "archive's .dsc refers to ".$dsc_hash.
1127 " but this is an ancestor of ".$lastpush_hash;
1130 $hash = generate_commit_from_dsc();
1131 } elsif ($lastpush_hash) {
1132 # only in git, not in the archive yet
1133 $hash = $lastpush_hash;
1134 print STDERR <<END or die $!;
1136 Package not found in the archive, but has allegedly been pushed using dgit.
1140 printdebug "nothing found!\n";
1141 if (defined $skew_warning_vsn) {
1142 print STDERR <<END or die $!;
1144 Warning: relevant archive skew detected.
1145 Archive allegedly contains $skew_warning_vsn
1146 But we were not able to obtain any version from the archive or git.
1152 printdebug "current hash=$hash\n";
1153 if ($lastpush_hash) {
1154 fail "not fast forward on last upload branch!".
1155 " (archive's version left in DGIT_ARCHIVE)"
1156 unless is_fast_fwd($lastpush_hash, $hash);
1158 if (defined $skew_warning_vsn) {
1160 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
1161 my $clogf = ".git/dgit/changelog.tmp";
1162 runcmd shell_cmd "exec >$clogf",
1163 @git, qw(cat-file blob), "$hash:debian/changelog";
1164 my $gotclogp = parsechangelog("-l$clogf");
1165 my $got_vsn = getfield $gotclogp, 'Version';
1166 printdebug "SKEW CHECK GOT $got_vsn\n";
1167 if (version_compare_string($got_vsn, $skew_warning_vsn) < 0) {
1168 print STDERR <<END or die $!;
1170 Warning: archive skew detected. Using the available version:
1171 Archive allegedly contains $skew_warning_vsn
1172 We were able to obtain only $got_vsn
1177 if ($lastpush_hash ne $hash) {
1178 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
1182 dryrun_report @upd_cmd;
1190 canonicalise_suite();
1191 badusage "dry run makes no sense with clone" unless act_local();
1192 mkdir $dstdir or die "$dstdir $!";
1194 runcmd @git, qw(init -q);
1195 runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec();
1196 open H, "> .git/HEAD" or die $!;
1197 print H "ref: ".lref()."\n" or die $!;
1199 runcmd @git, qw(remote add), 'origin', access_giturl();
1200 if (check_for_git()) {
1201 progress "fetching existing git history";
1203 runcmd_ordryrun_local @git, qw(fetch origin);
1205 progress "starting new git history";
1207 fetch_from_archive() or no_such_package;
1208 runcmd @git, qw(reset --hard), lrref();
1209 printdone "ready for work in $dstdir";
1213 if (check_for_git()) {
1216 fetch_from_archive() or no_such_package();
1217 printdone "fetched into ".lrref();
1222 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
1224 printdone "fetched to ".lrref()." and merged into HEAD";
1227 sub check_not_dirty () {
1228 return if $ignoredirty;
1229 my @cmd = (@git, qw(diff --quiet HEAD));
1230 printcmd(\*DEBUG,$debugprefix."+",@cmd) if $debug>0;
1231 $!=0; $?=0; system @cmd;
1232 return if !$! && !$?;
1233 if (!$! && $?==256) {
1234 fail "working tree is dirty (does not match HEAD)";
1240 sub commit_quilty_patch () {
1241 my $output = cmdoutput @git, qw(status --porcelain);
1243 foreach my $l (split /\n/, $output) {
1244 next unless $l =~ m/\S/;
1245 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
1250 progress "nothing quilty to commit, ok.";
1253 runcmd_ordryrun_local @git, qw(add), sort keys %adds;
1254 my $m = "Commit Debian 3.0 (quilt) metadata";
1256 runcmd_ordryrun_local @git, qw(commit -m), $m;
1261 return 0 unless $format eq '3.0 (quilt)';
1262 progress "Format \`$format', urgh";
1264 progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
1270 sub push_parse_changelog ($) {
1273 my $clogp = Dpkg::Control::Hash->new();
1274 $clogp->load($clogpfn) or die;
1276 $package = getfield $clogp, 'Source';
1277 my $cversion = getfield $clogp, 'Version';
1278 my $tag = debiantag($cversion);
1279 runcmd @git, qw(check-ref-format), $tag;
1281 my $dscfn = dscfn($cversion);
1283 return ($clogp, $cversion, $tag, $dscfn);
1286 sub push_parse_dsc ($$$) {
1287 my ($dscfn,$dscfnwhat, $cversion) = @_;
1288 $dsc = parsecontrol($dscfn,$dscfnwhat);
1289 my $dversion = getfield $dsc, 'Version';
1290 my $dscpackage = getfield $dsc, 'Source';
1291 ($dscpackage eq $package && $dversion eq $cversion) or
1292 fail "$dscfn is for $dscpackage $dversion".
1293 " but debian/changelog is for $package $cversion";
1296 sub push_mktag ($$$$$$$) {
1297 my ($head,$clogp,$tag,
1299 $changesfile,$changesfilewhat,
1302 $dsc->{$ourdscfield[0]} = $head;
1303 $dsc->save("$dscfn.tmp") or die $!;
1305 my $changes = parsecontrol($changesfile,$changesfilewhat);
1306 foreach my $field (qw(Source Distribution Version)) {
1307 $changes->{$field} eq $clogp->{$field} or
1308 fail "changes field $field \`$changes->{$field}'".
1309 " does not match changelog \`$clogp->{$field}'";
1312 my $cversion = getfield $clogp, 'Version';
1313 my $clogsuite = getfield $clogp, 'Distribution';
1315 # We make the git tag by hand because (a) that makes it easier
1316 # to control the "tagger" (b) we can do remote signing
1317 my $authline = clogp_authline $clogp;
1318 open TO, '>', $tfn->('.tmp') or die $!;
1319 print TO <<END or die $!;
1325 $package release $cversion for $clogsuite ($csuite) [dgit]
1329 my $tagobjfn = $tfn->('.tmp');
1331 if (!defined $keyid) {
1332 $keyid = access_cfg('keyid','RETURN-UNDEF');
1334 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
1335 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
1336 push @sign_cmd, qw(-u),$keyid if defined $keyid;
1337 push @sign_cmd, $tfn->('.tmp');
1338 runcmd_ordryrun @sign_cmd;
1340 $tagobjfn = $tfn->('.signed.tmp');
1341 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
1342 $tfn->('.tmp'), $tfn->('.tmp.asc');
1349 sub sign_changes ($) {
1350 my ($changesfile) = @_;
1352 my @debsign_cmd = @debsign;
1353 push @debsign_cmd, "-k$keyid" if defined $keyid;
1354 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
1355 push @debsign_cmd, $changesfile;
1356 runcmd_ordryrun @debsign_cmd;
1361 printdebug "actually entering push\n";
1364 my $clogpfn = ".git/dgit/changelog.822.tmp";
1365 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
1367 responder_send_file('parsed-changelog', $clogpfn);
1369 my ($clogp, $cversion, $tag, $dscfn) =
1370 push_parse_changelog("$clogpfn");
1372 my $dscpath = "$buildproductsdir/$dscfn";
1374 fail "looked for .dsc $dscfn, but $!;".
1375 " maybe you forgot to build";
1377 responder_send_file('dsc', $dscpath);
1379 push_parse_dsc($dscpath, $dscfn, $cversion);
1381 my $format = getfield $dsc, 'Format';
1382 printdebug "format $format\n";
1383 if (madformat($format)) {
1384 commit_quilty_patch();
1388 progress "checking that $dscfn corresponds to HEAD";
1389 runcmd qw(dpkg-source -x --),
1390 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
1391 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1392 changedir '../../../..';
1393 my @diffcmd = (@git, qw(diff --exit-code), $tree);
1394 printcmd \*DEBUG,$debugprefix."+",@diffcmd;
1396 if (system @diffcmd) {
1397 if ($! && $?==256) {
1398 fail "$dscfn specifies a different tree to your HEAD commit;".
1399 " perhaps you forgot to build";
1405 #do fast forward check and maybe fake merge
1406 # if (!is_fast_fwd(mainbranch
1407 # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
1408 # map { lref($_).":".rref($_) }
1410 my $head = rev_parse('HEAD');
1411 if (!$changesfile) {
1412 my $multi = "$buildproductsdir/".
1413 "${package}_".(stripepoch $cversion)."_multi.changes";
1414 if (stat "$multi") {
1415 $changesfile = $multi;
1417 $!==&ENOENT or die "$multi: $!";
1418 my $pat = "${package}_".(stripepoch $cversion)."_*.changes";
1419 my @cs = glob "$buildproductsdir/$pat";
1420 fail "failed to find unique changes file".
1421 " (looked for $pat in $buildproductsdir, or $multi);".
1422 " perhaps you need to use dgit -C"
1424 ($changesfile) = @cs;
1427 $changesfile = "$buildproductsdir/$changesfile";
1430 responder_send_file('changes',$changesfile);
1431 responder_send_command("param head $head");
1432 responder_send_command("param csuite $csuite");
1434 my $tfn = sub { ".git/dgit/tag$_[0]"; };
1437 if ($we_are_responder) {
1438 $tagobjfn = $tfn->('.signed.tmp');
1439 responder_receive_files('signed-tag', $tagobjfn);
1442 push_mktag($head,$clogp,$tag,
1444 $changesfile,$changesfile,
1448 my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
1449 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
1450 runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
1451 runcmd_ordryrun @git, qw(tag -v --), $tag;
1453 if (!check_for_git()) {
1454 create_remote_git_repo();
1456 runcmd_ordryrun @git, qw(push),access_giturl(),
1457 "HEAD:".rrref(), "refs/tags/$tag";
1458 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
1460 if ($we_are_responder) {
1461 my $dryrunsuffix = act_local() ? "" : ".tmp";
1462 responder_receive_files('signed-dsc-changes',
1463 "$dscpath$dryrunsuffix",
1464 "$changesfile$dryrunsuffix");
1467 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
1469 progress "[new .dsc left in $dscpath.tmp]";
1471 sign_changes $changesfile;
1474 my $host = access_cfg('upload-host','RETURN-UNDEF');
1475 my @hostarg = defined($host) ? ($host,) : ();
1476 runcmd_ordryrun @dput, @hostarg, $changesfile;
1477 printdone "pushed and uploaded $cversion";
1479 responder_send_command("complete");
1485 badusage "-p is not allowed with clone; specify as argument instead"
1486 if defined $package;
1489 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
1490 ($package,$isuite) = @ARGV;
1491 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
1492 ($package,$dstdir) = @ARGV;
1493 } elsif (@ARGV==3) {
1494 ($package,$isuite,$dstdir) = @ARGV;
1496 badusage "incorrect arguments to dgit clone";
1498 $dstdir ||= "$package";
1501 if ($rmonerror && !$dryrun_level) {
1502 $cwd_remove= getcwd();
1504 return unless defined $cwd_remove;
1505 if (!chdir "$cwd_remove") {
1506 return if $!==&ENOENT;
1507 die "chdir $cwd_remove: $!";
1509 rmtree($dstdir) or die "remove $dstdir: $!\n";
1514 $cwd_remove = undef;
1517 sub branchsuite () {
1518 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
1519 if ($branch =~ m#$lbranch_re#o) {
1526 sub fetchpullargs () {
1527 if (!defined $package) {
1528 my $sourcep = parsecontrol('debian/control','debian/control');
1529 $package = getfield $sourcep, 'Source';
1532 # $isuite = branchsuite(); # this doesn't work because dak hates canons
1534 my $clogp = parsechangelog();
1535 $isuite = getfield $clogp, 'Distribution';
1537 canonicalise_suite();
1538 progress "fetching from suite $csuite";
1539 } elsif (@ARGV==1) {
1541 canonicalise_suite();
1543 badusage "incorrect arguments to dgit fetch or dgit pull";
1561 badusage "-p is not allowed with dgit push" if defined $package;
1563 my $clogp = parsechangelog();
1564 $package = getfield $clogp, 'Source';
1567 } elsif (@ARGV==1) {
1568 ($specsuite) = (@ARGV);
1570 badusage "incorrect arguments to dgit push";
1572 $isuite = getfield $clogp, 'Distribution';
1574 local ($package) = $existing_package; # this is a hack
1575 canonicalise_suite();
1577 if (defined $specsuite && $specsuite ne $isuite) {
1578 canonicalise_suite();
1579 $csuite eq $specsuite or
1580 fail "dgit push: changelog specifies $isuite ($csuite)".
1581 " but command line specifies $specsuite";
1583 if (check_for_git()) {
1586 if (fetch_from_archive()) {
1587 is_fast_fwd(lrref(), 'HEAD') or
1588 fail "dgit push: HEAD is not a descendant".
1589 " of the archive's version.\n".
1590 "$us: To overwrite it, use git merge -s ours ".lrref().".";
1593 fail "package appears to be new in this suite;".
1594 " if this is intentional, use --new";
1599 #---------- remote commands' implementation ----------
1601 sub cmd_remote_push_responder {
1602 my ($nrargs) = shift @ARGV;
1603 my (@rargs) = @ARGV[0..$nrargs-1];
1604 @ARGV = @ARGV[$nrargs..$#ARGV];
1608 $we_are_responder = 1;
1610 open PI, "<&STDIN" or die $!;
1611 open STDIN, "/dev/null" or die $!;
1612 open PO, ">&STDOUT" or die $!;
1614 open STDOUT, ">&STDERR" or die $!;
1617 responder_send_command("dgit-remote-push-ready");
1629 printdebug "(killing remote child $i_child_pid)\n";
1630 kill 15, $i_child_pid;
1632 if (defined $i_tmp && !defined $initiator_tempdir) {
1634 eval { rmtree $i_tmp; };
1638 END { i_cleanup(); }
1641 my ($base,$selector,@args) = @_;
1642 $selector =~ s/\-/_/g;
1643 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
1649 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
1659 push @rdgit, @ropts;
1660 push @rdgit, qw(remote-push-responder), (scalar @rargs), @rargs;
1662 my @cmd = (@ssh, $host, shellquote @rdgit);
1663 printcmd \*DEBUG,$debugprefix."+",@cmd;
1665 if (defined $initiator_tempdir) {
1666 rmtree $initiator_tempdir;
1667 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
1668 $i_tmp = $initiator_tempdir;
1672 $i_child_pid = open2(\*RO, \*RI, @cmd);
1674 initiator_expect { m/^dgit-remote-push-ready/ };
1676 my ($icmd,$iargs) = initiator_expect {
1677 m/^(\S+)(?: (.*))?$/;
1680 i_method "i_resp", $icmd, $iargs;
1684 sub i_resp_progress ($) {
1686 my $msg = protocol_read_bytes \*RO, $rhs;
1690 sub i_resp_complete {
1691 my $pid = $i_child_pid;
1692 $i_child_pid = undef; # prevents killing some other process with same pid
1693 printdebug "waiting for remote child $pid...\n";
1694 my $got = waitpid $pid, 0;
1695 die $! unless $got == $pid;
1696 die "remote child failed $?" if $?;
1699 printdebug "all done\n";
1703 sub i_resp_file ($) {
1705 my $localname = i_method "i_localname", $keyword;
1706 my $localpath = "$i_tmp/$localname";
1707 stat $localpath and badproto \*RO, "file $keyword ($localpath) twice";
1708 protocol_receive_file \*RO, $localpath;
1709 i_method "i_file", $keyword;
1714 sub i_resp_param ($) {
1715 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
1721 sub i_resp_want ($) {
1723 die "$keyword ?" if $i_wanted{$keyword}++;
1724 my @localpaths = i_method "i_want", $keyword;
1725 printdebug "[[ $keyword @localpaths\n";
1726 foreach my $localpath (@localpaths) {
1727 protocol_send_file \*RI, $localpath;
1729 print RI "files-end\n" or die $!;
1732 our ($i_clogp, $i_version, $i_tag, $i_dscfn, $i_changesfn);
1734 sub i_localname_parsed_changelog {
1735 return "remote-changelog.822";
1737 sub i_file_parsed_changelog {
1738 ($i_clogp, $i_version, $i_tag, $i_dscfn) =
1739 push_parse_changelog "$i_tmp/remote-changelog.822";
1740 die if $i_dscfn =~ m#/|^\W#;
1743 sub i_localname_dsc {
1744 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
1749 sub i_localname_changes {
1750 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
1751 $i_changesfn = $i_dscfn;
1752 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
1753 return $i_changesfn;
1755 sub i_file_changes { }
1757 sub i_want_signed_tag {
1758 printdebug Dumper(\%i_param, $i_dscfn);
1759 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
1760 && defined $i_param{'csuite'}
1761 or badproto \*RO, "premature desire for signed-tag";
1762 my $head = $i_param{'head'};
1763 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
1765 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
1767 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
1770 push_mktag $head, $i_clogp, $i_tag,
1772 $i_changesfn, 'remote changes',
1773 sub { "tag$_[0]"; };
1778 sub i_want_signed_dsc_changes {
1779 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
1780 sign_changes $i_changesfn;
1781 return ($i_dscfn, $i_changesfn);
1784 #---------- building etc. ----------
1790 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
1792 sub build_maybe_quilt_fixup () {
1793 if (!open F, "debian/source/format") {
1794 die $! unless $!==&ENOENT;
1798 F->error and die $!;
1800 return unless madformat($_);
1803 my @cmd = (@git, qw(ls-files --exclude-standard -iodm));
1804 my $problems = cmdoutput @cmd;
1805 if (length $problems) {
1806 print STDERR "problematic files:\n";
1807 print STDERR " $_\n" foreach split /\n/, $problems;
1808 fail "Cannot do quilt fixup in tree containing ignored files. ".
1809 "Perhaps your package's clean target is broken, in which".
1810 " case -wg (which says to use git-clean -xdf) may help.";
1813 my $clogp = parsechangelog();
1814 my $version = getfield $clogp, 'Version';
1815 my $author = getfield $clogp, 'Maintainer';
1816 my $headref = rev_parse('HEAD');
1819 my $patchname = "auto-$version-$headref-$time";
1820 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
1822 my $descfn = ".git/dgit/quilt-description.tmp";
1823 open O, '>', $descfn or die "$descfn: $!";
1825 $msg =~ s/^\s+$/ ./mg;
1826 print O <<END or die $!;
1827 Description: Automatically generated patch ($clogp->{Version})
1828 Last (up to) $ncommits git changes, FYI:
1838 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
1839 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
1840 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
1841 runcmd_ordryrun_local @dpkgsource, qw(--commit .), $patchname;
1844 if (!open P, '>>', ".pc/applied-patches") {
1845 $!==&ENOENT or die $!;
1850 commit_quilty_patch();
1853 sub quilt_fixup_editor () {
1854 my $descfn = $ENV{$fakeeditorenv};
1855 my $editing = $ARGV[$#ARGV];
1856 open I1, '<', $descfn or die "$descfn: $!";
1857 open I2, '<', $editing or die "$editing: $!";
1858 unlink $editing or die "$editing: $!";
1859 open O, '>', $editing or die "$editing: $!";
1860 while (<I1>) { print O or die $!; } I1->error and die $!;
1863 $copying ||= m/^\-\-\- /;
1864 next unless $copying;
1867 I2->error and die $!;
1873 if ($cleanmode eq 'dpkg-source') {
1874 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
1875 } elsif ($cleanmode eq 'git') {
1876 runcmd_ordryrun_local @git, qw(clean -xdf);
1877 } elsif ($cleanmode eq 'none') {
1884 badusage "-p is not allowed when building" if defined $package;
1887 my $clogp = parsechangelog();
1888 $isuite = getfield $clogp, 'Distribution';
1889 $package = getfield $clogp, 'Source';
1890 $version = getfield $clogp, 'Version';
1891 build_maybe_quilt_fixup();
1894 sub changesopts () {
1895 my @opts =@changesopts[1..$#changesopts];
1896 if (!defined $changes_since_version) {
1897 my @vsns = archive_query('archive_query');
1898 my @quirk = access_quirk();
1899 if ($quirk[0] eq 'backports') {
1900 local $isuite = $quirk[2];
1902 canonicalise_suite();
1903 push @vsns, archive_query('archive_query');
1906 @vsns = map { $_->[0] } @vsns;
1907 @vsns = sort { -version_compare_string($a, $b) } @vsns;
1908 $changes_since_version = $vsns[0];
1909 progress "changelog will contain changes since $vsns[0]";
1911 $changes_since_version = '_';
1912 progress "package seems new, not specifying -v<version>";
1915 if ($changes_since_version ne '_') {
1916 unshift @opts, "-v$changes_since_version";
1923 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
1924 printdone "build successful\n";
1930 (qw(git-buildpackage -us -uc --git-no-sign-tags),
1931 "--git-builder=@dpkgbuildpackage");
1932 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
1933 canonicalise_suite();
1934 push @cmd, "--git-debian-branch=".lbranch();
1936 push @cmd, changesopts();
1937 runcmd_ordryrun_local @cmd, @ARGV;
1938 printdone "build successful\n";
1943 $sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
1944 $dscfn = dscfn($version);
1945 if ($cleanmode eq 'dpkg-source') {
1946 runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S)),
1949 my $pwd = must_getcwd();
1950 my $leafdir = basename $pwd;
1952 runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir;
1954 runcmd_ordryrun_local qw(sh -ec),
1955 'exec >$1; shift; exec "$@"','x',
1956 "../$sourcechanges",
1957 @dpkggenchanges, qw(-S), changesopts();
1961 sub cmd_build_source {
1962 badusage "build-source takes no additional arguments" if @ARGV;
1964 printdone "source built, results in $dscfn and $sourcechanges";
1970 my $pat = "${package}_".(stripepoch $version)."_*.changes";
1972 stat $dscfn or fail "$dscfn (in parent directory): $!";
1973 stat $sourcechanges or fail "$sourcechanges (in parent directory): $!";
1974 foreach my $cf (glob $pat) {
1975 next if $cf eq $sourcechanges;
1976 unlink $cf or fail "remove $cf: $!";
1979 runcmd_ordryrun_local @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
1980 my @changesfiles = glob $pat;
1981 @changesfiles = sort {
1982 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
1985 fail "wrong number of different changes files (@changesfiles)"
1986 unless @changesfiles;
1987 runcmd_ordryrun_local @mergechanges, @changesfiles;
1988 my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
1990 stat $multichanges or fail "$multichanges: $!";
1992 printdone "build successful, results in $multichanges\n" or die $!;
1995 sub cmd_quilt_fixup {
1996 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
1997 my $clogp = parsechangelog();
1998 $version = getfield $clogp, 'Version';
1999 build_maybe_quilt_fixup();
2002 #---------- argument parsing and main program ----------
2005 print "dgit version $our_version\n" or die $!;
2012 if (defined $ENV{'DGIT_SSH'}) {
2013 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
2014 } elsif (defined $ENV{'GIT_SSH'}) {
2015 @ssh = ($ENV{'GIT_SSH'});
2019 last unless $ARGV[0] =~ m/^-/;
2023 if (m/^--dry-run$/) {
2026 } elsif (m/^--damp-run$/) {
2029 } elsif (m/^--no-sign$/) {
2032 } elsif (m/^--help$/) {
2034 } elsif (m/^--version$/) {
2036 } elsif (m/^--new$/) {
2039 } elsif (m/^--since-version=([^_]+|_)$/) {
2041 $changes_since_version = $1;
2042 } elsif (m/^--([-0-9a-z]+)=(.*)/s &&
2043 ($om = $opts_opt_map{$1}) &&
2047 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
2048 !$opts_opt_cmdonly{$1} &&
2049 ($om = $opts_opt_map{$1})) {
2052 } elsif (m/^--existing-package=(.*)/s) {
2054 $existing_package = $1;
2055 } elsif (m/^--initiator-tempdir=(.*)/s) {
2056 $initiator_tempdir = $1;
2057 $initiator_tempdir =~ m#^/# or
2058 badusage "--initiator-tempdir must be used specify an".
2059 " absolute, not relative, directory."
2060 } elsif (m/^--distro=(.*)/s) {
2063 } elsif (m/^--build-products-dir=(.*)/s) {
2065 $buildproductsdir = $1;
2066 } elsif (m/^--clean=(dpkg-source|git|none)$/s) {
2069 } elsif (m/^--clean=(.*)$/s) {
2070 badusage "unknown cleaning mode \`$1'";
2071 } elsif (m/^--ignore-dirty$/s) {
2074 } elsif (m/^--no-quilt-fixup$/s) {
2077 } elsif (m/^--no-rm-on-error$/s) {
2081 badusage "unknown long option \`$_'";
2088 } elsif (s/^-L/-/) {
2091 } elsif (s/^-h/-/) {
2093 } elsif (s/^-D/-/) {
2095 open DEBUG, ">&STDERR" or die $!;
2098 } elsif (s/^-N/-/) {
2101 } elsif (s/^-v([^_]+|_)$//s) {
2103 $changes_since_version = $1;
2106 push @changesopts, $_;
2108 } elsif (s/^-c(.*=.*)//s) {
2110 push @git, '-c', $1;
2111 } elsif (s/^-d(.*)//s) {
2114 } elsif (s/^-C(.*)//s) {
2117 if ($changesfile =~ s#^(.*)/##) {
2118 $buildproductsdir = $1;
2120 } elsif (s/^-k(.*)//s) {
2122 } elsif (s/^-wn//s) {
2124 $cleanmode = 'none';
2125 } elsif (s/^-wg//s) {
2128 } elsif (s/^-wd//s) {
2130 $cleanmode = 'dpkg-source';
2132 badusage "unknown short option \`$_'";
2139 if ($ENV{$fakeeditorenv}) {
2140 quilt_fixup_editor();
2143 delete $ENV{'DGET_UNPACK'};
2146 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
2147 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
2148 if $dryrun_level == 1;
2150 print STDERR $helpmsg or die $!;
2153 my $cmd = shift @ARGV;
2155 { no strict qw(refs); &{"cmd_$cmd"}(); }