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)");
56 our (@dget) = qw(dget);
57 our (@dput) = qw(dput);
58 our (@debsign) = qw(debsign);
60 our (@sbuild) = qw(sbuild -A);
62 our (@dgit) = qw(dgit);
63 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
64 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
65 our (@dpkggenchanges) = qw(dpkg-genchanges);
66 our (@mergechanges) = qw(mergechanges -f);
67 our (@changesopts) = ('');
69 our %opts_opt_map = ('dget' => \@dget,
71 'debsign' => \@debsign,
76 'dpkg-source' => \@dpkgsource,
77 'dpkg-buildpackage' => \@dpkgbuildpackage,
78 'dpkg-genchanges' => \@dpkggenchanges,
79 'ch' => \@changesopts,
80 'mergechanges' => \@mergechanges);
82 our %opts_opt_cmdonly = ('gpg' => 1);
87 open DEBUG, ">/dev/null" or die $!;
91 our $remotename = 'dgit';
92 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
93 our $branchprefix = 'dgit';
96 sub lbranch () { return "$branchprefix/$csuite"; }
97 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
98 sub lref () { return "refs/heads/".lbranch(); }
99 sub lrref () { return "refs/remotes/$remotename/$branchprefix/$csuite"; }
100 sub rrref () { return "refs/$branchprefix/$csuite"; }
115 return "${package}_".(stripepoch $vsn).".dsc";
119 our $debugprefix = '';
121 sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
124 die $us.($we_are_responder ? " (build host)" : "").": @_\n";
127 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
129 sub no_such_package () {
130 print STDERR "$us: package $package does not exist in suite $isuite\n";
136 return "+".rrref().":".lrref();
141 printdebug "CD $newdir\n";
142 chdir $newdir or die "chdir: $newdir: $!";
145 #---------- remote protocol support, common ----------
147 # remote push initiator/responder protocol:
148 # < dgit-remote-push-ready [optional extra info ignored by old initiators]
150 # > file parsed-changelog
151 # [indicates that output of dpkg-parsechangelog follows]
152 # > data-block NBYTES
153 # > [NBYTES bytes of data (no newline)]
154 # [maybe some more blocks]
166 # [indicates that signed tag is wanted]
167 # < data-block NBYTES
168 # < [NBYTES bytes of data (no newline)]
169 # [maybe some more blocks]
173 # > want signed-dsc-changes
174 # < data-block NBYTES [transfer of signed dsc]
176 # < data-block NBYTES [transfer of signed changes]
184 fail "connection lost: $!" if $fh->error;
185 fail "protocol violation; $m not expected";
188 sub protocol_expect (&$) {
189 my ($match, $fh) = @_;
192 defined && chomp or badproto $fh, "eof";
200 badproto $fh, "\`$_'";
203 sub protocol_send_file ($$) {
204 my ($fh, $ourfn) = @_;
205 open PF, "<", $ourfn or die "$ourfn: $!";
208 my $got = read PF, $d, 65536;
209 die "$ourfn: $!" unless defined $got;
211 print $fh "data-block ".length($d)."\n" or die $!;
212 print $fh $d or die $!;
214 PF->error and die "$ourfn $!";
215 print $fh "data-end\n" or die $!;
219 sub protocol_read_bytes ($$) {
220 my ($fh, $nbytes) = @_;
221 $nbytes =~ m/^[1-9]\d{0,5}$/ or badproto \*RO, "bad byte count";
223 my $got = read $fh, $d, $nbytes;
224 $got==$nbytes or badproto $fh, "eof during data block";
228 sub protocol_receive_file ($$) {
229 my ($fh, $ourfn) = @_;
230 printdebug "() $ourfn\n";
231 open PF, ">", $ourfn or die "$ourfn: $!";
233 my ($y,$l) = protocol_expect {
234 m/^data-block (.*)$/ ? (1,$1) :
235 m/^data-end$/ ? (0,) :
239 my $d = protocol_read_bytes $fh, $l;
240 print PF $d or die $!;
245 #---------- remote protocol support, responder ----------
247 sub responder_send_command ($) {
249 return unless $we_are_responder;
250 # called even without $we_are_responder
251 printdebug ">> $command\n";
252 print PO $command, "\n" or die $!;
255 sub responder_send_file ($$) {
256 my ($keyword, $ourfn) = @_;
257 return unless $we_are_responder;
258 printdebug "]] $keyword $ourfn\n";
259 responder_send_command "file $keyword";
260 protocol_send_file \*PO, $ourfn;
263 sub responder_receive_files ($@) {
264 my ($keyword, @ourfns) = @_;
265 die unless $we_are_responder;
266 printdebug "[[ $keyword @ourfns\n";
267 responder_send_command "want $keyword";
268 foreach my $fn (@ourfns) {
269 protocol_receive_file \*PI, $fn;
272 protocol_expect { m/^files-end$/ } \*PI;
275 #---------- remote protocol support, initiator ----------
277 sub initiator_expect (&) {
279 protocol_expect { &$match } \*RO;
282 #---------- end remote code ----------
285 if ($we_are_responder) {
287 responder_send_command "progress ".length($m) or die $!;
288 print PO $m or die $!;
298 $ua = LWP::UserAgent->new();
302 progress "downloading $what...";
303 my $r = $ua->get(@_) or die $!;
304 return undef if $r->code == 404;
305 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
306 return $r->decoded_content();
309 our ($dscdata,$dscurl,$dsc,$skew_warning_vsn);
316 if (m{[^-=_./0-9a-z]}i) {
323 return join ' ', @out;
328 my $intro = shift @_;
329 print $fh $intro," " or die $!;
330 print $fh shellquote @_ or die $!;
331 print $fh "\n" or die $!;
335 { local ($!); printcmd \*STDERR, "$us: failed command:", @_ or die $!; };
337 fail "failed to fork/exec: $!";
338 } elsif (!($? & 0xff)) {
339 fail "subprocess failed with error exit status ".($?>>8);
341 fail "subprocess crashed (wait status $?)";
343 fail "subprocess produced invalid output";
348 printcmd(\*DEBUG,$debugprefix."+",@_) if $debug>0;
350 failedcmd @_ if system @_;
353 sub act_local () { return $dryrun_level <= 1; }
354 sub act_scary () { return !$dryrun_level; }
357 if (!$dryrun_level) {
358 progress "dgit ok: @_";
360 progress "would be ok: @_ (but dry run only)";
364 sub cmdoutput_errok {
365 die Dumper(\@_)." ?" if grep { !defined } @_;
366 printcmd(\*DEBUG,$debugprefix."|",@_) if $debug>0;
367 open P, "-|", @_ or die $!;
370 { local $/ = undef; $d = <P>; }
372 if (!close P) { printdebug "=>!$?\n" if $debug>0; return undef; }
375 printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debug>0; #';
380 my $d = cmdoutput_errok @_;
381 defined $d or failedcmd @_;
386 printcmd(\*STDERR,$debugprefix."#",@_);
389 sub runcmd_ordryrun {
397 sub runcmd_ordryrun_local {
406 my ($first_shell, @cmd) = @_;
407 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
410 our $helpmsg = <<END;
412 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
413 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
414 dgit [dgit-opts] build [git-buildpackage-opts|dpkg-buildpackage-opts]
415 dgit [dgit-opts] push [dgit-opts] [suite]
416 dgit [dgit-opts] rpush build-host:build-dir ...
417 important dgit options:
418 -k<keyid> sign tag and package with <keyid> instead of default
419 --dry-run -n do not change anything, but go through the motions
420 --damp-run -L like --dry-run but make local changes, without signing
421 --new -N allow introducing a new package
422 --debug -D increase debug level
423 -c<name>=<value> set git config option (used directly by dgit too)
426 our $later_warning_msg = <<END;
427 Perhaps the upload is stuck in incoming. Using the version from git.
431 print STDERR "$us: @_\n", $helpmsg or die $!;
436 @ARGV or badusage "too few arguments";
437 return scalar shift @ARGV;
441 print $helpmsg or die $!;
445 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
447 our %defcfg = ('dgit.default.distro' => 'debian',
448 'dgit.default.username' => '',
449 'dgit.default.archive-query-default-component' => 'main',
450 'dgit.default.ssh' => 'ssh',
451 'dgit-distro.debian.git-user' => 'dgit',
452 'dgit-distro.debian.git-host' => 'git.debian.org',
453 'dgit-distro.debian.git-proto' => 'git+ssh://',
454 'dgit-distro.debian.git-path' => '/dgit-repos/',
455 'dgit-distro.debian.git-check' => 'true',
456 'dgit-distro.debian.git-create' => 'true',
457 'dgit-distro.debian.sshpsql-host' => 'coccia.debian.org',
458 'dgit-distro.debian.sshpsql-dbname' => 'service=projectb',
459 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
460 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
461 'dgit-distro.debian.backports-quirk' => '%-backports*',
462 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
463 'dgit-distro.test-dummy.ssh' => "$td/ssh",
464 'dgit-distro.test-dummy.username' => "alice",
465 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
466 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
467 'dgit-distro.test-dummy.git-url' => "$td/git",
468 'dgit-distro.test-dummy.git-host' => "git",
469 'dgit-distro.test-dummy.git-path' => "$td/git",
470 'dgit-distro.test-dummy.archive-query' => "dummycat:$td/aq",
471 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
472 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
477 return undef if $c =~ /RETURN-UNDEF/;
478 my @cmd = (@git, qw(config --), $c);
481 local ($debug) = $debug-1;
482 $v = cmdoutput_errok @cmd;
489 my $dv = $defcfg{$c};
490 return $dv if defined $dv;
492 badcfg "need value for one of: @_";
495 sub access_basedistro () {
496 return cfg("dgit-suite.$isuite.distro",
497 "dgit.default.distro");
500 sub access_quirk () {
501 # returns (quirk name, distro to use instead, quirk-specific info)
502 my $basedistro = access_basedistro();
503 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
505 if (defined $backports_quirk) {
506 my $re = $backports_quirk;
507 $re =~ s/[^-0-9a-z_\%*]/\\$&/ig;
509 $re =~ s/\%/([-0-9a-z_]+)/ or badcfg "backports-quirk needs \%";
510 if ($isuite =~ m/^$re$/) {
511 return ('backports',"$basedistro-backports",$1);
514 return ('none',$basedistro);
517 sub access_distro () {
518 return (access_quirk())[1];
523 my $basedistro = access_basedistro();
524 my $distro = $idistro || access_distro();
525 my $value = cfg(map {
526 ("dgit-distro.$distro.$_",
527 "dgit-distro.$basedistro.$_",
533 sub string_to_ssh ($) {
535 if ($spec =~ m/\s/) {
536 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
542 sub access_cfg_ssh () {
543 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
544 if (!defined $gitssh) {
547 return string_to_ssh $gitssh;
551 sub access_someuserhost ($) {
553 my $user = access_cfg("$some-user",'username');
554 my $host = access_cfg("$some-host");
555 return length($user) ? "$user\@$host" : $host;
558 sub access_gituserhost () {
559 return access_someuserhost('git');
562 sub access_giturl () {
563 my $url = access_cfg('git-url','RETURN-UNDEF');
566 access_cfg('git-proto').
567 access_gituserhost().
568 access_cfg('git-path');
570 return "$url/$package.git";
573 sub parsecontrolfh ($$@) {
574 my ($fh, $desc, @opts) = @_;
575 my %opts = ('name' => $desc, @opts);
576 my $c = Dpkg::Control::Hash->new(%opts);
577 $c->parse($fh) or die "parsing of $desc failed";
582 my ($file, $desc) = @_;
583 my $fh = new IO::Handle;
584 open $fh, '<', $file or die "$file: $!";
585 my $c = parsecontrolfh($fh,$desc);
586 $fh->error and die $!;
592 my ($dctrl,$field) = @_;
593 my $v = $dctrl->{$field};
594 return $v if defined $v;
595 fail "missing field $field in ".$v->get_option('name');
599 my $c = Dpkg::Control::Hash->new();
600 my $p = new IO::Handle;
601 my @cmd = (qw(dpkg-parsechangelog), @_);
602 open $p, '-|', @cmd or die $!;
604 $?=0; $!=0; close $p or failedcmd @cmd;
608 sub git_get_ref ($) {
610 my $got = cmdoutput_errok @git, qw(show-ref --), $refname;
612 $?==256 or fail "git show-ref failed (status $?)";
613 printdebug "ref $refname= [show-ref exited 1]\n";
616 if ($got =~ m/^(\w+) \Q$refname\E$/m) {
617 printdebug "ref $refname=$1\n";
620 printdebug "ref $refname= [no match]\n";
627 sub archive_query ($) {
629 my $query = access_cfg('archive-query','RETURN-UNDEF');
630 if (!defined $query) {
631 my $distro = access_basedistro();
632 if ($distro eq 'debian') {
634 access_someuserhost('sshpsql').':'.
635 access_cfg('sshpsql-dbname');
637 $query = "madison:$distro";
640 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
643 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
646 sub pool_dsc_subpath ($$) {
647 my ($vsn,$component) = @_; # $package is implict arg
648 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
649 return "/pool/$component/$prefix/$package/".dscfn($vsn);
652 sub archive_query_madison ($$) {
653 my ($proto,$data) = @_;
654 die unless $proto eq 'madison';
655 $rmad{$package} ||= cmdoutput
656 qw(rmadison -asource),"-s$isuite","-u$data",$package;
657 my $rmad = $rmad{$package};
658 return madison_parse($rmad);
661 sub madison_parse ($) {
664 foreach my $l (split /\n/, $rmad) {
665 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
666 \s*( [^ \t|]+ )\s* \|
667 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
668 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
669 $1 eq $package or die "$rmad $package ?";
676 $component = access_cfg('archive-query-default-component');
678 $5 eq 'source' or die "$rmad ?";
679 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
681 return sort { -version_compare_string($a->[0],$b->[0]); } @out;
684 sub canonicalise_suite_madison ($$) {
685 # madison canonicalises for us
686 my @r = archive_query_madison($_[0],$_[1]);
688 "unable to canonicalise suite using package $package".
689 " which does not appear to exist in suite $isuite;".
690 " --existing-package may help";
695 my ($data,$sql) = @_;
696 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
697 my ($userhost,$dbname) = ($`,$'); #';
699 my @cmd = (access_cfg_ssh, $userhost,
700 "export LANG=C; ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
701 printcmd(\*DEBUG,$debugprefix."|",@cmd) if $debug>0;
702 open P, "-|", @cmd or die $!;
705 printdebug("$debugprefix>|$_|\n");
708 $!=0; $?=0; close P or failedcmd @cmd;
710 my $nrows = pop @rows;
711 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
712 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
713 @rows = map { [ split /\|/, $_ ] } @rows;
714 my $ncols = scalar @{ shift @rows };
715 die if grep { scalar @$_ != $ncols } @rows;
719 sub sql_injection_check {
720 foreach (@_) { die "$_ $& ?" if m/[']/; }
723 sub archive_query_sshpsql ($$) {
724 my ($proto,$data) = @_;
725 sql_injection_check $isuite, $package;
726 my @rows = sshpsql($data, <<END);
727 SELECT source.version, component.name, files.filename
729 JOIN src_associations ON source.id = src_associations.source
730 JOIN suite ON suite.id = src_associations.suite
731 JOIN dsc_files ON dsc_files.source = source.id
732 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
733 JOIN component ON component.id = files_archive_map.component_id
734 JOIN files ON files.id = dsc_files.file
735 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
736 AND source.source='$package'
737 AND files.filename LIKE '%.dsc';
739 @rows = sort { -version_compare_string($a->[0],$b->[0]) } @rows;
741 my ($vsn,$component,$filename) = @$_;
742 [ $vsn, "/pool/$component/$filename" ];
747 sub canonicalise_suite_sshpsql ($$) {
748 my ($proto,$data) = @_;
749 sql_injection_check $isuite;
750 my @rows = sshpsql($data, <<END);
751 SELECT suite.codename
752 FROM suite where suite_name='$isuite' or codename='$isuite';
754 @rows = map { $_->[0] } @rows;
755 fail "unknown suite $isuite" unless @rows;
756 die "ambiguous $isuite: @rows ?" if @rows>1;
760 sub canonicalise_suite_dummycat ($$) {
761 my ($proto,$data) = @_;
762 my $dpath = "$data/suite.$isuite";
763 if (!open C, "<", $dpath) {
764 $!==ENOENT or die "$dpath: $!";
765 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
769 chomp or die "$dpath: $!";
771 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
775 sub archive_query_dummycat ($$) {
776 my ($proto,$data) = @_;
777 canonicalise_suite();
778 my $dpath = "$data/package.$csuite.$package";
779 if (!open C, "<", $dpath) {
780 $!==ENOENT or die "$dpath: $!";
781 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
789 printdebug "dummycat query $csuite $package $dpath | $_\n";
790 my @row = split /\s+/, $_;
791 @row==2 or die "$dpath: $_ ?";
794 C->error and die "$dpath: $!";
796 return sort { -version_compare_string($a->[0],$b->[0]); } @rows;
799 sub canonicalise_suite () {
800 return if defined $csuite;
801 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
802 $csuite = archive_query('canonicalise_suite');
803 if ($isuite ne $csuite) {
804 progress "canonical suite name for $isuite is $csuite";
808 sub get_archive_dsc () {
809 canonicalise_suite();
810 my @vsns = archive_query('archive_query');
811 foreach my $vinfo (@vsns) {
812 my ($vsn,$subpath) = @$vinfo;
813 $dscurl = access_cfg('mirror').$subpath;
814 $dscdata = url_get($dscurl);
816 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
819 my $dscfh = new IO::File \$dscdata, '<' or die $!;
820 printdebug Dumper($dscdata) if $debug>1;
821 $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
822 printdebug Dumper($dsc) if $debug>1;
823 my $fmt = getfield $dsc, 'Format';
824 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
830 sub check_for_git () {
832 my $how = access_cfg('git-check');
833 if ($how eq 'ssh-cmd') {
835 (access_cfg_ssh, access_gituserhost(),
836 " set -e; cd ".access_cfg('git-path').";".
837 " if test -d $package.git; then echo 1; else echo 0; fi");
838 my $r= cmdoutput @cmd;
839 failedcmd @cmd unless $r =~ m/^[01]$/;
841 } elsif ($how eq 'true') {
844 badcfg "unknown git-check \`$how'";
848 sub create_remote_git_repo () {
849 my $how = access_cfg('git-create');
850 if ($how eq 'ssh-cmd') {
852 (access_cfg_ssh, access_gituserhost(),
853 "set -e; cd ".access_cfg('git-path').";".
854 " cp -a _template $package.git");
855 } elsif ($how eq 'true') {
858 badcfg "unknown git-create \`$how'";
862 our ($dsc_hash,$lastpush_hash);
864 our $ud = '.git/dgit/unpack';
872 sub mktree_in_ud_from_only_subdir () {
873 # changes into the subdir
876 $dirs[0] =~ m#^([^/]+)/\.$# or die;
879 fail "source package contains .git directory" if stat '.git';
880 die $! unless $!==&ENOENT;
881 runcmd qw(git init -q);
882 rmtree('.git/objects');
883 symlink '../../../../objects','.git/objects' or die $!;
884 runcmd @git, qw(add -Af);
885 my $tree = cmdoutput @git, qw(write-tree);
886 $tree =~ m/^\w+$/ or die "$tree ?";
890 sub dsc_files_info () {
891 foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
892 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
893 ['Files', 'Digest::MD5', 'new()']) {
894 my ($fname, $module, $method) = @$csumi;
895 my $field = $dsc->{$fname};
896 next unless defined $field;
897 eval "use $module; 1;" or die $@;
899 foreach (split /\n/, $field) {
901 m/^(\w+) (\d+) (\S+)$/ or
902 fail "could not parse .dsc $fname line \`$_'";
903 my $digester = eval "$module"."->$method;" or die $@;
908 Digester => $digester,
913 fail "missing any supported Checksums-* or Files field in ".
914 $dsc->get_option('name');
918 map { $_->{Filename} } dsc_files_info();
921 sub is_orig_file ($) {
923 m/\.orig(?:-\w+)?\.tar\.\w+$/;
926 sub make_commit ($) {
928 return cmdoutput @git, qw(hash-object -w -t commit), $file;
931 sub clogp_authline ($) {
933 my $author = getfield $clogp, 'Maintainer';
934 $author =~ s#,.*##ms;
935 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
936 my $authline = "$author $date";
937 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
938 fail "unexpected commit author line format \`$authline'".
939 " (was generated from changelog Maintainer field)";
943 sub generate_commit_from_dsc () {
947 foreach my $f (dsc_files()) {
948 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
950 link "../../../$f", $f
954 runcmd @dget, qw(--), $dscurl;
955 foreach my $f (grep { is_orig_file($_) } @files) {
956 link $f, "../../../../$f"
960 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
961 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
962 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
963 my $authline = clogp_authline $clogp;
964 my $changes = getfield $clogp, 'Changes';
965 open C, ">../commit.tmp" or die $!;
966 print C <<END or die $!;
973 # imported from the archive
976 my $outputhash = make_commit qw(../commit.tmp);
977 my $cversion = getfield $clogp, 'Version';
978 progress "synthesised git commit from .dsc $cversion";
979 if ($lastpush_hash) {
980 runcmd @git, qw(reset --hard), $lastpush_hash;
981 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
982 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
983 my $oversion = getfield $oldclogp, 'Version';
985 version_compare_string($oversion, $cversion);
987 # git upload/ is earlier vsn than archive, use archive
988 open C, ">../commit2.tmp" or die $!;
989 print C <<END or die $!;
991 parent $lastpush_hash
996 Record $package ($cversion) in archive suite $csuite
998 $outputhash = make_commit qw(../commit2.tmp);
999 } elsif ($vcmp > 0) {
1000 print STDERR <<END or die $!;
1002 Version actually in archive: $cversion (older)
1003 Last allegedly pushed/uploaded: $oversion (newer or same)
1006 $outputhash = $lastpush_hash;
1008 $outputhash = $lastpush_hash;
1011 changedir '../../../..';
1012 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
1013 'DGIT_ARCHIVE', $outputhash;
1014 cmdoutput @git, qw(log -n2), $outputhash;
1015 # ... gives git a chance to complain if our commit is malformed
1020 sub ensure_we_have_orig () {
1021 foreach my $fi (dsc_files_info()) {
1022 my $f = $fi->{Filename};
1023 next unless is_orig_file($f);
1024 if (open F, "<", "../$f") {
1025 $fi->{Digester}->reset();
1026 $fi->{Digester}->addfile(*F);
1027 F->error and die $!;
1028 my $got = $fi->{Digester}->hexdigest();
1029 $got eq $fi->{Hash} or
1030 fail "existing file $f has hash $got but .dsc".
1031 " demands hash $fi->{Hash}".
1032 " (perhaps you should delete this file?)";
1033 progress "using existing $f";
1036 die "$f $!" unless $!==&ENOENT;
1038 my $origurl = $dscurl;
1039 $origurl =~ s{/[^/]+$}{};
1041 die "$f ?" unless $f =~ m/^${package}_/;
1042 die "$f ?" if $f =~ m#/#;
1043 runcmd_ordryrun_local shell_cmd 'cd ..', @dget,'--',$origurl;
1048 return cmdoutput @git, qw(rev-parse), "$_[0]~0";
1051 sub is_fast_fwd ($$) {
1052 my ($ancestor,$child) = @_;
1053 my @cmd = (@git, qw(merge-base), $ancestor, $child);
1054 my $mb = cmdoutput_errok @cmd;
1056 return rev_parse($mb) eq rev_parse($ancestor);
1058 $?==256 or failedcmd @cmd;
1063 sub git_fetch_us () {
1064 runcmd_ordryrun_local @git, qw(fetch),access_giturl(),fetchspec();
1067 sub fetch_from_archive () {
1068 # ensures that lrref() is what is actually in the archive,
1069 # one way or another
1073 foreach my $field (@ourdscfield) {
1074 $dsc_hash = $dsc->{$field};
1075 last if defined $dsc_hash;
1077 if (defined $dsc_hash) {
1078 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
1080 progress "last upload to archive specified git hash";
1082 progress "last upload to archive has NO git hash";
1085 progress "no version available from the archive";
1088 $lastpush_hash = git_get_ref(lrref());
1089 printdebug "previous reference hash=$lastpush_hash\n";
1091 if (defined $dsc_hash) {
1092 fail "missing remote git history even though dsc has hash -".
1093 " could not find ref ".lrref().
1094 " (should have been fetched from ".access_giturl()."#".rrref().")"
1095 unless $lastpush_hash;
1097 ensure_we_have_orig();
1098 if ($dsc_hash eq $lastpush_hash) {
1099 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
1100 print STDERR <<END or die $!;
1102 Git commit in archive is behind the last version allegedly pushed/uploaded.
1103 Commit referred to by archive: $dsc_hash
1104 Last allegedly pushed/uploaded: $lastpush_hash
1107 $hash = $lastpush_hash;
1109 fail "archive's .dsc refers to ".$dsc_hash.
1110 " but this is an ancestor of ".$lastpush_hash;
1113 $hash = generate_commit_from_dsc();
1114 } elsif ($lastpush_hash) {
1115 # only in git, not in the archive yet
1116 $hash = $lastpush_hash;
1117 print STDERR <<END or die $!;
1119 Package not found in the archive, but has allegedly been pushed using dgit.
1123 printdebug "nothing found!\n";
1124 if (defined $skew_warning_vsn) {
1125 print STDERR <<END or die $!;
1127 Warning: relevant archive skew detected.
1128 Archive allegedly contains $skew_warning_vsn
1129 But we were not able to obtain any version from the archive or git.
1135 printdebug "current hash=$hash\n";
1136 if ($lastpush_hash) {
1137 fail "not fast forward on last upload branch!".
1138 " (archive's version left in DGIT_ARCHIVE)"
1139 unless is_fast_fwd($lastpush_hash, $hash);
1141 if (defined $skew_warning_vsn) {
1143 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
1144 my $clogf = ".git/dgit/changelog.tmp";
1145 runcmd shell_cmd "exec >$clogf",
1146 @git, qw(cat-file blob), "$hash:debian/changelog";
1147 my $gotclogp = parsechangelog("-l$clogf");
1148 my $got_vsn = getfield $gotclogp, 'Version';
1149 printdebug "SKEW CHECK GOT $got_vsn\n";
1150 if (version_compare_string($got_vsn, $skew_warning_vsn) < 0) {
1151 print STDERR <<END or die $!;
1153 Warning: archive skew detected. Using the available version:
1154 Archive allegedly contains $skew_warning_vsn
1155 We were able to obtain only $got_vsn
1160 if ($lastpush_hash ne $hash) {
1161 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
1165 dryrun_report @upd_cmd;
1173 canonicalise_suite();
1174 badusage "dry run makes no sense with clone" unless act_local();
1175 mkdir $dstdir or die "$dstdir $!";
1177 runcmd @git, qw(init -q);
1178 runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec();
1179 open H, "> .git/HEAD" or die $!;
1180 print H "ref: ".lref()."\n" or die $!;
1182 runcmd @git, qw(remote add), 'origin', access_giturl();
1183 if (check_for_git()) {
1184 progress "fetching existing git history";
1186 runcmd_ordryrun_local @git, qw(fetch origin);
1188 progress "starting new git history";
1190 fetch_from_archive() or no_such_package;
1191 runcmd @git, qw(reset --hard), lrref();
1192 printdone "ready for work in $dstdir";
1196 if (check_for_git()) {
1199 fetch_from_archive() or no_such_package();
1200 printdone "fetched into ".lrref();
1205 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
1207 printdone "fetched to ".lrref()." and merged into HEAD";
1210 sub check_not_dirty () {
1211 return if $ignoredirty;
1212 my @cmd = (@git, qw(diff --quiet HEAD));
1213 printcmd(\*DEBUG,$debugprefix."+",@cmd) if $debug>0;
1214 $!=0; $?=0; system @cmd;
1215 return if !$! && !$?;
1216 if (!$! && $?==256) {
1217 fail "working tree is dirty (does not match HEAD)";
1223 sub commit_quilty_patch () {
1224 my $output = cmdoutput @git, qw(status --porcelain);
1226 foreach my $l (split /\n/, $output) {
1227 next unless $l =~ m/\S/;
1228 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
1233 progress "nothing quilty to commit, ok.";
1236 runcmd_ordryrun_local @git, qw(add), sort keys %adds;
1237 my $m = "Commit Debian 3.0 (quilt) metadata";
1239 runcmd_ordryrun_local @git, qw(commit -m), $m;
1244 return 0 unless $format eq '3.0 (quilt)';
1245 progress "Format \`$format', urgh";
1247 progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
1253 sub push_parse_changelog ($) {
1256 my $clogp = Dpkg::Control::Hash->new();
1257 $clogp->load($clogpfn) or die;
1259 $package = getfield $clogp, 'Source';
1260 my $cversion = getfield $clogp, 'Version';
1261 my $tag = debiantag($cversion);
1262 runcmd @git, qw(check-ref-format), $tag;
1264 my $dscfn = dscfn($cversion);
1266 return ($clogp, $cversion, $tag, $dscfn);
1269 sub push_parse_dsc ($$$) {
1270 my ($dscfn,$dscfnwhat, $cversion) = @_;
1271 $dsc = parsecontrol($dscfn,$dscfnwhat);
1272 my $dversion = getfield $dsc, 'Version';
1273 my $dscpackage = getfield $dsc, 'Source';
1274 ($dscpackage eq $package && $dversion eq $cversion) or
1275 fail "$dscfn is for $dscpackage $dversion".
1276 " but debian/changelog is for $package $cversion";
1279 sub push_mktag ($$$$$$$) {
1280 my ($head,$clogp,$tag,
1282 $changesfile,$changesfilewhat,
1285 $dsc->{$ourdscfield[0]} = $head;
1286 $dsc->save("$dscfn.tmp") or die $!;
1288 my $changes = parsecontrol($changesfile,$changesfilewhat);
1289 foreach my $field (qw(Source Distribution Version)) {
1290 $changes->{$field} eq $clogp->{$field} or
1291 fail "changes field $field \`$changes->{$field}'".
1292 " does not match changelog \`$clogp->{$field}'";
1295 my $cversion = getfield $clogp, 'Version';
1296 my $clogsuite = getfield $clogp, 'Distribution';
1298 # We make the git tag by hand because (a) that makes it easier
1299 # to control the "tagger" (b) we can do remote signing
1300 my $authline = clogp_authline $clogp;
1301 open TO, '>', $tfn->('.tmp') or die $!;
1302 print TO <<END or die $!;
1308 $package release $cversion for $clogsuite [dgit]
1312 my $tagobjfn = $tfn->('.tmp');
1314 if (!defined $keyid) {
1315 $keyid = access_cfg('keyid','RETURN-UNDEF');
1317 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
1318 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
1319 push @sign_cmd, qw(-u),$keyid if defined $keyid;
1320 push @sign_cmd, $tfn->('.tmp');
1321 runcmd_ordryrun @sign_cmd;
1323 $tagobjfn = $tfn->('.signed.tmp');
1324 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
1325 $tfn->('.tmp'), $tfn->('.tmp.asc');
1332 sub sign_changes ($) {
1333 my ($changesfile) = @_;
1335 my @debsign_cmd = @debsign;
1336 push @debsign_cmd, "-k$keyid" if defined $keyid;
1337 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
1338 push @debsign_cmd, $changesfile;
1339 runcmd_ordryrun @debsign_cmd;
1344 printdebug "actually entering push\n";
1347 my $clogpfn = ".git/dgit/changelog.822.tmp";
1348 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
1350 responder_send_file('parsed-changelog', $clogpfn);
1352 my ($clogp, $cversion, $tag, $dscfn) =
1353 push_parse_changelog("$clogpfn");
1355 my $dscpath = "$buildproductsdir/$dscfn";
1357 fail "looked for .dsc $dscfn, but $!;".
1358 " maybe you forgot to build";
1360 responder_send_file('dsc', $dscpath);
1362 push_parse_dsc($dscpath, $dscfn, $cversion);
1364 my $format = getfield $dsc, 'Format';
1365 printdebug "format $format\n";
1366 if (madformat($format)) {
1367 commit_quilty_patch();
1371 progress "checking that $dscfn corresponds to HEAD";
1372 runcmd qw(dpkg-source -x --),
1373 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
1374 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1375 changedir '../../../..';
1376 my @diffcmd = (@git, qw(diff --exit-code), $tree);
1377 printcmd \*DEBUG,$debugprefix."+",@diffcmd;
1379 if (system @diffcmd) {
1380 if ($! && $?==256) {
1381 fail "$dscfn specifies a different tree to your HEAD commit;".
1382 " perhaps you forgot to build";
1388 #do fast forward check and maybe fake merge
1389 # if (!is_fast_fwd(mainbranch
1390 # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
1391 # map { lref($_).":".rref($_) }
1393 my $head = rev_parse('HEAD');
1394 if (!$changesfile) {
1395 my $multi = "$buildproductsdir/".
1396 "${package}_".(stripepoch $cversion)."_multi.changes";
1397 if (stat "$multi") {
1398 $changesfile = $multi;
1400 $!==&ENOENT or die "$multi: $!";
1401 my $pat = "${package}_".(stripepoch $cversion)."_*.changes";
1402 my @cs = glob "$buildproductsdir/$pat";
1403 fail "failed to find unique changes file".
1404 " (looked for $pat in $buildproductsdir, or $multi);".
1405 " perhaps you need to use dgit -C"
1407 ($changesfile) = @cs;
1410 $changesfile = "$buildproductsdir/$changesfile";
1413 responder_send_file('changes',$changesfile);
1414 responder_send_command("param head $head");
1416 my $tfn = sub { ".git/dgit/tag$_[0]"; };
1419 if ($we_are_responder) {
1420 $tagobjfn = $tfn->('.signed.tmp');
1421 responder_receive_files('signed-tag', $tagobjfn);
1424 push_mktag($head,$clogp,$tag,
1426 $changesfile,$changesfile,
1430 my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
1431 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
1432 runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
1433 runcmd_ordryrun @git, qw(tag -v --), $tag;
1435 if (!check_for_git()) {
1436 create_remote_git_repo();
1438 runcmd_ordryrun @git, qw(push),access_giturl(),
1439 "HEAD:".rrref(), "refs/tags/$tag";
1440 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
1442 if ($we_are_responder) {
1443 my $dryrunsuffix = act_local() ? "" : ".tmp";
1444 responder_receive_files('signed-dsc-changes',
1445 "$dscpath$dryrunsuffix",
1446 "$changesfile$dryrunsuffix");
1449 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
1451 progress "[new .dsc left in $dscpath.tmp]";
1453 sign_changes $changesfile;
1456 my $host = access_cfg('upload-host','RETURN-UNDEF');
1457 my @hostarg = defined($host) ? ($host,) : ();
1458 runcmd_ordryrun @dput, @hostarg, $changesfile;
1459 printdone "pushed and uploaded $cversion";
1461 responder_send_command("complete");
1467 badusage "-p is not allowed with clone; specify as argument instead"
1468 if defined $package;
1471 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
1472 ($package,$isuite) = @ARGV;
1473 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
1474 ($package,$dstdir) = @ARGV;
1475 } elsif (@ARGV==3) {
1476 ($package,$isuite,$dstdir) = @ARGV;
1478 badusage "incorrect arguments to dgit clone";
1480 $dstdir ||= "$package";
1484 sub branchsuite () {
1485 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
1486 if ($branch =~ m#$lbranch_re#o) {
1493 sub fetchpullargs () {
1494 if (!defined $package) {
1495 my $sourcep = parsecontrol('debian/control','debian/control');
1496 $package = getfield $sourcep, 'Source';
1499 # $isuite = branchsuite(); # this doesn't work because dak hates canons
1501 my $clogp = parsechangelog();
1502 $isuite = getfield $clogp, 'Distribution';
1504 canonicalise_suite();
1505 progress "fetching from suite $csuite";
1506 } elsif (@ARGV==1) {
1508 canonicalise_suite();
1510 badusage "incorrect arguments to dgit fetch or dgit pull";
1528 badusage "-p is not allowed with dgit push" if defined $package;
1530 my $clogp = parsechangelog();
1531 $package = getfield $clogp, 'Source';
1534 } elsif (@ARGV==1) {
1535 ($specsuite) = (@ARGV);
1537 badusage "incorrect arguments to dgit push";
1539 $isuite = getfield $clogp, 'Distribution';
1541 local ($package) = $existing_package; # this is a hack
1542 canonicalise_suite();
1544 if (defined $specsuite && $specsuite ne $isuite) {
1545 canonicalise_suite();
1546 $csuite eq $specsuite or
1547 fail "dgit push: changelog specifies $isuite ($csuite)".
1548 " but command line specifies $specsuite";
1550 if (check_for_git()) {
1553 if (fetch_from_archive()) {
1554 is_fast_fwd(lrref(), 'HEAD') or
1555 fail "dgit push: HEAD is not a descendant".
1556 " of the archive's version.\n".
1557 "$us: To overwrite it, use git merge -s ours ".lrref().".";
1560 fail "package appears to be new in this suite;".
1561 " if this is intentional, use --new";
1566 #---------- remote commands' implementation ----------
1568 sub cmd_remote_push_responder {
1569 my ($nrargs) = shift @ARGV;
1570 my (@rargs) = @ARGV[0..$nrargs-1];
1571 @ARGV = @ARGV[$nrargs..$#ARGV];
1575 $we_are_responder = 1;
1577 open PI, "<&STDIN" or die $!;
1578 open STDIN, "/dev/null" or die $!;
1579 open PO, ">&STDOUT" or die $!;
1581 open STDOUT, ">&STDERR" or die $!;
1584 responder_send_command("dgit-remote-push-ready");
1596 printdebug "(killing remote child $i_child_pid)\n";
1597 kill 15, $i_child_pid;
1599 if (defined $i_tmp && !defined $initiator_tempdir) {
1601 eval { rmtree $i_tmp; };
1605 END { i_cleanup(); }
1608 my ($base,$selector,@args) = @_;
1609 $selector =~ s/\-/_/g;
1610 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
1616 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
1626 push @rdgit, @ropts;
1627 push @rdgit, qw(remote-push-responder), (scalar @rargs), @rargs;
1629 my @cmd = (@ssh, $host, shellquote @rdgit);
1630 printcmd \*DEBUG,$debugprefix."+",@cmd;
1632 if (defined $initiator_tempdir) {
1633 rmtree $initiator_tempdir;
1634 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
1635 $i_tmp = $initiator_tempdir;
1639 $i_child_pid = open2(\*RO, \*RI, @cmd);
1641 initiator_expect { m/^dgit-remote-push-ready/ };
1643 my ($icmd,$iargs) = initiator_expect {
1644 m/^(\S+)(?: (.*))?$/;
1647 i_method "i_resp", $icmd, $iargs;
1651 sub i_resp_progress ($) {
1653 my $msg = protocol_read_bytes \*RO, $rhs;
1657 sub i_resp_complete {
1658 my $pid = $i_child_pid;
1659 $i_child_pid = undef; # prevents killing some other process with same pid
1660 printdebug "waiting for remote child $pid...\n";
1661 my $got = waitpid $pid, 0;
1662 die $! unless $got == $pid;
1663 die "remote child failed $?" if $?;
1666 printdebug "all done\n";
1670 sub i_resp_file ($) {
1672 my $localname = i_method "i_localname", $keyword;
1673 my $localpath = "$i_tmp/$localname";
1674 stat $localpath and badproto \*RO, "file $keyword ($localpath) twice";
1675 protocol_receive_file \*RO, $localpath;
1676 i_method "i_file", $keyword;
1681 sub i_resp_param ($) {
1682 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
1688 sub i_resp_want ($) {
1690 die "$keyword ?" if $i_wanted{$keyword}++;
1691 my @localpaths = i_method "i_want", $keyword;
1692 printdebug "[[ $keyword @localpaths\n";
1693 foreach my $localpath (@localpaths) {
1694 protocol_send_file \*RI, $localpath;
1696 print RI "files-end\n" or die $!;
1699 our ($i_clogp, $i_version, $i_tag, $i_dscfn, $i_changesfn);
1701 sub i_localname_parsed_changelog {
1702 return "remote-changelog.822";
1704 sub i_file_parsed_changelog {
1705 ($i_clogp, $i_version, $i_tag, $i_dscfn) =
1706 push_parse_changelog "$i_tmp/remote-changelog.822";
1707 die if $i_dscfn =~ m#/|^\W#;
1710 sub i_localname_dsc {
1711 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
1716 sub i_localname_changes {
1717 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
1718 $i_changesfn = $i_dscfn;
1719 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
1720 return $i_changesfn;
1722 sub i_file_changes { }
1724 sub i_want_signed_tag {
1725 printdebug Dumper(\%i_param, $i_dscfn);
1726 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
1727 or badproto \*RO, "premature desire for signed-tag";
1728 my $head = $i_param{'head'};
1729 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
1731 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
1734 push_mktag $head, $i_clogp, $i_tag,
1736 $i_changesfn, 'remote changes',
1737 sub { "tag$_[0]"; };
1742 sub i_want_signed_dsc_changes {
1743 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
1744 sign_changes $i_changesfn;
1745 return ($i_dscfn, $i_changesfn);
1748 #---------- building etc. ----------
1754 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
1756 sub build_maybe_quilt_fixup () {
1757 if (!open F, "debian/source/format") {
1758 die $! unless $!==&ENOENT;
1762 F->error and die $!;
1764 return unless madformat($_);
1767 my @cmd = (@git, qw(ls-files --exclude-standard -iodm));
1768 my $problems = cmdoutput @cmd;
1769 if (length $problems) {
1770 print STDERR "problematic files:\n";
1771 print STDERR " $_\n" foreach split /\n/, $problems;
1772 fail "Cannot do quilt fixup in tree containing ignored files. ".
1773 "Perhaps your package's clean target is broken, in which".
1774 " case -wg (which says to use git-clean -xdf) may help.";
1777 my $clogp = parsechangelog();
1778 my $version = getfield $clogp, 'Version';
1779 my $author = getfield $clogp, 'Maintainer';
1780 my $headref = rev_parse('HEAD');
1783 my $patchname = "auto-$version-$headref-$time";
1784 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
1786 my $descfn = ".git/dgit/quilt-description.tmp";
1787 open O, '>', $descfn or die "$descfn: $!";
1789 $msg =~ s/^\s+$/ ./mg;
1790 print O <<END or die $!;
1791 Description: Automatically generated patch ($clogp->{Version})
1792 Last (up to) $ncommits git changes, FYI:
1802 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
1803 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
1804 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
1805 runcmd_ordryrun_local @dpkgsource, qw(--commit .), $patchname;
1808 if (!open P, '>>', ".pc/applied-patches") {
1809 $!==&ENOENT or die $!;
1814 commit_quilty_patch();
1817 sub quilt_fixup_editor () {
1818 my $descfn = $ENV{$fakeeditorenv};
1819 my $editing = $ARGV[$#ARGV];
1820 open I1, '<', $descfn or die "$descfn: $!";
1821 open I2, '<', $editing or die "$editing: $!";
1822 unlink $editing or die "$editing: $!";
1823 open O, '>', $editing or die "$editing: $!";
1824 while (<I1>) { print O or die $!; } I1->error and die $!;
1827 $copying ||= m/^\-\-\- /;
1828 next unless $copying;
1831 I2->error and die $!;
1837 if ($cleanmode eq 'dpkg-source') {
1838 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
1839 } elsif ($cleanmode eq 'git') {
1840 runcmd_ordryrun_local @git, qw(clean -xdf);
1841 } elsif ($cleanmode eq 'none') {
1848 badusage "-p is not allowed when building" if defined $package;
1851 my $clogp = parsechangelog();
1852 $isuite = getfield $clogp, 'Distribution';
1853 $package = getfield $clogp, 'Source';
1854 $version = getfield $clogp, 'Version';
1855 build_maybe_quilt_fixup();
1858 sub changesopts () {
1859 my @opts =@changesopts[1..$#changesopts];
1860 if (!defined $changes_since_version) {
1861 my @vsns = archive_query('archive_query');
1862 my @quirk = access_quirk();
1863 if ($quirk[0] eq 'backports') {
1864 local $isuite = $quirk[2];
1866 canonicalise_suite();
1867 push @vsns, archive_query('archive_query');
1870 @vsns = map { $_->[0] } @vsns;
1871 @vsns = sort { -version_compare_string($a, $b) } @vsns;
1872 $changes_since_version = $vsns[0];
1873 progress "changelog will contain changes since $vsns[0]";
1875 $changes_since_version = '_';
1876 progress "package seems new, not specifying -v<version>";
1879 if ($changes_since_version ne '_') {
1880 unshift @opts, "-v$changes_since_version";
1887 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
1888 printdone "build successful\n";
1894 (qw(git-buildpackage -us -uc --git-no-sign-tags),
1895 "--git-builder=@dpkgbuildpackage");
1896 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
1897 canonicalise_suite();
1898 push @cmd, "--git-debian-branch=".lbranch();
1900 push @cmd, changesopts();
1901 runcmd_ordryrun_local @cmd, @ARGV;
1902 printdone "build successful\n";
1907 $sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
1908 $dscfn = dscfn($version);
1909 if ($cleanmode eq 'dpkg-source') {
1910 runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S)),
1913 my $pwd = cmdoutput qw(env - pwd);
1914 my $leafdir = basename $pwd;
1916 runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir;
1918 runcmd_ordryrun_local qw(sh -ec),
1919 'exec >$1; shift; exec "$@"','x',
1920 "../$sourcechanges",
1921 @dpkggenchanges, qw(-S), changesopts();
1925 sub cmd_build_source {
1926 badusage "build-source takes no additional arguments" if @ARGV;
1928 printdone "source built, results in $dscfn and $sourcechanges";
1934 my $pat = "${package}_".(stripepoch $version)."_*.changes";
1936 stat $dscfn or fail "$dscfn (in parent directory): $!";
1937 stat $sourcechanges or fail "$sourcechanges (in parent directory): $!";
1938 foreach my $cf (glob $pat) {
1939 next if $cf eq $sourcechanges;
1940 unlink $cf or fail "remove $cf: $!";
1943 runcmd_ordryrun_local @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
1944 my @changesfiles = glob $pat;
1945 @changesfiles = sort {
1946 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
1949 fail "wrong number of different changes files (@changesfiles)"
1950 unless @changesfiles;
1951 runcmd_ordryrun_local @mergechanges, @changesfiles;
1952 my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
1954 stat $multichanges or fail "$multichanges: $!";
1956 printdone "build successful, results in $multichanges\n" or die $!;
1959 sub cmd_quilt_fixup {
1960 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
1961 my $clogp = parsechangelog();
1962 $version = getfield $clogp, 'Version';
1963 build_maybe_quilt_fixup();
1966 #---------- argument parsing and main program ----------
1969 print "dgit version $our_version\n" or die $!;
1976 if (defined $ENV{'DGIT_SSH'}) {
1977 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
1978 } elsif (defined $ENV{'GIT_SSH'}) {
1979 @ssh = ($ENV{'GIT_SSH'});
1983 last unless $ARGV[0] =~ m/^-/;
1987 if (m/^--dry-run$/) {
1990 } elsif (m/^--damp-run$/) {
1993 } elsif (m/^--no-sign$/) {
1996 } elsif (m/^--help$/) {
1998 } elsif (m/^--version$/) {
2000 } elsif (m/^--new$/) {
2003 } elsif (m/^--since-version=([^_]+|_)$/) {
2005 $changes_since_version = $1;
2006 } elsif (m/^--([-0-9a-z]+)=(.*)/s &&
2007 ($om = $opts_opt_map{$1}) &&
2011 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
2012 !$opts_opt_cmdonly{$1} &&
2013 ($om = $opts_opt_map{$1})) {
2016 } elsif (m/^--existing-package=(.*)/s) {
2018 $existing_package = $1;
2019 } elsif (m/^--initiator-tempdir=(.*)/s) {
2020 $initiator_tempdir = $1;
2021 $initiator_tempdir =~ m#^/# or
2022 badusage "--initiator-tempdir must be used specify an".
2023 " absolute, not relative, directory."
2024 } elsif (m/^--distro=(.*)/s) {
2027 } elsif (m/^--build-products-dir=(.*)/s) {
2029 $buildproductsdir = $1;
2030 } elsif (m/^--clean=(dpkg-source|git|none)$/s) {
2033 } elsif (m/^--clean=(.*)$/s) {
2034 badusage "unknown cleaning mode \`$1'";
2035 } elsif (m/^--ignore-dirty$/s) {
2038 } elsif (m/^--no-quilt-fixup$/s) {
2042 badusage "unknown long option \`$_'";
2049 } elsif (s/^-L/-/) {
2052 } elsif (s/^-h/-/) {
2054 } elsif (s/^-D/-/) {
2056 open DEBUG, ">&STDERR" or die $!;
2059 } elsif (s/^-N/-/) {
2062 } elsif (s/^-v([^_]+|_)$//s) {
2064 $changes_since_version = $1;
2067 push @changesopts, $_;
2069 } elsif (s/^-c(.*=.*)//s) {
2071 push @git, '-c', $1;
2072 } elsif (s/^-d(.*)//s) {
2075 } elsif (s/^-C(.*)//s) {
2078 if ($changesfile =~ s#^(.*)/##) {
2079 $buildproductsdir = $1;
2081 } elsif (s/^-k(.*)//s) {
2083 } elsif (s/^-wn//s) {
2085 $cleanmode = 'none';
2086 } elsif (s/^-wg//s) {
2089 } elsif (s/^-wd//s) {
2091 $cleanmode = 'dpkg-source';
2093 badusage "unknown short option \`$_'";
2100 if ($ENV{$fakeeditorenv}) {
2101 quilt_fixup_editor();
2104 delete $ENV{'DGET_UNPACK'};
2107 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
2108 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
2109 if $dryrun_level == 1;
2111 print STDERR $helpmsg or die $!;
2114 my $cmd = shift @ARGV;
2116 { no strict qw(refs); &{"cmd_$cmd"}(); }