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 = '..';
47 our $existing_package = 'dpkg';
48 our $cleanmode = 'dpkg-source';
49 our $changes_since_version;
50 our $we_are_responder;
51 our $initiator_tempdir;
53 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
55 our $suite_re = '[-+.0-9a-z]+';
58 our (@dget) = qw(dget);
59 our (@dput) = qw(dput);
60 our (@debsign) = qw(debsign);
62 our (@sbuild) = qw(sbuild -A);
64 our (@dgit) = qw(dgit);
65 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
66 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
67 our (@dpkggenchanges) = qw(dpkg-genchanges);
68 our (@mergechanges) = qw(mergechanges -f);
69 our (@changesopts) = ('');
71 our %opts_opt_map = ('dget' => \@dget,
73 'debsign' => \@debsign,
78 'dpkg-source' => \@dpkgsource,
79 'dpkg-buildpackage' => \@dpkgbuildpackage,
80 'dpkg-genchanges' => \@dpkggenchanges,
81 'ch' => \@changesopts,
82 'mergechanges' => \@mergechanges);
84 our %opts_opt_cmdonly = ('gpg' => 1);
89 open DEBUG, ">/dev/null" or die $!;
93 our $remotename = 'dgit';
94 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
95 our $branchprefix = 'dgit';
98 sub lbranch () { return "$branchprefix/$csuite"; }
99 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
100 sub lref () { return "refs/heads/".lbranch(); }
101 sub lrref () { return "refs/remotes/$remotename/$branchprefix/$csuite"; }
102 sub rrref () { return "refs/$branchprefix/$csuite"; }
117 return "${package}_".(stripepoch $vsn).".dsc";
121 our $debugprefix = '';
123 sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
126 die $us.($we_are_responder ? " (build host)" : "").": @_\n";
129 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
131 sub no_such_package () {
132 print STDERR "$us: package $package does not exist in suite $isuite\n";
138 return "+".rrref().":".lrref();
143 printdebug "CD $newdir\n";
144 chdir $newdir or die "chdir: $newdir: $!";
147 #---------- remote protocol support, common ----------
149 # remote push initiator/responder protocol:
150 # < dgit-remote-push-ready [optional extra info ignored by old initiators]
152 # > file parsed-changelog
153 # [indicates that output of dpkg-parsechangelog follows]
154 # > data-block NBYTES
155 # > [NBYTES bytes of data (no newline)]
156 # [maybe some more blocks]
168 # [indicates that signed tag is wanted]
169 # < data-block NBYTES
170 # < [NBYTES bytes of data (no newline)]
171 # [maybe some more blocks]
175 # > want signed-dsc-changes
176 # < data-block NBYTES [transfer of signed dsc]
178 # < data-block NBYTES [transfer of signed changes]
186 fail "connection lost: $!" if $fh->error;
187 fail "protocol violation; $m not expected";
190 sub protocol_expect (&$) {
191 my ($match, $fh) = @_;
194 defined && chomp or badproto $fh, "eof";
202 badproto $fh, "\`$_'";
205 sub protocol_send_file ($$) {
206 my ($fh, $ourfn) = @_;
207 open PF, "<", $ourfn or die "$ourfn: $!";
210 my $got = read PF, $d, 65536;
211 die "$ourfn: $!" unless defined $got;
213 print $fh "data-block ".length($d)."\n" or die $!;
214 print $fh $d or die $!;
216 PF->error and die "$ourfn $!";
217 print $fh "data-end\n" or die $!;
221 sub protocol_read_bytes ($$) {
222 my ($fh, $nbytes) = @_;
223 $nbytes =~ m/^[1-9]\d{0,5}$/ or badproto \*RO, "bad byte count";
225 my $got = read $fh, $d, $nbytes;
226 $got==$nbytes or badproto $fh, "eof during data block";
230 sub protocol_receive_file ($$) {
231 my ($fh, $ourfn) = @_;
232 printdebug "() $ourfn\n";
233 open PF, ">", $ourfn or die "$ourfn: $!";
235 my ($y,$l) = protocol_expect {
236 m/^data-block (.*)$/ ? (1,$1) :
237 m/^data-end$/ ? (0,) :
241 my $d = protocol_read_bytes $fh, $l;
242 print PF $d or die $!;
247 #---------- remote protocol support, responder ----------
249 sub responder_send_command ($) {
251 return unless $we_are_responder;
252 # called even without $we_are_responder
253 printdebug ">> $command\n";
254 print PO $command, "\n" or die $!;
257 sub responder_send_file ($$) {
258 my ($keyword, $ourfn) = @_;
259 return unless $we_are_responder;
260 printdebug "]] $keyword $ourfn\n";
261 responder_send_command "file $keyword";
262 protocol_send_file \*PO, $ourfn;
265 sub responder_receive_files ($@) {
266 my ($keyword, @ourfns) = @_;
267 die unless $we_are_responder;
268 printdebug "[[ $keyword @ourfns\n";
269 responder_send_command "want $keyword";
270 foreach my $fn (@ourfns) {
271 protocol_receive_file \*PI, $fn;
274 protocol_expect { m/^files-end$/ } \*PI;
277 #---------- remote protocol support, initiator ----------
279 sub initiator_expect (&) {
281 protocol_expect { &$match } \*RO;
284 #---------- end remote code ----------
287 if ($we_are_responder) {
289 responder_send_command "progress ".length($m) or die $!;
290 print PO $m or die $!;
300 $ua = LWP::UserAgent->new();
304 progress "downloading $what...";
305 my $r = $ua->get(@_) or die $!;
306 return undef if $r->code == 404;
307 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
308 return $r->decoded_content();
311 our ($dscdata,$dscurl,$dsc,$skew_warning_vsn);
318 if (m{[^-=_./0-9a-z]}i) {
325 return join ' ', @out;
330 my $intro = shift @_;
331 print $fh $intro," " or die $!;
332 print $fh shellquote @_ or die $!;
333 print $fh "\n" or die $!;
337 { local ($!); printcmd \*STDERR, "$us: failed command:", @_ or die $!; };
339 fail "failed to fork/exec: $!";
340 } elsif (!($? & 0xff)) {
341 fail "subprocess failed with error exit status ".($?>>8);
343 fail "subprocess crashed (wait status $?)";
345 fail "subprocess produced invalid output";
350 printcmd(\*DEBUG,$debugprefix."+",@_) if $debug>0;
352 failedcmd @_ if system @_;
355 sub act_local () { return $dryrun_level <= 1; }
356 sub act_scary () { return !$dryrun_level; }
359 if (!$dryrun_level) {
360 progress "dgit ok: @_";
362 progress "would be ok: @_ (but dry run only)";
366 sub cmdoutput_errok {
367 die Dumper(\@_)." ?" if grep { !defined } @_;
368 printcmd(\*DEBUG,$debugprefix."|",@_) if $debug>0;
369 open P, "-|", @_ or die $!;
372 { local $/ = undef; $d = <P>; }
374 if (!close P) { printdebug "=>!$?\n" if $debug>0; return undef; }
377 printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #';
382 my $d = cmdoutput_errok @_;
383 defined $d or failedcmd @_;
388 printcmd(\*STDERR,$debugprefix."#",@_);
391 sub runcmd_ordryrun {
399 sub runcmd_ordryrun_local {
408 my ($first_shell, @cmd) = @_;
409 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
412 our $helpmsg = <<END;
414 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
415 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
416 dgit [dgit-opts] build [git-buildpackage-opts|dpkg-buildpackage-opts]
417 dgit [dgit-opts] push [dgit-opts] [suite]
418 dgit [dgit-opts] rpush build-host:build-dir ...
419 important dgit options:
420 -k<keyid> sign tag and package with <keyid> instead of default
421 --dry-run -n do not change anything, but go through the motions
422 --damp-run -L like --dry-run but make local changes, without signing
423 --new -N allow introducing a new package
424 --debug -D increase debug level
425 -c<name>=<value> set git config option (used directly by dgit too)
428 our $later_warning_msg = <<END;
429 Perhaps the upload is stuck in incoming. Using the version from git.
433 print STDERR "$us: @_\n", $helpmsg or die $!;
438 @ARGV or badusage "too few arguments";
439 return scalar shift @ARGV;
443 print $helpmsg or die $!;
447 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
449 our %defcfg = ('dgit.default.distro' => 'debian',
450 'dgit.default.username' => '',
451 'dgit.default.archive-query-default-component' => 'main',
452 'dgit.default.ssh' => 'ssh',
453 'dgit-distro.debian.git-host' => 'git.debian.org',
454 'dgit-distro.debian.git-proto' => 'git+ssh://',
455 'dgit-distro.debian.git-path' => '/git/dgit-repos/repos',
456 'dgit-distro.debian.git-check' => 'ssh-cmd',
457 'dgit-distro.debian.git-create' => 'ssh-cmd',
458 'dgit-distro.debian.sshpsql-host' => 'coccia.debian.org',
459 'dgit-distro.debian.sshpsql-dbname' => 'service=projectb',
460 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
461 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
462 'dgit-distro.debian.backports-quirk' => '%-backports*',
463 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
464 'dgit-distro.test-dummy.ssh' => "$td/ssh",
465 'dgit-distro.test-dummy.username' => "alice",
466 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
467 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
468 'dgit-distro.test-dummy.git-url' => "$td/git",
469 'dgit-distro.test-dummy.git-host' => "git",
470 'dgit-distro.test-dummy.git-path' => "$td/git",
471 'dgit-distro.test-dummy.archive-query' => "dummycat:$td/aq",
472 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
473 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
478 return undef if $c =~ /RETURN-UNDEF/;
479 my @cmd = (@git, qw(config --), $c);
482 local ($debug) = $debug-1;
483 $v = cmdoutput_errok @cmd;
490 my $dv = $defcfg{$c};
491 return $dv if defined $dv;
493 badcfg "need value for one of: @_";
496 sub access_basedistro () {
497 return cfg("dgit-suite.$isuite.distro",
498 "dgit.default.distro");
501 sub access_quirk () {
502 # returns (quirk name, distro to use instead, quirk-specific info)
503 my $basedistro = access_basedistro();
504 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
506 if (defined $backports_quirk) {
507 my $re = $backports_quirk;
508 $re =~ s/[^-0-9a-z_\%*]/\\$&/ig;
510 $re =~ s/\%/([-0-9a-z_]+)/ or badcfg "backports-quirk needs \%";
511 if ($isuite =~ m/^$re$/) {
512 return ('backports',"$basedistro-backports",$1);
515 return ('none',$basedistro);
518 sub access_distro () {
519 return (access_quirk())[1];
524 my $basedistro = access_basedistro();
525 my $distro = $idistro || access_distro();
526 my $value = cfg(map {
527 ("dgit-distro.$distro.$_",
528 "dgit-distro.$basedistro.$_",
534 sub string_to_ssh ($) {
536 if ($spec =~ m/\s/) {
537 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
543 sub access_cfg_ssh () {
544 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
545 if (!defined $gitssh) {
548 return string_to_ssh $gitssh;
552 sub access_someuserhost ($) {
554 my $user = access_cfg("$some-user",'username');
555 my $host = access_cfg("$some-host");
556 return length($user) ? "$user\@$host" : $host;
559 sub access_gituserhost () {
560 return access_someuserhost('git');
563 sub access_giturl () {
564 my $url = access_cfg('git-url','RETURN-UNDEF');
567 access_cfg('git-proto').
568 access_gituserhost().
569 access_cfg('git-path');
571 return "$url/$package.git";
574 sub parsecontrolfh ($$@) {
575 my ($fh, $desc, @opts) = @_;
576 my %opts = ('name' => $desc, @opts);
577 my $c = Dpkg::Control::Hash->new(%opts);
578 $c->parse($fh) or die "parsing of $desc failed";
583 my ($file, $desc) = @_;
584 my $fh = new IO::Handle;
585 open $fh, '<', $file or die "$file: $!";
586 my $c = parsecontrolfh($fh,$desc);
587 $fh->error and die $!;
593 my ($dctrl,$field) = @_;
594 my $v = $dctrl->{$field};
595 return $v if defined $v;
596 fail "missing field $field in ".$v->get_option('name');
600 my $c = Dpkg::Control::Hash->new();
601 my $p = new IO::Handle;
602 my @cmd = (qw(dpkg-parsechangelog), @_);
603 open $p, '-|', @cmd or die $!;
605 $?=0; $!=0; close $p or failedcmd @cmd;
609 sub git_get_ref ($) {
611 my $got = cmdoutput_errok @git, qw(show-ref --), $refname;
613 $?==256 or fail "git show-ref failed (status $?)";
614 printdebug "ref $refname= [show-ref exited 1]\n";
617 if ($got =~ m/^(\w+) \Q$refname\E$/m) {
618 printdebug "ref $refname=$1\n";
621 printdebug "ref $refname= [no match]\n";
628 sub archive_query ($) {
630 my $query = access_cfg('archive-query','RETURN-UNDEF');
631 if (!defined $query) {
632 my $distro = access_basedistro();
633 if ($distro eq 'debian') {
635 access_someuserhost('sshpsql').':'.
636 access_cfg('sshpsql-dbname');
638 $query = "madison:$distro";
641 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
644 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
647 sub pool_dsc_subpath ($$) {
648 my ($vsn,$component) = @_; # $package is implict arg
649 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
650 return "/pool/$component/$prefix/$package/".dscfn($vsn);
653 sub archive_query_madison ($$) {
654 my ($proto,$data) = @_;
655 die unless $proto eq 'madison';
656 $rmad{$package} ||= cmdoutput
657 qw(rmadison -asource),"-s$isuite","-u$data",$package;
658 my $rmad = $rmad{$package};
659 return madison_parse($rmad);
662 sub madison_parse ($) {
665 foreach my $l (split /\n/, $rmad) {
666 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
667 \s*( [^ \t|]+ )\s* \|
668 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
669 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
670 $1 eq $package or die "$rmad $package ?";
677 $component = access_cfg('archive-query-default-component');
679 $5 eq 'source' or die "$rmad ?";
680 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
682 return sort { -version_compare_string($a->[0],$b->[0]); } @out;
685 sub canonicalise_suite_madison ($$) {
686 # madison canonicalises for us
687 my @r = archive_query_madison($_[0],$_[1]);
689 "unable to canonicalise suite using package $package".
690 " which does not appear to exist in suite $isuite;".
691 " --existing-package may help";
696 my ($data,$sql) = @_;
697 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
698 my ($userhost,$dbname) = ($`,$'); #';
700 my @cmd = (access_cfg_ssh, $userhost,
701 "export LANG=C; ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
702 printcmd(\*DEBUG,$debugprefix."|",@cmd) if $debug>0;
703 open P, "-|", @cmd or die $!;
706 printdebug("$debugprefix>|$_|\n");
709 $!=0; $?=0; close P or failedcmd @cmd;
711 my $nrows = pop @rows;
712 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
713 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
714 @rows = map { [ split /\|/, $_ ] } @rows;
715 my $ncols = scalar @{ shift @rows };
716 die if grep { scalar @$_ != $ncols } @rows;
720 sub sql_injection_check {
721 foreach (@_) { die "$_ $& ?" if m/[']/; }
724 sub archive_query_sshpsql ($$) {
725 my ($proto,$data) = @_;
726 sql_injection_check $isuite, $package;
727 my @rows = sshpsql($data, <<END);
728 SELECT source.version, component.name, files.filename
730 JOIN src_associations ON source.id = src_associations.source
731 JOIN suite ON suite.id = src_associations.suite
732 JOIN dsc_files ON dsc_files.source = source.id
733 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
734 JOIN component ON component.id = files_archive_map.component_id
735 JOIN files ON files.id = dsc_files.file
736 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
737 AND source.source='$package'
738 AND files.filename LIKE '%.dsc';
740 @rows = sort { -version_compare_string($a->[0],$b->[0]) } @rows;
742 my ($vsn,$component,$filename) = @$_;
743 [ $vsn, "/pool/$component/$filename" ];
748 sub canonicalise_suite_sshpsql ($$) {
749 my ($proto,$data) = @_;
750 sql_injection_check $isuite;
751 my @rows = sshpsql($data, <<END);
752 SELECT suite.codename
753 FROM suite where suite_name='$isuite' or codename='$isuite';
755 @rows = map { $_->[0] } @rows;
756 fail "unknown suite $isuite" unless @rows;
757 die "ambiguous $isuite: @rows ?" if @rows>1;
761 sub canonicalise_suite_dummycat ($$) {
762 my ($proto,$data) = @_;
763 my $dpath = "$data/suite.$isuite";
764 if (!open C, "<", $dpath) {
765 $!==ENOENT or die "$dpath: $!";
766 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
770 chomp or die "$dpath: $!";
772 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
776 sub archive_query_dummycat ($$) {
777 my ($proto,$data) = @_;
778 canonicalise_suite();
779 my $dpath = "$data/package.$csuite.$package";
780 if (!open C, "<", $dpath) {
781 $!==ENOENT or die "$dpath: $!";
782 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
790 printdebug "dummycat query $csuite $package $dpath | $_\n";
791 my @row = split /\s+/, $_;
792 @row==2 or die "$dpath: $_ ?";
795 C->error and die "$dpath: $!";
797 return sort { -version_compare_string($a->[0],$b->[0]); } @rows;
800 sub canonicalise_suite () {
801 return if defined $csuite;
802 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
803 $csuite = archive_query('canonicalise_suite');
804 if ($isuite ne $csuite) {
805 progress "canonical suite name for $isuite is $csuite";
809 sub get_archive_dsc () {
810 canonicalise_suite();
811 my @vsns = archive_query('archive_query');
812 foreach my $vinfo (@vsns) {
813 my ($vsn,$subpath) = @$vinfo;
814 $dscurl = access_cfg('mirror').$subpath;
815 $dscdata = url_get($dscurl);
817 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
820 my $dscfh = new IO::File \$dscdata, '<' or die $!;
821 printdebug Dumper($dscdata) if $debug>1;
822 $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
823 printdebug Dumper($dsc) if $debug>1;
824 my $fmt = getfield $dsc, 'Format';
825 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
831 sub check_for_git () {
833 my $how = access_cfg('git-check');
834 if ($how eq 'ssh-cmd') {
836 (access_cfg_ssh, access_gituserhost(),
837 " set -e; cd ".access_cfg('git-path').";".
838 " if test -d $package.git; then echo 1; else echo 0; fi");
839 my $r= cmdoutput @cmd;
840 failedcmd @cmd unless $r =~ m/^[01]$/;
842 } elsif ($how eq 'true') {
845 badcfg "unknown git-check \`$how'";
849 sub create_remote_git_repo () {
850 my $how = access_cfg('git-create');
851 if ($how eq 'ssh-cmd') {
853 (access_cfg_ssh, access_gituserhost(),
854 "set -e; cd ".access_cfg('git-path').";".
855 " cp -a _template $package.git");
856 } elsif ($how eq 'true') {
859 badcfg "unknown git-create \`$how'";
863 our ($dsc_hash,$lastpush_hash);
865 our $ud = '.git/dgit/unpack';
873 sub mktree_in_ud_from_only_subdir () {
874 # changes into the subdir
877 $dirs[0] =~ m#^([^/]+)/\.$# or die;
880 fail "source package contains .git directory" if stat '.git';
881 die $! unless $!==&ENOENT;
882 runcmd qw(git init -q);
883 rmtree('.git/objects');
884 symlink '../../../../objects','.git/objects' or die $!;
885 runcmd @git, qw(add -Af);
886 my $tree = cmdoutput @git, qw(write-tree);
887 $tree =~ m/^\w+$/ or die "$tree ?";
891 sub dsc_files_info () {
892 foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
893 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
894 ['Files', 'Digest::MD5', 'new()']) {
895 my ($fname, $module, $method) = @$csumi;
896 my $field = $dsc->{$fname};
897 next unless defined $field;
898 eval "use $module; 1;" or die $@;
900 foreach (split /\n/, $field) {
902 m/^(\w+) (\d+) (\S+)$/ or
903 fail "could not parse .dsc $fname line \`$_'";
904 my $digester = eval "$module"."->$method;" or die $@;
909 Digester => $digester,
914 fail "missing any supported Checksums-* or Files field in ".
915 $dsc->get_option('name');
919 map { $_->{Filename} } dsc_files_info();
922 sub is_orig_file ($) {
924 m/\.orig(?:-\w+)?\.tar\.\w+$/;
927 sub make_commit ($) {
929 return cmdoutput @git, qw(hash-object -w -t commit), $file;
932 sub clogp_authline ($) {
934 my $author = getfield $clogp, 'Maintainer';
935 $author =~ s#,.*##ms;
936 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
937 my $authline = "$author $date";
938 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
939 fail "unexpected commit author line format \`$authline'".
940 " (was generated from changelog Maintainer field)";
944 sub generate_commit_from_dsc () {
948 foreach my $f (dsc_files()) {
949 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
951 link "../../../$f", $f
955 runcmd @dget, qw(--), $dscurl;
956 foreach my $f (grep { is_orig_file($_) } @files) {
957 link $f, "../../../../$f"
961 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
962 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
963 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
964 my $authline = clogp_authline $clogp;
965 my $changes = getfield $clogp, 'Changes';
966 open C, ">../commit.tmp" or die $!;
967 print C <<END or die $!;
974 # imported from the archive
977 my $outputhash = make_commit qw(../commit.tmp);
978 my $cversion = getfield $clogp, 'Version';
979 progress "synthesised git commit from .dsc $cversion";
980 if ($lastpush_hash) {
981 runcmd @git, qw(reset --hard), $lastpush_hash;
982 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
983 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
984 my $oversion = getfield $oldclogp, 'Version';
986 version_compare_string($oversion, $cversion);
988 # git upload/ is earlier vsn than archive, use archive
989 open C, ">../commit2.tmp" or die $!;
990 print C <<END or die $!;
992 parent $lastpush_hash
997 Record $package ($cversion) in archive suite $csuite
999 $outputhash = make_commit qw(../commit2.tmp);
1000 } elsif ($vcmp > 0) {
1001 print STDERR <<END or die $!;
1003 Version actually in archive: $cversion (older)
1004 Last allegedly pushed/uploaded: $oversion (newer or same)
1007 $outputhash = $lastpush_hash;
1009 $outputhash = $lastpush_hash;
1012 changedir '../../../..';
1013 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
1014 'DGIT_ARCHIVE', $outputhash;
1015 cmdoutput @git, qw(log -n2), $outputhash;
1016 # ... gives git a chance to complain if our commit is malformed
1021 sub ensure_we_have_orig () {
1022 foreach my $fi (dsc_files_info()) {
1023 my $f = $fi->{Filename};
1024 next unless is_orig_file($f);
1025 if (open F, "<", "../$f") {
1026 $fi->{Digester}->reset();
1027 $fi->{Digester}->addfile(*F);
1028 F->error and die $!;
1029 my $got = $fi->{Digester}->hexdigest();
1030 $got eq $fi->{Hash} or
1031 fail "existing file $f has hash $got but .dsc".
1032 " demands hash $fi->{Hash}".
1033 " (perhaps you should delete this file?)";
1034 progress "using existing $f";
1037 die "$f $!" unless $!==&ENOENT;
1039 my $origurl = $dscurl;
1040 $origurl =~ s{/[^/]+$}{};
1042 die "$f ?" unless $f =~ m/^${package}_/;
1043 die "$f ?" if $f =~ m#/#;
1044 runcmd_ordryrun_local shell_cmd 'cd ..', @dget,'--',$origurl;
1049 return cmdoutput @git, qw(rev-parse), "$_[0]~0";
1052 sub is_fast_fwd ($$) {
1053 my ($ancestor,$child) = @_;
1054 my @cmd = (@git, qw(merge-base), $ancestor, $child);
1055 my $mb = cmdoutput_errok @cmd;
1057 return rev_parse($mb) eq rev_parse($ancestor);
1059 $?==256 or failedcmd @cmd;
1064 sub git_fetch_us () {
1065 runcmd_ordryrun_local @git, qw(fetch),access_giturl(),fetchspec();
1068 sub fetch_from_archive () {
1069 # ensures that lrref() is what is actually in the archive,
1070 # one way or another
1074 foreach my $field (@ourdscfield) {
1075 $dsc_hash = $dsc->{$field};
1076 last if defined $dsc_hash;
1078 if (defined $dsc_hash) {
1079 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
1081 progress "last upload to archive specified git hash";
1083 progress "last upload to archive has NO git hash";
1086 progress "no version available from the archive";
1089 $lastpush_hash = git_get_ref(lrref());
1090 printdebug "previous reference hash=$lastpush_hash\n";
1092 if (defined $dsc_hash) {
1093 fail "missing remote git history even though dsc has hash -".
1094 " could not find ref ".lrref().
1095 " (should have been fetched from ".access_giturl()."#".rrref().")"
1096 unless $lastpush_hash;
1098 ensure_we_have_orig();
1099 if ($dsc_hash eq $lastpush_hash) {
1100 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
1101 print STDERR <<END or die $!;
1103 Git commit in archive is behind the last version allegedly pushed/uploaded.
1104 Commit referred to by archive: $dsc_hash
1105 Last allegedly pushed/uploaded: $lastpush_hash
1108 $hash = $lastpush_hash;
1110 fail "archive's .dsc refers to ".$dsc_hash.
1111 " but this is an ancestor of ".$lastpush_hash;
1114 $hash = generate_commit_from_dsc();
1115 } elsif ($lastpush_hash) {
1116 # only in git, not in the archive yet
1117 $hash = $lastpush_hash;
1118 print STDERR <<END or die $!;
1120 Package not found in the archive, but has allegedly been pushed using dgit.
1124 printdebug "nothing found!\n";
1125 if (defined $skew_warning_vsn) {
1126 print STDERR <<END or die $!;
1128 Warning: relevant archive skew detected.
1129 Archive allegedly contains $skew_warning_vsn
1130 But we were not able to obtain any version from the archive or git.
1136 printdebug "current hash=$hash\n";
1137 if ($lastpush_hash) {
1138 fail "not fast forward on last upload branch!".
1139 " (archive's version left in DGIT_ARCHIVE)"
1140 unless is_fast_fwd($lastpush_hash, $hash);
1142 if (defined $skew_warning_vsn) {
1144 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
1145 my $clogf = ".git/dgit/changelog.tmp";
1146 runcmd shell_cmd "exec >$clogf",
1147 @git, qw(cat-file blob), "$hash:debian/changelog";
1148 my $gotclogp = parsechangelog("-l$clogf");
1149 my $got_vsn = getfield $gotclogp, 'Version';
1150 printdebug "SKEW CHECK GOT $got_vsn\n";
1151 if (version_compare_string($got_vsn, $skew_warning_vsn) < 0) {
1152 print STDERR <<END or die $!;
1154 Warning: archive skew detected. Using the available version:
1155 Archive allegedly contains $skew_warning_vsn
1156 We were able to obtain only $got_vsn
1161 if ($lastpush_hash ne $hash) {
1162 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
1166 dryrun_report @upd_cmd;
1174 canonicalise_suite();
1175 badusage "dry run makes no sense with clone" unless act_local();
1176 mkdir $dstdir or die "$dstdir $!";
1178 runcmd @git, qw(init -q);
1179 runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec();
1180 open H, "> .git/HEAD" or die $!;
1181 print H "ref: ".lref()."\n" or die $!;
1183 runcmd @git, qw(remote add), 'origin', access_giturl();
1184 if (check_for_git()) {
1185 progress "fetching existing git history";
1187 runcmd_ordryrun_local @git, qw(fetch origin);
1189 progress "starting new git history";
1191 fetch_from_archive() or no_such_package;
1192 runcmd @git, qw(reset --hard), lrref();
1193 printdone "ready for work in $dstdir";
1197 if (check_for_git()) {
1200 fetch_from_archive() or no_such_package();
1201 printdone "fetched into ".lrref();
1206 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
1208 printdone "fetched to ".lrref()." and merged into HEAD";
1211 sub check_not_dirty () {
1212 return if $ignoredirty;
1213 my @cmd = (@git, qw(diff --quiet HEAD));
1214 printcmd(\*DEBUG,$debugprefix."+",@cmd) if $debug>0;
1215 $!=0; $?=0; system @cmd;
1216 return if !$! && !$?;
1217 if (!$! && $?==256) {
1218 fail "working tree is dirty (does not match HEAD)";
1224 sub commit_quilty_patch () {
1225 my $output = cmdoutput @git, qw(status --porcelain);
1227 foreach my $l (split /\n/, $output) {
1228 next unless $l =~ m/\S/;
1229 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
1234 progress "nothing quilty to commit, ok.";
1237 runcmd_ordryrun_local @git, qw(add), sort keys %adds;
1238 my $m = "Commit Debian 3.0 (quilt) metadata";
1240 runcmd_ordryrun_local @git, qw(commit -m), $m;
1245 return 0 unless $format eq '3.0 (quilt)';
1246 progress "Format \`$format', urgh";
1248 progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
1254 sub push_parse_changelog ($) {
1257 my $clogp = Dpkg::Control::Hash->new();
1258 $clogp->load($clogpfn) or die;
1260 $package = getfield $clogp, 'Source';
1261 my $cversion = getfield $clogp, 'Version';
1262 my $tag = debiantag($cversion);
1263 runcmd @git, qw(check-ref-format), $tag;
1265 my $dscfn = dscfn($cversion);
1267 return ($clogp, $cversion, $tag, $dscfn);
1270 sub push_parse_dsc ($$$) {
1271 my ($dscfn,$dscfnwhat, $cversion) = @_;
1272 $dsc = parsecontrol($dscfn,$dscfnwhat);
1273 my $dversion = getfield $dsc, 'Version';
1274 my $dscpackage = getfield $dsc, 'Source';
1275 ($dscpackage eq $package && $dversion eq $cversion) or
1276 fail "$dscfn is for $dscpackage $dversion".
1277 " but debian/changelog is for $package $cversion";
1280 sub push_mktag ($$$$$$$) {
1281 my ($head,$clogp,$tag,
1283 $changesfile,$changesfilewhat,
1286 $dsc->{$ourdscfield[0]} = $head;
1287 $dsc->save("$dscfn.tmp") or die $!;
1289 my $changes = parsecontrol($changesfile,$changesfilewhat);
1290 foreach my $field (qw(Source Distribution Version)) {
1291 $changes->{$field} eq $clogp->{$field} or
1292 fail "changes field $field \`$changes->{$field}'".
1293 " does not match changelog \`$clogp->{$field}'";
1296 my $cversion = getfield $clogp, 'Version';
1297 my $clogsuite = getfield $clogp, 'Distribution';
1299 # We make the git tag by hand because (a) that makes it easier
1300 # to control the "tagger" (b) we can do remote signing
1301 my $authline = clogp_authline $clogp;
1302 open TO, '>', $tfn->('.tmp') or die $!;
1303 print TO <<END or die $!;
1309 $package release $cversion for $clogsuite ($csuite) [dgit]
1313 my $tagobjfn = $tfn->('.tmp');
1315 if (!defined $keyid) {
1316 $keyid = access_cfg('keyid','RETURN-UNDEF');
1318 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
1319 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
1320 push @sign_cmd, qw(-u),$keyid if defined $keyid;
1321 push @sign_cmd, $tfn->('.tmp');
1322 runcmd_ordryrun @sign_cmd;
1324 $tagobjfn = $tfn->('.signed.tmp');
1325 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
1326 $tfn->('.tmp'), $tfn->('.tmp.asc');
1333 sub sign_changes ($) {
1334 my ($changesfile) = @_;
1336 my @debsign_cmd = @debsign;
1337 push @debsign_cmd, "-k$keyid" if defined $keyid;
1338 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
1339 push @debsign_cmd, $changesfile;
1340 runcmd_ordryrun @debsign_cmd;
1345 printdebug "actually entering push\n";
1348 my $clogpfn = ".git/dgit/changelog.822.tmp";
1349 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
1351 responder_send_file('parsed-changelog', $clogpfn);
1353 my ($clogp, $cversion, $tag, $dscfn) =
1354 push_parse_changelog("$clogpfn");
1356 my $dscpath = "$buildproductsdir/$dscfn";
1358 fail "looked for .dsc $dscfn, but $!;".
1359 " maybe you forgot to build";
1361 responder_send_file('dsc', $dscpath);
1363 push_parse_dsc($dscpath, $dscfn, $cversion);
1365 my $format = getfield $dsc, 'Format';
1366 printdebug "format $format\n";
1367 if (madformat($format)) {
1368 commit_quilty_patch();
1372 progress "checking that $dscfn corresponds to HEAD";
1373 runcmd qw(dpkg-source -x --),
1374 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
1375 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1376 changedir '../../../..';
1377 my @diffcmd = (@git, qw(diff --exit-code), $tree);
1378 printcmd \*DEBUG,$debugprefix."+",@diffcmd;
1380 if (system @diffcmd) {
1381 if ($! && $?==256) {
1382 fail "$dscfn specifies a different tree to your HEAD commit;".
1383 " perhaps you forgot to build";
1389 #do fast forward check and maybe fake merge
1390 # if (!is_fast_fwd(mainbranch
1391 # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
1392 # map { lref($_).":".rref($_) }
1394 my $head = rev_parse('HEAD');
1395 if (!$changesfile) {
1396 my $multi = "$buildproductsdir/".
1397 "${package}_".(stripepoch $cversion)."_multi.changes";
1398 if (stat "$multi") {
1399 $changesfile = $multi;
1401 $!==&ENOENT or die "$multi: $!";
1402 my $pat = "${package}_".(stripepoch $cversion)."_*.changes";
1403 my @cs = glob "$buildproductsdir/$pat";
1404 fail "failed to find unique changes file".
1405 " (looked for $pat in $buildproductsdir, or $multi);".
1406 " perhaps you need to use dgit -C"
1408 ($changesfile) = @cs;
1411 $changesfile = "$buildproductsdir/$changesfile";
1414 responder_send_file('changes',$changesfile);
1415 responder_send_command("param head $head");
1416 responder_send_command("param csuite $csuite");
1418 my $tfn = sub { ".git/dgit/tag$_[0]"; };
1421 if ($we_are_responder) {
1422 $tagobjfn = $tfn->('.signed.tmp');
1423 responder_receive_files('signed-tag', $tagobjfn);
1426 push_mktag($head,$clogp,$tag,
1428 $changesfile,$changesfile,
1432 my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
1433 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
1434 runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
1435 runcmd_ordryrun @git, qw(tag -v --), $tag;
1437 if (!check_for_git()) {
1438 create_remote_git_repo();
1440 runcmd_ordryrun @git, qw(push),access_giturl(),
1441 "HEAD:".rrref(), "refs/tags/$tag";
1442 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
1444 if ($we_are_responder) {
1445 my $dryrunsuffix = act_local() ? "" : ".tmp";
1446 responder_receive_files('signed-dsc-changes',
1447 "$dscpath$dryrunsuffix",
1448 "$changesfile$dryrunsuffix");
1451 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
1453 progress "[new .dsc left in $dscpath.tmp]";
1455 sign_changes $changesfile;
1458 my $host = access_cfg('upload-host','RETURN-UNDEF');
1459 my @hostarg = defined($host) ? ($host,) : ();
1460 runcmd_ordryrun @dput, @hostarg, $changesfile;
1461 printdone "pushed and uploaded $cversion";
1463 responder_send_command("complete");
1469 badusage "-p is not allowed with clone; specify as argument instead"
1470 if defined $package;
1473 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
1474 ($package,$isuite) = @ARGV;
1475 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
1476 ($package,$dstdir) = @ARGV;
1477 } elsif (@ARGV==3) {
1478 ($package,$isuite,$dstdir) = @ARGV;
1480 badusage "incorrect arguments to dgit clone";
1482 $dstdir ||= "$package";
1486 sub branchsuite () {
1487 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
1488 if ($branch =~ m#$lbranch_re#o) {
1495 sub fetchpullargs () {
1496 if (!defined $package) {
1497 my $sourcep = parsecontrol('debian/control','debian/control');
1498 $package = getfield $sourcep, 'Source';
1501 # $isuite = branchsuite(); # this doesn't work because dak hates canons
1503 my $clogp = parsechangelog();
1504 $isuite = getfield $clogp, 'Distribution';
1506 canonicalise_suite();
1507 progress "fetching from suite $csuite";
1508 } elsif (@ARGV==1) {
1510 canonicalise_suite();
1512 badusage "incorrect arguments to dgit fetch or dgit pull";
1530 badusage "-p is not allowed with dgit push" if defined $package;
1532 my $clogp = parsechangelog();
1533 $package = getfield $clogp, 'Source';
1536 } elsif (@ARGV==1) {
1537 ($specsuite) = (@ARGV);
1539 badusage "incorrect arguments to dgit push";
1541 $isuite = getfield $clogp, 'Distribution';
1543 local ($package) = $existing_package; # this is a hack
1544 canonicalise_suite();
1546 if (defined $specsuite && $specsuite ne $isuite) {
1547 canonicalise_suite();
1548 $csuite eq $specsuite or
1549 fail "dgit push: changelog specifies $isuite ($csuite)".
1550 " but command line specifies $specsuite";
1552 if (check_for_git()) {
1555 if (fetch_from_archive()) {
1556 is_fast_fwd(lrref(), 'HEAD') or
1557 fail "dgit push: HEAD is not a descendant".
1558 " of the archive's version.\n".
1559 "$us: To overwrite it, use git merge -s ours ".lrref().".";
1562 fail "package appears to be new in this suite;".
1563 " if this is intentional, use --new";
1568 #---------- remote commands' implementation ----------
1570 sub cmd_remote_push_responder {
1571 my ($nrargs) = shift @ARGV;
1572 my (@rargs) = @ARGV[0..$nrargs-1];
1573 @ARGV = @ARGV[$nrargs..$#ARGV];
1577 $we_are_responder = 1;
1579 open PI, "<&STDIN" or die $!;
1580 open STDIN, "/dev/null" or die $!;
1581 open PO, ">&STDOUT" or die $!;
1583 open STDOUT, ">&STDERR" or die $!;
1586 responder_send_command("dgit-remote-push-ready");
1598 printdebug "(killing remote child $i_child_pid)\n";
1599 kill 15, $i_child_pid;
1601 if (defined $i_tmp && !defined $initiator_tempdir) {
1603 eval { rmtree $i_tmp; };
1607 END { i_cleanup(); }
1610 my ($base,$selector,@args) = @_;
1611 $selector =~ s/\-/_/g;
1612 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
1618 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
1628 push @rdgit, @ropts;
1629 push @rdgit, qw(remote-push-responder), (scalar @rargs), @rargs;
1631 my @cmd = (@ssh, $host, shellquote @rdgit);
1632 printcmd \*DEBUG,$debugprefix."+",@cmd;
1634 if (defined $initiator_tempdir) {
1635 rmtree $initiator_tempdir;
1636 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
1637 $i_tmp = $initiator_tempdir;
1641 $i_child_pid = open2(\*RO, \*RI, @cmd);
1643 initiator_expect { m/^dgit-remote-push-ready/ };
1645 my ($icmd,$iargs) = initiator_expect {
1646 m/^(\S+)(?: (.*))?$/;
1649 i_method "i_resp", $icmd, $iargs;
1653 sub i_resp_progress ($) {
1655 my $msg = protocol_read_bytes \*RO, $rhs;
1659 sub i_resp_complete {
1660 my $pid = $i_child_pid;
1661 $i_child_pid = undef; # prevents killing some other process with same pid
1662 printdebug "waiting for remote child $pid...\n";
1663 my $got = waitpid $pid, 0;
1664 die $! unless $got == $pid;
1665 die "remote child failed $?" if $?;
1668 printdebug "all done\n";
1672 sub i_resp_file ($) {
1674 my $localname = i_method "i_localname", $keyword;
1675 my $localpath = "$i_tmp/$localname";
1676 stat $localpath and badproto \*RO, "file $keyword ($localpath) twice";
1677 protocol_receive_file \*RO, $localpath;
1678 i_method "i_file", $keyword;
1683 sub i_resp_param ($) {
1684 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
1690 sub i_resp_want ($) {
1692 die "$keyword ?" if $i_wanted{$keyword}++;
1693 my @localpaths = i_method "i_want", $keyword;
1694 printdebug "[[ $keyword @localpaths\n";
1695 foreach my $localpath (@localpaths) {
1696 protocol_send_file \*RI, $localpath;
1698 print RI "files-end\n" or die $!;
1701 our ($i_clogp, $i_version, $i_tag, $i_dscfn, $i_changesfn);
1703 sub i_localname_parsed_changelog {
1704 return "remote-changelog.822";
1706 sub i_file_parsed_changelog {
1707 ($i_clogp, $i_version, $i_tag, $i_dscfn) =
1708 push_parse_changelog "$i_tmp/remote-changelog.822";
1709 die if $i_dscfn =~ m#/|^\W#;
1712 sub i_localname_dsc {
1713 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
1718 sub i_localname_changes {
1719 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
1720 $i_changesfn = $i_dscfn;
1721 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
1722 return $i_changesfn;
1724 sub i_file_changes { }
1726 sub i_want_signed_tag {
1727 printdebug Dumper(\%i_param, $i_dscfn);
1728 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
1729 && defined $i_param{'csuite'}
1730 or badproto \*RO, "premature desire for signed-tag";
1731 my $head = $i_param{'head'};
1732 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
1734 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
1736 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
1739 push_mktag $head, $i_clogp, $i_tag,
1741 $i_changesfn, 'remote changes',
1742 sub { "tag$_[0]"; };
1747 sub i_want_signed_dsc_changes {
1748 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
1749 sign_changes $i_changesfn;
1750 return ($i_dscfn, $i_changesfn);
1753 #---------- building etc. ----------
1759 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
1761 sub build_maybe_quilt_fixup () {
1762 if (!open F, "debian/source/format") {
1763 die $! unless $!==&ENOENT;
1767 F->error and die $!;
1769 return unless madformat($_);
1772 my @cmd = (@git, qw(ls-files --exclude-standard -iodm));
1773 my $problems = cmdoutput @cmd;
1774 if (length $problems) {
1775 print STDERR "problematic files:\n";
1776 print STDERR " $_\n" foreach split /\n/, $problems;
1777 fail "Cannot do quilt fixup in tree containing ignored files. ".
1778 "Perhaps your package's clean target is broken, in which".
1779 " case -wg (which says to use git-clean -xdf) may help.";
1782 my $clogp = parsechangelog();
1783 my $version = getfield $clogp, 'Version';
1784 my $author = getfield $clogp, 'Maintainer';
1785 my $headref = rev_parse('HEAD');
1788 my $patchname = "auto-$version-$headref-$time";
1789 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
1791 my $descfn = ".git/dgit/quilt-description.tmp";
1792 open O, '>', $descfn or die "$descfn: $!";
1794 $msg =~ s/^\s+$/ ./mg;
1795 print O <<END or die $!;
1796 Description: Automatically generated patch ($clogp->{Version})
1797 Last (up to) $ncommits git changes, FYI:
1807 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
1808 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
1809 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
1810 runcmd_ordryrun_local @dpkgsource, qw(--commit .), $patchname;
1813 if (!open P, '>>', ".pc/applied-patches") {
1814 $!==&ENOENT or die $!;
1819 commit_quilty_patch();
1822 sub quilt_fixup_editor () {
1823 my $descfn = $ENV{$fakeeditorenv};
1824 my $editing = $ARGV[$#ARGV];
1825 open I1, '<', $descfn or die "$descfn: $!";
1826 open I2, '<', $editing or die "$editing: $!";
1827 unlink $editing or die "$editing: $!";
1828 open O, '>', $editing or die "$editing: $!";
1829 while (<I1>) { print O or die $!; } I1->error and die $!;
1832 $copying ||= m/^\-\-\- /;
1833 next unless $copying;
1836 I2->error and die $!;
1842 if ($cleanmode eq 'dpkg-source') {
1843 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
1844 } elsif ($cleanmode eq 'git') {
1845 runcmd_ordryrun_local @git, qw(clean -xdf);
1846 } elsif ($cleanmode eq 'none') {
1853 badusage "-p is not allowed when building" if defined $package;
1856 my $clogp = parsechangelog();
1857 $isuite = getfield $clogp, 'Distribution';
1858 $package = getfield $clogp, 'Source';
1859 $version = getfield $clogp, 'Version';
1860 build_maybe_quilt_fixup();
1863 sub changesopts () {
1864 my @opts =@changesopts[1..$#changesopts];
1865 if (!defined $changes_since_version) {
1866 my @vsns = archive_query('archive_query');
1867 my @quirk = access_quirk();
1868 if ($quirk[0] eq 'backports') {
1869 local $isuite = $quirk[2];
1871 canonicalise_suite();
1872 push @vsns, archive_query('archive_query');
1875 @vsns = map { $_->[0] } @vsns;
1876 @vsns = sort { -version_compare_string($a, $b) } @vsns;
1877 $changes_since_version = $vsns[0];
1878 progress "changelog will contain changes since $vsns[0]";
1880 $changes_since_version = '_';
1881 progress "package seems new, not specifying -v<version>";
1884 if ($changes_since_version ne '_') {
1885 unshift @opts, "-v$changes_since_version";
1892 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
1893 printdone "build successful\n";
1899 (qw(git-buildpackage -us -uc --git-no-sign-tags),
1900 "--git-builder=@dpkgbuildpackage");
1901 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
1902 canonicalise_suite();
1903 push @cmd, "--git-debian-branch=".lbranch();
1905 push @cmd, changesopts();
1906 runcmd_ordryrun_local @cmd, @ARGV;
1907 printdone "build successful\n";
1912 $sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
1913 $dscfn = dscfn($version);
1914 if ($cleanmode eq 'dpkg-source') {
1915 runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S)),
1918 my $pwd = cmdoutput qw(env - pwd);
1919 my $leafdir = basename $pwd;
1921 runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir;
1923 runcmd_ordryrun_local qw(sh -ec),
1924 'exec >$1; shift; exec "$@"','x',
1925 "../$sourcechanges",
1926 @dpkggenchanges, qw(-S), changesopts();
1930 sub cmd_build_source {
1931 badusage "build-source takes no additional arguments" if @ARGV;
1933 printdone "source built, results in $dscfn and $sourcechanges";
1939 my $pat = "${package}_".(stripepoch $version)."_*.changes";
1941 stat $dscfn or fail "$dscfn (in parent directory): $!";
1942 stat $sourcechanges or fail "$sourcechanges (in parent directory): $!";
1943 foreach my $cf (glob $pat) {
1944 next if $cf eq $sourcechanges;
1945 unlink $cf or fail "remove $cf: $!";
1948 runcmd_ordryrun_local @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
1949 my @changesfiles = glob $pat;
1950 @changesfiles = sort {
1951 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
1954 fail "wrong number of different changes files (@changesfiles)"
1955 unless @changesfiles;
1956 runcmd_ordryrun_local @mergechanges, @changesfiles;
1957 my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
1959 stat $multichanges or fail "$multichanges: $!";
1961 printdone "build successful, results in $multichanges\n" or die $!;
1964 sub cmd_quilt_fixup {
1965 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
1966 my $clogp = parsechangelog();
1967 $version = getfield $clogp, 'Version';
1968 build_maybe_quilt_fixup();
1971 #---------- argument parsing and main program ----------
1974 print "dgit version $our_version\n" or die $!;
1981 if (defined $ENV{'DGIT_SSH'}) {
1982 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
1983 } elsif (defined $ENV{'GIT_SSH'}) {
1984 @ssh = ($ENV{'GIT_SSH'});
1988 last unless $ARGV[0] =~ m/^-/;
1992 if (m/^--dry-run$/) {
1995 } elsif (m/^--damp-run$/) {
1998 } elsif (m/^--no-sign$/) {
2001 } elsif (m/^--help$/) {
2003 } elsif (m/^--version$/) {
2005 } elsif (m/^--new$/) {
2008 } elsif (m/^--since-version=([^_]+|_)$/) {
2010 $changes_since_version = $1;
2011 } elsif (m/^--([-0-9a-z]+)=(.*)/s &&
2012 ($om = $opts_opt_map{$1}) &&
2016 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
2017 !$opts_opt_cmdonly{$1} &&
2018 ($om = $opts_opt_map{$1})) {
2021 } elsif (m/^--existing-package=(.*)/s) {
2023 $existing_package = $1;
2024 } elsif (m/^--initiator-tempdir=(.*)/s) {
2025 $initiator_tempdir = $1;
2026 $initiator_tempdir =~ m#^/# or
2027 badusage "--initiator-tempdir must be used specify an".
2028 " absolute, not relative, directory."
2029 } elsif (m/^--distro=(.*)/s) {
2032 } elsif (m/^--build-products-dir=(.*)/s) {
2034 $buildproductsdir = $1;
2035 } elsif (m/^--clean=(dpkg-source|git|none)$/s) {
2038 } elsif (m/^--clean=(.*)$/s) {
2039 badusage "unknown cleaning mode \`$1'";
2040 } elsif (m/^--ignore-dirty$/s) {
2043 } elsif (m/^--no-quilt-fixup$/s) {
2047 badusage "unknown long option \`$_'";
2054 } elsif (s/^-L/-/) {
2057 } elsif (s/^-h/-/) {
2059 } elsif (s/^-D/-/) {
2061 open DEBUG, ">&STDERR" or die $!;
2064 } elsif (s/^-N/-/) {
2067 } elsif (s/^-v([^_]+|_)$//s) {
2069 $changes_since_version = $1;
2072 push @changesopts, $_;
2074 } elsif (s/^-c(.*=.*)//s) {
2076 push @git, '-c', $1;
2077 } elsif (s/^-d(.*)//s) {
2080 } elsif (s/^-C(.*)//s) {
2083 if ($changesfile =~ s#^(.*)/##) {
2084 $buildproductsdir = $1;
2086 } elsif (s/^-k(.*)//s) {
2088 } elsif (s/^-wn//s) {
2090 $cleanmode = 'none';
2091 } elsif (s/^-wg//s) {
2094 } elsif (s/^-wd//s) {
2096 $cleanmode = 'dpkg-source';
2098 badusage "unknown short option \`$_'";
2105 if ($ENV{$fakeeditorenv}) {
2106 quilt_fixup_editor();
2109 delete $ENV{'DGET_UNPACK'};
2112 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
2113 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
2114 if $dryrun_level == 1;
2116 print STDERR $helpmsg or die $!;
2119 my $cmd = shift @ARGV;
2121 { no strict qw(refs); &{"cmd_$cmd"}(); }