3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 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);
37 use List::Util qw(any);
38 use List::MoreUtils qw(pairwise);
39 use Text::Glob qw(match_glob);
40 use Fcntl qw(:DEFAULT :flock);
45 our $our_version = 'UNRELEASED'; ###substituted###
46 our $absurdity = undef; ###substituted###
48 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
51 our $isuite = 'unstable';
57 our $dryrun_level = 0;
59 our $buildproductsdir = '..';
65 our $existing_package = 'dpkg';
67 our $changes_since_version;
69 our $overwrite_version; # undef: not specified; '': check changelog
71 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
72 our $split_brain_save;
73 our $we_are_responder;
74 our $initiator_tempdir;
75 our $patches_applied_dirtily = 00;
80 our %forceopts = map { $_=>0 }
81 qw(unrepresentable unsupported-source-format
82 dsc-changes-mismatch changes-origs-exactly
83 import-gitapply-absurd
84 import-gitapply-no-absurd
85 import-dsc-with-dgit-field);
87 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
89 our $suite_re = '[-+.0-9a-z]+';
90 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
91 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
92 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
93 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
95 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
96 our $splitbraincache = 'dgit-intern/quilt-cache';
99 our (@dget) = qw(dget);
100 our (@curl) = qw(curl);
101 our (@dput) = qw(dput);
102 our (@debsign) = qw(debsign);
103 our (@gpg) = qw(gpg);
104 our (@sbuild) = qw(sbuild);
106 our (@dgit) = qw(dgit);
107 our (@aptget) = qw(apt-get);
108 our (@aptcache) = qw(apt-cache);
109 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
110 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
111 our (@dpkggenchanges) = qw(dpkg-genchanges);
112 our (@mergechanges) = qw(mergechanges -f);
113 our (@gbp_build) = ('');
114 our (@gbp_pq) = ('gbp pq');
115 our (@changesopts) = ('');
117 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
120 'debsign' => \@debsign,
122 'sbuild' => \@sbuild,
126 'apt-get' => \@aptget,
127 'apt-cache' => \@aptcache,
128 'dpkg-source' => \@dpkgsource,
129 'dpkg-buildpackage' => \@dpkgbuildpackage,
130 'dpkg-genchanges' => \@dpkggenchanges,
131 'gbp-build' => \@gbp_build,
132 'gbp-pq' => \@gbp_pq,
133 'ch' => \@changesopts,
134 'mergechanges' => \@mergechanges);
136 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
137 our %opts_cfg_insertpos = map {
139 scalar @{ $opts_opt_map{$_} }
140 } keys %opts_opt_map;
142 sub finalise_opts_opts();
148 our $supplementary_message = '';
149 our $need_split_build_invocation = 0;
150 our $split_brain = 0;
154 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
157 our $remotename = 'dgit';
158 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
162 if (!defined $absurdity) {
164 $absurdity =~ s{/[^/]+$}{/absurd} or die;
168 my ($v,$distro) = @_;
169 return $tagformatfn->($v, $distro);
172 sub debiantag_maintview ($$) {
173 my ($v,$distro) = @_;
178 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
180 sub lbranch () { return "$branchprefix/$csuite"; }
181 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
182 sub lref () { return "refs/heads/".lbranch(); }
183 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
184 sub rrref () { return server_ref($csuite); }
186 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
187 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
189 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
190 # locally fetched refs because they have unhelpful names and clutter
191 # up gitk etc. So we track whether we have "used up" head ref (ie,
192 # whether we have made another local ref which refers to this object).
194 # (If we deleted them unconditionally, then we might end up
195 # re-fetching the same git objects each time dgit fetch was run.)
197 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
198 # in git_fetch_us to fetch the refs in question, and possibly a call
199 # to lrfetchref_used.
201 our (%lrfetchrefs_f, %lrfetchrefs_d);
202 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
204 sub lrfetchref_used ($) {
205 my ($fullrefname) = @_;
206 my $objid = $lrfetchrefs_f{$fullrefname};
207 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
218 return "${package}_".(stripepoch $vsn).$sfx
223 return srcfn($vsn,".dsc");
226 sub changespat ($;$) {
227 my ($vsn, $arch) = @_;
228 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
231 sub upstreamversion ($) {
243 foreach my $f (@end) {
245 print STDERR "$us: cleanup: $@" if length $@;
249 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
251 sub forceable_fail ($$) {
252 my ($forceoptsl, $msg) = @_;
253 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
254 print STDERR "warning: overriding problem due to --force:\n". $msg;
258 my ($forceoptsl) = @_;
259 my @got = grep { $forceopts{$_} } @$forceoptsl;
260 return 0 unless @got;
262 "warning: skipping checks or functionality due to --force-$got[0]\n";
265 sub no_such_package () {
266 print STDERR "$us: package $package does not exist in suite $isuite\n";
272 printdebug "CD $newdir\n";
273 chdir $newdir or confess "chdir: $newdir: $!";
276 sub deliberately ($) {
278 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
281 sub deliberately_not_fast_forward () {
282 foreach (qw(not-fast-forward fresh-repo)) {
283 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
287 sub quiltmode_splitbrain () {
288 $quilt_mode =~ m/gbp|dpm|unapplied/;
291 sub opts_opt_multi_cmd {
293 push @cmd, split /\s+/, shift @_;
299 return opts_opt_multi_cmd @gbp_pq;
302 #---------- remote protocol support, common ----------
304 # remote push initiator/responder protocol:
305 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
306 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
307 # < dgit-remote-push-ready <actual-proto-vsn>
314 # > supplementary-message NBYTES # $protovsn >= 3
319 # > file parsed-changelog
320 # [indicates that output of dpkg-parsechangelog follows]
321 # > data-block NBYTES
322 # > [NBYTES bytes of data (no newline)]
323 # [maybe some more blocks]
332 # > param head DGIT-VIEW-HEAD
333 # > param csuite SUITE
334 # > param tagformat old|new
335 # > param maint-view MAINT-VIEW-HEAD
337 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
338 # # goes into tag, for replay prevention
341 # [indicates that signed tag is wanted]
342 # < data-block NBYTES
343 # < [NBYTES bytes of data (no newline)]
344 # [maybe some more blocks]
348 # > want signed-dsc-changes
349 # < data-block NBYTES [transfer of signed dsc]
351 # < data-block NBYTES [transfer of signed changes]
359 sub i_child_report () {
360 # Sees if our child has died, and reap it if so. Returns a string
361 # describing how it died if it failed, or undef otherwise.
362 return undef unless $i_child_pid;
363 my $got = waitpid $i_child_pid, WNOHANG;
364 return undef if $got <= 0;
365 die unless $got == $i_child_pid;
366 $i_child_pid = undef;
367 return undef unless $?;
368 return "build host child ".waitstatusmsg();
373 fail "connection lost: $!" if $fh->error;
374 fail "protocol violation; $m not expected";
377 sub badproto_badread ($$) {
379 fail "connection lost: $!" if $!;
380 my $report = i_child_report();
381 fail $report if defined $report;
382 badproto $fh, "eof (reading $wh)";
385 sub protocol_expect (&$) {
386 my ($match, $fh) = @_;
389 defined && chomp or badproto_badread $fh, "protocol message";
397 badproto $fh, "\`$_'";
400 sub protocol_send_file ($$) {
401 my ($fh, $ourfn) = @_;
402 open PF, "<", $ourfn or die "$ourfn: $!";
405 my $got = read PF, $d, 65536;
406 die "$ourfn: $!" unless defined $got;
408 print $fh "data-block ".length($d)."\n" or die $!;
409 print $fh $d or die $!;
411 PF->error and die "$ourfn $!";
412 print $fh "data-end\n" or die $!;
416 sub protocol_read_bytes ($$) {
417 my ($fh, $nbytes) = @_;
418 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
420 my $got = read $fh, $d, $nbytes;
421 $got==$nbytes or badproto_badread $fh, "data block";
425 sub protocol_receive_file ($$) {
426 my ($fh, $ourfn) = @_;
427 printdebug "() $ourfn\n";
428 open PF, ">", $ourfn or die "$ourfn: $!";
430 my ($y,$l) = protocol_expect {
431 m/^data-block (.*)$/ ? (1,$1) :
432 m/^data-end$/ ? (0,) :
436 my $d = protocol_read_bytes $fh, $l;
437 print PF $d or die $!;
442 #---------- remote protocol support, responder ----------
444 sub responder_send_command ($) {
446 return unless $we_are_responder;
447 # called even without $we_are_responder
448 printdebug ">> $command\n";
449 print PO $command, "\n" or die $!;
452 sub responder_send_file ($$) {
453 my ($keyword, $ourfn) = @_;
454 return unless $we_are_responder;
455 printdebug "]] $keyword $ourfn\n";
456 responder_send_command "file $keyword";
457 protocol_send_file \*PO, $ourfn;
460 sub responder_receive_files ($@) {
461 my ($keyword, @ourfns) = @_;
462 die unless $we_are_responder;
463 printdebug "[[ $keyword @ourfns\n";
464 responder_send_command "want $keyword";
465 foreach my $fn (@ourfns) {
466 protocol_receive_file \*PI, $fn;
469 protocol_expect { m/^files-end$/ } \*PI;
472 #---------- remote protocol support, initiator ----------
474 sub initiator_expect (&) {
476 protocol_expect { &$match } \*RO;
479 #---------- end remote code ----------
482 if ($we_are_responder) {
484 responder_send_command "progress ".length($m) or die $!;
485 print PO $m or die $!;
495 $ua = LWP::UserAgent->new();
499 progress "downloading $what...";
500 my $r = $ua->get(@_) or die $!;
501 return undef if $r->code == 404;
502 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
503 return $r->decoded_content(charset => 'none');
506 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
511 failedcmd @_ if system @_;
514 sub act_local () { return $dryrun_level <= 1; }
515 sub act_scary () { return !$dryrun_level; }
518 if (!$dryrun_level) {
519 progress "$us ok: @_";
521 progress "would be ok: @_ (but dry run only)";
526 printcmd(\*STDERR,$debugprefix."#",@_);
529 sub runcmd_ordryrun {
537 sub runcmd_ordryrun_local {
546 my ($first_shell, @cmd) = @_;
547 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
550 our $helpmsg = <<END;
552 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
553 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
554 dgit [dgit-opts] build [dpkg-buildpackage-opts]
555 dgit [dgit-opts] sbuild [sbuild-opts]
556 dgit [dgit-opts] push [dgit-opts] [suite]
557 dgit [dgit-opts] rpush build-host:build-dir ...
558 important dgit options:
559 -k<keyid> sign tag and package with <keyid> instead of default
560 --dry-run -n do not change anything, but go through the motions
561 --damp-run -L like --dry-run but make local changes, without signing
562 --new -N allow introducing a new package
563 --debug -D increase debug level
564 -c<name>=<value> set git config option (used directly by dgit too)
567 our $later_warning_msg = <<END;
568 Perhaps the upload is stuck in incoming. Using the version from git.
572 print STDERR "$us: @_\n", $helpmsg or die $!;
577 @ARGV or badusage "too few arguments";
578 return scalar shift @ARGV;
582 print $helpmsg or die $!;
586 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
588 our %defcfg = ('dgit.default.distro' => 'debian',
589 'dgit-suite.*-security.distro' => 'debian-security',
590 'dgit.default.username' => '',
591 'dgit.default.archive-query-default-component' => 'main',
592 'dgit.default.ssh' => 'ssh',
593 'dgit.default.archive-query' => 'madison:',
594 'dgit.default.sshpsql-dbname' => 'service=projectb',
595 'dgit.default.aptget-components' => 'main',
596 'dgit.default.dgit-tag-format' => 'new,old,maint',
597 # old means "repo server accepts pushes with old dgit tags"
598 # new means "repo server accepts pushes with new dgit tags"
599 # maint means "repo server accepts split brain pushes"
600 # hist means "repo server may have old pushes without new tag"
601 # ("hist" is implied by "old")
602 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
603 'dgit-distro.debian.git-check' => 'url',
604 'dgit-distro.debian.git-check-suffix' => '/info/refs',
605 'dgit-distro.debian.new-private-pushers' => 't',
606 'dgit-distro.debian/push.git-url' => '',
607 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
608 'dgit-distro.debian/push.git-user-force' => 'dgit',
609 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
610 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
611 'dgit-distro.debian/push.git-create' => 'true',
612 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
613 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
614 # 'dgit-distro.debian.archive-query-tls-key',
615 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
616 # ^ this does not work because curl is broken nowadays
617 # Fixing #790093 properly will involve providing providing the key
618 # in some pacagke and maybe updating these paths.
620 # 'dgit-distro.debian.archive-query-tls-curl-args',
621 # '--ca-path=/etc/ssl/ca-debian',
622 # ^ this is a workaround but works (only) on DSA-administered machines
623 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
624 'dgit-distro.debian.git-url-suffix' => '',
625 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
626 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
627 'dgit-distro.debian-security.archive-query' => 'aptget:',
628 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
629 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
630 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
631 'dgit-distro.debian-security.nominal-distro' => 'debian',
632 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
633 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
634 'dgit-distro.ubuntu.git-check' => 'false',
635 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
636 'dgit-distro.test-dummy.ssh' => "$td/ssh",
637 'dgit-distro.test-dummy.username' => "alice",
638 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
639 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
640 'dgit-distro.test-dummy.git-url' => "$td/git",
641 'dgit-distro.test-dummy.git-host' => "git",
642 'dgit-distro.test-dummy.git-path' => "$td/git",
643 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
644 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
645 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
646 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
650 our @gitcfgsources = qw(cmdline local global system);
652 sub git_slurp_config () {
653 local ($debuglevel) = $debuglevel-2;
656 # This algoritm is a bit subtle, but this is needed so that for
657 # options which we want to be single-valued, we allow the
658 # different config sources to override properly. See #835858.
659 foreach my $src (@gitcfgsources) {
660 next if $src eq 'cmdline';
661 # we do this ourselves since git doesn't handle it
663 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
666 open GITS, "-|", @cmd or die $!;
669 printdebug "=> ", (messagequote $_), "\n";
671 push @{ $gitcfgs{$src}{$`} }, $'; #';
675 or ($!==0 && $?==256)
680 sub git_get_config ($) {
682 foreach my $src (@gitcfgsources) {
683 my $l = $gitcfgs{$src}{$c};
684 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
687 @$l==1 or badcfg "multiple values for $c".
688 " (in $src git config)" if @$l > 1;
696 return undef if $c =~ /RETURN-UNDEF/;
697 my $v = git_get_config($c);
698 return $v if defined $v;
699 my $dv = $defcfg{$c};
700 return $dv if defined $dv;
702 badcfg "need value for one of: @_\n".
703 "$us: distro or suite appears not to be (properly) supported";
706 sub access_basedistro () {
707 if (defined $idistro) {
710 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
711 return $def if defined $def;
712 foreach my $src (@gitcfgsources, 'internal') {
713 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
715 foreach my $k (keys %$kl) {
716 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
718 next unless match_glob $dpat, $isuite;
722 return cfg("dgit.default.distro");
726 sub access_nomdistro () {
727 my $base = access_basedistro();
728 return cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
731 sub access_quirk () {
732 # returns (quirk name, distro to use instead or undef, quirk-specific info)
733 my $basedistro = access_basedistro();
734 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
736 if (defined $backports_quirk) {
737 my $re = $backports_quirk;
738 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
740 $re =~ s/\%/([-0-9a-z_]+)/
741 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
742 if ($isuite =~ m/^$re$/) {
743 return ('backports',"$basedistro-backports",$1);
746 return ('none',undef);
751 sub parse_cfg_bool ($$$) {
752 my ($what,$def,$v) = @_;
755 $v =~ m/^[ty1]/ ? 1 :
756 $v =~ m/^[fn0]/ ? 0 :
757 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
760 sub access_forpush_config () {
761 my $d = access_basedistro();
765 parse_cfg_bool('new-private-pushers', 0,
766 cfg("dgit-distro.$d.new-private-pushers",
769 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
772 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
773 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
774 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
775 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
778 sub access_forpush () {
779 $access_forpush //= access_forpush_config();
780 return $access_forpush;
784 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
785 badcfg "pushing but distro is configured readonly"
786 if access_forpush_config() eq '0';
788 $supplementary_message = <<'END' unless $we_are_responder;
789 Push failed, before we got started.
790 You can retry the push, after fixing the problem, if you like.
792 finalise_opts_opts();
796 finalise_opts_opts();
799 sub supplementary_message ($) {
801 if (!$we_are_responder) {
802 $supplementary_message = $msg;
804 } elsif ($protovsn >= 3) {
805 responder_send_command "supplementary-message ".length($msg)
807 print PO $msg or die $!;
811 sub access_distros () {
812 # Returns list of distros to try, in order
815 # 0. `instead of' distro name(s) we have been pointed to
816 # 1. the access_quirk distro, if any
817 # 2a. the user's specified distro, or failing that } basedistro
818 # 2b. the distro calculated from the suite }
819 my @l = access_basedistro();
821 my (undef,$quirkdistro) = access_quirk();
822 unshift @l, $quirkdistro;
823 unshift @l, $instead_distro;
824 @l = grep { defined } @l;
826 push @l, access_nomdistro();
828 if (access_forpush()) {
829 @l = map { ("$_/push", $_) } @l;
834 sub access_cfg_cfgs (@) {
837 # The nesting of these loops determines the search order. We put
838 # the key loop on the outside so that we search all the distros
839 # for each key, before going on to the next key. That means that
840 # if access_cfg is called with a more specific, and then a less
841 # specific, key, an earlier distro can override the less specific
842 # without necessarily overriding any more specific keys. (If the
843 # distro wants to override the more specific keys it can simply do
844 # so; whereas if we did the loop the other way around, it would be
845 # impossible to for an earlier distro to override a less specific
846 # key but not the more specific ones without restating the unknown
847 # values of the more specific keys.
850 # We have to deal with RETURN-UNDEF specially, so that we don't
851 # terminate the search prematurely.
853 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
856 foreach my $d (access_distros()) {
857 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
859 push @cfgs, map { "dgit.default.$_" } @realkeys;
866 my (@cfgs) = access_cfg_cfgs(@keys);
867 my $value = cfg(@cfgs);
871 sub access_cfg_bool ($$) {
872 my ($def, @keys) = @_;
873 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
876 sub string_to_ssh ($) {
878 if ($spec =~ m/\s/) {
879 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
885 sub access_cfg_ssh () {
886 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
887 if (!defined $gitssh) {
890 return string_to_ssh $gitssh;
894 sub access_runeinfo ($) {
896 return ": dgit ".access_basedistro()." $info ;";
899 sub access_someuserhost ($) {
901 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
902 defined($user) && length($user) or
903 $user = access_cfg("$some-user",'username');
904 my $host = access_cfg("$some-host");
905 return length($user) ? "$user\@$host" : $host;
908 sub access_gituserhost () {
909 return access_someuserhost('git');
912 sub access_giturl (;$) {
914 my $url = access_cfg('git-url','RETURN-UNDEF');
917 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
918 return undef unless defined $proto;
921 access_gituserhost().
922 access_cfg('git-path');
924 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
927 return "$url/$package$suffix";
930 sub parsecontrolfh ($$;$) {
931 my ($fh, $desc, $allowsigned) = @_;
932 our $dpkgcontrolhash_noissigned;
935 my %opts = ('name' => $desc);
936 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
937 $c = Dpkg::Control::Hash->new(%opts);
938 $c->parse($fh,$desc) or die "parsing of $desc failed";
939 last if $allowsigned;
940 last if $dpkgcontrolhash_noissigned;
941 my $issigned= $c->get_option('is_pgp_signed');
942 if (!defined $issigned) {
943 $dpkgcontrolhash_noissigned= 1;
944 seek $fh, 0,0 or die "seek $desc: $!";
945 } elsif ($issigned) {
946 fail "control file $desc is (already) PGP-signed. ".
947 " Note that dgit push needs to modify the .dsc and then".
948 " do the signature itself";
957 my ($file, $desc, $allowsigned) = @_;
958 my $fh = new IO::Handle;
959 open $fh, '<', $file or die "$file: $!";
960 my $c = parsecontrolfh($fh,$desc,$allowsigned);
961 $fh->error and die $!;
967 my ($dctrl,$field) = @_;
968 my $v = $dctrl->{$field};
969 return $v if defined $v;
970 fail "missing field $field in ".$dctrl->get_option('name');
974 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
975 my $p = new IO::Handle;
976 my @cmd = (qw(dpkg-parsechangelog), @_);
977 open $p, '-|', @cmd or die $!;
979 $?=0; $!=0; close $p or failedcmd @cmd;
983 sub commit_getclogp ($) {
984 # Returns the parsed changelog hashref for a particular commit
986 our %commit_getclogp_memo;
987 my $memo = $commit_getclogp_memo{$objid};
988 return $memo if $memo;
990 my $mclog = ".git/dgit/clog-$objid";
991 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
992 "$objid:debian/changelog";
993 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
998 defined $d or fail "getcwd failed: $!";
1002 sub parse_dscdata () {
1003 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1004 printdebug Dumper($dscdata) if $debuglevel>1;
1005 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1006 printdebug Dumper($dsc) if $debuglevel>1;
1011 sub archive_query ($;@) {
1012 my ($method) = shift @_;
1013 fail "this operation does not support multiple comma-separated suites"
1015 my $query = access_cfg('archive-query','RETURN-UNDEF');
1016 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1019 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1022 sub archive_query_prepend_mirror {
1023 my $m = access_cfg('mirror');
1024 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1027 sub pool_dsc_subpath ($$) {
1028 my ($vsn,$component) = @_; # $package is implict arg
1029 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1030 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1033 sub cfg_apply_map ($$$) {
1034 my ($varref, $what, $mapspec) = @_;
1035 return unless $mapspec;
1037 printdebug "config $what EVAL{ $mapspec; }\n";
1039 eval "package Dgit::Config; $mapspec;";
1044 #---------- `ftpmasterapi' archive query method (nascent) ----------
1046 sub archive_api_query_cmd ($) {
1048 my @cmd = (@curl, qw(-sS));
1049 my $url = access_cfg('archive-query-url');
1050 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1052 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1053 foreach my $key (split /\:/, $keys) {
1054 $key =~ s/\%HOST\%/$host/g;
1056 fail "for $url: stat $key: $!" unless $!==ENOENT;
1059 fail "config requested specific TLS key but do not know".
1060 " how to get curl to use exactly that EE key ($key)";
1061 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1062 # # Sadly the above line does not work because of changes
1063 # # to gnutls. The real fix for #790093 may involve
1064 # # new curl options.
1067 # Fixing #790093 properly will involve providing a value
1068 # for this on clients.
1069 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1070 push @cmd, split / /, $kargs if defined $kargs;
1072 push @cmd, $url.$subpath;
1076 sub api_query ($$;$) {
1078 my ($data, $subpath, $ok404) = @_;
1079 badcfg "ftpmasterapi archive query method takes no data part"
1081 my @cmd = archive_api_query_cmd($subpath);
1082 my $url = $cmd[$#cmd];
1083 push @cmd, qw(-w %{http_code});
1084 my $json = cmdoutput @cmd;
1085 unless ($json =~ s/\d+\d+\d$//) {
1086 failedcmd_report_cmd undef, @cmd;
1087 fail "curl failed to print 3-digit HTTP code";
1090 return undef if $code eq '404' && $ok404;
1091 fail "fetch of $url gave HTTP code $code"
1092 unless $url =~ m#^file://# or $code =~ m/^2/;
1093 return decode_json($json);
1096 sub canonicalise_suite_ftpmasterapi {
1097 my ($proto,$data) = @_;
1098 my $suites = api_query($data, 'suites');
1100 foreach my $entry (@$suites) {
1102 my $v = $entry->{$_};
1103 defined $v && $v eq $isuite;
1104 } qw(codename name);
1105 push @matched, $entry;
1107 fail "unknown suite $isuite" unless @matched;
1110 @matched==1 or die "multiple matches for suite $isuite\n";
1111 $cn = "$matched[0]{codename}";
1112 defined $cn or die "suite $isuite info has no codename\n";
1113 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1115 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1120 sub archive_query_ftpmasterapi {
1121 my ($proto,$data) = @_;
1122 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1124 my $digester = Digest::SHA->new(256);
1125 foreach my $entry (@$info) {
1127 my $vsn = "$entry->{version}";
1128 my ($ok,$msg) = version_check $vsn;
1129 die "bad version: $msg\n" unless $ok;
1130 my $component = "$entry->{component}";
1131 $component =~ m/^$component_re$/ or die "bad component";
1132 my $filename = "$entry->{filename}";
1133 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1134 or die "bad filename";
1135 my $sha256sum = "$entry->{sha256sum}";
1136 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1137 push @rows, [ $vsn, "/pool/$component/$filename",
1138 $digester, $sha256sum ];
1140 die "bad ftpmaster api response: $@\n".Dumper($entry)
1143 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1144 return archive_query_prepend_mirror @rows;
1147 sub file_in_archive_ftpmasterapi {
1148 my ($proto,$data,$filename) = @_;
1149 my $pat = $filename;
1152 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1153 my $info = api_query($data, "file_in_archive/$pat", 1);
1156 #---------- `aptget' archive query method ----------
1159 our $aptget_releasefile;
1160 our $aptget_configpath;
1162 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1163 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1165 sub aptget_cache_clean {
1166 runcmd_ordryrun_local qw(sh -ec),
1167 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1171 sub aptget_lock_acquire () {
1172 my $lockfile = "$aptget_base/lock";
1173 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1174 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1177 sub aptget_prep ($) {
1179 return if defined $aptget_base;
1181 badcfg "aptget archive query method takes no data part"
1184 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1187 ensuredir "$cache/dgit";
1189 access_cfg('aptget-cachekey','RETURN-UNDEF')
1190 // access_nomdistro();
1192 $aptget_base = "$cache/dgit/aptget";
1193 ensuredir $aptget_base;
1195 my $quoted_base = $aptget_base;
1196 die "$quoted_base contains bad chars, cannot continue"
1197 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1199 ensuredir $aptget_base;
1201 aptget_lock_acquire();
1203 aptget_cache_clean();
1205 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1206 my $sourceslist = "source.list#$cachekey";
1208 my $aptsuites = $isuite;
1209 cfg_apply_map(\$aptsuites, 'suite map',
1210 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1212 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1213 printf SRCS "deb-src %s %s %s\n",
1214 access_cfg('mirror'),
1216 access_cfg('aptget-components')
1219 ensuredir "$aptget_base/cache";
1220 ensuredir "$aptget_base/lists";
1222 open CONF, ">", $aptget_configpath or die $!;
1224 Debug::NoLocking "true";
1225 APT::Get::List-Cleanup "false";
1226 #clear APT::Update::Post-Invoke-Success;
1227 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1228 Dir::State::Lists "$quoted_base/lists";
1229 Dir::Etc::preferences "$quoted_base/preferences";
1230 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1231 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1234 foreach my $key (qw(
1237 Dir::Cache::Archives
1238 Dir::Etc::SourceParts
1239 Dir::Etc::preferencesparts
1241 ensuredir "$aptget_base/$key";
1242 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1245 my $oldatime = (time // die $!) - 1;
1246 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1247 next unless stat_exists $oldlist;
1248 my ($mtime) = (stat _)[9];
1249 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1252 runcmd_ordryrun_local aptget_aptget(), qw(update);
1255 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1256 next unless stat_exists $oldlist;
1257 my ($atime) = (stat _)[8];
1258 next if $atime == $oldatime;
1259 push @releasefiles, $oldlist;
1261 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1262 @releasefiles = @inreleasefiles if @inreleasefiles;
1263 die "apt updated wrong number of Release files (@releasefiles), erk"
1264 unless @releasefiles == 1;
1266 ($aptget_releasefile) = @releasefiles;
1269 sub canonicalise_suite_aptget {
1270 my ($proto,$data) = @_;
1273 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1275 foreach my $name (qw(Codename Suite)) {
1276 my $val = $release->{$name};
1278 printdebug "release file $name: $val\n";
1279 $val =~ m/^$suite_re$/o or fail
1280 "Release file ($aptget_releasefile) specifies intolerable $name";
1281 cfg_apply_map(\$val, 'suite rmap',
1282 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1289 sub archive_query_aptget {
1290 my ($proto,$data) = @_;
1293 ensuredir "$aptget_base/source";
1294 foreach my $old (<$aptget_base/source/*.dsc>) {
1295 unlink $old or die "$old: $!";
1298 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1299 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1300 # avoids apt-get source failing with ambiguous error code
1302 runcmd_ordryrun_local
1303 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1304 aptget_aptget(), qw(--download-only --only-source source), $package;
1306 my @dscs = <$aptget_base/source/*.dsc>;
1307 fail "apt-get source did not produce a .dsc" unless @dscs;
1308 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1310 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1313 my $uri = "file://". uri_escape $dscs[0];
1314 $uri =~ s{\%2f}{/}gi;
1315 return [ (getfield $pre_dsc, 'Version'), $uri ];
1318 #---------- `dummyapicat' archive query method ----------
1320 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1321 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1323 sub file_in_archive_dummycatapi ($$$) {
1324 my ($proto,$data,$filename) = @_;
1325 my $mirror = access_cfg('mirror');
1326 $mirror =~ s#^file://#/# or die "$mirror ?";
1328 my @cmd = (qw(sh -ec), '
1330 find -name "$2" -print0 |
1332 ', qw(x), $mirror, $filename);
1333 debugcmd "-|", @cmd;
1334 open FIA, "-|", @cmd or die $!;
1337 printdebug "| $_\n";
1338 m/^(\w+) (\S+)$/ or die "$_ ?";
1339 push @out, { sha256sum => $1, filename => $2 };
1341 close FIA or die failedcmd @cmd;
1345 #---------- `madison' archive query method ----------
1347 sub archive_query_madison {
1348 return archive_query_prepend_mirror
1349 map { [ @$_[0..1] ] } madison_get_parse(@_);
1352 sub madison_get_parse {
1353 my ($proto,$data) = @_;
1354 die unless $proto eq 'madison';
1355 if (!length $data) {
1356 $data= access_cfg('madison-distro','RETURN-UNDEF');
1357 $data //= access_basedistro();
1359 $rmad{$proto,$data,$package} ||= cmdoutput
1360 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1361 my $rmad = $rmad{$proto,$data,$package};
1364 foreach my $l (split /\n/, $rmad) {
1365 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1366 \s*( [^ \t|]+ )\s* \|
1367 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1368 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1369 $1 eq $package or die "$rmad $package ?";
1376 $component = access_cfg('archive-query-default-component');
1378 $5 eq 'source' or die "$rmad ?";
1379 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1381 return sort { -version_compare($a->[0],$b->[0]); } @out;
1384 sub canonicalise_suite_madison {
1385 # madison canonicalises for us
1386 my @r = madison_get_parse(@_);
1388 "unable to canonicalise suite using package $package".
1389 " which does not appear to exist in suite $isuite;".
1390 " --existing-package may help";
1394 sub file_in_archive_madison { return undef; }
1396 #---------- `sshpsql' archive query method ----------
1399 my ($data,$runeinfo,$sql) = @_;
1400 if (!length $data) {
1401 $data= access_someuserhost('sshpsql').':'.
1402 access_cfg('sshpsql-dbname');
1404 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1405 my ($userhost,$dbname) = ($`,$'); #';
1407 my @cmd = (access_cfg_ssh, $userhost,
1408 access_runeinfo("ssh-psql $runeinfo").
1409 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1410 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1412 open P, "-|", @cmd or die $!;
1415 printdebug(">|$_|\n");
1418 $!=0; $?=0; close P or failedcmd @cmd;
1420 my $nrows = pop @rows;
1421 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1422 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1423 @rows = map { [ split /\|/, $_ ] } @rows;
1424 my $ncols = scalar @{ shift @rows };
1425 die if grep { scalar @$_ != $ncols } @rows;
1429 sub sql_injection_check {
1430 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1433 sub archive_query_sshpsql ($$) {
1434 my ($proto,$data) = @_;
1435 sql_injection_check $isuite, $package;
1436 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1437 SELECT source.version, component.name, files.filename, files.sha256sum
1439 JOIN src_associations ON source.id = src_associations.source
1440 JOIN suite ON suite.id = src_associations.suite
1441 JOIN dsc_files ON dsc_files.source = source.id
1442 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1443 JOIN component ON component.id = files_archive_map.component_id
1444 JOIN files ON files.id = dsc_files.file
1445 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1446 AND source.source='$package'
1447 AND files.filename LIKE '%.dsc';
1449 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1450 my $digester = Digest::SHA->new(256);
1452 my ($vsn,$component,$filename,$sha256sum) = @$_;
1453 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1455 return archive_query_prepend_mirror @rows;
1458 sub canonicalise_suite_sshpsql ($$) {
1459 my ($proto,$data) = @_;
1460 sql_injection_check $isuite;
1461 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1462 SELECT suite.codename
1463 FROM suite where suite_name='$isuite' or codename='$isuite';
1465 @rows = map { $_->[0] } @rows;
1466 fail "unknown suite $isuite" unless @rows;
1467 die "ambiguous $isuite: @rows ?" if @rows>1;
1471 sub file_in_archive_sshpsql ($$$) { return undef; }
1473 #---------- `dummycat' archive query method ----------
1475 sub canonicalise_suite_dummycat ($$) {
1476 my ($proto,$data) = @_;
1477 my $dpath = "$data/suite.$isuite";
1478 if (!open C, "<", $dpath) {
1479 $!==ENOENT or die "$dpath: $!";
1480 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1484 chomp or die "$dpath: $!";
1486 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1490 sub archive_query_dummycat ($$) {
1491 my ($proto,$data) = @_;
1492 canonicalise_suite();
1493 my $dpath = "$data/package.$csuite.$package";
1494 if (!open C, "<", $dpath) {
1495 $!==ENOENT or die "$dpath: $!";
1496 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1504 printdebug "dummycat query $csuite $package $dpath | $_\n";
1505 my @row = split /\s+/, $_;
1506 @row==2 or die "$dpath: $_ ?";
1509 C->error and die "$dpath: $!";
1511 return archive_query_prepend_mirror
1512 sort { -version_compare($a->[0],$b->[0]); } @rows;
1515 sub file_in_archive_dummycat () { return undef; }
1517 #---------- tag format handling ----------
1519 sub access_cfg_tagformats () {
1520 split /\,/, access_cfg('dgit-tag-format');
1523 sub need_tagformat ($$) {
1524 my ($fmt, $why) = @_;
1525 fail "need to use tag format $fmt ($why) but also need".
1526 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1527 " - no way to proceed"
1528 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1529 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1532 sub select_tagformat () {
1534 return if $tagformatfn && !$tagformat_want;
1535 die 'bug' if $tagformatfn && $tagformat_want;
1536 # ... $tagformat_want assigned after previous select_tagformat
1538 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1539 printdebug "select_tagformat supported @supported\n";
1541 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1542 printdebug "select_tagformat specified @$tagformat_want\n";
1544 my ($fmt,$why,$override) = @$tagformat_want;
1546 fail "target distro supports tag formats @supported".
1547 " but have to use $fmt ($why)"
1549 or grep { $_ eq $fmt } @supported;
1551 $tagformat_want = undef;
1553 $tagformatfn = ${*::}{"debiantag_$fmt"};
1555 fail "trying to use unknown tag format \`$fmt' ($why) !"
1556 unless $tagformatfn;
1559 #---------- archive query entrypoints and rest of program ----------
1561 sub canonicalise_suite () {
1562 return if defined $csuite;
1563 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1564 $csuite = archive_query('canonicalise_suite');
1565 if ($isuite ne $csuite) {
1566 progress "canonical suite name for $isuite is $csuite";
1568 progress "canonical suite name is $csuite";
1572 sub get_archive_dsc () {
1573 canonicalise_suite();
1574 my @vsns = archive_query('archive_query');
1575 foreach my $vinfo (@vsns) {
1576 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1577 $dscurl = $vsn_dscurl;
1578 $dscdata = url_get($dscurl);
1580 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1585 $digester->add($dscdata);
1586 my $got = $digester->hexdigest();
1588 fail "$dscurl has hash $got but".
1589 " archive told us to expect $digest";
1592 my $fmt = getfield $dsc, 'Format';
1593 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1594 "unsupported source format $fmt, sorry";
1596 $dsc_checked = !!$digester;
1597 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1601 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1604 sub check_for_git ();
1605 sub check_for_git () {
1607 my $how = access_cfg('git-check');
1608 if ($how eq 'ssh-cmd') {
1610 (access_cfg_ssh, access_gituserhost(),
1611 access_runeinfo("git-check $package").
1612 " set -e; cd ".access_cfg('git-path').";".
1613 " if test -d $package.git; then echo 1; else echo 0; fi");
1614 my $r= cmdoutput @cmd;
1615 if (defined $r and $r =~ m/^divert (\w+)$/) {
1617 my ($usedistro,) = access_distros();
1618 # NB that if we are pushing, $usedistro will be $distro/push
1619 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1620 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1621 progress "diverting to $divert (using config for $instead_distro)";
1622 return check_for_git();
1624 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1626 } elsif ($how eq 'url') {
1627 my $prefix = access_cfg('git-check-url','git-url');
1628 my $suffix = access_cfg('git-check-suffix','git-suffix',
1629 'RETURN-UNDEF') // '.git';
1630 my $url = "$prefix/$package$suffix";
1631 my @cmd = (@curl, qw(-sS -I), $url);
1632 my $result = cmdoutput @cmd;
1633 $result =~ s/^\S+ 200 .*\n\r?\n//;
1634 # curl -sS -I with https_proxy prints
1635 # HTTP/1.0 200 Connection established
1636 $result =~ m/^\S+ (404|200) /s or
1637 fail "unexpected results from git check query - ".
1638 Dumper($prefix, $result);
1640 if ($code eq '404') {
1642 } elsif ($code eq '200') {
1647 } elsif ($how eq 'true') {
1649 } elsif ($how eq 'false') {
1652 badcfg "unknown git-check \`$how'";
1656 sub create_remote_git_repo () {
1657 my $how = access_cfg('git-create');
1658 if ($how eq 'ssh-cmd') {
1660 (access_cfg_ssh, access_gituserhost(),
1661 access_runeinfo("git-create $package").
1662 "set -e; cd ".access_cfg('git-path').";".
1663 " cp -a _template $package.git");
1664 } elsif ($how eq 'true') {
1667 badcfg "unknown git-create \`$how'";
1671 our ($dsc_hash,$lastpush_mergeinput);
1673 our $ud = '.git/dgit/unpack';
1683 sub mktree_in_ud_here () {
1684 runcmd qw(git init -q);
1685 runcmd qw(git config gc.auto 0);
1686 rmtree('.git/objects');
1687 symlink '../../../../objects','.git/objects' or die $!;
1690 sub git_write_tree () {
1691 my $tree = cmdoutput @git, qw(write-tree);
1692 $tree =~ m/^\w+$/ or die "$tree ?";
1696 sub git_add_write_tree () {
1697 runcmd @git, qw(add -Af .);
1698 return git_write_tree();
1701 sub remove_stray_gits ($) {
1703 my @gitscmd = qw(find -name .git -prune -print0);
1704 debugcmd "|",@gitscmd;
1705 open GITS, "-|", @gitscmd or die $!;
1710 print STDERR "$us: warning: removing from $what: ",
1711 (messagequote $_), "\n";
1715 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1718 sub mktree_in_ud_from_only_subdir ($;$) {
1719 my ($what,$raw) = @_;
1721 # changes into the subdir
1723 die "expected one subdir but found @dirs ?" unless @dirs==1;
1724 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1728 remove_stray_gits($what);
1729 mktree_in_ud_here();
1731 my ($format, $fopts) = get_source_format();
1732 if (madformat($format)) {
1737 my $tree=git_add_write_tree();
1738 return ($tree,$dir);
1741 our @files_csum_info_fields =
1742 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1743 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1744 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1746 sub dsc_files_info () {
1747 foreach my $csumi (@files_csum_info_fields) {
1748 my ($fname, $module, $method) = @$csumi;
1749 my $field = $dsc->{$fname};
1750 next unless defined $field;
1751 eval "use $module; 1;" or die $@;
1753 foreach (split /\n/, $field) {
1755 m/^(\w+) (\d+) (\S+)$/ or
1756 fail "could not parse .dsc $fname line \`$_'";
1757 my $digester = eval "$module"."->$method;" or die $@;
1762 Digester => $digester,
1767 fail "missing any supported Checksums-* or Files field in ".
1768 $dsc->get_option('name');
1772 map { $_->{Filename} } dsc_files_info();
1775 sub files_compare_inputs (@) {
1780 my $showinputs = sub {
1781 return join "; ", map { $_->get_option('name') } @$inputs;
1784 foreach my $in (@$inputs) {
1786 my $in_name = $in->get_option('name');
1788 printdebug "files_compare_inputs $in_name\n";
1790 foreach my $csumi (@files_csum_info_fields) {
1791 my ($fname) = @$csumi;
1792 printdebug "files_compare_inputs $in_name $fname\n";
1794 my $field = $in->{$fname};
1795 next unless defined $field;
1798 foreach (split /\n/, $field) {
1801 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1802 fail "could not parse $in_name $fname line \`$_'";
1804 printdebug "files_compare_inputs $in_name $fname $f\n";
1808 my $re = \ $record{$f}{$fname};
1810 $fchecked{$f}{$in_name} = 1;
1812 fail "hash or size of $f varies in $fname fields".
1813 " (between: ".$showinputs->().")";
1818 @files = sort @files;
1819 $expected_files //= \@files;
1820 "@$expected_files" eq "@files" or
1821 fail "file list in $in_name varies between hash fields!";
1824 fail "$in_name has no files list field(s)";
1826 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1829 grep { keys %$_ == @$inputs-1 } values %fchecked
1830 or fail "no file appears in all file lists".
1831 " (looked in: ".$showinputs->().")";
1834 sub is_orig_file_in_dsc ($$) {
1835 my ($f, $dsc_files_info) = @_;
1836 return 0 if @$dsc_files_info <= 1;
1837 # One file means no origs, and the filename doesn't have a "what
1838 # part of dsc" component. (Consider versions ending `.orig'.)
1839 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1843 sub is_orig_file_of_vsn ($$) {
1844 my ($f, $upstreamvsn) = @_;
1845 my $base = srcfn $upstreamvsn, '';
1846 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1850 sub changes_update_origs_from_dsc ($$$$) {
1851 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1853 printdebug "checking origs needed ($upstreamvsn)...\n";
1854 $_ = getfield $changes, 'Files';
1855 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1856 fail "cannot find section/priority from .changes Files field";
1857 my $placementinfo = $1;
1859 printdebug "checking origs needed placement '$placementinfo'...\n";
1860 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1861 $l =~ m/\S+$/ or next;
1863 printdebug "origs $file | $l\n";
1864 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1865 printdebug "origs $file is_orig\n";
1866 my $have = archive_query('file_in_archive', $file);
1867 if (!defined $have) {
1869 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1875 printdebug "origs $file \$#\$have=$#$have\n";
1876 foreach my $h (@$have) {
1879 foreach my $csumi (@files_csum_info_fields) {
1880 my ($fname, $module, $method, $archivefield) = @$csumi;
1881 next unless defined $h->{$archivefield};
1882 $_ = $dsc->{$fname};
1883 next unless defined;
1884 m/^(\w+) .* \Q$file\E$/m or
1885 fail ".dsc $fname missing entry for $file";
1886 if ($h->{$archivefield} eq $1) {
1890 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1893 die "$file ".Dumper($h)." ?!" if $same && @differ;
1896 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1899 printdebug "origs $file f.same=$found_same".
1900 " #f._differ=$#found_differ\n";
1901 if (@found_differ && !$found_same) {
1903 "archive contains $file with different checksum",
1906 # Now we edit the changes file to add or remove it
1907 foreach my $csumi (@files_csum_info_fields) {
1908 my ($fname, $module, $method, $archivefield) = @$csumi;
1909 next unless defined $changes->{$fname};
1911 # in archive, delete from .changes if it's there
1912 $changed{$file} = "removed" if
1913 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1914 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1915 # not in archive, but it's here in the .changes
1917 my $dsc_data = getfield $dsc, $fname;
1918 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1920 $extra =~ s/ \d+ /$&$placementinfo /
1921 or die "$fname $extra >$dsc_data< ?"
1922 if $fname eq 'Files';
1923 $changes->{$fname} .= "\n". $extra;
1924 $changed{$file} = "added";
1929 foreach my $file (keys %changed) {
1931 "edited .changes for archive .orig contents: %s %s",
1932 $changed{$file}, $file;
1934 my $chtmp = "$changesfile.tmp";
1935 $changes->save($chtmp);
1937 rename $chtmp,$changesfile or die "$changesfile $!";
1939 progress "[new .changes left in $changesfile]";
1942 progress "$changesfile already has appropriate .orig(s) (if any)";
1946 sub make_commit ($) {
1948 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1951 sub make_commit_text ($) {
1954 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1956 print Dumper($text) if $debuglevel > 1;
1957 my $child = open2($out, $in, @cmd) or die $!;
1960 print $in $text or die $!;
1961 close $in or die $!;
1963 $h =~ m/^\w+$/ or die;
1965 printdebug "=> $h\n";
1968 waitpid $child, 0 == $child or die "$child $!";
1969 $? and failedcmd @cmd;
1973 sub clogp_authline ($) {
1975 my $author = getfield $clogp, 'Maintainer';
1976 $author =~ s#,.*##ms;
1977 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1978 my $authline = "$author $date";
1979 $authline =~ m/$git_authline_re/o or
1980 fail "unexpected commit author line format \`$authline'".
1981 " (was generated from changelog Maintainer field)";
1982 return ($1,$2,$3) if wantarray;
1986 sub vendor_patches_distro ($$) {
1987 my ($checkdistro, $what) = @_;
1988 return unless defined $checkdistro;
1990 my $series = "debian/patches/\L$checkdistro\E.series";
1991 printdebug "checking for vendor-specific $series ($what)\n";
1993 if (!open SERIES, "<", $series) {
1994 die "$series $!" unless $!==ENOENT;
2003 Unfortunately, this source package uses a feature of dpkg-source where
2004 the same source package unpacks to different source code on different
2005 distros. dgit cannot safely operate on such packages on affected
2006 distros, because the meaning of source packages is not stable.
2008 Please ask the distro/maintainer to remove the distro-specific series
2009 files and use a different technique (if necessary, uploading actually
2010 different packages, if different distros are supposed to have
2014 fail "Found active distro-specific series file for".
2015 " $checkdistro ($what): $series, cannot continue";
2017 die "$series $!" if SERIES->error;
2021 sub check_for_vendor_patches () {
2022 # This dpkg-source feature doesn't seem to be documented anywhere!
2023 # But it can be found in the changelog (reformatted):
2025 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2026 # Author: Raphael Hertzog <hertzog@debian.org>
2027 # Date: Sun Oct 3 09:36:48 2010 +0200
2029 # dpkg-source: correctly create .pc/.quilt_series with alternate
2032 # If you have debian/patches/ubuntu.series and you were
2033 # unpacking the source package on ubuntu, quilt was still
2034 # directed to debian/patches/series instead of
2035 # debian/patches/ubuntu.series.
2037 # debian/changelog | 3 +++
2038 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2039 # 2 files changed, 6 insertions(+), 1 deletion(-)
2042 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2043 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2044 "Dpkg::Vendor \`current vendor'");
2045 vendor_patches_distro(access_basedistro(),
2046 "(base) distro being accessed");
2047 vendor_patches_distro(access_nomdistro(),
2048 "(nominal) distro being accessed");
2051 sub generate_commits_from_dsc () {
2052 # See big comment in fetch_from_archive, below.
2053 # See also README.dsc-import.
2057 my @dfi = dsc_files_info();
2058 foreach my $fi (@dfi) {
2059 my $f = $fi->{Filename};
2060 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2062 printdebug "considering linking $f: ";
2064 link_ltarget "../../../../$f", $f
2065 or ((printdebug "($!) "), 0)
2069 printdebug "linked.\n";
2071 complete_file_from_dsc('.', $fi)
2074 if (is_orig_file_in_dsc($f, \@dfi)) {
2075 link $f, "../../../../$f"
2081 # We unpack and record the orig tarballs first, so that we only
2082 # need disk space for one private copy of the unpacked source.
2083 # But we can't make them into commits until we have the metadata
2084 # from the debian/changelog, so we record the tree objects now and
2085 # make them into commits later.
2087 my $upstreamv = upstreamversion $dsc->{version};
2088 my $orig_f_base = srcfn $upstreamv, '';
2090 foreach my $fi (@dfi) {
2091 # We actually import, and record as a commit, every tarball
2092 # (unless there is only one file, in which case there seems
2095 my $f = $fi->{Filename};
2096 printdebug "import considering $f ";
2097 (printdebug "only one dfi\n"), next if @dfi == 1;
2098 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2099 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2103 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2105 printdebug "Y ", (join ' ', map { $_//"(none)" }
2106 $compr_ext, $orig_f_part
2109 my $input = new IO::File $f, '<' or die "$f $!";
2113 if (defined $compr_ext) {
2115 Dpkg::Compression::compression_guess_from_filename $f;
2116 fail "Dpkg::Compression cannot handle file $f in source package"
2117 if defined $compr_ext && !defined $cname;
2119 new Dpkg::Compression::Process compression => $cname;
2120 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2121 my $compr_fh = new IO::Handle;
2122 my $compr_pid = open $compr_fh, "-|" // die $!;
2124 open STDIN, "<&", $input or die $!;
2126 die "dgit (child): exec $compr_cmd[0]: $!\n";
2131 rmtree "_unpack-tar";
2132 mkdir "_unpack-tar" or die $!;
2133 my @tarcmd = qw(tar -x -f -
2134 --no-same-owner --no-same-permissions
2135 --no-acls --no-xattrs --no-selinux);
2136 my $tar_pid = fork // die $!;
2138 chdir "_unpack-tar" or die $!;
2139 open STDIN, "<&", $input or die $!;
2141 die "dgit (child): exec $tarcmd[0]: $!";
2143 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2144 !$? or failedcmd @tarcmd;
2147 (@compr_cmd ? failedcmd @compr_cmd
2149 # finally, we have the results in "tarball", but maybe
2150 # with the wrong permissions
2152 runcmd qw(chmod -R +rwX _unpack-tar);
2153 changedir "_unpack-tar";
2154 remove_stray_gits($f);
2155 mktree_in_ud_here();
2157 my ($tree) = git_add_write_tree();
2158 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2159 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2161 printdebug "one subtree $1\n";
2163 printdebug "multiple subtrees\n";
2166 rmtree "_unpack-tar";
2168 my $ent = [ $f, $tree ];
2170 Orig => !!$orig_f_part,
2171 Sort => (!$orig_f_part ? 2 :
2172 $orig_f_part =~ m/-/g ? 1 :
2180 # put any without "_" first (spec is not clear whether files
2181 # are always in the usual order). Tarballs without "_" are
2182 # the main orig or the debian tarball.
2183 $a->{Sort} <=> $b->{Sort} or
2187 my $any_orig = grep { $_->{Orig} } @tartrees;
2189 my $dscfn = "$package.dsc";
2191 my $treeimporthow = 'package';
2193 open D, ">", $dscfn or die "$dscfn: $!";
2194 print D $dscdata or die "$dscfn: $!";
2195 close D or die "$dscfn: $!";
2196 my @cmd = qw(dpkg-source);
2197 push @cmd, '--no-check' if $dsc_checked;
2198 if (madformat $dsc->{format}) {
2199 push @cmd, '--skip-patches';
2200 $treeimporthow = 'unpatched';
2202 push @cmd, qw(-x --), $dscfn;
2205 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2206 if (madformat $dsc->{format}) {
2207 check_for_vendor_patches();
2211 if (madformat $dsc->{format}) {
2212 my @pcmd = qw(dpkg-source --before-build .);
2213 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2215 $dappliedtree = git_add_write_tree();
2218 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2219 debugcmd "|",@clogcmd;
2220 open CLOGS, "-|", @clogcmd or die $!;
2225 printdebug "import clog search...\n";
2228 my $stanzatext = do { local $/=""; <CLOGS>; };
2229 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2230 last if !defined $stanzatext;
2232 my $desc = "package changelog, entry no.$.";
2233 open my $stanzafh, "<", \$stanzatext or die;
2234 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2235 $clogp //= $thisstanza;
2237 printdebug "import clog $thisstanza->{version} $desc...\n";
2239 last if !$any_orig; # we don't need $r1clogp
2241 # We look for the first (most recent) changelog entry whose
2242 # version number is lower than the upstream version of this
2243 # package. Then the last (least recent) previous changelog
2244 # entry is treated as the one which introduced this upstream
2245 # version and used for the synthetic commits for the upstream
2248 # One might think that a more sophisticated algorithm would be
2249 # necessary. But: we do not want to scan the whole changelog
2250 # file. Stopping when we see an earlier version, which
2251 # necessarily then is an earlier upstream version, is the only
2252 # realistic way to do that. Then, either the earliest
2253 # changelog entry we have seen so far is indeed the earliest
2254 # upload of this upstream version; or there are only changelog
2255 # entries relating to later upstream versions (which is not
2256 # possible unless the changelog and .dsc disagree about the
2257 # version). Then it remains to choose between the physically
2258 # last entry in the file, and the one with the lowest version
2259 # number. If these are not the same, we guess that the
2260 # versions were created in a non-monotic order rather than
2261 # that the changelog entries have been misordered.
2263 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2265 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2266 $r1clogp = $thisstanza;
2268 printdebug "import clog $r1clogp->{version} becomes r1\n";
2270 die $! if CLOGS->error;
2271 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2273 $clogp or fail "package changelog has no entries!";
2275 my $authline = clogp_authline $clogp;
2276 my $changes = getfield $clogp, 'Changes';
2277 my $cversion = getfield $clogp, 'Version';
2280 $r1clogp //= $clogp; # maybe there's only one entry;
2281 my $r1authline = clogp_authline $r1clogp;
2282 # Strictly, r1authline might now be wrong if it's going to be
2283 # unused because !$any_orig. Whatever.
2285 printdebug "import tartrees authline $authline\n";
2286 printdebug "import tartrees r1authline $r1authline\n";
2288 foreach my $tt (@tartrees) {
2289 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2291 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2294 committer $r1authline
2298 [dgit import orig $tt->{F}]
2306 [dgit import tarball $package $cversion $tt->{F}]
2311 printdebug "import main commit\n";
2313 open C, ">../commit.tmp" or die $!;
2314 print C <<END or die $!;
2317 print C <<END or die $! foreach @tartrees;
2320 print C <<END or die $!;
2326 [dgit import $treeimporthow $package $cversion]
2330 my $rawimport_hash = make_commit qw(../commit.tmp);
2332 if (madformat $dsc->{format}) {
2333 printdebug "import apply patches...\n";
2335 # regularise the state of the working tree so that
2336 # the checkout of $rawimport_hash works nicely.
2337 my $dappliedcommit = make_commit_text(<<END);
2344 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2346 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2348 # We need the answers to be reproducible
2349 my @authline = clogp_authline($clogp);
2350 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2351 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2352 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2353 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2354 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2355 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2357 my $path = $ENV{PATH} or die;
2359 foreach my $use_absurd (qw(0 1)) {
2360 local $ENV{PATH} = $path;
2363 progress "warning: $@";
2364 $path = "$absurdity:$path";
2365 progress "$us: trying slow absurd-git-apply...";
2366 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2371 die "forbid absurd git-apply\n" if $use_absurd
2372 && forceing [qw(import-gitapply-no-absurd)];
2373 die "only absurd git-apply!\n" if !$use_absurd
2374 && forceing [qw(import-gitapply-absurd)];
2376 local $ENV{PATH} = $path if $use_absurd;
2378 my @showcmd = (gbp_pq, qw(import));
2379 my @realcmd = shell_cmd
2380 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2381 debugcmd "+",@realcmd;
2382 if (system @realcmd) {
2383 die +(shellquote @showcmd).
2385 failedcmd_waitstatus()."\n";
2388 my $gapplied = git_rev_parse('HEAD');
2389 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2390 $gappliedtree eq $dappliedtree or
2392 gbp-pq import and dpkg-source disagree!
2393 gbp-pq import gave commit $gapplied
2394 gbp-pq import gave tree $gappliedtree
2395 dpkg-source --before-build gave tree $dappliedtree
2397 $rawimport_hash = $gapplied;
2402 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2407 progress "synthesised git commit from .dsc $cversion";
2409 my $rawimport_mergeinput = {
2410 Commit => $rawimport_hash,
2411 Info => "Import of source package",
2413 my @output = ($rawimport_mergeinput);
2415 if ($lastpush_mergeinput) {
2416 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2417 my $oversion = getfield $oldclogp, 'Version';
2419 version_compare($oversion, $cversion);
2421 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2422 { Message => <<END, ReverseParents => 1 });
2423 Record $package ($cversion) in archive suite $csuite
2425 } elsif ($vcmp > 0) {
2426 print STDERR <<END or die $!;
2428 Version actually in archive: $cversion (older)
2429 Last version pushed with dgit: $oversion (newer or same)
2432 @output = $lastpush_mergeinput;
2434 # Same version. Use what's in the server git branch,
2435 # discarding our own import. (This could happen if the
2436 # server automatically imports all packages into git.)
2437 @output = $lastpush_mergeinput;
2440 changedir '../../../..';
2445 sub complete_file_from_dsc ($$) {
2446 our ($dstdir, $fi) = @_;
2447 # Ensures that we have, in $dir, the file $fi, with the correct
2448 # contents. (Downloading it from alongside $dscurl if necessary.)
2450 my $f = $fi->{Filename};
2451 my $tf = "$dstdir/$f";
2454 if (stat_exists $tf) {
2455 progress "using existing $f";
2457 printdebug "$tf does not exist, need to fetch\n";
2459 $furl =~ s{/[^/]+$}{};
2461 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2462 die "$f ?" if $f =~ m#/#;
2463 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2464 return 0 if !act_local();
2468 open F, "<", "$tf" or die "$tf: $!";
2469 $fi->{Digester}->reset();
2470 $fi->{Digester}->addfile(*F);
2471 F->error and die $!;
2472 my $got = $fi->{Digester}->hexdigest();
2473 $got eq $fi->{Hash} or
2474 fail "file $f has hash $got but .dsc".
2475 " demands hash $fi->{Hash} ".
2476 ($downloaded ? "(got wrong file from archive!)"
2477 : "(perhaps you should delete this file?)");
2482 sub ensure_we_have_orig () {
2483 my @dfi = dsc_files_info();
2484 foreach my $fi (@dfi) {
2485 my $f = $fi->{Filename};
2486 next unless is_orig_file_in_dsc($f, \@dfi);
2487 complete_file_from_dsc('..', $fi)
2492 sub git_fetch_us () {
2493 # Want to fetch only what we are going to use, unless
2494 # deliberately-not-ff, in which case we must fetch everything.
2496 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2498 (quiltmode_splitbrain
2499 ? (map { $_->('*',access_nomdistro) }
2500 \&debiantag_new, \&debiantag_maintview)
2501 : debiantags('*',access_nomdistro));
2502 push @specs, server_branch($csuite);
2503 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2505 # This is rather miserable:
2506 # When git fetch --prune is passed a fetchspec ending with a *,
2507 # it does a plausible thing. If there is no * then:
2508 # - it matches subpaths too, even if the supplied refspec
2509 # starts refs, and behaves completely madly if the source
2510 # has refs/refs/something. (See, for example, Debian #NNNN.)
2511 # - if there is no matching remote ref, it bombs out the whole
2513 # We want to fetch a fixed ref, and we don't know in advance
2514 # if it exists, so this is not suitable.
2516 # Our workaround is to use git ls-remote. git ls-remote has its
2517 # own qairks. Notably, it has the absurd multi-tail-matching
2518 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2519 # refs/refs/foo etc.
2521 # Also, we want an idempotent snapshot, but we have to make two
2522 # calls to the remote: one to git ls-remote and to git fetch. The
2523 # solution is use git ls-remote to obtain a target state, and
2524 # git fetch to try to generate it. If we don't manage to generate
2525 # the target state, we try again.
2527 printdebug "git_fetch_us specs @specs\n";
2529 my $specre = join '|', map {
2535 printdebug "git_fetch_us specre=$specre\n";
2536 my $wanted_rref = sub {
2538 return m/^(?:$specre)$/o;
2541 my $fetch_iteration = 0;
2544 printdebug "git_fetch_us iteration $fetch_iteration\n";
2545 if (++$fetch_iteration > 10) {
2546 fail "too many iterations trying to get sane fetch!";
2549 my @look = map { "refs/$_" } @specs;
2550 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2554 open GITLS, "-|", @lcmd or die $!;
2556 printdebug "=> ", $_;
2557 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2558 my ($objid,$rrefname) = ($1,$2);
2559 if (!$wanted_rref->($rrefname)) {
2561 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2565 $wantr{$rrefname} = $objid;
2568 close GITLS or failedcmd @lcmd;
2570 # OK, now %want is exactly what we want for refs in @specs
2572 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2573 "+refs/$_:".lrfetchrefs."/$_";
2576 printdebug "git_fetch_us fspecs @fspecs\n";
2578 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2579 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2582 %lrfetchrefs_f = ();
2585 git_for_each_ref(lrfetchrefs, sub {
2586 my ($objid,$objtype,$lrefname,$reftail) = @_;
2587 $lrfetchrefs_f{$lrefname} = $objid;
2588 $objgot{$objid} = 1;
2591 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2592 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2593 if (!exists $wantr{$rrefname}) {
2594 if ($wanted_rref->($rrefname)) {
2596 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2600 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2603 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2604 delete $lrfetchrefs_f{$lrefname};
2608 foreach my $rrefname (sort keys %wantr) {
2609 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2610 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2611 my $want = $wantr{$rrefname};
2612 next if $got eq $want;
2613 if (!defined $objgot{$want}) {
2615 warning: git ls-remote suggests we want $lrefname
2616 warning: and it should refer to $want
2617 warning: but git fetch didn't fetch that object to any relevant ref.
2618 warning: This may be due to a race with someone updating the server.
2619 warning: Will try again...
2621 next FETCH_ITERATION;
2624 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2626 runcmd_ordryrun_local @git, qw(update-ref -m),
2627 "dgit fetch git fetch fixup", $lrefname, $want;
2628 $lrfetchrefs_f{$lrefname} = $want;
2632 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2633 Dumper(\%lrfetchrefs_f);
2636 my @tagpats = debiantags('*',access_nomdistro);
2638 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2639 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2640 printdebug "currently $fullrefname=$objid\n";
2641 $here{$fullrefname} = $objid;
2643 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2644 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2645 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2646 printdebug "offered $lref=$objid\n";
2647 if (!defined $here{$lref}) {
2648 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2649 runcmd_ordryrun_local @upd;
2650 lrfetchref_used $fullrefname;
2651 } elsif ($here{$lref} eq $objid) {
2652 lrfetchref_used $fullrefname;
2655 "Not updateting $lref from $here{$lref} to $objid.\n";
2660 sub mergeinfo_getclogp ($) {
2661 # Ensures thit $mi->{Clogp} exists and returns it
2663 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2666 sub mergeinfo_version ($) {
2667 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2670 sub fetch_from_archive_record_1 ($) {
2672 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2673 'DGIT_ARCHIVE', $hash;
2674 cmdoutput @git, qw(log -n2), $hash;
2675 # ... gives git a chance to complain if our commit is malformed
2678 sub fetch_from_archive_record_2 ($) {
2680 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2684 dryrun_report @upd_cmd;
2688 sub fetch_from_archive () {
2689 ensure_setup_existing_tree();
2691 # Ensures that lrref() is what is actually in the archive, one way
2692 # or another, according to us - ie this client's
2693 # appropritaely-updated archive view. Also returns the commit id.
2694 # If there is nothing in the archive, leaves lrref alone and
2695 # returns undef. git_fetch_us must have already been called.
2699 foreach my $field (@ourdscfield) {
2700 $dsc_hash = $dsc->{$field};
2701 last if defined $dsc_hash;
2703 if (defined $dsc_hash) {
2704 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2706 progress "last upload to archive specified git hash";
2708 progress "last upload to archive has NO git hash";
2711 progress "no version available from the archive";
2714 # If the archive's .dsc has a Dgit field, there are three
2715 # relevant git commitids we need to choose between and/or merge
2717 # 1. $dsc_hash: the Dgit field from the archive
2718 # 2. $lastpush_hash: the suite branch on the dgit git server
2719 # 3. $lastfetch_hash: our local tracking brach for the suite
2721 # These may all be distinct and need not be in any fast forward
2724 # If the dsc was pushed to this suite, then the server suite
2725 # branch will have been updated; but it might have been pushed to
2726 # a different suite and copied by the archive. Conversely a more
2727 # recent version may have been pushed with dgit but not appeared
2728 # in the archive (yet).
2730 # $lastfetch_hash may be awkward because archive imports
2731 # (particularly, imports of Dgit-less .dscs) are performed only as
2732 # needed on individual clients, so different clients may perform a
2733 # different subset of them - and these imports are only made
2734 # public during push. So $lastfetch_hash may represent a set of
2735 # imports different to a subsequent upload by a different dgit
2738 # Our approach is as follows:
2740 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2741 # descendant of $dsc_hash, then it was pushed by a dgit user who
2742 # had based their work on $dsc_hash, so we should prefer it.
2743 # Otherwise, $dsc_hash was installed into this suite in the
2744 # archive other than by a dgit push, and (necessarily) after the
2745 # last dgit push into that suite (since a dgit push would have
2746 # been descended from the dgit server git branch); thus, in that
2747 # case, we prefer the archive's version (and produce a
2748 # pseudo-merge to overwrite the dgit server git branch).
2750 # (If there is no Dgit field in the archive's .dsc then
2751 # generate_commit_from_dsc uses the version numbers to decide
2752 # whether the suite branch or the archive is newer. If the suite
2753 # branch is newer it ignores the archive's .dsc; otherwise it
2754 # generates an import of the .dsc, and produces a pseudo-merge to
2755 # overwrite the suite branch with the archive contents.)
2757 # The outcome of that part of the algorithm is the `public view',
2758 # and is same for all dgit clients: it does not depend on any
2759 # unpublished history in the local tracking branch.
2761 # As between the public view and the local tracking branch: The
2762 # local tracking branch is only updated by dgit fetch, and
2763 # whenever dgit fetch runs it includes the public view in the
2764 # local tracking branch. Therefore if the public view is not
2765 # descended from the local tracking branch, the local tracking
2766 # branch must contain history which was imported from the archive
2767 # but never pushed; and, its tip is now out of date. So, we make
2768 # a pseudo-merge to overwrite the old imports and stitch the old
2771 # Finally: we do not necessarily reify the public view (as
2772 # described above). This is so that we do not end up stacking two
2773 # pseudo-merges. So what we actually do is figure out the inputs
2774 # to any public view pseudo-merge and put them in @mergeinputs.
2777 # $mergeinputs[]{Commit}
2778 # $mergeinputs[]{Info}
2779 # $mergeinputs[0] is the one whose tree we use
2780 # @mergeinputs is in the order we use in the actual commit)
2783 # $mergeinputs[]{Message} is a commit message to use
2784 # $mergeinputs[]{ReverseParents} if def specifies that parent
2785 # list should be in opposite order
2786 # Such an entry has no Commit or Info. It applies only when found
2787 # in the last entry. (This ugliness is to support making
2788 # identical imports to previous dgit versions.)
2790 my $lastpush_hash = git_get_ref(lrfetchref());
2791 printdebug "previous reference hash=$lastpush_hash\n";
2792 $lastpush_mergeinput = $lastpush_hash && {
2793 Commit => $lastpush_hash,
2794 Info => "dgit suite branch on dgit git server",
2797 my $lastfetch_hash = git_get_ref(lrref());
2798 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2799 my $lastfetch_mergeinput = $lastfetch_hash && {
2800 Commit => $lastfetch_hash,
2801 Info => "dgit client's archive history view",
2804 my $dsc_mergeinput = $dsc_hash && {
2805 Commit => $dsc_hash,
2806 Info => "Dgit field in .dsc from archive",
2810 my $del_lrfetchrefs = sub {
2813 printdebug "del_lrfetchrefs...\n";
2814 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2815 my $objid = $lrfetchrefs_d{$fullrefname};
2816 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2818 $gur ||= new IO::Handle;
2819 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2821 printf $gur "delete %s %s\n", $fullrefname, $objid;
2824 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2828 if (defined $dsc_hash) {
2829 ensure_we_have_orig();
2830 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2831 @mergeinputs = $dsc_mergeinput
2832 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2833 print STDERR <<END or die $!;
2835 Git commit in archive is behind the last version allegedly pushed/uploaded.
2836 Commit referred to by archive: $dsc_hash
2837 Last version pushed with dgit: $lastpush_hash
2840 @mergeinputs = ($lastpush_mergeinput);
2842 # Archive has .dsc which is not a descendant of the last dgit
2843 # push. This can happen if the archive moves .dscs about.
2844 # Just follow its lead.
2845 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2846 progress "archive .dsc names newer git commit";
2847 @mergeinputs = ($dsc_mergeinput);
2849 progress "archive .dsc names other git commit, fixing up";
2850 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2854 @mergeinputs = generate_commits_from_dsc();
2855 # We have just done an import. Now, our import algorithm might
2856 # have been improved. But even so we do not want to generate
2857 # a new different import of the same package. So if the
2858 # version numbers are the same, just use our existing version.
2859 # If the version numbers are different, the archive has changed
2860 # (perhaps, rewound).
2861 if ($lastfetch_mergeinput &&
2862 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2863 (mergeinfo_version $mergeinputs[0]) )) {
2864 @mergeinputs = ($lastfetch_mergeinput);
2866 } elsif ($lastpush_hash) {
2867 # only in git, not in the archive yet
2868 @mergeinputs = ($lastpush_mergeinput);
2869 print STDERR <<END or die $!;
2871 Package not found in the archive, but has allegedly been pushed using dgit.
2875 printdebug "nothing found!\n";
2876 if (defined $skew_warning_vsn) {
2877 print STDERR <<END or die $!;
2879 Warning: relevant archive skew detected.
2880 Archive allegedly contains $skew_warning_vsn
2881 But we were not able to obtain any version from the archive or git.
2885 unshift @end, $del_lrfetchrefs;
2889 if ($lastfetch_hash &&
2891 my $h = $_->{Commit};
2892 $h and is_fast_fwd($lastfetch_hash, $h);
2893 # If true, one of the existing parents of this commit
2894 # is a descendant of the $lastfetch_hash, so we'll
2895 # be ff from that automatically.
2899 push @mergeinputs, $lastfetch_mergeinput;
2902 printdebug "fetch mergeinfos:\n";
2903 foreach my $mi (@mergeinputs) {
2905 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2907 printdebug sprintf " ReverseParents=%d Message=%s",
2908 $mi->{ReverseParents}, $mi->{Message};
2912 my $compat_info= pop @mergeinputs
2913 if $mergeinputs[$#mergeinputs]{Message};
2915 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2918 if (@mergeinputs > 1) {
2920 my $tree_commit = $mergeinputs[0]{Commit};
2922 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2923 $tree =~ m/\n\n/; $tree = $`;
2924 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2927 # We use the changelog author of the package in question the
2928 # author of this pseudo-merge. This is (roughly) correct if
2929 # this commit is simply representing aa non-dgit upload.
2930 # (Roughly because it does not record sponsorship - but we
2931 # don't have sponsorship info because that's in the .changes,
2932 # which isn't in the archivw.)
2934 # But, it might be that we are representing archive history
2935 # updates (including in-archive copies). These are not really
2936 # the responsibility of the person who created the .dsc, but
2937 # there is no-one whose name we should better use. (The
2938 # author of the .dsc-named commit is clearly worse.)
2940 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2941 my $author = clogp_authline $useclogp;
2942 my $cversion = getfield $useclogp, 'Version';
2944 my $mcf = ".git/dgit/mergecommit";
2945 open MC, ">", $mcf or die "$mcf $!";
2946 print MC <<END or die $!;
2950 my @parents = grep { $_->{Commit} } @mergeinputs;
2951 @parents = reverse @parents if $compat_info->{ReverseParents};
2952 print MC <<END or die $! foreach @parents;
2956 print MC <<END or die $!;
2962 if (defined $compat_info->{Message}) {
2963 print MC $compat_info->{Message} or die $!;
2965 print MC <<END or die $!;
2966 Record $package ($cversion) in archive suite $csuite
2970 my $message_add_info = sub {
2972 my $mversion = mergeinfo_version $mi;
2973 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2977 $message_add_info->($mergeinputs[0]);
2978 print MC <<END or die $!;
2979 should be treated as descended from
2981 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2985 $hash = make_commit $mcf;
2987 $hash = $mergeinputs[0]{Commit};
2989 printdebug "fetch hash=$hash\n";
2992 my ($lasth, $what) = @_;
2993 return unless $lasth;
2994 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2997 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
2999 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3001 fetch_from_archive_record_1($hash);
3003 if (defined $skew_warning_vsn) {
3005 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3006 my $gotclogp = commit_getclogp($hash);
3007 my $got_vsn = getfield $gotclogp, 'Version';
3008 printdebug "SKEW CHECK GOT $got_vsn\n";
3009 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3010 print STDERR <<END or die $!;
3012 Warning: archive skew detected. Using the available version:
3013 Archive allegedly contains $skew_warning_vsn
3014 We were able to obtain only $got_vsn
3020 if ($lastfetch_hash ne $hash) {
3021 fetch_from_archive_record_2($hash);
3024 lrfetchref_used lrfetchref();
3026 unshift @end, $del_lrfetchrefs;
3030 sub set_local_git_config ($$) {
3032 runcmd @git, qw(config), $k, $v;
3035 sub setup_mergechangelogs (;$) {
3037 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3039 my $driver = 'dpkg-mergechangelogs';
3040 my $cb = "merge.$driver";
3041 my $attrs = '.git/info/attributes';
3042 ensuredir '.git/info';
3044 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3045 if (!open ATTRS, "<", $attrs) {
3046 $!==ENOENT or die "$attrs: $!";
3050 next if m{^debian/changelog\s};
3051 print NATTRS $_, "\n" or die $!;
3053 ATTRS->error and die $!;
3056 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3059 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3060 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3062 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3065 sub setup_useremail (;$) {
3067 return unless $always || access_cfg_bool(1, 'setup-useremail');
3070 my ($k, $envvar) = @_;
3071 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3072 return unless defined $v;
3073 set_local_git_config "user.$k", $v;
3076 $setup->('email', 'DEBEMAIL');
3077 $setup->('name', 'DEBFULLNAME');
3080 sub ensure_setup_existing_tree () {
3081 my $k = "remote.$remotename.skipdefaultupdate";
3082 my $c = git_get_config $k;
3083 return if defined $c;
3084 set_local_git_config $k, 'true';
3087 sub setup_new_tree () {
3088 setup_mergechangelogs();
3092 sub multisuite_suite_child ($$$) {
3093 my ($tsuite, $merginputs, $fn) = @_;
3094 # in child, sets things up, calls $fn->(), and returns undef
3095 # in parent, returns canonical suite name for $tsuite
3096 my $canonsuitefh = IO::File::new_tmpfile;
3097 my $pid = fork // die $!;
3100 $us .= " [$isuite]";
3101 $debugprefix .= " ";
3102 progress "fetching $tsuite...";
3103 canonicalise_suite();
3104 print $canonsuitefh $csuite, "\n" or die $!;
3105 close $canonsuitefh or die $!;
3109 waitpid $pid,0 == $pid or die $!;
3110 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3111 seek $canonsuitefh,0,0 or die $!;
3112 local $csuite = <$canonsuitefh>;
3113 die $! unless defined $csuite && chomp $csuite;
3115 printdebug "multisuite $tsuite missing\n";
3118 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3119 push @$merginputs, {
3126 sub fork_for_multisuite ($) {
3127 my ($before_fetch_merge) = @_;
3128 # if nothing unusual, just returns ''
3131 # returns 0 to caller in child, to do first of the specified suites
3132 # in child, $csuite is not yet set
3134 # returns 1 to caller in parent, to finish up anything needed after
3135 # in parent, $csuite is set to canonicalised portmanteau
3137 my $org_isuite = $isuite;
3138 my @suites = split /\,/, $isuite;
3139 return '' unless @suites > 1;
3140 printdebug "fork_for_multisuite: @suites\n";
3144 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3146 return 0 unless defined $cbasesuite;
3148 fail "package $package missing in (base suite) $cbasesuite"
3149 unless @mergeinputs;
3151 my @csuites = ($cbasesuite);
3153 $before_fetch_merge->();
3155 foreach my $tsuite (@suites[1..$#suites]) {
3156 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3162 # xxx collecte the ref here
3164 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3165 push @csuites, $csubsuite;
3168 foreach my $mi (@mergeinputs) {
3169 my $ref = git_get_ref $mi->{Ref};
3170 die "$mi->{Ref} ?" unless length $ref;
3171 $mi->{Commit} = $ref;
3174 $csuite = join ",", @csuites;
3176 my $previous = git_get_ref lrref;
3178 unshift @mergeinputs, {
3179 Commit => $previous,
3180 Info => "local combined tracking branch",
3182 "archive seems to have rewound: local tracking branch is ahead!",
3186 foreach my $ix (0..$#mergeinputs) {
3187 $mergeinputs[$ix]{Index} = $ix;
3190 @mergeinputs = sort {
3191 -version_compare(mergeinfo_version $a,
3192 mergeinfo_version $b) # highest version first
3194 $a->{Index} <=> $b->{Index}; # earliest in spec first
3200 foreach my $mi (@mergeinputs) {
3201 printdebug "multisuite merge check $mi->{Info}\n";
3202 foreach my $previous (@needed) {
3203 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3204 printdebug "multisuite merge un-needed $previous->{Info}\n";
3208 printdebug "multisuite merge this-needed\n";
3209 $mi->{Character} = '+';
3212 $needed[0]{Character} = '*';
3214 my $output = $needed[0]{Commit};
3217 printdebug "multisuite merge nontrivial\n";
3218 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3220 my $commit = "tree $tree\n";
3221 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3222 "Input branches:\n";
3224 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3225 printdebug "multisuite merge include $mi->{Info}\n";
3226 $mi->{Character} //= ' ';
3227 $commit .= "parent $mi->{Commit}\n";
3228 $msg .= sprintf " %s %-25s %s\n",
3230 (mergeinfo_version $mi),
3233 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3235 " * marks the highest version branch, which choose to use\n".
3236 " + marks each branch which was not already an ancestor\n\n".
3237 "[dgit multi-suite $csuite]\n";
3239 "author $authline\n".
3240 "committer $authline\n\n";
3241 $output = make_commit_text $commit.$msg;
3242 printdebug "multisuite merge generated $output\n";
3245 fetch_from_archive_record_1($output);
3246 fetch_from_archive_record_2($output);
3248 progress "calculated combined tracking suite $csuite";
3253 sub clone_set_head () {
3254 open H, "> .git/HEAD" or die $!;
3255 print H "ref: ".lref()."\n" or die $!;
3258 sub clone_finish ($) {
3260 runcmd @git, qw(reset --hard), lrref();
3261 runcmd qw(bash -ec), <<'END';
3263 git ls-tree -r --name-only -z HEAD | \
3264 xargs -0r touch -r . --
3266 printdone "ready for work in $dstdir";
3271 badusage "dry run makes no sense with clone" unless act_local();
3273 my $multi_fetched = fork_for_multisuite(sub {
3274 printdebug "multi clone before fetch merge\n";
3277 if ($multi_fetched) {
3278 printdebug "multi clone after fetch merge\n";
3280 clone_finish($dstdir);
3283 printdebug "clone main body\n";
3285 canonicalise_suite();
3286 my $hasgit = check_for_git();
3287 mkdir $dstdir or fail "create \`$dstdir': $!";
3289 runcmd @git, qw(init -q);
3291 my $giturl = access_giturl(1);
3292 if (defined $giturl) {
3293 runcmd @git, qw(remote add), 'origin', $giturl;
3296 progress "fetching existing git history";
3298 runcmd_ordryrun_local @git, qw(fetch origin);
3300 progress "starting new git history";
3302 fetch_from_archive() or no_such_package;
3303 my $vcsgiturl = $dsc->{'Vcs-Git'};
3304 if (length $vcsgiturl) {
3305 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3306 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3309 clone_finish($dstdir);
3313 canonicalise_suite();
3314 if (check_for_git()) {
3317 fetch_from_archive() or no_such_package();
3318 printdone "fetched into ".lrref();
3322 my $multi_fetched = fork_for_multisuite(sub { });
3323 fetch() unless $multi_fetched; # parent
3324 return if $multi_fetched eq '0'; # child
3325 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3327 printdone "fetched to ".lrref()." and merged into HEAD";
3330 sub check_not_dirty () {
3331 foreach my $f (qw(local-options local-patch-header)) {
3332 if (stat_exists "debian/source/$f") {
3333 fail "git tree contains debian/source/$f";
3337 return if $ignoredirty;
3339 my @cmd = (@git, qw(diff --quiet HEAD));
3341 $!=0; $?=-1; system @cmd;
3344 fail "working tree is dirty (does not match HEAD)";
3350 sub commit_admin ($) {
3353 runcmd_ordryrun_local @git, qw(commit -m), $m;
3356 sub commit_quilty_patch () {
3357 my $output = cmdoutput @git, qw(status --porcelain);
3359 foreach my $l (split /\n/, $output) {
3360 next unless $l =~ m/\S/;
3361 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3365 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3367 progress "nothing quilty to commit, ok.";
3370 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3371 runcmd_ordryrun_local @git, qw(add -f), @adds;
3373 Commit Debian 3.0 (quilt) metadata
3375 [dgit ($our_version) quilt-fixup]
3379 sub get_source_format () {
3381 if (open F, "debian/source/options") {
3385 s/\s+$//; # ignore missing final newline
3387 my ($k, $v) = ($`, $'); #');
3388 $v =~ s/^"(.*)"$/$1/;
3394 F->error and die $!;
3397 die $! unless $!==&ENOENT;
3400 if (!open F, "debian/source/format") {
3401 die $! unless $!==&ENOENT;
3405 F->error and die $!;
3407 return ($_, \%options);
3410 sub madformat_wantfixup ($) {
3412 return 0 unless $format eq '3.0 (quilt)';
3413 our $quilt_mode_warned;
3414 if ($quilt_mode eq 'nocheck') {
3415 progress "Not doing any fixup of \`$format' due to".
3416 " ----no-quilt-fixup or --quilt=nocheck"
3417 unless $quilt_mode_warned++;
3420 progress "Format \`$format', need to check/update patch stack"
3421 unless $quilt_mode_warned++;
3425 sub maybe_split_brain_save ($$$) {
3426 my ($headref, $dgitview, $msg) = @_;
3427 # => message fragment "$saved" describing disposition of $dgitview
3428 return "commit id $dgitview" unless defined $split_brain_save;
3429 my @cmd = (shell_cmd "cd ../../../..",
3430 @git, qw(update-ref -m),
3431 "dgit --dgit-view-save $msg HEAD=$headref",
3432 $split_brain_save, $dgitview);
3434 return "and left in $split_brain_save";
3437 # An "infopair" is a tuple [ $thing, $what ]
3438 # (often $thing is a commit hash; $what is a description)
3440 sub infopair_cond_equal ($$) {
3442 $x->[0] eq $y->[0] or fail <<END;
3443 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3447 sub infopair_lrf_tag_lookup ($$) {
3448 my ($tagnames, $what) = @_;
3449 # $tagname may be an array ref
3450 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3451 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3452 foreach my $tagname (@tagnames) {
3453 my $lrefname = lrfetchrefs."/tags/$tagname";
3454 my $tagobj = $lrfetchrefs_f{$lrefname};
3455 next unless defined $tagobj;
3456 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3457 return [ git_rev_parse($tagobj), $what ];
3459 fail @tagnames==1 ? <<END : <<END;
3460 Wanted tag $what (@tagnames) on dgit server, but not found
3462 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3466 sub infopair_cond_ff ($$) {
3467 my ($anc,$desc) = @_;
3468 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3469 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3473 sub pseudomerge_version_check ($$) {
3474 my ($clogp, $archive_hash) = @_;
3476 my $arch_clogp = commit_getclogp $archive_hash;
3477 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3478 'version currently in archive' ];
3479 if (defined $overwrite_version) {
3480 if (length $overwrite_version) {
3481 infopair_cond_equal([ $overwrite_version,
3482 '--overwrite= version' ],
3485 my $v = $i_arch_v->[0];
3486 progress "Checking package changelog for archive version $v ...";
3488 my @xa = ("-f$v", "-t$v");
3489 my $vclogp = parsechangelog @xa;
3490 my $cv = [ (getfield $vclogp, 'Version'),
3491 "Version field from dpkg-parsechangelog @xa" ];
3492 infopair_cond_equal($i_arch_v, $cv);
3495 $@ =~ s/^dgit: //gm;
3497 "Perhaps debian/changelog does not mention $v ?";
3502 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3506 sub pseudomerge_make_commit ($$$$ $$) {
3507 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3508 $msg_cmd, $msg_msg) = @_;
3509 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3511 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3512 my $authline = clogp_authline $clogp;
3516 !defined $overwrite_version ? ""
3517 : !length $overwrite_version ? " --overwrite"
3518 : " --overwrite=".$overwrite_version;
3521 my $pmf = ".git/dgit/pseudomerge";
3522 open MC, ">", $pmf or die "$pmf $!";
3523 print MC <<END or die $!;
3526 parent $archive_hash
3536 return make_commit($pmf);
3539 sub splitbrain_pseudomerge ($$$$) {
3540 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3541 # => $merged_dgitview
3542 printdebug "splitbrain_pseudomerge...\n";
3544 # We: debian/PREVIOUS HEAD($maintview)
3545 # expect: o ----------------- o
3548 # a/d/PREVIOUS $dgitview
3551 # we do: `------------------ o
3555 return $dgitview unless defined $archive_hash;
3557 printdebug "splitbrain_pseudomerge...\n";
3559 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3561 if (!defined $overwrite_version) {
3562 progress "Checking that HEAD inciudes all changes in archive...";
3565 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3567 if (defined $overwrite_version) {
3569 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3570 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3571 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3572 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3573 my $i_archive = [ $archive_hash, "current archive contents" ];
3575 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3577 infopair_cond_equal($i_dgit, $i_archive);
3578 infopair_cond_ff($i_dep14, $i_dgit);
3579 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3583 $us: check failed (maybe --overwrite is needed, consult documentation)
3588 my $r = pseudomerge_make_commit
3589 $clogp, $dgitview, $archive_hash, $i_arch_v,
3590 "dgit --quilt=$quilt_mode",
3591 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3592 Declare fast forward from $i_arch_v->[0]
3594 Make fast forward from $i_arch_v->[0]
3597 maybe_split_brain_save $maintview, $r, "pseudomerge";
3599 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3603 sub plain_overwrite_pseudomerge ($$$) {
3604 my ($clogp, $head, $archive_hash) = @_;
3606 printdebug "plain_overwrite_pseudomerge...";
3608 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3610 return $head if is_fast_fwd $archive_hash, $head;
3612 my $m = "Declare fast forward from $i_arch_v->[0]";
3614 my $r = pseudomerge_make_commit
3615 $clogp, $head, $archive_hash, $i_arch_v,
3618 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3620 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3624 sub push_parse_changelog ($) {
3627 my $clogp = Dpkg::Control::Hash->new();
3628 $clogp->load($clogpfn) or die;
3630 my $clogpackage = getfield $clogp, 'Source';
3631 $package //= $clogpackage;
3632 fail "-p specified $package but changelog specified $clogpackage"
3633 unless $package eq $clogpackage;
3634 my $cversion = getfield $clogp, 'Version';
3635 my $tag = debiantag($cversion, access_nomdistro);
3636 runcmd @git, qw(check-ref-format), $tag;
3638 my $dscfn = dscfn($cversion);
3640 return ($clogp, $cversion, $dscfn);
3643 sub push_parse_dsc ($$$) {
3644 my ($dscfn,$dscfnwhat, $cversion) = @_;
3645 $dsc = parsecontrol($dscfn,$dscfnwhat);
3646 my $dversion = getfield $dsc, 'Version';
3647 my $dscpackage = getfield $dsc, 'Source';
3648 ($dscpackage eq $package && $dversion eq $cversion) or
3649 fail "$dscfn is for $dscpackage $dversion".
3650 " but debian/changelog is for $package $cversion";
3653 sub push_tagwants ($$$$) {
3654 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3657 TagFn => \&debiantag,
3662 if (defined $maintviewhead) {
3664 TagFn => \&debiantag_maintview,
3665 Objid => $maintviewhead,
3666 TfSuffix => '-maintview',
3670 foreach my $tw (@tagwants) {
3671 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3672 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3674 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3678 sub push_mktags ($$ $$ $) {
3680 $changesfile,$changesfilewhat,
3683 die unless $tagwants->[0]{View} eq 'dgit';
3685 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3686 $dsc->save("$dscfn.tmp") or die $!;
3688 my $changes = parsecontrol($changesfile,$changesfilewhat);
3689 foreach my $field (qw(Source Distribution Version)) {
3690 $changes->{$field} eq $clogp->{$field} or
3691 fail "changes field $field \`$changes->{$field}'".
3692 " does not match changelog \`$clogp->{$field}'";
3695 my $cversion = getfield $clogp, 'Version';
3696 my $clogsuite = getfield $clogp, 'Distribution';
3698 # We make the git tag by hand because (a) that makes it easier
3699 # to control the "tagger" (b) we can do remote signing
3700 my $authline = clogp_authline $clogp;
3701 my $delibs = join(" ", "",@deliberatelies);
3702 my $declaredistro = access_nomdistro();
3706 my $tfn = $tw->{Tfn};
3707 my $head = $tw->{Objid};
3708 my $tag = $tw->{Tag};
3710 open TO, '>', $tfn->('.tmp') or die $!;
3711 print TO <<END or die $!;
3718 if ($tw->{View} eq 'dgit') {
3719 print TO <<END or die $!;
3720 $package release $cversion for $clogsuite ($csuite) [dgit]
3721 [dgit distro=$declaredistro$delibs]
3723 foreach my $ref (sort keys %previously) {
3724 print TO <<END or die $!;
3725 [dgit previously:$ref=$previously{$ref}]
3728 } elsif ($tw->{View} eq 'maint') {
3729 print TO <<END or die $!;
3730 $package release $cversion for $clogsuite ($csuite)
3731 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3734 die Dumper($tw)."?";
3739 my $tagobjfn = $tfn->('.tmp');
3741 if (!defined $keyid) {
3742 $keyid = access_cfg('keyid','RETURN-UNDEF');
3744 if (!defined $keyid) {
3745 $keyid = getfield $clogp, 'Maintainer';
3747 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3748 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3749 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3750 push @sign_cmd, $tfn->('.tmp');
3751 runcmd_ordryrun @sign_cmd;
3753 $tagobjfn = $tfn->('.signed.tmp');
3754 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3755 $tfn->('.tmp'), $tfn->('.tmp.asc');
3761 my @r = map { $mktag->($_); } @$tagwants;
3765 sub sign_changes ($) {
3766 my ($changesfile) = @_;
3768 my @debsign_cmd = @debsign;
3769 push @debsign_cmd, "-k$keyid" if defined $keyid;
3770 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3771 push @debsign_cmd, $changesfile;
3772 runcmd_ordryrun @debsign_cmd;
3777 printdebug "actually entering push\n";
3779 supplementary_message(<<'END');
3780 Push failed, while checking state of the archive.
3781 You can retry the push, after fixing the problem, if you like.
3783 if (check_for_git()) {
3786 my $archive_hash = fetch_from_archive();
3787 if (!$archive_hash) {
3789 fail "package appears to be new in this suite;".
3790 " if this is intentional, use --new";
3793 supplementary_message(<<'END');
3794 Push failed, while preparing your push.
3795 You can retry the push, after fixing the problem, if you like.
3798 need_tagformat 'new', "quilt mode $quilt_mode"
3799 if quiltmode_splitbrain;
3803 access_giturl(); # check that success is vaguely likely
3806 my $clogpfn = ".git/dgit/changelog.822.tmp";
3807 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3809 responder_send_file('parsed-changelog', $clogpfn);
3811 my ($clogp, $cversion, $dscfn) =
3812 push_parse_changelog("$clogpfn");
3814 my $dscpath = "$buildproductsdir/$dscfn";
3815 stat_exists $dscpath or
3816 fail "looked for .dsc $dscfn, but $!;".
3817 " maybe you forgot to build";
3819 responder_send_file('dsc', $dscpath);
3821 push_parse_dsc($dscpath, $dscfn, $cversion);
3823 my $format = getfield $dsc, 'Format';
3824 printdebug "format $format\n";
3826 my $actualhead = git_rev_parse('HEAD');
3827 my $dgithead = $actualhead;
3828 my $maintviewhead = undef;
3830 my $upstreamversion = upstreamversion $clogp->{Version};
3832 if (madformat_wantfixup($format)) {
3833 # user might have not used dgit build, so maybe do this now:
3834 if (quiltmode_splitbrain()) {
3836 quilt_make_fake_dsc($upstreamversion);
3838 ($dgithead, $cachekey) =
3839 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3841 "--quilt=$quilt_mode but no cached dgit view:
3842 perhaps tree changed since dgit build[-source] ?";
3844 $dgithead = splitbrain_pseudomerge($clogp,
3845 $actualhead, $dgithead,
3847 $maintviewhead = $actualhead;
3848 changedir '../../../..';
3849 prep_ud(); # so _only_subdir() works, below
3851 commit_quilty_patch();
3855 if (defined $overwrite_version && !defined $maintviewhead) {
3856 $dgithead = plain_overwrite_pseudomerge($clogp,
3864 if ($archive_hash) {
3865 if (is_fast_fwd($archive_hash, $dgithead)) {
3867 } elsif (deliberately_not_fast_forward) {
3870 fail "dgit push: HEAD is not a descendant".
3871 " of the archive's version.\n".
3872 "To overwrite the archive's contents,".
3873 " pass --overwrite[=VERSION].\n".
3874 "To rewind history, if permitted by the archive,".
3875 " use --deliberately-not-fast-forward.";
3880 progress "checking that $dscfn corresponds to HEAD";
3881 runcmd qw(dpkg-source -x --),
3882 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3883 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
3884 check_for_vendor_patches() if madformat($dsc->{format});
3885 changedir '../../../..';
3886 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3887 debugcmd "+",@diffcmd;
3889 my $r = system @diffcmd;
3892 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3894 HEAD specifies a different tree to $dscfn:
3896 Perhaps you forgot to build. Or perhaps there is a problem with your
3897 source tree (see dgit(7) for some hints). To see a full diff, run
3904 if (!$changesfile) {
3905 my $pat = changespat $cversion;
3906 my @cs = glob "$buildproductsdir/$pat";
3907 fail "failed to find unique changes file".
3908 " (looked for $pat in $buildproductsdir);".
3909 " perhaps you need to use dgit -C"
3911 ($changesfile) = @cs;
3913 $changesfile = "$buildproductsdir/$changesfile";
3916 # Check that changes and .dsc agree enough
3917 $changesfile =~ m{[^/]*$};
3918 my $changes = parsecontrol($changesfile,$&);
3919 files_compare_inputs($dsc, $changes)
3920 unless forceing [qw(dsc-changes-mismatch)];
3922 # Perhaps adjust .dsc to contain right set of origs
3923 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3925 unless forceing [qw(changes-origs-exactly)];
3927 # Checks complete, we're going to try and go ahead:
3929 responder_send_file('changes',$changesfile);
3930 responder_send_command("param head $dgithead");
3931 responder_send_command("param csuite $csuite");
3932 responder_send_command("param tagformat $tagformat");
3933 if (defined $maintviewhead) {
3934 die unless ($protovsn//4) >= 4;
3935 responder_send_command("param maint-view $maintviewhead");
3938 if (deliberately_not_fast_forward) {
3939 git_for_each_ref(lrfetchrefs, sub {
3940 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3941 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3942 responder_send_command("previously $rrefname=$objid");
3943 $previously{$rrefname} = $objid;
3947 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3951 supplementary_message(<<'END');
3952 Push failed, while signing the tag.
3953 You can retry the push, after fixing the problem, if you like.
3955 # If we manage to sign but fail to record it anywhere, it's fine.
3956 if ($we_are_responder) {
3957 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3958 responder_receive_files('signed-tag', @tagobjfns);
3960 @tagobjfns = push_mktags($clogp,$dscpath,
3961 $changesfile,$changesfile,
3964 supplementary_message(<<'END');
3965 Push failed, *after* signing the tag.
3966 If you want to try again, you should use a new version number.
3969 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3971 foreach my $tw (@tagwants) {
3972 my $tag = $tw->{Tag};
3973 my $tagobjfn = $tw->{TagObjFn};
3975 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3976 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3977 runcmd_ordryrun_local
3978 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3981 supplementary_message(<<'END');
3982 Push failed, while updating the remote git repository - see messages above.
3983 If you want to try again, you should use a new version number.
3985 if (!check_for_git()) {
3986 create_remote_git_repo();
3989 my @pushrefs = $forceflag.$dgithead.":".rrref();
3990 foreach my $tw (@tagwants) {
3991 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3994 runcmd_ordryrun @git,
3995 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3996 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3998 supplementary_message(<<'END');
3999 Push failed, after updating the remote git repository.
4000 If you want to try again, you must use a new version number.
4002 if ($we_are_responder) {
4003 my $dryrunsuffix = act_local() ? "" : ".tmp";
4004 responder_receive_files('signed-dsc-changes',
4005 "$dscpath$dryrunsuffix",
4006 "$changesfile$dryrunsuffix");
4009 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4011 progress "[new .dsc left in $dscpath.tmp]";
4013 sign_changes $changesfile;
4016 supplementary_message(<<END);
4017 Push failed, while uploading package(s) to the archive server.
4018 You can retry the upload of exactly these same files with dput of:
4020 If that .changes file is broken, you will need to use a new version
4021 number for your next attempt at the upload.
4023 my $host = access_cfg('upload-host','RETURN-UNDEF');
4024 my @hostarg = defined($host) ? ($host,) : ();
4025 runcmd_ordryrun @dput, @hostarg, $changesfile;
4026 printdone "pushed and uploaded $cversion";
4028 supplementary_message('');
4029 responder_send_command("complete");
4036 badusage "-p is not allowed with clone; specify as argument instead"
4037 if defined $package;
4040 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4041 ($package,$isuite) = @ARGV;
4042 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4043 ($package,$dstdir) = @ARGV;
4044 } elsif (@ARGV==3) {
4045 ($package,$isuite,$dstdir) = @ARGV;
4047 badusage "incorrect arguments to dgit clone";
4049 $dstdir ||= "$package";
4051 if (stat_exists $dstdir) {
4052 fail "$dstdir already exists";
4056 if ($rmonerror && !$dryrun_level) {
4057 $cwd_remove= getcwd();
4059 return unless defined $cwd_remove;
4060 if (!chdir "$cwd_remove") {
4061 return if $!==&ENOENT;
4062 die "chdir $cwd_remove: $!";
4064 printdebug "clone rmonerror removing $dstdir\n";
4066 rmtree($dstdir) or die "remove $dstdir: $!\n";
4067 } elsif (grep { $! == $_ }
4068 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4070 print STDERR "check whether to remove $dstdir: $!\n";
4076 $cwd_remove = undef;
4079 sub branchsuite () {
4080 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4081 if ($branch =~ m#$lbranch_re#o) {
4088 sub fetchpullargs () {
4090 if (!defined $package) {
4091 my $sourcep = parsecontrol('debian/control','debian/control');
4092 $package = getfield $sourcep, 'Source';
4095 $isuite = branchsuite();
4097 my $clogp = parsechangelog();
4098 $isuite = getfield $clogp, 'Distribution';
4100 } elsif (@ARGV==1) {
4103 badusage "incorrect arguments to dgit fetch or dgit pull";
4110 my $multi_fetched = fork_for_multisuite(sub { });
4111 exit 0 if $multi_fetched;
4118 if (quiltmode_splitbrain()) {
4119 my ($format, $fopts) = get_source_format();
4120 madformat($format) and fail <<END
4121 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4130 badusage "-p is not allowed with dgit push" if defined $package;
4132 my $clogp = parsechangelog();
4133 $package = getfield $clogp, 'Source';
4136 } elsif (@ARGV==1) {
4137 ($specsuite) = (@ARGV);
4139 badusage "incorrect arguments to dgit push";
4141 $isuite = getfield $clogp, 'Distribution';
4143 local ($package) = $existing_package; # this is a hack
4144 canonicalise_suite();
4146 canonicalise_suite();
4148 if (defined $specsuite &&
4149 $specsuite ne $isuite &&
4150 $specsuite ne $csuite) {
4151 fail "dgit push: changelog specifies $isuite ($csuite)".
4152 " but command line specifies $specsuite";
4157 #---------- remote commands' implementation ----------
4159 sub cmd_remote_push_build_host {
4160 my ($nrargs) = shift @ARGV;
4161 my (@rargs) = @ARGV[0..$nrargs-1];
4162 @ARGV = @ARGV[$nrargs..$#ARGV];
4164 my ($dir,$vsnwant) = @rargs;
4165 # vsnwant is a comma-separated list; we report which we have
4166 # chosen in our ready response (so other end can tell if they
4169 $we_are_responder = 1;
4170 $us .= " (build host)";
4174 open PI, "<&STDIN" or die $!;
4175 open STDIN, "/dev/null" or die $!;
4176 open PO, ">&STDOUT" or die $!;
4178 open STDOUT, ">&STDERR" or die $!;
4182 ($protovsn) = grep {
4183 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4184 } @rpushprotovsn_support;
4186 fail "build host has dgit rpush protocol versions ".
4187 (join ",", @rpushprotovsn_support).
4188 " but invocation host has $vsnwant"
4189 unless defined $protovsn;
4191 responder_send_command("dgit-remote-push-ready $protovsn");
4192 rpush_handle_protovsn_bothends();
4197 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4198 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4199 # a good error message)
4201 sub rpush_handle_protovsn_bothends () {
4202 if ($protovsn < 4) {
4203 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4212 my $report = i_child_report();
4213 if (defined $report) {
4214 printdebug "($report)\n";
4215 } elsif ($i_child_pid) {
4216 printdebug "(killing build host child $i_child_pid)\n";
4217 kill 15, $i_child_pid;
4219 if (defined $i_tmp && !defined $initiator_tempdir) {
4221 eval { rmtree $i_tmp; };
4225 END { i_cleanup(); }
4228 my ($base,$selector,@args) = @_;
4229 $selector =~ s/\-/_/g;
4230 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4237 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4245 push @rargs, join ",", @rpushprotovsn_support;
4248 push @rdgit, @ropts;
4249 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4251 my @cmd = (@ssh, $host, shellquote @rdgit);
4254 if (defined $initiator_tempdir) {
4255 rmtree $initiator_tempdir;
4256 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4257 $i_tmp = $initiator_tempdir;
4261 $i_child_pid = open2(\*RO, \*RI, @cmd);
4263 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4264 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4265 $supplementary_message = '' unless $protovsn >= 3;
4267 fail "rpush negotiated protocol version $protovsn".
4268 " which does not support quilt mode $quilt_mode"
4269 if quiltmode_splitbrain;
4271 rpush_handle_protovsn_bothends();
4273 my ($icmd,$iargs) = initiator_expect {
4274 m/^(\S+)(?: (.*))?$/;
4277 i_method "i_resp", $icmd, $iargs;
4281 sub i_resp_progress ($) {
4283 my $msg = protocol_read_bytes \*RO, $rhs;
4287 sub i_resp_supplementary_message ($) {
4289 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4292 sub i_resp_complete {
4293 my $pid = $i_child_pid;
4294 $i_child_pid = undef; # prevents killing some other process with same pid
4295 printdebug "waiting for build host child $pid...\n";
4296 my $got = waitpid $pid, 0;
4297 die $! unless $got == $pid;
4298 die "build host child failed $?" if $?;
4301 printdebug "all done\n";
4305 sub i_resp_file ($) {
4307 my $localname = i_method "i_localname", $keyword;
4308 my $localpath = "$i_tmp/$localname";
4309 stat_exists $localpath and
4310 badproto \*RO, "file $keyword ($localpath) twice";
4311 protocol_receive_file \*RO, $localpath;
4312 i_method "i_file", $keyword;
4317 sub i_resp_param ($) {
4318 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4322 sub i_resp_previously ($) {
4323 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4324 or badproto \*RO, "bad previously spec";
4325 my $r = system qw(git check-ref-format), $1;
4326 die "bad previously ref spec ($r)" if $r;
4327 $previously{$1} = $2;
4332 sub i_resp_want ($) {
4334 die "$keyword ?" if $i_wanted{$keyword}++;
4335 my @localpaths = i_method "i_want", $keyword;
4336 printdebug "[[ $keyword @localpaths\n";
4337 foreach my $localpath (@localpaths) {
4338 protocol_send_file \*RI, $localpath;
4340 print RI "files-end\n" or die $!;
4343 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4345 sub i_localname_parsed_changelog {
4346 return "remote-changelog.822";
4348 sub i_file_parsed_changelog {
4349 ($i_clogp, $i_version, $i_dscfn) =
4350 push_parse_changelog "$i_tmp/remote-changelog.822";
4351 die if $i_dscfn =~ m#/|^\W#;
4354 sub i_localname_dsc {
4355 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4360 sub i_localname_changes {
4361 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4362 $i_changesfn = $i_dscfn;
4363 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4364 return $i_changesfn;
4366 sub i_file_changes { }
4368 sub i_want_signed_tag {
4369 printdebug Dumper(\%i_param, $i_dscfn);
4370 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4371 && defined $i_param{'csuite'}
4372 or badproto \*RO, "premature desire for signed-tag";
4373 my $head = $i_param{'head'};
4374 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4376 my $maintview = $i_param{'maint-view'};
4377 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4380 if ($protovsn >= 4) {
4381 my $p = $i_param{'tagformat'} // '<undef>';
4383 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4386 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4388 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4390 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4393 push_mktags $i_clogp, $i_dscfn,
4394 $i_changesfn, 'remote changes',
4398 sub i_want_signed_dsc_changes {
4399 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4400 sign_changes $i_changesfn;
4401 return ($i_dscfn, $i_changesfn);
4404 #---------- building etc. ----------
4410 #----- `3.0 (quilt)' handling -----
4412 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4414 sub quiltify_dpkg_commit ($$$;$) {
4415 my ($patchname,$author,$msg, $xinfo) = @_;
4419 my $descfn = ".git/dgit/quilt-description.tmp";
4420 open O, '>', $descfn or die "$descfn: $!";
4421 $msg =~ s/\n+/\n\n/;
4422 print O <<END or die $!;
4424 ${xinfo}Subject: $msg
4431 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4432 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4433 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4434 runcmd @dpkgsource, qw(--commit .), $patchname;
4438 sub quiltify_trees_differ ($$;$$$) {
4439 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4440 # returns true iff the two tree objects differ other than in debian/
4441 # with $finegrained,
4442 # returns bitmask 01 - differ in upstream files except .gitignore
4443 # 02 - differ in .gitignore
4444 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4445 # is set for each modified .gitignore filename $fn
4446 # if $unrepres is defined, array ref to which is appeneded
4447 # a list of unrepresentable changes (removals of upstream files
4450 my @cmd = (@git, qw(diff-tree -z));
4451 push @cmd, qw(--name-only) unless $unrepres;
4452 push @cmd, qw(-r) if $finegrained || $unrepres;
4454 my $diffs= cmdoutput @cmd;
4457 foreach my $f (split /\0/, $diffs) {
4458 if ($unrepres && !@lmodes) {
4459 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4462 my ($oldmode,$newmode) = @lmodes;
4465 next if $f =~ m#^debian(?:/.*)?$#s;
4469 die "deleted\n" unless $newmode =~ m/[^0]/;
4470 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4471 if ($oldmode =~ m/[^0]/) {
4472 die "mode changed\n" if $oldmode ne $newmode;
4474 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4478 local $/="\n"; chomp $@;
4479 push @$unrepres, [ $f, $@ ];
4483 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4484 $r |= $isignore ? 02 : 01;
4485 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4487 printdebug "quiltify_trees_differ $x $y => $r\n";
4491 sub quiltify_tree_sentinelfiles ($) {
4492 # lists the `sentinel' files present in the tree
4494 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4495 qw(-- debian/rules debian/control);
4500 sub quiltify_splitbrain_needed () {
4501 if (!$split_brain) {
4502 progress "dgit view: changes are required...";
4503 runcmd @git, qw(checkout -q -b dgit-view);
4508 sub quiltify_splitbrain ($$$$$$) {
4509 my ($clogp, $unapplied, $headref, $diffbits,
4510 $editedignores, $cachekey) = @_;
4511 if ($quilt_mode !~ m/gbp|dpm/) {
4512 # treat .gitignore just like any other upstream file
4513 $diffbits = { %$diffbits };
4514 $_ = !!$_ foreach values %$diffbits;
4516 # We would like any commits we generate to be reproducible
4517 my @authline = clogp_authline($clogp);
4518 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4519 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4520 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4521 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4522 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4523 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4525 if ($quilt_mode =~ m/gbp|unapplied/ &&
4526 ($diffbits->{O2H} & 01)) {
4528 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4529 " but git tree differs from orig in upstream files.";
4530 if (!stat_exists "debian/patches") {
4532 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4536 if ($quilt_mode =~ m/dpm/ &&
4537 ($diffbits->{H2A} & 01)) {
4539 --quilt=$quilt_mode specified, implying patches-applied git tree
4540 but git tree differs from result of applying debian/patches to upstream
4543 if ($quilt_mode =~ m/gbp|unapplied/ &&
4544 ($diffbits->{O2A} & 01)) { # some patches
4545 quiltify_splitbrain_needed();
4546 progress "dgit view: creating patches-applied version using gbp pq";
4547 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4548 # gbp pq import creates a fresh branch; push back to dgit-view
4549 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4550 runcmd @git, qw(checkout -q dgit-view);
4552 if ($quilt_mode =~ m/gbp|dpm/ &&
4553 ($diffbits->{O2A} & 02)) {
4555 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4556 tool which does not create patches for changes to upstream
4557 .gitignores: but, such patches exist in debian/patches.
4560 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4561 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4562 quiltify_splitbrain_needed();
4563 progress "dgit view: creating patch to represent .gitignore changes";
4564 ensuredir "debian/patches";
4565 my $gipatch = "debian/patches/auto-gitignore";
4566 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4567 stat GIPATCH or die "$gipatch: $!";
4568 fail "$gipatch already exists; but want to create it".
4569 " to record .gitignore changes" if (stat _)[7];
4570 print GIPATCH <<END or die "$gipatch: $!";
4571 Subject: Update .gitignore from Debian packaging branch
4573 The Debian packaging git branch contains these updates to the upstream
4574 .gitignore file(s). This patch is autogenerated, to provide these
4575 updates to users of the official Debian archive view of the package.
4577 [dgit ($our_version) update-gitignore]
4580 close GIPATCH or die "$gipatch: $!";
4581 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4582 $unapplied, $headref, "--", sort keys %$editedignores;
4583 open SERIES, "+>>", "debian/patches/series" or die $!;
4584 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4586 defined read SERIES, $newline, 1 or die $!;
4587 print SERIES "\n" or die $! unless $newline eq "\n";
4588 print SERIES "auto-gitignore\n" or die $!;
4589 close SERIES or die $!;
4590 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4592 Commit patch to update .gitignore
4594 [dgit ($our_version) update-gitignore-quilt-fixup]
4598 my $dgitview = git_rev_parse 'HEAD';
4600 changedir '../../../..';
4601 # When we no longer need to support squeeze, use --create-reflog
4603 ensuredir ".git/logs/refs/dgit-intern";
4604 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4607 my $oldcache = git_get_ref "refs/$splitbraincache";
4608 if ($oldcache eq $dgitview) {
4609 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4610 # git update-ref doesn't always update, in this case. *sigh*
4611 my $dummy = make_commit_text <<END;
4614 author Dgit <dgit\@example.com> 1000000000 +0000
4615 committer Dgit <dgit\@example.com> 1000000000 +0000
4617 Dummy commit - do not use
4619 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4620 "refs/$splitbraincache", $dummy;
4622 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4625 changedir '.git/dgit/unpack/work';
4627 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4628 progress "dgit view: created ($saved)";
4631 sub quiltify ($$$$) {
4632 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4634 # Quilt patchification algorithm
4636 # We search backwards through the history of the main tree's HEAD
4637 # (T) looking for a start commit S whose tree object is identical
4638 # to to the patch tip tree (ie the tree corresponding to the
4639 # current dpkg-committed patch series). For these purposes
4640 # `identical' disregards anything in debian/ - this wrinkle is
4641 # necessary because dpkg-source treates debian/ specially.
4643 # We can only traverse edges where at most one of the ancestors'
4644 # trees differs (in changes outside in debian/). And we cannot
4645 # handle edges which change .pc/ or debian/patches. To avoid
4646 # going down a rathole we avoid traversing edges which introduce
4647 # debian/rules or debian/control. And we set a limit on the
4648 # number of edges we are willing to look at.
4650 # If we succeed, we walk forwards again. For each traversed edge
4651 # PC (with P parent, C child) (starting with P=S and ending with
4652 # C=T) to we do this:
4654 # - dpkg-source --commit with a patch name and message derived from C
4655 # After traversing PT, we git commit the changes which
4656 # should be contained within debian/patches.
4658 # The search for the path S..T is breadth-first. We maintain a
4659 # todo list containing search nodes. A search node identifies a
4660 # commit, and looks something like this:
4662 # Commit => $git_commit_id,
4663 # Child => $c, # or undef if P=T
4664 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4665 # Nontrivial => true iff $p..$c has relevant changes
4672 my %considered; # saves being exponential on some weird graphs
4674 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4677 my ($search,$whynot) = @_;
4678 printdebug " search NOT $search->{Commit} $whynot\n";
4679 $search->{Whynot} = $whynot;
4680 push @nots, $search;
4681 no warnings qw(exiting);
4690 my $c = shift @todo;
4691 next if $considered{$c->{Commit}}++;
4693 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4695 printdebug "quiltify investigate $c->{Commit}\n";
4698 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4699 printdebug " search finished hooray!\n";
4704 if ($quilt_mode eq 'nofix') {
4705 fail "quilt fixup required but quilt mode is \`nofix'\n".
4706 "HEAD commit $c->{Commit} differs from tree implied by ".
4707 " debian/patches (tree object $oldtiptree)";
4709 if ($quilt_mode eq 'smash') {
4710 printdebug " search quitting smash\n";
4714 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4715 $not->($c, "has $c_sentinels not $t_sentinels")
4716 if $c_sentinels ne $t_sentinels;
4718 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4719 $commitdata =~ m/\n\n/;
4721 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4722 @parents = map { { Commit => $_, Child => $c } } @parents;
4724 $not->($c, "root commit") if !@parents;
4726 foreach my $p (@parents) {
4727 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4729 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4730 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4732 foreach my $p (@parents) {
4733 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4735 my @cmd= (@git, qw(diff-tree -r --name-only),
4736 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4737 my $patchstackchange = cmdoutput @cmd;
4738 if (length $patchstackchange) {
4739 $patchstackchange =~ s/\n/,/g;
4740 $not->($p, "changed $patchstackchange");
4743 printdebug " search queue P=$p->{Commit} ",
4744 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4750 printdebug "quiltify want to smash\n";
4753 my $x = $_[0]{Commit};
4754 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4757 my $reportnot = sub {
4759 my $s = $abbrev->($notp);
4760 my $c = $notp->{Child};
4761 $s .= "..".$abbrev->($c) if $c;
4762 $s .= ": ".$notp->{Whynot};
4765 if ($quilt_mode eq 'linear') {
4766 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4767 foreach my $notp (@nots) {
4768 print STDERR "$us: ", $reportnot->($notp), "\n";
4770 print STDERR "$us: $_\n" foreach @$failsuggestion;
4771 fail "quilt fixup naive history linearisation failed.\n".
4772 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4773 } elsif ($quilt_mode eq 'smash') {
4774 } elsif ($quilt_mode eq 'auto') {
4775 progress "quilt fixup cannot be linear, smashing...";
4777 die "$quilt_mode ?";
4780 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4781 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4783 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4785 quiltify_dpkg_commit "auto-$version-$target-$time",
4786 (getfield $clogp, 'Maintainer'),
4787 "Automatically generated patch ($clogp->{Version})\n".
4788 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4792 progress "quiltify linearisation planning successful, executing...";
4794 for (my $p = $sref_S;
4795 my $c = $p->{Child};
4797 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4798 next unless $p->{Nontrivial};
4800 my $cc = $c->{Commit};
4802 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4803 $commitdata =~ m/\n\n/ or die "$c ?";
4806 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4809 my $commitdate = cmdoutput
4810 @git, qw(log -n1 --pretty=format:%aD), $cc;
4812 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4814 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4821 my $gbp_check_suitable = sub {
4826 die "contains unexpected slashes\n" if m{//} || m{/$};
4827 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4828 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4829 die "too long" if length > 200;
4831 return $_ unless $@;
4832 print STDERR "quiltifying commit $cc:".
4833 " ignoring/dropping Gbp-Pq $what: $@";
4837 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4839 (\S+) \s* \n //ixm) {
4840 $patchname = $gbp_check_suitable->($1, 'Name');
4842 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4844 (\S+) \s* \n //ixm) {
4845 $patchdir = $gbp_check_suitable->($1, 'Topic');
4850 if (!defined $patchname) {
4851 $patchname = $title;
4852 $patchname =~ s/[.:]$//;
4855 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4856 my $translitname = $converter->convert($patchname);
4857 die unless defined $translitname;
4858 $patchname = $translitname;
4861 "dgit: patch title transliteration error: $@"
4863 $patchname =~ y/ A-Z/-a-z/;
4864 $patchname =~ y/-a-z0-9_.+=~//cd;
4865 $patchname =~ s/^\W/x-$&/;
4866 $patchname = substr($patchname,0,40);
4868 if (!defined $patchdir) {
4871 if (length $patchdir) {
4872 $patchname = "$patchdir/$patchname";
4874 if ($patchname =~ m{^(.*)/}) {
4875 mkpath "debian/patches/$1";
4880 stat "debian/patches/$patchname$index";
4882 $!==ENOENT or die "$patchname$index $!";
4884 runcmd @git, qw(checkout -q), $cc;
4886 # We use the tip's changelog so that dpkg-source doesn't
4887 # produce complaining messages from dpkg-parsechangelog. None
4888 # of the information dpkg-source gets from the changelog is
4889 # actually relevant - it gets put into the original message
4890 # which dpkg-source provides our stunt editor, and then
4892 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4894 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4895 "Date: $commitdate\n".
4896 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4898 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4901 runcmd @git, qw(checkout -q master);
4904 sub build_maybe_quilt_fixup () {
4905 my ($format,$fopts) = get_source_format;
4906 return unless madformat_wantfixup $format;
4909 check_for_vendor_patches();
4911 if (quiltmode_splitbrain) {
4912 foreach my $needtf (qw(new maint)) {
4913 next if grep { $_ eq $needtf } access_cfg_tagformats;
4915 quilt mode $quilt_mode requires split view so server needs to support
4916 both "new" and "maint" tag formats, but config says it doesn't.
4921 my $clogp = parsechangelog();
4922 my $headref = git_rev_parse('HEAD');
4927 my $upstreamversion = upstreamversion $version;
4929 if ($fopts->{'single-debian-patch'}) {
4930 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4932 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4935 die 'bug' if $split_brain && !$need_split_build_invocation;
4937 changedir '../../../..';
4938 runcmd_ordryrun_local
4939 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4942 sub quilt_fixup_mkwork ($) {
4945 mkdir "work" or die $!;
4947 mktree_in_ud_here();
4948 runcmd @git, qw(reset -q --hard), $headref;
4951 sub quilt_fixup_linkorigs ($$) {
4952 my ($upstreamversion, $fn) = @_;
4953 # calls $fn->($leafname);
4955 foreach my $f (<../../../../*>) { #/){
4956 my $b=$f; $b =~ s{.*/}{};
4958 local ($debuglevel) = $debuglevel-1;
4959 printdebug "QF linkorigs $b, $f ?\n";
4961 next unless is_orig_file_of_vsn $b, $upstreamversion;
4962 printdebug "QF linkorigs $b, $f Y\n";
4963 link_ltarget $f, $b or die "$b $!";
4968 sub quilt_fixup_delete_pc () {
4969 runcmd @git, qw(rm -rqf .pc);
4971 Commit removal of .pc (quilt series tracking data)
4973 [dgit ($our_version) upgrade quilt-remove-pc]
4977 sub quilt_fixup_singlepatch ($$$) {
4978 my ($clogp, $headref, $upstreamversion) = @_;
4980 progress "starting quiltify (single-debian-patch)";
4982 # dpkg-source --commit generates new patches even if
4983 # single-debian-patch is in debian/source/options. In order to
4984 # get it to generate debian/patches/debian-changes, it is
4985 # necessary to build the source package.
4987 quilt_fixup_linkorigs($upstreamversion, sub { });
4988 quilt_fixup_mkwork($headref);
4990 rmtree("debian/patches");
4992 runcmd @dpkgsource, qw(-b .);
4994 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4995 rename srcfn("$upstreamversion", "/debian/patches"),
4996 "work/debian/patches";
4999 commit_quilty_patch();
5002 sub quilt_make_fake_dsc ($) {
5003 my ($upstreamversion) = @_;
5005 my $fakeversion="$upstreamversion-~~DGITFAKE";
5007 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5008 print $fakedsc <<END or die $!;
5011 Version: $fakeversion
5015 my $dscaddfile=sub {
5018 my $md = new Digest::MD5;
5020 my $fh = new IO::File $b, '<' or die "$b $!";
5025 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5028 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5030 my @files=qw(debian/source/format debian/rules
5031 debian/control debian/changelog);
5032 foreach my $maybe (qw(debian/patches debian/source/options
5033 debian/tests/control)) {
5034 next unless stat_exists "../../../$maybe";
5035 push @files, $maybe;
5038 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5039 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5041 $dscaddfile->($debtar);
5042 close $fakedsc or die $!;
5045 sub quilt_check_splitbrain_cache ($$) {
5046 my ($headref, $upstreamversion) = @_;
5047 # Called only if we are in (potentially) split brain mode.
5049 # Computes the cache key and looks in the cache.
5050 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5052 my $splitbrain_cachekey;
5055 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5056 # we look in the reflog of dgit-intern/quilt-cache
5057 # we look for an entry whose message is the key for the cache lookup
5058 my @cachekey = (qw(dgit), $our_version);
5059 push @cachekey, $upstreamversion;
5060 push @cachekey, $quilt_mode;
5061 push @cachekey, $headref;
5063 push @cachekey, hashfile('fake.dsc');
5065 my $srcshash = Digest::SHA->new(256);
5066 my %sfs = ( %INC, '$0(dgit)' => $0 );
5067 foreach my $sfk (sort keys %sfs) {
5068 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5069 $srcshash->add($sfk," ");
5070 $srcshash->add(hashfile($sfs{$sfk}));
5071 $srcshash->add("\n");
5073 push @cachekey, $srcshash->hexdigest();
5074 $splitbrain_cachekey = "@cachekey";
5076 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5078 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5079 debugcmd "|(probably)",@cmd;
5080 my $child = open GC, "-|"; defined $child or die $!;
5082 chdir '../../..' or die $!;
5083 if (!stat ".git/logs/refs/$splitbraincache") {
5084 $! == ENOENT or die $!;
5085 printdebug ">(no reflog)\n";
5092 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5093 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5096 quilt_fixup_mkwork($headref);
5097 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5098 if ($cachehit ne $headref) {
5099 progress "dgit view: found cached ($saved)";
5100 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5102 return ($cachehit, $splitbrain_cachekey);
5104 progress "dgit view: found cached, no changes required";
5105 return ($headref, $splitbrain_cachekey);
5107 die $! if GC->error;
5108 failedcmd unless close GC;
5110 printdebug "splitbrain cache miss\n";
5111 return (undef, $splitbrain_cachekey);
5114 sub quilt_fixup_multipatch ($$$) {
5115 my ($clogp, $headref, $upstreamversion) = @_;
5117 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5120 # - honour any existing .pc in case it has any strangeness
5121 # - determine the git commit corresponding to the tip of
5122 # the patch stack (if there is one)
5123 # - if there is such a git commit, convert each subsequent
5124 # git commit into a quilt patch with dpkg-source --commit
5125 # - otherwise convert all the differences in the tree into
5126 # a single git commit
5130 # Our git tree doesn't necessarily contain .pc. (Some versions of
5131 # dgit would include the .pc in the git tree.) If there isn't
5132 # one, we need to generate one by unpacking the patches that we
5135 # We first look for a .pc in the git tree. If there is one, we
5136 # will use it. (This is not the normal case.)
5138 # Otherwise need to regenerate .pc so that dpkg-source --commit
5139 # can work. We do this as follows:
5140 # 1. Collect all relevant .orig from parent directory
5141 # 2. Generate a debian.tar.gz out of
5142 # debian/{patches,rules,source/format,source/options}
5143 # 3. Generate a fake .dsc containing just these fields:
5144 # Format Source Version Files
5145 # 4. Extract the fake .dsc
5146 # Now the fake .dsc has a .pc directory.
5147 # (In fact we do this in every case, because in future we will
5148 # want to search for a good base commit for generating patches.)
5150 # Then we can actually do the dpkg-source --commit
5151 # 1. Make a new working tree with the same object
5152 # store as our main tree and check out the main
5154 # 2. Copy .pc from the fake's extraction, if necessary
5155 # 3. Run dpkg-source --commit
5156 # 4. If the result has changes to debian/, then
5157 # - git add them them
5158 # - git add .pc if we had a .pc in-tree
5160 # 5. If we had a .pc in-tree, delete it, and git commit
5161 # 6. Back in the main tree, fast forward to the new HEAD
5163 # Another situation we may have to cope with is gbp-style
5164 # patches-unapplied trees.
5166 # We would want to detect these, so we know to escape into
5167 # quilt_fixup_gbp. However, this is in general not possible.
5168 # Consider a package with a one patch which the dgit user reverts
5169 # (with git revert or the moral equivalent).
5171 # That is indistinguishable in contents from a patches-unapplied
5172 # tree. And looking at the history to distinguish them is not
5173 # useful because the user might have made a confusing-looking git
5174 # history structure (which ought to produce an error if dgit can't
5175 # cope, not a silent reintroduction of an unwanted patch).
5177 # So gbp users will have to pass an option. But we can usually
5178 # detect their failure to do so: if the tree is not a clean
5179 # patches-applied tree, quilt linearisation fails, but the tree
5180 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5181 # they want --quilt=unapplied.
5183 # To help detect this, when we are extracting the fake dsc, we
5184 # first extract it with --skip-patches, and then apply the patches
5185 # afterwards with dpkg-source --before-build. That lets us save a
5186 # tree object corresponding to .origs.
5188 my $splitbrain_cachekey;
5190 quilt_make_fake_dsc($upstreamversion);
5192 if (quiltmode_splitbrain()) {
5194 ($cachehit, $splitbrain_cachekey) =
5195 quilt_check_splitbrain_cache($headref, $upstreamversion);
5196 return if $cachehit;
5200 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5202 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5203 rename $fakexdir, "fake" or die "$fakexdir $!";
5207 remove_stray_gits("source package");
5208 mktree_in_ud_here();
5212 my $unapplied=git_add_write_tree();
5213 printdebug "fake orig tree object $unapplied\n";
5217 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5219 if (system @bbcmd) {
5220 failedcmd @bbcmd if $? < 0;
5222 failed to apply your git tree's patch stack (from debian/patches/) to
5223 the corresponding upstream tarball(s). Your source tree and .orig
5224 are probably too inconsistent. dgit can only fix up certain kinds of
5225 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5231 quilt_fixup_mkwork($headref);
5234 if (stat_exists ".pc") {
5236 progress "Tree already contains .pc - will use it then delete it.";
5239 rename '../fake/.pc','.pc' or die $!;
5242 changedir '../fake';
5244 my $oldtiptree=git_add_write_tree();
5245 printdebug "fake o+d/p tree object $unapplied\n";
5246 changedir '../work';
5249 # We calculate some guesswork now about what kind of tree this might
5250 # be. This is mostly for error reporting.
5256 # O = orig, without patches applied
5257 # A = "applied", ie orig with H's debian/patches applied
5258 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5259 \%editedignores, \@unrepres),
5260 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5261 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5265 foreach my $b (qw(01 02)) {
5266 foreach my $v (qw(O2H O2A H2A)) {
5267 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5270 printdebug "differences \@dl @dl.\n";
5273 "$us: base trees orig=%.20s o+d/p=%.20s",
5274 $unapplied, $oldtiptree;
5276 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5277 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5278 $dl[0], $dl[1], $dl[3], $dl[4],
5282 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5284 forceable_fail [qw(unrepresentable)], <<END;
5285 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5290 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5291 push @failsuggestion, "This might be a patches-unapplied branch.";
5292 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5293 push @failsuggestion, "This might be a patches-applied branch.";
5295 push @failsuggestion, "Maybe you need to specify one of".
5296 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5298 if (quiltmode_splitbrain()) {
5299 quiltify_splitbrain($clogp, $unapplied, $headref,
5300 $diffbits, \%editedignores,
5301 $splitbrain_cachekey);
5305 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5306 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5308 if (!open P, '>>', ".pc/applied-patches") {
5309 $!==&ENOENT or die $!;
5314 commit_quilty_patch();
5316 if ($mustdeletepc) {
5317 quilt_fixup_delete_pc();
5321 sub quilt_fixup_editor () {
5322 my $descfn = $ENV{$fakeeditorenv};
5323 my $editing = $ARGV[$#ARGV];
5324 open I1, '<', $descfn or die "$descfn: $!";
5325 open I2, '<', $editing or die "$editing: $!";
5326 unlink $editing or die "$editing: $!";
5327 open O, '>', $editing or die "$editing: $!";
5328 while (<I1>) { print O or die $!; } I1->error and die $!;
5331 $copying ||= m/^\-\-\- /;
5332 next unless $copying;
5335 I2->error and die $!;
5340 sub maybe_apply_patches_dirtily () {
5341 return unless $quilt_mode =~ m/gbp|unapplied/;
5342 print STDERR <<END or die $!;
5344 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5345 dgit: Have to apply the patches - making the tree dirty.
5346 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5349 $patches_applied_dirtily = 01;
5350 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5351 runcmd qw(dpkg-source --before-build .);
5354 sub maybe_unapply_patches_again () {
5355 progress "dgit: Unapplying patches again to tidy up the tree."
5356 if $patches_applied_dirtily;
5357 runcmd qw(dpkg-source --after-build .)
5358 if $patches_applied_dirtily & 01;
5360 if $patches_applied_dirtily & 02;
5361 $patches_applied_dirtily = 0;
5364 #----- other building -----
5366 our $clean_using_builder;
5367 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5368 # clean the tree before building (perhaps invoked indirectly by
5369 # whatever we are using to run the build), rather than separately
5370 # and explicitly by us.
5373 return if $clean_using_builder;
5374 if ($cleanmode eq 'dpkg-source') {
5375 maybe_apply_patches_dirtily();
5376 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5377 } elsif ($cleanmode eq 'dpkg-source-d') {
5378 maybe_apply_patches_dirtily();
5379 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5380 } elsif ($cleanmode eq 'git') {
5381 runcmd_ordryrun_local @git, qw(clean -xdf);
5382 } elsif ($cleanmode eq 'git-ff') {
5383 runcmd_ordryrun_local @git, qw(clean -xdff);
5384 } elsif ($cleanmode eq 'check') {
5385 my $leftovers = cmdoutput @git, qw(clean -xdn);
5386 if (length $leftovers) {
5387 print STDERR $leftovers, "\n" or die $!;
5388 fail "tree contains uncommitted files and --clean=check specified";
5390 } elsif ($cleanmode eq 'none') {
5397 badusage "clean takes no additional arguments" if @ARGV;
5400 maybe_unapply_patches_again();
5403 sub build_prep_early () {
5404 our $build_prep_early_done //= 0;
5405 return if $build_prep_early_done++;
5407 badusage "-p is not allowed when building" if defined $package;
5408 my $clogp = parsechangelog();
5409 $isuite = getfield $clogp, 'Distribution';
5410 $package = getfield $clogp, 'Source';
5411 $version = getfield $clogp, 'Version';
5418 build_maybe_quilt_fixup();
5420 my $pat = changespat $version;
5421 foreach my $f (glob "$buildproductsdir/$pat") {
5423 unlink $f or fail "remove old changes file $f: $!";
5425 progress "would remove $f";
5431 sub changesopts_initial () {
5432 my @opts =@changesopts[1..$#changesopts];
5435 sub changesopts_version () {
5436 if (!defined $changes_since_version) {
5437 my @vsns = archive_query('archive_query');
5438 my @quirk = access_quirk();
5439 if ($quirk[0] eq 'backports') {
5440 local $isuite = $quirk[2];
5442 canonicalise_suite();
5443 push @vsns, archive_query('archive_query');
5446 @vsns = map { $_->[0] } @vsns;
5447 @vsns = sort { -version_compare($a, $b) } @vsns;
5448 $changes_since_version = $vsns[0];
5449 progress "changelog will contain changes since $vsns[0]";
5451 $changes_since_version = '_';
5452 progress "package seems new, not specifying -v<version>";
5455 if ($changes_since_version ne '_') {
5456 return ("-v$changes_since_version");
5462 sub changesopts () {
5463 return (changesopts_initial(), changesopts_version());
5466 sub massage_dbp_args ($;$) {
5467 my ($cmd,$xargs) = @_;
5470 # - if we're going to split the source build out so we can
5471 # do strange things to it, massage the arguments to dpkg-buildpackage
5472 # so that the main build doessn't build source (or add an argument
5473 # to stop it building source by default).
5475 # - add -nc to stop dpkg-source cleaning the source tree,
5476 # unless we're not doing a split build and want dpkg-source
5477 # as cleanmode, in which case we can do nothing
5480 # 0 - source will NOT need to be built separately by caller
5481 # +1 - source will need to be built separately by caller
5482 # +2 - source will need to be built separately by caller AND
5483 # dpkg-buildpackage should not in fact be run at all!
5484 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5485 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5486 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5487 $clean_using_builder = 1;
5490 # -nc has the side effect of specifying -b if nothing else specified
5491 # and some combinations of -S, -b, et al, are errors, rather than
5492 # later simply overriding earlie. So we need to:
5493 # - search the command line for these options
5494 # - pick the last one
5495 # - perhaps add our own as a default
5496 # - perhaps adjust it to the corresponding non-source-building version
5498 foreach my $l ($cmd, $xargs) {
5500 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5503 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5505 if ($need_split_build_invocation) {
5506 printdebug "massage split $dmode.\n";
5507 $r = $dmode =~ m/[S]/ ? +2 :
5508 $dmode =~ y/gGF/ABb/ ? +1 :
5509 $dmode =~ m/[ABb]/ ? 0 :
5512 printdebug "massage done $r $dmode.\n";
5514 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5520 my $wasdir = must_getcwd();
5526 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5527 my ($msg_if_onlyone) = @_;
5528 # If there is only one .changes file, fail with $msg_if_onlyone,
5529 # or if that is undef, be a no-op.
5530 # Returns the changes file to report to the user.
5531 my $pat = changespat $version;
5532 my @changesfiles = glob $pat;
5533 @changesfiles = sort {
5534 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5538 if (@changesfiles==1) {
5539 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5540 only one changes file from build (@changesfiles)
5542 $result = $changesfiles[0];
5543 } elsif (@changesfiles==2) {
5544 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5545 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5546 fail "$l found in binaries changes file $binchanges"
5549 runcmd_ordryrun_local @mergechanges, @changesfiles;
5550 my $multichanges = changespat $version,'multi';
5552 stat_exists $multichanges or fail "$multichanges: $!";
5553 foreach my $cf (glob $pat) {
5554 next if $cf eq $multichanges;
5555 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5558 $result = $multichanges;
5560 fail "wrong number of different changes files (@changesfiles)";
5562 printdone "build successful, results in $result\n" or die $!;
5565 sub midbuild_checkchanges () {
5566 my $pat = changespat $version;
5567 return if $rmchanges;
5568 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5569 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5571 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5572 Suggest you delete @unwanted.
5577 sub midbuild_checkchanges_vanilla ($) {
5579 midbuild_checkchanges() if $wantsrc == 1;
5582 sub postbuild_mergechanges_vanilla ($) {
5584 if ($wantsrc == 1) {
5586 postbuild_mergechanges(undef);
5589 printdone "build successful\n";
5594 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5595 my $wantsrc = massage_dbp_args \@dbp;
5598 midbuild_checkchanges_vanilla $wantsrc;
5603 push @dbp, changesopts_version();
5604 maybe_apply_patches_dirtily();
5605 runcmd_ordryrun_local @dbp;
5607 maybe_unapply_patches_again();
5608 postbuild_mergechanges_vanilla $wantsrc;
5612 $quilt_mode //= 'gbp';
5618 # gbp can make .origs out of thin air. In my tests it does this
5619 # even for a 1.0 format package, with no origs present. So I
5620 # guess it keys off just the version number. We don't know
5621 # exactly what .origs ought to exist, but let's assume that we
5622 # should run gbp if: the version has an upstream part and the main
5624 my $upstreamversion = upstreamversion $version;
5625 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5626 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5628 if ($gbp_make_orig) {
5630 $cleanmode = 'none'; # don't do it again
5631 $need_split_build_invocation = 1;
5634 my @dbp = @dpkgbuildpackage;
5636 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5638 if (!length $gbp_build[0]) {
5639 if (length executable_on_path('git-buildpackage')) {
5640 $gbp_build[0] = qw(git-buildpackage);
5642 $gbp_build[0] = 'gbp buildpackage';
5645 my @cmd = opts_opt_multi_cmd @gbp_build;
5647 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5649 if ($gbp_make_orig) {
5650 ensuredir '.git/dgit';
5651 my $ok = '.git/dgit/origs-gen-ok';
5652 unlink $ok or $!==&ENOENT or die $!;
5653 my @origs_cmd = @cmd;
5654 push @origs_cmd, qw(--git-cleaner=true);
5655 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5656 push @origs_cmd, @ARGV;
5658 debugcmd @origs_cmd;
5660 do { local $!; stat_exists $ok; }
5661 or failedcmd @origs_cmd;
5663 dryrun_report @origs_cmd;
5669 midbuild_checkchanges_vanilla $wantsrc;
5671 if (!$clean_using_builder) {
5672 push @cmd, '--git-cleaner=true';
5676 maybe_unapply_patches_again();
5678 push @cmd, changesopts();
5679 runcmd_ordryrun_local @cmd, @ARGV;
5681 postbuild_mergechanges_vanilla $wantsrc;
5683 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5686 my $our_cleanmode = $cleanmode;
5687 if ($need_split_build_invocation) {
5688 # Pretend that clean is being done some other way. This
5689 # forces us not to try to use dpkg-buildpackage to clean and
5690 # build source all in one go; and instead we run dpkg-source
5691 # (and build_prep() will do the clean since $clean_using_builder
5693 $our_cleanmode = 'ELSEWHERE';
5695 if ($our_cleanmode =~ m/^dpkg-source/) {
5696 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5697 $clean_using_builder = 1;
5700 $sourcechanges = changespat $version,'source';
5702 unlink "../$sourcechanges" or $!==ENOENT
5703 or fail "remove $sourcechanges: $!";
5705 $dscfn = dscfn($version);
5706 if ($our_cleanmode eq 'dpkg-source') {
5707 maybe_apply_patches_dirtily();
5708 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5710 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5711 maybe_apply_patches_dirtily();
5712 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5715 my @cmd = (@dpkgsource, qw(-b --));
5718 runcmd_ordryrun_local @cmd, "work";
5719 my @udfiles = <${package}_*>;
5720 changedir "../../..";
5721 foreach my $f (@udfiles) {
5722 printdebug "source copy, found $f\n";
5725 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5726 $f eq srcfn($version, $&));
5727 printdebug "source copy, found $f - renaming\n";
5728 rename "$ud/$f", "../$f" or $!==ENOENT
5729 or fail "put in place new source file ($f): $!";
5732 my $pwd = must_getcwd();
5733 my $leafdir = basename $pwd;
5735 runcmd_ordryrun_local @cmd, $leafdir;
5738 runcmd_ordryrun_local qw(sh -ec),
5739 'exec >$1; shift; exec "$@"','x',
5740 "../$sourcechanges",
5741 @dpkggenchanges, qw(-S), changesopts();
5745 sub cmd_build_source {
5746 badusage "build-source takes no additional arguments" if @ARGV;
5748 maybe_unapply_patches_again();
5749 printdone "source built, results in $dscfn and $sourcechanges";
5754 midbuild_checkchanges();
5757 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5758 stat_exists $sourcechanges
5759 or fail "$sourcechanges (in parent directory): $!";
5761 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5763 maybe_unapply_patches_again();
5765 postbuild_mergechanges(<<END);
5766 perhaps you need to pass -A ? (sbuild's default is to build only
5767 arch-specific binaries; dgit 1.4 used to override that.)
5772 sub cmd_quilt_fixup {
5773 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5774 my $clogp = parsechangelog();
5775 $version = getfield $clogp, 'Version';
5776 $package = getfield $clogp, 'Source';
5779 build_maybe_quilt_fixup();
5782 sub cmd_import_dsc {
5786 last unless $ARGV[0] =~ m/^-/;
5789 if (m/^--require-valid-signature$/) {
5792 badusage "unknown dgit import-dsc sub-option \`$_'";
5796 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5797 my ($dscfn, $dstbranch) = @ARGV;
5799 badusage "dry run makes no sense with import-dsc" unless act_local();
5801 my $force = $dstbranch =~ s/^\+// ? +1 :
5802 $dstbranch =~ s/^\.\.// ? -1 :
5804 my $info = $force ? " $&" : '';
5805 $info = "$dscfn$info";
5807 my $specbranch = $dstbranch;
5808 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5809 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5811 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5812 my $chead = cmdoutput_errok @symcmd;
5813 defined $chead or $?==256 or failedcmd @symcmd;
5815 fail "$dstbranch is checked out - will not update it"
5816 if defined $chead and $chead eq $dstbranch;
5818 my $oldhash = git_get_ref $dstbranch;
5820 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5821 $dscdata = do { local $/ = undef; <D>; };
5822 D->error and fail "read $dscfn: $!";
5825 # we don't normally need this so import it here
5826 use Dpkg::Source::Package;
5827 my $dp = new Dpkg::Source::Package filename => $dscfn,
5828 require_valid_signature => $needsig;
5830 local $SIG{__WARN__} = sub {
5832 return unless $needsig;
5833 fail "import-dsc signature check failed";
5835 if (!$dp->is_signed()) {
5836 warn "$us: warning: importing unsigned .dsc\n";
5838 my $r = $dp->check_signature();
5839 die "->check_signature => $r" if $needsig && $r;
5845 my $dgit_commit = $dsc->{$ourdscfield[0]};
5846 if (defined $dgit_commit &&
5847 !forceing [qw(import-dsc-with-dgit-field)]) {
5848 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5849 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5850 my @cmd = (qw(sh -ec),
5851 "echo $dgit_commit | git cat-file --batch-check");
5852 my $objgot = cmdoutput @cmd;
5853 if ($objgot =~ m#^\w+ missing\b#) {
5855 .dsc contains Dgit field referring to object $dgit_commit
5856 Your git tree does not have that object. Try `git fetch' from a
5857 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5860 if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
5862 progress "Not fast forward, forced update.";
5864 fail "Not fast forward to $dgit_commit";
5867 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5868 $dstbranch, $dgit_commit);
5870 progress "dgit: import-dsc updated git ref $dstbranch";
5875 Branch $dstbranch already exists
5876 Specify ..$specbranch for a pseudo-merge, binding in existing history
5877 Specify +$specbranch to overwrite, discarding existing history
5879 if $oldhash && !$force;
5881 $package = getfield $dsc, 'Source';
5882 my @dfi = dsc_files_info();
5883 foreach my $fi (@dfi) {
5884 my $f = $fi->{Filename};
5886 next if lstat $here;
5887 fail "stat $here: $!" unless $! == ENOENT;
5889 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5891 } elsif ($dscfn =~ m#^/#) {
5894 fail "cannot import $dscfn which seems to be inside working tree!";
5896 $there =~ s#/+[^/]+$## or
5897 fail "cannot import $dscfn which seems to not have a basename";
5899 symlink $there, $here or fail "symlink $there to $here: $!";
5900 progress "made symlink $here -> $there";
5901 print STDERR Dumper($fi);
5903 my @mergeinputs = generate_commits_from_dsc();
5904 die unless @mergeinputs == 1;
5906 my $newhash = $mergeinputs[0]{Commit};
5910 progress "Import, forced update - synthetic orphan git history.";
5911 } elsif ($force < 0) {
5912 progress "Import, merging.";
5913 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5914 my $version = getfield $dsc, 'Version';
5915 $newhash = make_commit_text <<END;
5920 Merge $package ($version) import into $dstbranch
5923 die; # caught earlier
5927 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5928 $dstbranch, $newhash);
5930 progress "dgit: import-dsc results are in in git ref $dstbranch";
5933 sub cmd_archive_api_query {
5934 badusage "need only 1 subpath argument" unless @ARGV==1;
5935 my ($subpath) = @ARGV;
5936 my @cmd = archive_api_query_cmd($subpath);
5939 exec @cmd or fail "exec curl: $!\n";
5942 sub cmd_clone_dgit_repos_server {
5943 badusage "need destination argument" unless @ARGV==1;
5944 my ($destdir) = @ARGV;
5945 $package = '_dgit-repos-server';
5946 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5948 exec @cmd or fail "exec git clone: $!\n";
5951 sub cmd_setup_mergechangelogs {
5952 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5953 setup_mergechangelogs(1);
5956 sub cmd_setup_useremail {
5957 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5961 sub cmd_setup_new_tree {
5962 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5966 #---------- argument parsing and main program ----------
5969 print "dgit version $our_version\n" or die $!;
5973 our (%valopts_long, %valopts_short);
5976 sub defvalopt ($$$$) {
5977 my ($long,$short,$val_re,$how) = @_;
5978 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5979 $valopts_long{$long} = $oi;
5980 $valopts_short{$short} = $oi;
5981 # $how subref should:
5982 # do whatever assignemnt or thing it likes with $_[0]
5983 # if the option should not be passed on to remote, @rvalopts=()
5984 # or $how can be a scalar ref, meaning simply assign the value
5987 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5988 defvalopt '--distro', '-d', '.+', \$idistro;
5989 defvalopt '', '-k', '.+', \$keyid;
5990 defvalopt '--existing-package','', '.*', \$existing_package;
5991 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5992 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5993 defvalopt '--package', '-p', $package_re, \$package;
5994 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5996 defvalopt '', '-C', '.+', sub {
5997 ($changesfile) = (@_);
5998 if ($changesfile =~ s#^(.*)/##) {
5999 $buildproductsdir = $1;
6003 defvalopt '--initiator-tempdir','','.*', sub {
6004 ($initiator_tempdir) = (@_);
6005 $initiator_tempdir =~ m#^/# or
6006 badusage "--initiator-tempdir must be used specify an".
6007 " absolute, not relative, directory."
6013 if (defined $ENV{'DGIT_SSH'}) {
6014 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6015 } elsif (defined $ENV{'GIT_SSH'}) {
6016 @ssh = ($ENV{'GIT_SSH'});
6024 if (!defined $val) {
6025 badusage "$what needs a value" unless @ARGV;
6027 push @rvalopts, $val;
6029 badusage "bad value \`$val' for $what" unless
6030 $val =~ m/^$oi->{Re}$(?!\n)/s;
6031 my $how = $oi->{How};
6032 if (ref($how) eq 'SCALAR') {
6037 push @ropts, @rvalopts;
6041 last unless $ARGV[0] =~ m/^-/;
6045 if (m/^--dry-run$/) {
6048 } elsif (m/^--damp-run$/) {
6051 } elsif (m/^--no-sign$/) {
6054 } elsif (m/^--help$/) {
6056 } elsif (m/^--version$/) {
6058 } elsif (m/^--new$/) {
6061 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6062 ($om = $opts_opt_map{$1}) &&
6066 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6067 !$opts_opt_cmdonly{$1} &&
6068 ($om = $opts_opt_map{$1})) {
6071 } elsif (m/^--(gbp|dpm)$/s) {
6072 push @ropts, "--quilt=$1";
6074 } elsif (m/^--ignore-dirty$/s) {
6077 } elsif (m/^--no-quilt-fixup$/s) {
6079 $quilt_mode = 'nocheck';
6080 } elsif (m/^--no-rm-on-error$/s) {
6083 } elsif (m/^--overwrite$/s) {
6085 $overwrite_version = '';
6086 } elsif (m/^--overwrite=(.+)$/s) {
6088 $overwrite_version = $1;
6089 } elsif (m/^--delayed=(\d+)$/s) {
6092 } elsif (m/^--dgit-view-save=(.+)$/s) {
6094 $split_brain_save = $1;
6095 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6096 } elsif (m/^--(no-)?rm-old-changes$/s) {
6099 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6101 push @deliberatelies, $&;
6102 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6106 } elsif (m/^--force-/) {
6108 "$us: warning: ignoring unknown force option $_\n";
6110 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6111 # undocumented, for testing
6113 $tagformat_want = [ $1, 'command line', 1 ];
6114 # 1 menas overrides distro configuration
6115 } elsif (m/^--always-split-source-build$/s) {
6116 # undocumented, for testing
6118 $need_split_build_invocation = 1;
6119 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6120 $val = $2 ? $' : undef; #';
6121 $valopt->($oi->{Long});
6123 badusage "unknown long option \`$_'";
6130 } elsif (s/^-L/-/) {
6133 } elsif (s/^-h/-/) {
6135 } elsif (s/^-D/-/) {
6139 } elsif (s/^-N/-/) {
6144 push @changesopts, $_;
6146 } elsif (s/^-wn$//s) {
6148 $cleanmode = 'none';
6149 } elsif (s/^-wg$//s) {
6152 } elsif (s/^-wgf$//s) {
6154 $cleanmode = 'git-ff';
6155 } elsif (s/^-wd$//s) {
6157 $cleanmode = 'dpkg-source';
6158 } elsif (s/^-wdd$//s) {
6160 $cleanmode = 'dpkg-source-d';
6161 } elsif (s/^-wc$//s) {
6163 $cleanmode = 'check';
6164 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6165 push @git, '-c', $&;
6166 $gitcfgs{cmdline}{$1} = [ $2 ];
6167 } elsif (s/^-c([^=]+)$//s) {
6168 push @git, '-c', $&;
6169 $gitcfgs{cmdline}{$1} = [ 'true' ];
6170 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6172 $val = undef unless length $val;
6173 $valopt->($oi->{Short});
6176 badusage "unknown short option \`$_'";
6183 sub check_env_sanity () {
6184 my $blocked = new POSIX::SigSet;
6185 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6188 foreach my $name (qw(PIPE CHLD)) {
6189 my $signame = "SIG$name";
6190 my $signum = eval "POSIX::$signame" // die;
6191 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6192 die "$signame is set to something other than SIG_DFL\n";
6193 $blocked->ismember($signum) and
6194 die "$signame is blocked\n";
6200 On entry to dgit, $@
6201 This is a bug produced by something in in your execution environment.
6207 sub finalise_opts_opts () {
6208 foreach my $k (keys %opts_opt_map) {
6209 my $om = $opts_opt_map{$k};
6211 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6213 badcfg "cannot set command for $k"
6214 unless length $om->[0];
6218 foreach my $c (access_cfg_cfgs("opts-$k")) {
6220 map { $_ ? @$_ : () }
6221 map { $gitcfgs{$_}{$c} }
6222 reverse @gitcfgsources;
6223 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6224 "\n" if $debuglevel >= 4;
6226 badcfg "cannot configure options for $k"
6227 if $opts_opt_cmdonly{$k};
6228 my $insertpos = $opts_cfg_insertpos{$k};
6229 @$om = ( @$om[0..$insertpos-1],
6231 @$om[$insertpos..$#$om] );
6236 if ($ENV{$fakeeditorenv}) {
6238 quilt_fixup_editor();
6245 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6246 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6247 if $dryrun_level == 1;
6249 print STDERR $helpmsg or die $!;
6252 my $cmd = shift @ARGV;
6255 my $pre_fn = ${*::}{"pre_$cmd"};
6256 $pre_fn->() if $pre_fn;
6258 if (!defined $rmchanges) {
6259 local $access_forpush;
6260 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6263 if (!defined $quilt_mode) {
6264 local $access_forpush;
6265 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6266 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6268 $quilt_mode =~ m/^($quilt_modes_re)$/
6269 or badcfg "unknown quilt-mode \`$quilt_mode'";
6273 $need_split_build_invocation ||= quiltmode_splitbrain();
6275 if (!defined $cleanmode) {
6276 local $access_forpush;
6277 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6278 $cleanmode //= 'dpkg-source';
6280 badcfg "unknown clean-mode \`$cleanmode'" unless
6281 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6284 my $fn = ${*::}{"cmd_$cmd"};
6285 $fn or badusage "unknown operation $cmd";