3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2015 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/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
40 our $our_version = 'UNRELEASED'; ###substituted###
42 our @rpushprotovsn_support = qw(3 2);
45 our $isuite = 'unstable';
51 our $dryrun_level = 0;
53 our $buildproductsdir = '..';
59 our $existing_package = 'dpkg';
60 our $cleanmode = 'dpkg-source';
61 our $changes_since_version;
63 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck';
64 our $we_are_responder;
65 our $initiator_tempdir;
67 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
69 our $suite_re = '[-+.0-9a-z]+';
72 our (@dget) = qw(dget);
73 our (@curl) = qw(curl -f);
74 our (@dput) = qw(dput);
75 our (@debsign) = qw(debsign);
77 our (@sbuild) = qw(sbuild -A);
79 our (@dgit) = qw(dgit);
80 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
81 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
82 our (@dpkggenchanges) = qw(dpkg-genchanges);
83 our (@mergechanges) = qw(mergechanges -f);
84 our (@changesopts) = ('');
86 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
89 'debsign' => \@debsign,
94 'dpkg-source' => \@dpkgsource,
95 'dpkg-buildpackage' => \@dpkgbuildpackage,
96 'dpkg-genchanges' => \@dpkggenchanges,
97 'ch' => \@changesopts,
98 'mergechanges' => \@mergechanges);
100 our %opts_opt_cmdonly = ('gpg' => 1);
101 our %opts_cfg_insertpos = map {
103 scalar @{ $opts_opt_map{$_} }
104 } keys %opts_opt_map;
106 sub finalise_opts_opts();
112 our $supplementary_message = '';
116 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
119 our $remotename = 'dgit';
120 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
124 sub lbranch () { return "$branchprefix/$csuite"; }
125 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
126 sub lref () { return "refs/heads/".lbranch(); }
127 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
128 sub rrref () { return server_ref($csuite); }
130 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
140 return "${package}_".(stripepoch $vsn).$sfx
145 return srcfn($vsn,".dsc");
154 foreach my $f (@end) {
156 warn "$us: cleanup: $@" if length $@;
160 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
162 sub no_such_package () {
163 print STDERR "$us: package $package does not exist in suite $isuite\n";
169 return "+".rrref().":".lrref();
174 printdebug "CD $newdir\n";
175 chdir $newdir or die "chdir: $newdir: $!";
178 sub deliberately ($) {
180 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
183 sub deliberately_not_fast_forward () {
184 foreach (qw(not-fast-forward fresh-repo)) {
185 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
189 #---------- remote protocol support, common ----------
191 # remote push initiator/responder protocol:
192 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
193 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
194 # < dgit-remote-push-ready <actual-proto-vsn>
196 # > file parsed-changelog
197 # [indicates that output of dpkg-parsechangelog follows]
198 # > data-block NBYTES
199 # > [NBYTES bytes of data (no newline)]
200 # [maybe some more blocks]
212 # [indicates that signed tag is wanted]
213 # < data-block NBYTES
214 # < [NBYTES bytes of data (no newline)]
215 # [maybe some more blocks]
219 # > want signed-dsc-changes
220 # < data-block NBYTES [transfer of signed dsc]
222 # < data-block NBYTES [transfer of signed changes]
230 sub i_child_report () {
231 # Sees if our child has died, and reap it if so. Returns a string
232 # describing how it died if it failed, or undef otherwise.
233 return undef unless $i_child_pid;
234 my $got = waitpid $i_child_pid, WNOHANG;
235 return undef if $got <= 0;
236 die unless $got == $i_child_pid;
237 $i_child_pid = undef;
238 return undef unless $?;
239 return "build host child ".waitstatusmsg();
244 fail "connection lost: $!" if $fh->error;
245 fail "protocol violation; $m not expected";
248 sub badproto_badread ($$) {
250 fail "connection lost: $!" if $!;
251 my $report = i_child_report();
252 fail $report if defined $report;
253 badproto $fh, "eof (reading $wh)";
256 sub protocol_expect (&$) {
257 my ($match, $fh) = @_;
260 defined && chomp or badproto_badread $fh, "protocol message";
268 badproto $fh, "\`$_'";
271 sub protocol_send_file ($$) {
272 my ($fh, $ourfn) = @_;
273 open PF, "<", $ourfn or die "$ourfn: $!";
276 my $got = read PF, $d, 65536;
277 die "$ourfn: $!" unless defined $got;
279 print $fh "data-block ".length($d)."\n" or die $!;
280 print $fh $d or die $!;
282 PF->error and die "$ourfn $!";
283 print $fh "data-end\n" or die $!;
287 sub protocol_read_bytes ($$) {
288 my ($fh, $nbytes) = @_;
289 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
291 my $got = read $fh, $d, $nbytes;
292 $got==$nbytes or badproto_badread $fh, "data block";
296 sub protocol_receive_file ($$) {
297 my ($fh, $ourfn) = @_;
298 printdebug "() $ourfn\n";
299 open PF, ">", $ourfn or die "$ourfn: $!";
301 my ($y,$l) = protocol_expect {
302 m/^data-block (.*)$/ ? (1,$1) :
303 m/^data-end$/ ? (0,) :
307 my $d = protocol_read_bytes $fh, $l;
308 print PF $d or die $!;
313 #---------- remote protocol support, responder ----------
315 sub responder_send_command ($) {
317 return unless $we_are_responder;
318 # called even without $we_are_responder
319 printdebug ">> $command\n";
320 print PO $command, "\n" or die $!;
323 sub responder_send_file ($$) {
324 my ($keyword, $ourfn) = @_;
325 return unless $we_are_responder;
326 printdebug "]] $keyword $ourfn\n";
327 responder_send_command "file $keyword";
328 protocol_send_file \*PO, $ourfn;
331 sub responder_receive_files ($@) {
332 my ($keyword, @ourfns) = @_;
333 die unless $we_are_responder;
334 printdebug "[[ $keyword @ourfns\n";
335 responder_send_command "want $keyword";
336 foreach my $fn (@ourfns) {
337 protocol_receive_file \*PI, $fn;
340 protocol_expect { m/^files-end$/ } \*PI;
343 #---------- remote protocol support, initiator ----------
345 sub initiator_expect (&) {
347 protocol_expect { &$match } \*RO;
350 #---------- end remote code ----------
353 if ($we_are_responder) {
355 responder_send_command "progress ".length($m) or die $!;
356 print PO $m or die $!;
366 $ua = LWP::UserAgent->new();
370 progress "downloading $what...";
371 my $r = $ua->get(@_) or die $!;
372 return undef if $r->code == 404;
373 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
374 return $r->decoded_content(charset => 'none');
377 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
382 failedcmd @_ if system @_;
385 sub act_local () { return $dryrun_level <= 1; }
386 sub act_scary () { return !$dryrun_level; }
389 if (!$dryrun_level) {
390 progress "dgit ok: @_";
392 progress "would be ok: @_ (but dry run only)";
397 printcmd(\*STDERR,$debugprefix."#",@_);
400 sub runcmd_ordryrun {
408 sub runcmd_ordryrun_local {
417 my ($first_shell, @cmd) = @_;
418 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
421 our $helpmsg = <<END;
423 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
424 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
425 dgit [dgit-opts] build [git-buildpackage-opts|dpkg-buildpackage-opts]
426 dgit [dgit-opts] push [dgit-opts] [suite]
427 dgit [dgit-opts] rpush build-host:build-dir ...
428 important dgit options:
429 -k<keyid> sign tag and package with <keyid> instead of default
430 --dry-run -n do not change anything, but go through the motions
431 --damp-run -L like --dry-run but make local changes, without signing
432 --new -N allow introducing a new package
433 --debug -D increase debug level
434 -c<name>=<value> set git config option (used directly by dgit too)
437 our $later_warning_msg = <<END;
438 Perhaps the upload is stuck in incoming. Using the version from git.
442 print STDERR "$us: @_\n", $helpmsg or die $!;
447 @ARGV or badusage "too few arguments";
448 return scalar shift @ARGV;
452 print $helpmsg or die $!;
456 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
458 our %defcfg = ('dgit.default.distro' => 'debian',
459 'dgit.default.username' => '',
460 'dgit.default.archive-query-default-component' => 'main',
461 'dgit.default.ssh' => 'ssh',
462 'dgit.default.archive-query' => 'madison:',
463 'dgit.default.sshpsql-dbname' => 'service=projectb',
464 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
465 'dgit-distro.debian.git-check' => 'url',
466 'dgit-distro.debian.git-check-suffix' => '/info/refs',
467 'dgit-distro.debian.new-private-pushers' => 't',
468 'dgit-distro.debian/push.git-url' => '',
469 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
470 'dgit-distro.debian/push.git-user-force' => 'dgit',
471 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
472 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
473 'dgit-distro.debian/push.git-create' => 'true',
474 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
475 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
476 # 'dgit-distro.debian.archive-query-tls-key',
477 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
478 # ^ this does not work because curl is broken nowadays
479 # Fixing #790093 properly will involve providing providing the key
480 # in some pacagke and maybe updating these paths.
482 # 'dgit-distro.debian.archive-query-tls-curl-args',
483 # '--ca-path=/etc/ssl/ca-debian',
484 # ^ this is a workaround but works (only) on DSA-administered machines
485 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
486 'dgit-distro.debian.git-url-suffix' => '',
487 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
488 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
489 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
490 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
491 'dgit-distro.ubuntu.git-check' => 'false',
492 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
493 'dgit-distro.test-dummy.ssh' => "$td/ssh",
494 'dgit-distro.test-dummy.username' => "alice",
495 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
496 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
497 'dgit-distro.test-dummy.git-url' => "$td/git",
498 'dgit-distro.test-dummy.git-host' => "git",
499 'dgit-distro.test-dummy.git-path' => "$td/git",
500 'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
501 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
502 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
503 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
508 sub git_slurp_config () {
509 local ($debuglevel) = $debuglevel-2;
512 my @cmd = (@git, qw(config -z --get-regexp .*));
515 open GITS, "-|", @cmd or failedcmd @cmd;
518 printdebug "=> ", (messagequote $_), "\n";
520 push @{ $gitcfg{$`} }, $'; #';
524 or ($!==0 && $?==256)
528 sub git_get_config ($) {
531 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
534 @$l==1 or badcfg "multiple values for $c" if @$l > 1;
540 return undef if $c =~ /RETURN-UNDEF/;
541 my $v = git_get_config($c);
542 return $v if defined $v;
543 my $dv = $defcfg{$c};
544 return $dv if defined $dv;
546 badcfg "need value for one of: @_\n".
547 "$us: distro or suite appears not to be (properly) supported";
550 sub access_basedistro () {
551 if (defined $idistro) {
554 return cfg("dgit-suite.$isuite.distro",
555 "dgit.default.distro");
559 sub access_quirk () {
560 # returns (quirk name, distro to use instead or undef, quirk-specific info)
561 my $basedistro = access_basedistro();
562 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
564 if (defined $backports_quirk) {
565 my $re = $backports_quirk;
566 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
568 $re =~ s/\%/([-0-9a-z_]+)/
569 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
570 if ($isuite =~ m/^$re$/) {
571 return ('backports',"$basedistro-backports",$1);
574 return ('none',undef);
579 sub parse_cfg_bool ($$$) {
580 my ($what,$def,$v) = @_;
583 $v =~ m/^[ty1]/ ? 1 :
584 $v =~ m/^[fn0]/ ? 0 :
585 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
588 sub access_forpush_config () {
589 my $d = access_basedistro();
593 parse_cfg_bool('new-private-pushers', 0,
594 cfg("dgit-distro.$d.new-private-pushers",
597 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
600 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
601 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
602 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
603 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
606 sub access_forpush () {
607 $access_forpush //= access_forpush_config();
608 return $access_forpush;
612 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
613 badcfg "pushing but distro is configured readonly"
614 if access_forpush_config() eq '0';
616 $supplementary_message = <<'END' unless $we_are_responder;
617 Push failed, before we got started.
618 You can retry the push, after fixing the problem, if you like.
620 finalise_opts_opts();
624 finalise_opts_opts();
627 sub supplementary_message ($) {
629 if (!$we_are_responder) {
630 $supplementary_message = $msg;
632 } elsif ($protovsn >= 3) {
633 responder_send_command "supplementary-message ".length($msg)
635 print PO $msg or die $!;
639 sub access_distros () {
640 # Returns list of distros to try, in order
643 # 0. `instead of' distro name(s) we have been pointed to
644 # 1. the access_quirk distro, if any
645 # 2a. the user's specified distro, or failing that } basedistro
646 # 2b. the distro calculated from the suite }
647 my @l = access_basedistro();
649 my (undef,$quirkdistro) = access_quirk();
650 unshift @l, $quirkdistro;
651 unshift @l, $instead_distro;
652 @l = grep { defined } @l;
654 if (access_forpush()) {
655 @l = map { ("$_/push", $_) } @l;
660 sub access_cfg_cfgs (@) {
663 # The nesting of these loops determines the search order. We put
664 # the key loop on the outside so that we search all the distros
665 # for each key, before going on to the next key. That means that
666 # if access_cfg is called with a more specific, and then a less
667 # specific, key, an earlier distro can override the less specific
668 # without necessarily overriding any more specific keys. (If the
669 # distro wants to override the more specific keys it can simply do
670 # so; whereas if we did the loop the other way around, it would be
671 # impossible to for an earlier distro to override a less specific
672 # key but not the more specific ones without restating the unknown
673 # values of the more specific keys.
676 # We have to deal with RETURN-UNDEF specially, so that we don't
677 # terminate the search prematurely.
679 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
682 foreach my $d (access_distros()) {
683 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
685 push @cfgs, map { "dgit.default.$_" } @realkeys;
692 my (@cfgs) = access_cfg_cfgs(@keys);
693 my $value = cfg(@cfgs);
697 sub access_cfg_bool ($$) {
698 my ($def, @keys) = @_;
699 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
702 sub string_to_ssh ($) {
704 if ($spec =~ m/\s/) {
705 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
711 sub access_cfg_ssh () {
712 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
713 if (!defined $gitssh) {
716 return string_to_ssh $gitssh;
720 sub access_runeinfo ($) {
722 return ": dgit ".access_basedistro()." $info ;";
725 sub access_someuserhost ($) {
727 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
728 defined($user) && length($user) or
729 $user = access_cfg("$some-user",'username');
730 my $host = access_cfg("$some-host");
731 return length($user) ? "$user\@$host" : $host;
734 sub access_gituserhost () {
735 return access_someuserhost('git');
738 sub access_giturl (;$) {
740 my $url = access_cfg('git-url','RETURN-UNDEF');
743 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
744 return undef unless defined $proto;
747 access_gituserhost().
748 access_cfg('git-path');
750 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
753 return "$url/$package$suffix";
756 sub parsecontrolfh ($$;$) {
757 my ($fh, $desc, $allowsigned) = @_;
758 our $dpkgcontrolhash_noissigned;
761 my %opts = ('name' => $desc);
762 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
763 $c = Dpkg::Control::Hash->new(%opts);
764 $c->parse($fh,$desc) or die "parsing of $desc failed";
765 last if $allowsigned;
766 last if $dpkgcontrolhash_noissigned;
767 my $issigned= $c->get_option('is_pgp_signed');
768 if (!defined $issigned) {
769 $dpkgcontrolhash_noissigned= 1;
770 seek $fh, 0,0 or die "seek $desc: $!";
771 } elsif ($issigned) {
772 fail "control file $desc is (already) PGP-signed. ".
773 " Note that dgit push needs to modify the .dsc and then".
774 " do the signature itself";
783 my ($file, $desc) = @_;
784 my $fh = new IO::Handle;
785 open $fh, '<', $file or die "$file: $!";
786 my $c = parsecontrolfh($fh,$desc);
787 $fh->error and die $!;
793 my ($dctrl,$field) = @_;
794 my $v = $dctrl->{$field};
795 return $v if defined $v;
796 fail "missing field $field in ".$v->get_option('name');
800 my $c = Dpkg::Control::Hash->new();
801 my $p = new IO::Handle;
802 my @cmd = (qw(dpkg-parsechangelog), @_);
803 open $p, '-|', @cmd or die $!;
805 $?=0; $!=0; close $p or failedcmd @cmd;
811 defined $d or fail "getcwd failed: $!";
817 sub archive_query ($) {
819 my $query = access_cfg('archive-query','RETURN-UNDEF');
820 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
823 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
826 sub pool_dsc_subpath ($$) {
827 my ($vsn,$component) = @_; # $package is implict arg
828 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
829 return "/pool/$component/$prefix/$package/".dscfn($vsn);
832 #---------- `ftpmasterapi' archive query method (nascent) ----------
834 sub archive_api_query_cmd ($) {
836 my @cmd = qw(curl -sS);
837 my $url = access_cfg('archive-query-url');
838 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
840 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
841 foreach my $key (split /\:/, $keys) {
842 $key =~ s/\%HOST\%/$host/g;
844 fail "for $url: stat $key: $!" unless $!==ENOENT;
847 fail "config requested specific TLS key but do not know".
848 " how to get curl to use exactly that EE key ($key)";
849 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
850 # # Sadly the above line does not work because of changes
851 # # to gnutls. The real fix for #790093 may involve
852 # # new curl options.
855 # Fixing #790093 properly will involve providing a value
856 # for this on clients.
857 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
858 push @cmd, split / /, $kargs if defined $kargs;
860 push @cmd, $url.$subpath;
866 my ($data, $subpath) = @_;
867 badcfg "ftpmasterapi archive query method takes no data part"
869 my @cmd = archive_api_query_cmd($subpath);
870 my $json = cmdoutput @cmd;
871 return decode_json($json);
874 sub canonicalise_suite_ftpmasterapi () {
875 my ($proto,$data) = @_;
876 my $suites = api_query($data, 'suites');
878 foreach my $entry (@$suites) {
880 my $v = $entry->{$_};
881 defined $v && $v eq $isuite;
883 push @matched, $entry;
885 fail "unknown suite $isuite" unless @matched;
888 @matched==1 or die "multiple matches for suite $isuite\n";
889 $cn = "$matched[0]{codename}";
890 defined $cn or die "suite $isuite info has no codename\n";
891 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
893 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
898 sub archive_query_ftpmasterapi () {
899 my ($proto,$data) = @_;
900 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
902 my $digester = Digest::SHA->new(256);
903 foreach my $entry (@$info) {
905 my $vsn = "$entry->{version}";
906 my ($ok,$msg) = version_check $vsn;
907 die "bad version: $msg\n" unless $ok;
908 my $component = "$entry->{component}";
909 $component =~ m/^$component_re$/ or die "bad component";
910 my $filename = "$entry->{filename}";
911 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
912 or die "bad filename";
913 my $sha256sum = "$entry->{sha256sum}";
914 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
915 push @rows, [ $vsn, "/pool/$component/$filename",
916 $digester, $sha256sum ];
918 die "bad ftpmaster api response: $@\n".Dumper($entry)
921 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
925 #---------- `madison' archive query method ----------
927 sub archive_query_madison {
928 return map { [ @$_[0..1] ] } madison_get_parse(@_);
931 sub madison_get_parse {
932 my ($proto,$data) = @_;
933 die unless $proto eq 'madison';
935 $data= access_cfg('madison-distro','RETURN-UNDEF');
936 $data //= access_basedistro();
938 $rmad{$proto,$data,$package} ||= cmdoutput
939 qw(rmadison -asource),"-s$isuite","-u$data",$package;
940 my $rmad = $rmad{$proto,$data,$package};
943 foreach my $l (split /\n/, $rmad) {
944 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
945 \s*( [^ \t|]+ )\s* \|
946 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
947 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
948 $1 eq $package or die "$rmad $package ?";
955 $component = access_cfg('archive-query-default-component');
957 $5 eq 'source' or die "$rmad ?";
958 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
960 return sort { -version_compare($a->[0],$b->[0]); } @out;
963 sub canonicalise_suite_madison {
964 # madison canonicalises for us
965 my @r = madison_get_parse(@_);
967 "unable to canonicalise suite using package $package".
968 " which does not appear to exist in suite $isuite;".
969 " --existing-package may help";
973 #---------- `sshpsql' archive query method ----------
976 my ($data,$runeinfo,$sql) = @_;
978 $data= access_someuserhost('sshpsql').':'.
979 access_cfg('sshpsql-dbname');
981 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
982 my ($userhost,$dbname) = ($`,$'); #';
984 my @cmd = (access_cfg_ssh, $userhost,
985 access_runeinfo("ssh-psql $runeinfo").
986 " export LC_MESSAGES=C; export LC_CTYPE=C;".
987 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
989 open P, "-|", @cmd or die $!;
992 printdebug(">|$_|\n");
995 $!=0; $?=0; close P or failedcmd @cmd;
997 my $nrows = pop @rows;
998 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
999 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1000 @rows = map { [ split /\|/, $_ ] } @rows;
1001 my $ncols = scalar @{ shift @rows };
1002 die if grep { scalar @$_ != $ncols } @rows;
1006 sub sql_injection_check {
1007 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1010 sub archive_query_sshpsql ($$) {
1011 my ($proto,$data) = @_;
1012 sql_injection_check $isuite, $package;
1013 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1014 SELECT source.version, component.name, files.filename, files.sha256sum
1016 JOIN src_associations ON source.id = src_associations.source
1017 JOIN suite ON suite.id = src_associations.suite
1018 JOIN dsc_files ON dsc_files.source = source.id
1019 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1020 JOIN component ON component.id = files_archive_map.component_id
1021 JOIN files ON files.id = dsc_files.file
1022 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1023 AND source.source='$package'
1024 AND files.filename LIKE '%.dsc';
1026 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1027 my $digester = Digest::SHA->new(256);
1029 my ($vsn,$component,$filename,$sha256sum) = @$_;
1030 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1035 sub canonicalise_suite_sshpsql ($$) {
1036 my ($proto,$data) = @_;
1037 sql_injection_check $isuite;
1038 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1039 SELECT suite.codename
1040 FROM suite where suite_name='$isuite' or codename='$isuite';
1042 @rows = map { $_->[0] } @rows;
1043 fail "unknown suite $isuite" unless @rows;
1044 die "ambiguous $isuite: @rows ?" if @rows>1;
1048 #---------- `dummycat' archive query method ----------
1050 sub canonicalise_suite_dummycat ($$) {
1051 my ($proto,$data) = @_;
1052 my $dpath = "$data/suite.$isuite";
1053 if (!open C, "<", $dpath) {
1054 $!==ENOENT or die "$dpath: $!";
1055 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1059 chomp or die "$dpath: $!";
1061 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1065 sub archive_query_dummycat ($$) {
1066 my ($proto,$data) = @_;
1067 canonicalise_suite();
1068 my $dpath = "$data/package.$csuite.$package";
1069 if (!open C, "<", $dpath) {
1070 $!==ENOENT or die "$dpath: $!";
1071 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1079 printdebug "dummycat query $csuite $package $dpath | $_\n";
1080 my @row = split /\s+/, $_;
1081 @row==2 or die "$dpath: $_ ?";
1084 C->error and die "$dpath: $!";
1086 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1089 #---------- archive query entrypoints and rest of program ----------
1091 sub canonicalise_suite () {
1092 return if defined $csuite;
1093 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1094 $csuite = archive_query('canonicalise_suite');
1095 if ($isuite ne $csuite) {
1096 progress "canonical suite name for $isuite is $csuite";
1100 sub get_archive_dsc () {
1101 canonicalise_suite();
1102 my @vsns = archive_query('archive_query');
1103 foreach my $vinfo (@vsns) {
1104 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1105 $dscurl = access_cfg('mirror').$subpath;
1106 $dscdata = url_get($dscurl);
1108 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1113 $digester->add($dscdata);
1114 my $got = $digester->hexdigest();
1116 fail "$dscurl has hash $got but".
1117 " archive told us to expect $digest";
1119 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1120 printdebug Dumper($dscdata) if $debuglevel>1;
1121 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1122 printdebug Dumper($dsc) if $debuglevel>1;
1123 my $fmt = getfield $dsc, 'Format';
1124 fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
1125 $dsc_checked = !!$digester;
1131 sub check_for_git ();
1132 sub check_for_git () {
1134 my $how = access_cfg('git-check');
1135 if ($how eq 'ssh-cmd') {
1137 (access_cfg_ssh, access_gituserhost(),
1138 access_runeinfo("git-check $package").
1139 " set -e; cd ".access_cfg('git-path').";".
1140 " if test -d $package.git; then echo 1; else echo 0; fi");
1141 my $r= cmdoutput @cmd;
1142 if ($r =~ m/^divert (\w+)$/) {
1144 my ($usedistro,) = access_distros();
1145 # NB that if we are pushing, $usedistro will be $distro/push
1146 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1147 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1148 progress "diverting to $divert (using config for $instead_distro)";
1149 return check_for_git();
1151 failedcmd @cmd unless $r =~ m/^[01]$/;
1153 } elsif ($how eq 'url') {
1154 my $prefix = access_cfg('git-check-url','git-url');
1155 my $suffix = access_cfg('git-check-suffix','git-suffix',
1156 'RETURN-UNDEF') // '.git';
1157 my $url = "$prefix/$package$suffix";
1158 my @cmd = (qw(curl -sS -I), $url);
1159 my $result = cmdoutput @cmd;
1160 $result =~ m/^\S+ (404|200) /s or
1161 fail "unexpected results from git check query - ".
1162 Dumper($prefix, $result);
1164 if ($code eq '404') {
1166 } elsif ($code eq '200') {
1171 } elsif ($how eq 'true') {
1173 } elsif ($how eq 'false') {
1176 badcfg "unknown git-check \`$how'";
1180 sub create_remote_git_repo () {
1181 my $how = access_cfg('git-create');
1182 if ($how eq 'ssh-cmd') {
1184 (access_cfg_ssh, access_gituserhost(),
1185 access_runeinfo("git-create $package").
1186 "set -e; cd ".access_cfg('git-path').";".
1187 " cp -a _template $package.git");
1188 } elsif ($how eq 'true') {
1191 badcfg "unknown git-create \`$how'";
1195 our ($dsc_hash,$lastpush_hash);
1197 our $ud = '.git/dgit/unpack';
1202 mkdir $ud or die $!;
1205 sub mktree_in_ud_here () {
1206 runcmd qw(git init -q);
1207 rmtree('.git/objects');
1208 symlink '../../../../objects','.git/objects' or die $!;
1211 sub git_write_tree () {
1212 my $tree = cmdoutput @git, qw(write-tree);
1213 $tree =~ m/^\w+$/ or die "$tree ?";
1217 sub mktree_in_ud_from_only_subdir () {
1218 # changes into the subdir
1220 die unless @dirs==1;
1221 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1225 my @gitscmd = qw(find -name .git -prune -print0);
1226 debugcmd "|",@gitscmd;
1227 open GITS, "-|", @gitscmd or failedcmd @gitscmd;
1232 print STDERR "$us: warning: removing from source package: ",
1233 (messagequote $_), "\n";
1237 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1239 mktree_in_ud_here();
1240 my $format=get_source_format();
1241 if (madformat($format)) {
1244 runcmd @git, qw(add -Af);
1245 my $tree=git_write_tree();
1246 return ($tree,$dir);
1249 sub dsc_files_info () {
1250 foreach my $csumi (['Checksums-Sha256','Digest::SHA', 'new(256)'],
1251 ['Checksums-Sha1', 'Digest::SHA', 'new(1)'],
1252 ['Files', 'Digest::MD5', 'new()']) {
1253 my ($fname, $module, $method) = @$csumi;
1254 my $field = $dsc->{$fname};
1255 next unless defined $field;
1256 eval "use $module; 1;" or die $@;
1258 foreach (split /\n/, $field) {
1260 m/^(\w+) (\d+) (\S+)$/ or
1261 fail "could not parse .dsc $fname line \`$_'";
1262 my $digester = eval "$module"."->$method;" or die $@;
1267 Digester => $digester,
1272 fail "missing any supported Checksums-* or Files field in ".
1273 $dsc->get_option('name');
1277 map { $_->{Filename} } dsc_files_info();
1280 sub is_orig_file ($;$) {
1283 m/\.orig(?:-\w+)?\.tar\.\w+$/ or return 0;
1284 defined $base or return 1;
1288 sub make_commit ($) {
1290 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1293 sub clogp_authline ($) {
1295 my $author = getfield $clogp, 'Maintainer';
1296 $author =~ s#,.*##ms;
1297 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1298 my $authline = "$author $date";
1299 $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
1300 fail "unexpected commit author line format \`$authline'".
1301 " (was generated from changelog Maintainer field)";
1305 sub vendor_patches_distro ($$) {
1306 my ($checkdistro, $what) = @_;
1307 return unless defined $checkdistro;
1309 my $series = "debian/patches/\L$checkdistro\E.series";
1310 printdebug "checking for vendor-specific $series ($what)\n";
1312 if (!open SERIES, "<", $series) {
1313 die "$series $!" unless $!==ENOENT;
1322 Unfortunately, this source package uses a feature of dpkg-source where
1323 the same source package unpacks to different source code on different
1324 distros. dgit cannot safely operate on such packages on affected
1325 distros, because the meaning of source packages is not stable.
1327 Please ask the distro/maintainer to remove the distro-specific series
1328 files and use a different technique (if necessary, uploading actually
1329 different packages, if different distros are supposed to have
1333 fail "Found active distro-specific series file for".
1334 " $checkdistro ($what): $series, cannot continue";
1336 die "$series $!" if SERIES->error;
1340 sub check_for_vendor_patches () {
1341 # This dpkg-source feature doesn't seem to be documented anywhere!
1342 # But it can be found in the changelog (reformatted):
1344 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1345 # Author: Raphael Hertzog <hertzog@debian.org>
1346 # Date: Sun Oct 3 09:36:48 2010 +0200
1348 # dpkg-source: correctly create .pc/.quilt_series with alternate
1351 # If you have debian/patches/ubuntu.series and you were
1352 # unpacking the source package on ubuntu, quilt was still
1353 # directed to debian/patches/series instead of
1354 # debian/patches/ubuntu.series.
1356 # debian/changelog | 3 +++
1357 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1358 # 2 files changed, 6 insertions(+), 1 deletion(-)
1361 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1362 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1363 "Dpkg::Vendor \`current vendor'");
1364 vendor_patches_distro(access_basedistro(),
1365 "distro being accessed");
1368 sub generate_commit_from_dsc () {
1372 foreach my $fi (dsc_files_info()) {
1373 my $f = $fi->{Filename};
1374 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1376 link "../../../$f", $f
1380 complete_file_from_dsc('.', $fi);
1382 if (is_orig_file($f)) {
1383 link $f, "../../../../$f"
1389 my $dscfn = "$package.dsc";
1391 open D, ">", $dscfn or die "$dscfn: $!";
1392 print D $dscdata or die "$dscfn: $!";
1393 close D or die "$dscfn: $!";
1394 my @cmd = qw(dpkg-source);
1395 push @cmd, '--no-check' if $dsc_checked;
1396 push @cmd, qw(-x --), $dscfn;
1399 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1400 check_for_vendor_patches() if madformat($dsc->{format});
1401 runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
1402 my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
1403 my $authline = clogp_authline $clogp;
1404 my $changes = getfield $clogp, 'Changes';
1405 open C, ">../commit.tmp" or die $!;
1406 print C <<END or die $!;
1413 # imported from the archive
1416 my $outputhash = make_commit qw(../commit.tmp);
1417 my $cversion = getfield $clogp, 'Version';
1418 progress "synthesised git commit from .dsc $cversion";
1419 if ($lastpush_hash) {
1420 runcmd @git, qw(reset --hard), $lastpush_hash;
1421 runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
1422 my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
1423 my $oversion = getfield $oldclogp, 'Version';
1425 version_compare($oversion, $cversion);
1427 # git upload/ is earlier vsn than archive, use archive
1428 open C, ">../commit2.tmp" or die $!;
1429 print C <<END or die $!;
1431 parent $lastpush_hash
1436 Record $package ($cversion) in archive suite $csuite
1438 $outputhash = make_commit qw(../commit2.tmp);
1439 } elsif ($vcmp > 0) {
1440 print STDERR <<END or die $!;
1442 Version actually in archive: $cversion (older)
1443 Last allegedly pushed/uploaded: $oversion (newer or same)
1446 $outputhash = $lastpush_hash;
1448 $outputhash = $lastpush_hash;
1451 changedir '../../../..';
1452 runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
1453 'DGIT_ARCHIVE', $outputhash;
1454 cmdoutput @git, qw(log -n2), $outputhash;
1455 # ... gives git a chance to complain if our commit is malformed
1460 sub complete_file_from_dsc ($$) {
1461 our ($dstdir, $fi) = @_;
1462 # Ensures that we have, in $dir, the file $fi, with the correct
1463 # contents. (Downloading it from alongside $dscurl if necessary.)
1465 my $f = $fi->{Filename};
1466 my $tf = "$dstdir/$f";
1469 if (stat_exists $tf) {
1470 progress "using existing $f";
1473 $furl =~ s{/[^/]+$}{};
1475 die "$f ?" unless $f =~ m/^${package}_/;
1476 die "$f ?" if $f =~ m#/#;
1477 runcmd_ordryrun_local @curl,qw(-o),$tf,'--',"$furl";
1478 next if !act_local();
1482 open F, "<", "$tf" or die "$tf: $!";
1483 $fi->{Digester}->reset();
1484 $fi->{Digester}->addfile(*F);
1485 F->error and die $!;
1486 my $got = $fi->{Digester}->hexdigest();
1487 $got eq $fi->{Hash} or
1488 fail "file $f has hash $got but .dsc".
1489 " demands hash $fi->{Hash} ".
1490 ($downloaded ? "(got wrong file from archive!)"
1491 : "(perhaps you should delete this file?)");
1494 sub ensure_we_have_orig () {
1495 foreach my $fi (dsc_files_info()) {
1496 my $f = $fi->{Filename};
1497 next unless is_orig_file($f);
1498 complete_file_from_dsc('..', $fi);
1502 sub git_fetch_us () {
1503 my @specs = (fetchspec());
1505 map { "+refs/$_/*:".lrfetchrefs."/$_/*" }
1507 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(), @specs;
1510 my $tagpat = debiantag('*',access_basedistro);
1512 git_for_each_ref("refs/tags/".$tagpat, sub {
1513 my ($objid,$objtype,$fullrefname,$reftail) = @_;
1514 printdebug "currently $fullrefname=$objid\n";
1515 $here{$fullrefname} = $objid;
1517 git_for_each_ref(lrfetchrefs."/tags/".$tagpat, sub {
1518 my ($objid,$objtype,$fullrefname,$reftail) = @_;
1519 my $lref = "refs".substr($fullrefname, length lrfetchrefs);
1520 printdebug "offered $lref=$objid\n";
1521 if (!defined $here{$lref}) {
1522 my @upd = (@git, qw(update-ref), $lref, $objid, '');
1523 runcmd_ordryrun_local @upd;
1524 } elsif ($here{$lref} eq $objid) {
1527 "Not updateting $lref from $here{$lref} to $objid.\n";
1532 sub fetch_from_archive () {
1533 # ensures that lrref() is what is actually in the archive,
1534 # one way or another
1538 foreach my $field (@ourdscfield) {
1539 $dsc_hash = $dsc->{$field};
1540 last if defined $dsc_hash;
1542 if (defined $dsc_hash) {
1543 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
1545 progress "last upload to archive specified git hash";
1547 progress "last upload to archive has NO git hash";
1550 progress "no version available from the archive";
1553 $lastpush_hash = git_get_ref(lrref());
1554 printdebug "previous reference hash=$lastpush_hash\n";
1556 if (defined $dsc_hash) {
1557 fail "missing remote git history even though dsc has hash -".
1558 " could not find ref ".lrref().
1559 " (should have been fetched from ".access_giturl()."#".rrref().")"
1560 unless $lastpush_hash;
1562 ensure_we_have_orig();
1563 if ($dsc_hash eq $lastpush_hash) {
1564 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
1565 print STDERR <<END or die $!;
1567 Git commit in archive is behind the last version allegedly pushed/uploaded.
1568 Commit referred to by archive: $dsc_hash
1569 Last allegedly pushed/uploaded: $lastpush_hash
1572 $hash = $lastpush_hash;
1574 fail "git head (".lrref()."=$lastpush_hash) is not a ".
1575 "descendant of archive's .dsc hash ($dsc_hash)";
1578 $hash = generate_commit_from_dsc();
1579 } elsif ($lastpush_hash) {
1580 # only in git, not in the archive yet
1581 $hash = $lastpush_hash;
1582 print STDERR <<END or die $!;
1584 Package not found in the archive, but has allegedly been pushed using dgit.
1588 printdebug "nothing found!\n";
1589 if (defined $skew_warning_vsn) {
1590 print STDERR <<END or die $!;
1592 Warning: relevant archive skew detected.
1593 Archive allegedly contains $skew_warning_vsn
1594 But we were not able to obtain any version from the archive or git.
1600 printdebug "current hash=$hash\n";
1601 if ($lastpush_hash) {
1602 fail "not fast forward on last upload branch!".
1603 " (archive's version left in DGIT_ARCHIVE)"
1604 unless is_fast_fwd($lastpush_hash, $hash);
1606 if (defined $skew_warning_vsn) {
1608 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
1609 my $clogf = ".git/dgit/changelog.tmp";
1610 runcmd shell_cmd "exec >$clogf",
1611 @git, qw(cat-file blob), "$hash:debian/changelog";
1612 my $gotclogp = parsechangelog("-l$clogf");
1613 my $got_vsn = getfield $gotclogp, 'Version';
1614 printdebug "SKEW CHECK GOT $got_vsn\n";
1615 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
1616 print STDERR <<END or die $!;
1618 Warning: archive skew detected. Using the available version:
1619 Archive allegedly contains $skew_warning_vsn
1620 We were able to obtain only $got_vsn
1625 if ($lastpush_hash ne $hash) {
1626 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
1630 dryrun_report @upd_cmd;
1636 sub set_local_git_config ($$) {
1638 runcmd @git, qw(config), $k, $v;
1641 sub setup_mergechangelogs (;$) {
1643 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
1645 my $driver = 'dpkg-mergechangelogs';
1646 my $cb = "merge.$driver";
1647 my $attrs = '.git/info/attributes';
1648 ensuredir '.git/info';
1650 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
1651 if (!open ATTRS, "<", $attrs) {
1652 $!==ENOENT or die "$attrs: $!";
1656 next if m{^debian/changelog\s};
1657 print NATTRS $_, "\n" or die $!;
1659 ATTRS->error and die $!;
1662 print NATTRS "debian/changelog merge=$driver\n" or die $!;
1665 set_local_git_config "$cb.name", 'debian/changelog merge driver';
1666 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
1668 rename "$attrs.new", "$attrs" or die "$attrs: $!";
1671 sub setup_new_tree () {
1672 setup_mergechangelogs();
1677 canonicalise_suite();
1678 badusage "dry run makes no sense with clone" unless act_local();
1679 my $hasgit = check_for_git();
1680 mkdir $dstdir or die "$dstdir $!";
1682 runcmd @git, qw(init -q);
1683 my $giturl = access_giturl(1);
1684 if (defined $giturl) {
1685 set_local_git_config "remote.$remotename.fetch", fetchspec();
1686 open H, "> .git/HEAD" or die $!;
1687 print H "ref: ".lref()."\n" or die $!;
1689 runcmd @git, qw(remote add), 'origin', $giturl;
1692 progress "fetching existing git history";
1694 runcmd_ordryrun_local @git, qw(fetch origin);
1696 progress "starting new git history";
1698 fetch_from_archive() or no_such_package;
1699 my $vcsgiturl = $dsc->{'Vcs-Git'};
1700 if (length $vcsgiturl) {
1701 $vcsgiturl =~ s/\s+-b\s+\S+//g;
1702 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
1705 runcmd @git, qw(reset --hard), lrref();
1706 printdone "ready for work in $dstdir";
1710 if (check_for_git()) {
1713 fetch_from_archive() or no_such_package();
1714 printdone "fetched into ".lrref();
1719 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
1721 printdone "fetched to ".lrref()." and merged into HEAD";
1724 sub check_not_dirty () {
1725 return if $ignoredirty;
1726 my @cmd = (@git, qw(diff --quiet HEAD));
1728 $!=0; $?=0; system @cmd;
1729 return if !$! && !$?;
1730 if (!$! && $?==256) {
1731 fail "working tree is dirty (does not match HEAD)";
1737 sub commit_admin ($) {
1740 runcmd_ordryrun_local @git, qw(commit -m), $m;
1743 sub commit_quilty_patch () {
1744 my $output = cmdoutput @git, qw(status --porcelain);
1746 foreach my $l (split /\n/, $output) {
1747 next unless $l =~ m/\S/;
1748 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
1752 delete $adds{'.pc'}; # if there wasn't one before, don't add it
1754 progress "nothing quilty to commit, ok.";
1757 runcmd_ordryrun_local @git, qw(add), sort keys %adds;
1758 commit_admin "Commit Debian 3.0 (quilt) metadata";
1761 sub get_source_format () {
1762 if (!open F, "debian/source/format") {
1763 die $! unless $!==&ENOENT;
1767 F->error and die $!;
1774 return 0 unless $format eq '3.0 (quilt)';
1775 if ($quilt_mode eq 'nocheck') {
1776 progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
1779 progress "Format \`$format', checking/updating patch stack";
1783 sub push_parse_changelog ($) {
1786 my $clogp = Dpkg::Control::Hash->new();
1787 $clogp->load($clogpfn) or die;
1789 $package = getfield $clogp, 'Source';
1790 my $cversion = getfield $clogp, 'Version';
1791 my $tag = debiantag($cversion, access_basedistro);
1792 runcmd @git, qw(check-ref-format), $tag;
1794 my $dscfn = dscfn($cversion);
1796 return ($clogp, $cversion, $tag, $dscfn);
1799 sub push_parse_dsc ($$$) {
1800 my ($dscfn,$dscfnwhat, $cversion) = @_;
1801 $dsc = parsecontrol($dscfn,$dscfnwhat);
1802 my $dversion = getfield $dsc, 'Version';
1803 my $dscpackage = getfield $dsc, 'Source';
1804 ($dscpackage eq $package && $dversion eq $cversion) or
1805 fail "$dscfn is for $dscpackage $dversion".
1806 " but debian/changelog is for $package $cversion";
1809 sub push_mktag ($$$$$$$) {
1810 my ($head,$clogp,$tag,
1812 $changesfile,$changesfilewhat,
1815 $dsc->{$ourdscfield[0]} = $head;
1816 $dsc->save("$dscfn.tmp") or die $!;
1818 my $changes = parsecontrol($changesfile,$changesfilewhat);
1819 foreach my $field (qw(Source Distribution Version)) {
1820 $changes->{$field} eq $clogp->{$field} or
1821 fail "changes field $field \`$changes->{$field}'".
1822 " does not match changelog \`$clogp->{$field}'";
1825 my $cversion = getfield $clogp, 'Version';
1826 my $clogsuite = getfield $clogp, 'Distribution';
1828 # We make the git tag by hand because (a) that makes it easier
1829 # to control the "tagger" (b) we can do remote signing
1830 my $authline = clogp_authline $clogp;
1831 my $delibs = join(" ", "",@deliberatelies);
1832 my $declaredistro = access_basedistro();
1833 open TO, '>', $tfn->('.tmp') or die $!;
1834 print TO <<END or die $!;
1840 $package release $cversion for $clogsuite ($csuite) [dgit]
1841 [dgit distro=$declaredistro$delibs]
1843 foreach my $ref (sort keys %previously) {
1844 print TO <<END or die $!;
1845 [dgit previously:$ref=$previously{$ref}]
1851 my $tagobjfn = $tfn->('.tmp');
1853 if (!defined $keyid) {
1854 $keyid = access_cfg('keyid','RETURN-UNDEF');
1856 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
1857 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
1858 push @sign_cmd, qw(-u),$keyid if defined $keyid;
1859 push @sign_cmd, $tfn->('.tmp');
1860 runcmd_ordryrun @sign_cmd;
1862 $tagobjfn = $tfn->('.signed.tmp');
1863 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
1864 $tfn->('.tmp'), $tfn->('.tmp.asc');
1871 sub sign_changes ($) {
1872 my ($changesfile) = @_;
1874 my @debsign_cmd = @debsign;
1875 push @debsign_cmd, "-k$keyid" if defined $keyid;
1876 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
1877 push @debsign_cmd, $changesfile;
1878 runcmd_ordryrun @debsign_cmd;
1883 my ($forceflag) = @_;
1884 printdebug "actually entering push\n";
1885 supplementary_message(<<'END');
1886 Push failed, while preparing your push.
1887 You can retry the push, after fixing the problem, if you like.
1891 access_giturl(); # check that success is vaguely likely
1893 my $clogpfn = ".git/dgit/changelog.822.tmp";
1894 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
1896 responder_send_file('parsed-changelog', $clogpfn);
1898 my ($clogp, $cversion, $tag, $dscfn) =
1899 push_parse_changelog("$clogpfn");
1901 my $dscpath = "$buildproductsdir/$dscfn";
1902 stat_exists $dscpath or
1903 fail "looked for .dsc $dscfn, but $!;".
1904 " maybe you forgot to build";
1906 responder_send_file('dsc', $dscpath);
1908 push_parse_dsc($dscpath, $dscfn, $cversion);
1910 my $format = getfield $dsc, 'Format';
1911 printdebug "format $format\n";
1912 if (madformat($format)) {
1913 commit_quilty_patch();
1917 progress "checking that $dscfn corresponds to HEAD";
1918 runcmd qw(dpkg-source -x --),
1919 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
1920 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1921 check_for_vendor_patches() if madformat($dsc->{format});
1922 changedir '../../../..';
1923 my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
1924 my @diffcmd = (@git, qw(diff), $diffopt, $tree);
1925 debugcmd "+",@diffcmd;
1927 my $r = system @diffcmd;
1930 fail "$dscfn specifies a different tree to your HEAD commit;".
1931 " perhaps you forgot to build".
1932 ($diffopt eq '--exit-code' ? "" :
1933 " (run with -D to see full diff output)");
1938 my $head = git_rev_parse('HEAD');
1939 if (!$changesfile) {
1940 my $multi = "$buildproductsdir/".
1941 "${package}_".(stripepoch $cversion)."_multi.changes";
1942 if (stat_exists "$multi") {
1943 $changesfile = $multi;
1945 my $pat = "${package}_".(stripepoch $cversion)."_*.changes";
1946 my @cs = glob "$buildproductsdir/$pat";
1947 fail "failed to find unique changes file".
1948 " (looked for $pat in $buildproductsdir, or $multi);".
1949 " perhaps you need to use dgit -C"
1951 ($changesfile) = @cs;
1954 $changesfile = "$buildproductsdir/$changesfile";
1957 responder_send_file('changes',$changesfile);
1958 responder_send_command("param head $head");
1959 responder_send_command("param csuite $csuite");
1961 if (deliberately_not_fast_forward) {
1962 git_for_each_ref(lrfetchrefs, sub {
1963 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
1964 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
1965 responder_send_command("previously $rrefname=$objid");
1966 $previously{$rrefname} = $objid;
1970 my $tfn = sub { ".git/dgit/tag$_[0]"; };
1973 supplementary_message(<<'END');
1974 Push failed, while signing the tag.
1975 You can retry the push, after fixing the problem, if you like.
1977 # If we manage to sign but fail to record it anywhere, it's fine.
1978 if ($we_are_responder) {
1979 $tagobjfn = $tfn->('.signed.tmp');
1980 responder_receive_files('signed-tag', $tagobjfn);
1983 push_mktag($head,$clogp,$tag,
1985 $changesfile,$changesfile,
1988 supplementary_message(<<'END');
1989 Push failed, *after* signing the tag.
1990 If you want to try again, you should use a new version number.
1993 my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
1994 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
1995 runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
1997 supplementary_message(<<'END');
1998 Push failed, while updating the remote git repository - see messages above.
1999 If you want to try again, you should use a new version number.
2001 if (!check_for_git()) {
2002 create_remote_git_repo();
2004 runcmd_ordryrun @git, qw(push),access_giturl(),
2005 $forceflag."HEAD:".rrref(), $forceflag."refs/tags/$tag";
2006 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
2008 supplementary_message(<<'END');
2009 Push failed, after updating the remote git repository.
2010 If you want to try again, you must use a new version number.
2012 if ($we_are_responder) {
2013 my $dryrunsuffix = act_local() ? "" : ".tmp";
2014 responder_receive_files('signed-dsc-changes',
2015 "$dscpath$dryrunsuffix",
2016 "$changesfile$dryrunsuffix");
2019 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
2021 progress "[new .dsc left in $dscpath.tmp]";
2023 sign_changes $changesfile;
2026 supplementary_message(<<'END');
2027 Push failed, while uploading package(s) to the archive server.
2028 You can retry the upload of exactly these same files with dput of:
2030 If that .changes file is broken, you will need to use a new version
2031 number for your next attempt at the upload.
2033 my $host = access_cfg('upload-host','RETURN-UNDEF');
2034 my @hostarg = defined($host) ? ($host,) : ();
2035 runcmd_ordryrun @dput, @hostarg, $changesfile;
2036 printdone "pushed and uploaded $cversion";
2038 supplementary_message('');
2039 responder_send_command("complete");
2046 badusage "-p is not allowed with clone; specify as argument instead"
2047 if defined $package;
2050 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
2051 ($package,$isuite) = @ARGV;
2052 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
2053 ($package,$dstdir) = @ARGV;
2054 } elsif (@ARGV==3) {
2055 ($package,$isuite,$dstdir) = @ARGV;
2057 badusage "incorrect arguments to dgit clone";
2059 $dstdir ||= "$package";
2061 if (stat_exists $dstdir) {
2062 fail "$dstdir already exists";
2066 if ($rmonerror && !$dryrun_level) {
2067 $cwd_remove= getcwd();
2069 return unless defined $cwd_remove;
2070 if (!chdir "$cwd_remove") {
2071 return if $!==&ENOENT;
2072 die "chdir $cwd_remove: $!";
2074 rmtree($dstdir) or die "remove $dstdir: $!\n";
2079 $cwd_remove = undef;
2082 sub branchsuite () {
2083 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
2084 if ($branch =~ m#$lbranch_re#o) {
2091 sub fetchpullargs () {
2093 if (!defined $package) {
2094 my $sourcep = parsecontrol('debian/control','debian/control');
2095 $package = getfield $sourcep, 'Source';
2098 # $isuite = branchsuite(); # this doesn't work because dak hates canons
2100 my $clogp = parsechangelog();
2101 $isuite = getfield $clogp, 'Distribution';
2103 canonicalise_suite();
2104 progress "fetching from suite $csuite";
2105 } elsif (@ARGV==1) {
2107 canonicalise_suite();
2109 badusage "incorrect arguments to dgit fetch or dgit pull";
2128 badusage "-p is not allowed with dgit push" if defined $package;
2130 my $clogp = parsechangelog();
2131 $package = getfield $clogp, 'Source';
2134 } elsif (@ARGV==1) {
2135 ($specsuite) = (@ARGV);
2137 badusage "incorrect arguments to dgit push";
2139 $isuite = getfield $clogp, 'Distribution';
2141 local ($package) = $existing_package; # this is a hack
2142 canonicalise_suite();
2144 canonicalise_suite();
2146 if (defined $specsuite &&
2147 $specsuite ne $isuite &&
2148 $specsuite ne $csuite) {
2149 fail "dgit push: changelog specifies $isuite ($csuite)".
2150 " but command line specifies $specsuite";
2152 supplementary_message(<<'END');
2153 Push failed, while checking state of the archive.
2154 You can retry the push, after fixing the problem, if you like.
2156 if (check_for_git()) {
2160 if (fetch_from_archive()) {
2161 if (is_fast_fwd(lrref(), 'HEAD')) {
2163 } elsif (deliberately_not_fast_forward) {
2166 fail "dgit push: HEAD is not a descendant".
2167 " of the archive's version.\n".
2168 "dgit: To overwrite its contents,".
2169 " use git merge -s ours ".lrref().".\n".
2170 "dgit: To rewind history, if permitted by the archive,".
2171 " use --deliberately-not-fast-forward";
2175 fail "package appears to be new in this suite;".
2176 " if this is intentional, use --new";
2181 #---------- remote commands' implementation ----------
2183 sub cmd_remote_push_build_host {
2184 my ($nrargs) = shift @ARGV;
2185 my (@rargs) = @ARGV[0..$nrargs-1];
2186 @ARGV = @ARGV[$nrargs..$#ARGV];
2188 my ($dir,$vsnwant) = @rargs;
2189 # vsnwant is a comma-separated list; we report which we have
2190 # chosen in our ready response (so other end can tell if they
2193 $we_are_responder = 1;
2194 $us .= " (build host)";
2198 open PI, "<&STDIN" or die $!;
2199 open STDIN, "/dev/null" or die $!;
2200 open PO, ">&STDOUT" or die $!;
2202 open STDOUT, ">&STDERR" or die $!;
2206 ($protovsn) = grep {
2207 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
2208 } @rpushprotovsn_support;
2210 fail "build host has dgit rpush protocol versions ".
2211 (join ",", @rpushprotovsn_support).
2212 " but invocation host has $vsnwant"
2213 unless defined $protovsn;
2215 responder_send_command("dgit-remote-push-ready $protovsn");
2221 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
2222 # ... for compatibility with proto vsn.1 dgit (just so that user gets
2223 # a good error message)
2229 my $report = i_child_report();
2230 if (defined $report) {
2231 printdebug "($report)\n";
2232 } elsif ($i_child_pid) {
2233 printdebug "(killing build host child $i_child_pid)\n";
2234 kill 15, $i_child_pid;
2236 if (defined $i_tmp && !defined $initiator_tempdir) {
2238 eval { rmtree $i_tmp; };
2242 END { i_cleanup(); }
2245 my ($base,$selector,@args) = @_;
2246 $selector =~ s/\-/_/g;
2247 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
2254 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
2262 push @rargs, join ",", @rpushprotovsn_support;
2265 push @rdgit, @ropts;
2266 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
2268 my @cmd = (@ssh, $host, shellquote @rdgit);
2271 if (defined $initiator_tempdir) {
2272 rmtree $initiator_tempdir;
2273 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
2274 $i_tmp = $initiator_tempdir;
2278 $i_child_pid = open2(\*RO, \*RI, @cmd);
2280 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
2281 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
2282 $supplementary_message = '' unless $protovsn >= 3;
2284 my ($icmd,$iargs) = initiator_expect {
2285 m/^(\S+)(?: (.*))?$/;
2288 i_method "i_resp", $icmd, $iargs;
2292 sub i_resp_progress ($) {
2294 my $msg = protocol_read_bytes \*RO, $rhs;
2298 sub i_resp_supplementary_message ($) {
2300 $supplementary_message = protocol_read_bytes \*RO, $rhs;
2303 sub i_resp_complete {
2304 my $pid = $i_child_pid;
2305 $i_child_pid = undef; # prevents killing some other process with same pid
2306 printdebug "waiting for build host child $pid...\n";
2307 my $got = waitpid $pid, 0;
2308 die $! unless $got == $pid;
2309 die "build host child failed $?" if $?;
2312 printdebug "all done\n";
2316 sub i_resp_file ($) {
2318 my $localname = i_method "i_localname", $keyword;
2319 my $localpath = "$i_tmp/$localname";
2320 stat_exists $localpath and
2321 badproto \*RO, "file $keyword ($localpath) twice";
2322 protocol_receive_file \*RO, $localpath;
2323 i_method "i_file", $keyword;
2328 sub i_resp_param ($) {
2329 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
2333 sub i_resp_previously ($) {
2334 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
2335 or badproto \*RO, "bad previously spec";
2336 my $r = system qw(git check-ref-format), $1;
2337 die "bad previously ref spec ($r)" if $r;
2338 $previously{$1} = $2;
2343 sub i_resp_want ($) {
2345 die "$keyword ?" if $i_wanted{$keyword}++;
2346 my @localpaths = i_method "i_want", $keyword;
2347 printdebug "[[ $keyword @localpaths\n";
2348 foreach my $localpath (@localpaths) {
2349 protocol_send_file \*RI, $localpath;
2351 print RI "files-end\n" or die $!;
2354 our ($i_clogp, $i_version, $i_tag, $i_dscfn, $i_changesfn);
2356 sub i_localname_parsed_changelog {
2357 return "remote-changelog.822";
2359 sub i_file_parsed_changelog {
2360 ($i_clogp, $i_version, $i_tag, $i_dscfn) =
2361 push_parse_changelog "$i_tmp/remote-changelog.822";
2362 die if $i_dscfn =~ m#/|^\W#;
2365 sub i_localname_dsc {
2366 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
2371 sub i_localname_changes {
2372 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
2373 $i_changesfn = $i_dscfn;
2374 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
2375 return $i_changesfn;
2377 sub i_file_changes { }
2379 sub i_want_signed_tag {
2380 printdebug Dumper(\%i_param, $i_dscfn);
2381 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
2382 && defined $i_param{'csuite'}
2383 or badproto \*RO, "premature desire for signed-tag";
2384 my $head = $i_param{'head'};
2385 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
2387 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
2389 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
2392 push_mktag $head, $i_clogp, $i_tag,
2394 $i_changesfn, 'remote changes',
2395 sub { "tag$_[0]"; };
2400 sub i_want_signed_dsc_changes {
2401 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
2402 sign_changes $i_changesfn;
2403 return ($i_dscfn, $i_changesfn);
2406 #---------- building etc. ----------
2412 #----- `3.0 (quilt)' handling -----
2414 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
2416 sub quiltify_dpkg_commit ($$$;$) {
2417 my ($patchname,$author,$msg, $xinfo) = @_;
2421 my $descfn = ".git/dgit/quilt-description.tmp";
2422 open O, '>', $descfn or die "$descfn: $!";
2425 $msg =~ s/^\s+$/ ./mg;
2426 print O <<END or die $!;
2436 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
2437 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
2438 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
2439 runcmd_ordryrun_local @dpkgsource, qw(--commit .), $patchname;
2443 sub quiltify_trees_differ ($$) {
2445 # returns 1 iff the two tree objects differ other than in debian/
2447 my @cmd = (@git, qw(diff-tree --name-only -z), $x, $y);
2448 my $diffs= cmdoutput @cmd;
2449 foreach my $f (split /\0/, $diffs) {
2450 next if $f eq 'debian';
2456 sub quiltify_tree_sentinelfiles ($) {
2457 # lists the `sentinel' files present in the tree
2459 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
2460 qw(-- debian/rules debian/control);
2466 my ($clogp,$target) = @_;
2468 # Quilt patchification algorithm
2470 # We search backwards through the history of the main tree's HEAD
2471 # (T) looking for a start commit S whose tree object is identical
2472 # to to the patch tip tree (ie the tree corresponding to the
2473 # current dpkg-committed patch series). For these purposes
2474 # `identical' disregards anything in debian/ - this wrinkle is
2475 # necessary because dpkg-source treates debian/ specially.
2477 # We can only traverse edges where at most one of the ancestors'
2478 # trees differs (in changes outside in debian/). And we cannot
2479 # handle edges which change .pc/ or debian/patches. To avoid
2480 # going down a rathole we avoid traversing edges which introduce
2481 # debian/rules or debian/control. And we set a limit on the
2482 # number of edges we are willing to look at.
2484 # If we succeed, we walk forwards again. For each traversed edge
2485 # PC (with P parent, C child) (starting with P=S and ending with
2486 # C=T) to we do this:
2488 # - dpkg-source --commit with a patch name and message derived from C
2489 # After traversing PT, we git commit the changes which
2490 # should be contained within debian/patches.
2492 changedir '../fake';
2493 mktree_in_ud_here();
2495 runcmd @git, 'add', '.';
2496 my $oldtiptree=git_write_tree();
2497 changedir '../work';
2499 # The search for the path S..T is breadth-first. We maintain a
2500 # todo list containing search nodes. A search node identifies a
2501 # commit, and looks something like this:
2503 # Commit => $git_commit_id,
2504 # Child => $c, # or undef if P=T
2505 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
2506 # Nontrivial => true iff $p..$c has relevant changes
2513 my %considered; # saves being exponential on some weird graphs
2515 my $t_sentinels = quiltify_tree_sentinelfiles $target;
2518 my ($search,$whynot) = @_;
2519 printdebug " search NOT $search->{Commit} $whynot\n";
2520 $search->{Whynot} = $whynot;
2521 push @nots, $search;
2522 no warnings qw(exiting);
2531 my $c = shift @todo;
2532 next if $considered{$c->{Commit}}++;
2534 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
2536 printdebug "quiltify investigate $c->{Commit}\n";
2539 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
2540 printdebug " search finished hooray!\n";
2545 if ($quilt_mode eq 'nofix') {
2546 fail "quilt fixup required but quilt mode is \`nofix'\n".
2547 "HEAD commit $c->{Commit} differs from tree implied by ".
2548 " debian/patches (tree object $oldtiptree)";
2550 if ($quilt_mode eq 'smash') {
2551 printdebug " search quitting smash\n";
2555 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
2556 $not->($c, "has $c_sentinels not $t_sentinels")
2557 if $c_sentinels ne $t_sentinels;
2559 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
2560 $commitdata =~ m/\n\n/;
2562 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
2563 @parents = map { { Commit => $_, Child => $c } } @parents;
2565 $not->($c, "root commit") if !@parents;
2567 foreach my $p (@parents) {
2568 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
2570 my $ndiffers = grep { $_->{Nontrivial} } @parents;
2571 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
2573 foreach my $p (@parents) {
2574 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
2576 my @cmd= (@git, qw(diff-tree -r --name-only),
2577 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
2578 my $patchstackchange = cmdoutput @cmd;
2579 if (length $patchstackchange) {
2580 $patchstackchange =~ s/\n/,/g;
2581 $not->($p, "changed $patchstackchange");
2584 printdebug " search queue P=$p->{Commit} ",
2585 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
2591 printdebug "quiltify want to smash\n";
2594 my $x = $_[0]{Commit};
2595 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
2598 my $reportnot = sub {
2600 my $s = $abbrev->($notp);
2601 my $c = $notp->{Child};
2602 $s .= "..".$abbrev->($c) if $c;
2603 $s .= ": ".$notp->{Whynot};
2606 if ($quilt_mode eq 'linear') {
2607 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
2608 foreach my $notp (@nots) {
2609 print STDERR "$us: ", $reportnot->($notp), "\n";
2611 fail "quilt fixup naive history linearisation failed.\n".
2612 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
2613 } elsif ($quilt_mode eq 'smash') {
2614 } elsif ($quilt_mode eq 'auto') {
2615 progress "quilt fixup cannot be linear, smashing...";
2617 die "$quilt_mode ?";
2622 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
2624 quiltify_dpkg_commit "auto-$version-$target-$time",
2625 (getfield $clogp, 'Maintainer'),
2626 "Automatically generated patch ($clogp->{Version})\n".
2627 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
2631 progress "quiltify linearisation planning successful, executing...";
2633 for (my $p = $sref_S;
2634 my $c = $p->{Child};
2636 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
2637 next unless $p->{Nontrivial};
2639 my $cc = $c->{Commit};
2641 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
2642 $commitdata =~ m/\n\n/ or die "$c ?";
2645 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
2648 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
2651 my $patchname = $title;
2652 $patchname =~ s/[.:]$//;
2653 $patchname =~ y/ A-Z/-a-z/;
2654 $patchname =~ y/-a-z0-9_.+=~//cd;
2655 $patchname =~ s/^\W/x-$&/;
2656 $patchname = substr($patchname,0,40);
2659 stat "debian/patches/$patchname$index";
2661 $!==ENOENT or die "$patchname$index $!";
2663 runcmd @git, qw(checkout -q), $cc;
2665 # We use the tip's changelog so that dpkg-source doesn't
2666 # produce complaining messages from dpkg-parsechangelog. None
2667 # of the information dpkg-source gets from the changelog is
2668 # actually relevant - it gets put into the original message
2669 # which dpkg-source provides our stunt editor, and then
2671 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
2673 quiltify_dpkg_commit "$patchname$index", $author, $msg,
2674 "X-Dgit-Generated: $clogp->{Version} $cc\n";
2676 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
2679 runcmd @git, qw(checkout -q master);
2682 sub build_maybe_quilt_fixup () {
2683 my $format=get_source_format;
2684 return unless madformat $format;
2687 check_for_vendor_patches();
2690 # - honour any existing .pc in case it has any strangeness
2691 # - determine the git commit corresponding to the tip of
2692 # the patch stack (if there is one)
2693 # - if there is such a git commit, convert each subsequent
2694 # git commit into a quilt patch with dpkg-source --commit
2695 # - otherwise convert all the differences in the tree into
2696 # a single git commit
2700 # Our git tree doesn't necessarily contain .pc. (Some versions of
2701 # dgit would include the .pc in the git tree.) If there isn't
2702 # one, we need to generate one by unpacking the patches that we
2705 # We first look for a .pc in the git tree. If there is one, we
2706 # will use it. (This is not the normal case.)
2708 # Otherwise need to regenerate .pc so that dpkg-source --commit
2709 # can work. We do this as follows:
2710 # 1. Collect all relevant .orig from parent directory
2711 # 2. Generate a debian.tar.gz out of
2712 # debian/{patches,rules,source/format}
2713 # 3. Generate a fake .dsc containing just these fields:
2714 # Format Source Version Files
2715 # 4. Extract the fake .dsc
2716 # Now the fake .dsc has a .pc directory.
2717 # (In fact we do this in every case, because in future we will
2718 # want to search for a good base commit for generating patches.)
2720 # Then we can actually do the dpkg-source --commit
2721 # 1. Make a new working tree with the same object
2722 # store as our main tree and check out the main
2724 # 2. Copy .pc from the fake's extraction, if necessary
2725 # 3. Run dpkg-source --commit
2726 # 4. If the result has changes to debian/, then
2727 # - git-add them them
2728 # - git-add .pc if we had a .pc in-tree
2730 # 5. If we had a .pc in-tree, delete it, and git-commit
2731 # 6. Back in the main tree, fast forward to the new HEAD
2733 my $clogp = parsechangelog();
2734 my $headref = git_rev_parse('HEAD');
2739 my $upstreamversion=$version;
2740 $upstreamversion =~ s/-[^-]*$//;
2742 my $fakeversion="$upstreamversion-~~DGITFAKE";
2744 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
2745 print $fakedsc <<END or die $!;
2748 Version: $fakeversion
2752 my $dscaddfile=sub {
2755 my $md = new Digest::MD5;
2757 my $fh = new IO::File $b, '<' or die "$b $!";
2762 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
2765 foreach my $f (<../../../../*>) { #/){
2766 my $b=$f; $b =~ s{.*/}{};
2767 next unless is_orig_file $b, srcfn $upstreamversion,'';
2768 link $f, $b or die "$b $!";
2772 my @files=qw(debian/source/format debian/rules);
2773 if (stat_exists '../../../debian/patches') {
2774 push @files, 'debian/patches';
2777 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
2778 runcmd qw(env GZIP=-1 tar -zcf), "./$debtar", qw(-C ../../..), @files;
2780 $dscaddfile->($debtar);
2781 close $fakedsc or die $!;
2783 runcmd qw(sh -ec), 'exec dpkg-source --no-check -x fake.dsc >/dev/null';
2785 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
2786 rename $fakexdir, "fake" or die "$fakexdir $!";
2788 mkdir "work" or die $!;
2790 mktree_in_ud_here();
2791 runcmd @git, qw(reset --hard), $headref;
2794 if (stat_exists ".pc") {
2796 progress "Tree already contains .pc - will use it then delete it.";
2799 rename '../fake/.pc','.pc' or die $!;
2802 quiltify($clogp,$headref);
2804 if (!open P, '>>', ".pc/applied-patches") {
2805 $!==&ENOENT or die $!;
2810 commit_quilty_patch();
2812 if ($mustdeletepc) {
2813 runcmd @git, qw(rm -rqf .pc);
2814 commit_admin "Commit removal of .pc (quilt series tracking data)";
2817 changedir '../../../..';
2818 runcmd @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
2821 sub quilt_fixup_editor () {
2822 my $descfn = $ENV{$fakeeditorenv};
2823 my $editing = $ARGV[$#ARGV];
2824 open I1, '<', $descfn or die "$descfn: $!";
2825 open I2, '<', $editing or die "$editing: $!";
2826 unlink $editing or die "$editing: $!";
2827 open O, '>', $editing or die "$editing: $!";
2828 while (<I1>) { print O or die $!; } I1->error and die $!;
2831 $copying ||= m/^\-\-\- /;
2832 next unless $copying;
2835 I2->error and die $!;
2840 #----- other building -----
2843 if ($cleanmode eq 'dpkg-source') {
2844 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
2845 } elsif ($cleanmode eq 'dpkg-source-d') {
2846 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
2847 } elsif ($cleanmode eq 'git') {
2848 runcmd_ordryrun_local @git, qw(clean -xdf);
2849 } elsif ($cleanmode eq 'git-ff') {
2850 runcmd_ordryrun_local @git, qw(clean -xdff);
2851 } elsif ($cleanmode eq 'check') {
2852 my $leftovers = cmdoutput @git, qw(clean -xdn);
2853 if (length $leftovers) {
2854 print STDERR $leftovers, "\n" or die $!;
2855 fail "tree contains uncommitted files and --clean=check specified";
2857 } elsif ($cleanmode eq 'none') {
2864 badusage "clean takes no additional arguments" if @ARGV;
2871 badusage "-p is not allowed when building" if defined $package;
2874 my $clogp = parsechangelog();
2875 $isuite = getfield $clogp, 'Distribution';
2876 $package = getfield $clogp, 'Source';
2877 $version = getfield $clogp, 'Version';
2878 build_maybe_quilt_fixup();
2881 sub changesopts () {
2882 my @opts =@changesopts[1..$#changesopts];
2883 if (!defined $changes_since_version) {
2884 my @vsns = archive_query('archive_query');
2885 my @quirk = access_quirk();
2886 if ($quirk[0] eq 'backports') {
2887 local $isuite = $quirk[2];
2889 canonicalise_suite();
2890 push @vsns, archive_query('archive_query');
2893 @vsns = map { $_->[0] } @vsns;
2894 @vsns = sort { -version_compare($a, $b) } @vsns;
2895 $changes_since_version = $vsns[0];
2896 progress "changelog will contain changes since $vsns[0]";
2898 $changes_since_version = '_';
2899 progress "package seems new, not specifying -v<version>";
2902 if ($changes_since_version ne '_') {
2903 unshift @opts, "-v$changes_since_version";
2908 sub massage_dbp_args ($) {
2910 return unless $cleanmode =~ m/git|none/;
2911 debugcmd '#massaging#', @$cmd if $debuglevel>1;
2912 my @newcmd = shift @$cmd;
2913 # -nc has the side effect of specifying -b if nothing else specified
2914 push @newcmd, '-nc';
2915 # and some combinations of -S, -b, et al, are errors, rather than
2916 # later simply overriding earlier
2917 push @newcmd, '-F' unless grep { m/^-[bBASF]$/ } @$cmd;
2918 push @newcmd, @$cmd;
2924 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV);
2925 massage_dbp_args \@dbp;
2926 runcmd_ordryrun_local @dbp;
2927 printdone "build successful\n";
2932 my @dbp = @dpkgbuildpackage;
2933 massage_dbp_args \@dbp;
2935 (qw(git-buildpackage -us -uc --git-no-sign-tags),
2936 "--git-builder=@dbp");
2937 unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
2938 canonicalise_suite();
2939 push @cmd, "--git-debian-branch=".lbranch();
2941 push @cmd, changesopts();
2942 runcmd_ordryrun_local @cmd, @ARGV;
2943 printdone "build successful\n";
2948 $sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
2949 $dscfn = dscfn($version);
2950 if ($cleanmode eq 'dpkg-source') {
2951 runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S)),
2953 } elsif ($cleanmode eq 'dpkg-source-d') {
2954 runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S -d)),
2957 my $pwd = must_getcwd();
2958 my $leafdir = basename $pwd;
2960 runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir;
2962 runcmd_ordryrun_local qw(sh -ec),
2963 'exec >$1; shift; exec "$@"','x',
2964 "../$sourcechanges",
2965 @dpkggenchanges, qw(-S), changesopts();
2969 sub cmd_build_source {
2970 badusage "build-source takes no additional arguments" if @ARGV;
2972 printdone "source built, results in $dscfn and $sourcechanges";
2978 my $pat = "${package}_".(stripepoch $version)."_*.changes";
2980 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
2981 stat_exists $sourcechanges
2982 or fail "$sourcechanges (in parent directory): $!";
2983 foreach my $cf (glob $pat) {
2984 next if $cf eq $sourcechanges;
2985 unlink $cf or fail "remove $cf: $!";
2988 runcmd_ordryrun_local @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
2989 my @changesfiles = glob $pat;
2990 @changesfiles = sort {
2991 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
2994 fail "wrong number of different changes files (@changesfiles)"
2995 unless @changesfiles;
2996 runcmd_ordryrun_local @mergechanges, @changesfiles;
2997 my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
2999 stat_exists $multichanges or fail "$multichanges: $!";
3001 printdone "build successful, results in $multichanges\n" or die $!;
3004 sub cmd_quilt_fixup {
3005 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
3006 my $clogp = parsechangelog();
3007 $version = getfield $clogp, 'Version';
3008 $package = getfield $clogp, 'Source';
3009 build_maybe_quilt_fixup();
3012 sub cmd_archive_api_query {
3013 badusage "need only 1 subpath argument" unless @ARGV==1;
3014 my ($subpath) = @ARGV;
3015 my @cmd = archive_api_query_cmd($subpath);
3017 exec @cmd or fail "exec curl: $!\n";
3020 sub cmd_clone_dgit_repos_server {
3021 badusage "need destination argument" unless @ARGV==1;
3022 my ($destdir) = @ARGV;
3023 $package = '_dgit-repos-server';
3024 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
3026 exec @cmd or fail "exec git clone: $!\n";
3029 sub cmd_setup_mergechangelogs {
3030 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
3031 setup_mergechangelogs(1);
3034 sub cmd_setup_new_tree {
3035 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
3039 #---------- argument parsing and main program ----------
3042 print "dgit version $our_version\n" or die $!;
3049 if (defined $ENV{'DGIT_SSH'}) {
3050 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
3051 } elsif (defined $ENV{'GIT_SSH'}) {
3052 @ssh = ($ENV{'GIT_SSH'});
3056 last unless $ARGV[0] =~ m/^-/;
3060 if (m/^--dry-run$/) {
3063 } elsif (m/^--damp-run$/) {
3066 } elsif (m/^--no-sign$/) {
3069 } elsif (m/^--help$/) {
3071 } elsif (m/^--version$/) {
3073 } elsif (m/^--new$/) {
3076 } elsif (m/^--since-version=([^_]+|_)$/) {
3078 $changes_since_version = $1;
3079 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
3080 ($om = $opts_opt_map{$1}) &&
3084 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
3085 !$opts_opt_cmdonly{$1} &&
3086 ($om = $opts_opt_map{$1})) {
3089 } elsif (m/^--existing-package=(.*)/s) {
3091 $existing_package = $1;
3092 } elsif (m/^--initiator-tempdir=(.*)/s) {
3093 $initiator_tempdir = $1;
3094 $initiator_tempdir =~ m#^/# or
3095 badusage "--initiator-tempdir must be used specify an".
3096 " absolute, not relative, directory."
3097 } elsif (m/^--distro=(.*)/s) {
3100 } elsif (m/^--build-products-dir=(.*)/s) {
3102 $buildproductsdir = $1;
3103 } elsif (m/^--clean=(dpkg-source(?:-d)?|git|git-ff|check|none)$/s) {
3106 } elsif (m/^--clean=(.*)$/s) {
3107 badusage "unknown cleaning mode \`$1'";
3108 } elsif (m/^--quilt=($quilt_modes_re)$/s) {
3111 } elsif (m/^--quilt=(.*)$/s) {
3112 badusage "unknown quilt fixup mode \`$1'";
3113 } elsif (m/^--ignore-dirty$/s) {
3116 } elsif (m/^--no-quilt-fixup$/s) {
3118 $quilt_mode = 'nocheck';
3119 } elsif (m/^--no-rm-on-error$/s) {
3122 } elsif (m/^--deliberately-($deliberately_re)$/s) {
3124 push @deliberatelies, $&;
3126 badusage "unknown long option \`$_'";
3133 } elsif (s/^-L/-/) {
3136 } elsif (s/^-h/-/) {
3138 } elsif (s/^-D/-/) {
3142 } elsif (s/^-N/-/) {
3145 } elsif (s/^-v([^_]+|_)$//s) {
3147 $changes_since_version = $1;
3150 push @changesopts, $_;
3152 } elsif (s/^-c(.*=.*)//s) {
3154 push @git, '-c', $1;
3155 } elsif (s/^-d(.+)//s) {
3158 } elsif (s/^-C(.+)//s) {
3161 if ($changesfile =~ s#^(.*)/##) {
3162 $buildproductsdir = $1;
3164 } elsif (s/^-k(.+)//s) {
3166 } elsif (m/^-[vdCk]$/) {
3168 "option \`$_' requires an argument (and no space before the argument)";
3169 } elsif (s/^-wn$//s) {
3171 $cleanmode = 'none';
3172 } elsif (s/^-wg$//s) {
3175 } elsif (s/^-wgf$//s) {
3177 $cleanmode = 'git-ff';
3178 } elsif (s/^-wd$//s) {
3180 $cleanmode = 'dpkg-source';
3181 } elsif (s/^-wdd$//s) {
3183 $cleanmode = 'dpkg-source-d';
3184 } elsif (s/^-wc$//s) {
3186 $cleanmode = 'check';
3188 badusage "unknown short option \`$_'";
3195 sub finalise_opts_opts () {
3196 foreach my $k (keys %opts_opt_map) {
3197 my $om = $opts_opt_map{$k};
3199 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
3201 badcfg "cannot set command for $k"
3202 unless length $om->[0];
3206 foreach my $c (access_cfg_cfgs("opts-$k")) {
3207 my $vl = $gitcfg{$c};
3208 printdebug "CL $c ",
3209 ($vl ? join " ", map { shellquote } @$vl : ""),
3210 "\n" if $debuglevel >= 4;
3212 badcfg "cannot configure options for $k"
3213 if $opts_opt_cmdonly{$k};
3214 my $insertpos = $opts_cfg_insertpos{$k};
3215 @$om = ( @$om[0..$insertpos-1],
3217 @$om[$insertpos..$#$om] );
3222 if ($ENV{$fakeeditorenv}) {
3224 quilt_fixup_editor();
3230 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
3231 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
3232 if $dryrun_level == 1;
3234 print STDERR $helpmsg or die $!;
3237 my $cmd = shift @ARGV;
3240 if (!defined $quilt_mode) {
3241 local $access_forpush;
3242 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
3243 // access_cfg('quilt-mode', 'RETURN-UNDEF')
3245 $quilt_mode =~ m/^($quilt_modes_re)$/
3246 or badcfg "unknown quilt-mode \`$quilt_mode'";
3250 my $fn = ${*::}{"cmd_$cmd"};
3251 $fn or badusage "unknown operation $cmd";