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) = @_;
174 return "$distro/".dep14_version_mangle $v;
177 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
179 sub lbranch () { return "$branchprefix/$csuite"; }
180 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
181 sub lref () { return "refs/heads/".lbranch(); }
182 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
183 sub rrref () { return server_ref($csuite); }
185 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
186 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
188 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
189 # locally fetched refs because they have unhelpful names and clutter
190 # up gitk etc. So we track whether we have "used up" head ref (ie,
191 # whether we have made another local ref which refers to this object).
193 # (If we deleted them unconditionally, then we might end up
194 # re-fetching the same git objects each time dgit fetch was run.)
196 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
197 # in git_fetch_us to fetch the refs in question, and possibly a call
198 # to lrfetchref_used.
200 our (%lrfetchrefs_f, %lrfetchrefs_d);
201 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
203 sub lrfetchref_used ($) {
204 my ($fullrefname) = @_;
205 my $objid = $lrfetchrefs_f{$fullrefname};
206 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
217 return "${package}_".(stripepoch $vsn).$sfx
222 return srcfn($vsn,".dsc");
225 sub changespat ($;$) {
226 my ($vsn, $arch) = @_;
227 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
230 sub upstreamversion ($) {
242 foreach my $f (@end) {
244 print STDERR "$us: cleanup: $@" if length $@;
248 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
250 sub forceable_fail ($$) {
251 my ($forceoptsl, $msg) = @_;
252 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
253 print STDERR "warning: overriding problem due to --force:\n". $msg;
257 my ($forceoptsl) = @_;
258 my @got = grep { $forceopts{$_} } @$forceoptsl;
259 return 0 unless @got;
261 "warning: skipping checks or functionality due to --force-$got[0]\n";
264 sub no_such_package () {
265 print STDERR "$us: package $package does not exist in suite $isuite\n";
271 printdebug "CD $newdir\n";
272 chdir $newdir or confess "chdir: $newdir: $!";
275 sub deliberately ($) {
277 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
280 sub deliberately_not_fast_forward () {
281 foreach (qw(not-fast-forward fresh-repo)) {
282 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
286 sub quiltmode_splitbrain () {
287 $quilt_mode =~ m/gbp|dpm|unapplied/;
290 sub opts_opt_multi_cmd {
292 push @cmd, split /\s+/, shift @_;
298 return opts_opt_multi_cmd @gbp_pq;
301 #---------- remote protocol support, common ----------
303 # remote push initiator/responder protocol:
304 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
305 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
306 # < dgit-remote-push-ready <actual-proto-vsn>
313 # > supplementary-message NBYTES # $protovsn >= 3
318 # > file parsed-changelog
319 # [indicates that output of dpkg-parsechangelog follows]
320 # > data-block NBYTES
321 # > [NBYTES bytes of data (no newline)]
322 # [maybe some more blocks]
331 # > param head DGIT-VIEW-HEAD
332 # > param csuite SUITE
333 # > param tagformat old|new
334 # > param maint-view MAINT-VIEW-HEAD
336 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
337 # # goes into tag, for replay prevention
340 # [indicates that signed tag is wanted]
341 # < data-block NBYTES
342 # < [NBYTES bytes of data (no newline)]
343 # [maybe some more blocks]
347 # > want signed-dsc-changes
348 # < data-block NBYTES [transfer of signed dsc]
350 # < data-block NBYTES [transfer of signed changes]
358 sub i_child_report () {
359 # Sees if our child has died, and reap it if so. Returns a string
360 # describing how it died if it failed, or undef otherwise.
361 return undef unless $i_child_pid;
362 my $got = waitpid $i_child_pid, WNOHANG;
363 return undef if $got <= 0;
364 die unless $got == $i_child_pid;
365 $i_child_pid = undef;
366 return undef unless $?;
367 return "build host child ".waitstatusmsg();
372 fail "connection lost: $!" if $fh->error;
373 fail "protocol violation; $m not expected";
376 sub badproto_badread ($$) {
378 fail "connection lost: $!" if $!;
379 my $report = i_child_report();
380 fail $report if defined $report;
381 badproto $fh, "eof (reading $wh)";
384 sub protocol_expect (&$) {
385 my ($match, $fh) = @_;
388 defined && chomp or badproto_badread $fh, "protocol message";
396 badproto $fh, "\`$_'";
399 sub protocol_send_file ($$) {
400 my ($fh, $ourfn) = @_;
401 open PF, "<", $ourfn or die "$ourfn: $!";
404 my $got = read PF, $d, 65536;
405 die "$ourfn: $!" unless defined $got;
407 print $fh "data-block ".length($d)."\n" or die $!;
408 print $fh $d or die $!;
410 PF->error and die "$ourfn $!";
411 print $fh "data-end\n" or die $!;
415 sub protocol_read_bytes ($$) {
416 my ($fh, $nbytes) = @_;
417 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
419 my $got = read $fh, $d, $nbytes;
420 $got==$nbytes or badproto_badread $fh, "data block";
424 sub protocol_receive_file ($$) {
425 my ($fh, $ourfn) = @_;
426 printdebug "() $ourfn\n";
427 open PF, ">", $ourfn or die "$ourfn: $!";
429 my ($y,$l) = protocol_expect {
430 m/^data-block (.*)$/ ? (1,$1) :
431 m/^data-end$/ ? (0,) :
435 my $d = protocol_read_bytes $fh, $l;
436 print PF $d or die $!;
441 #---------- remote protocol support, responder ----------
443 sub responder_send_command ($) {
445 return unless $we_are_responder;
446 # called even without $we_are_responder
447 printdebug ">> $command\n";
448 print PO $command, "\n" or die $!;
451 sub responder_send_file ($$) {
452 my ($keyword, $ourfn) = @_;
453 return unless $we_are_responder;
454 printdebug "]] $keyword $ourfn\n";
455 responder_send_command "file $keyword";
456 protocol_send_file \*PO, $ourfn;
459 sub responder_receive_files ($@) {
460 my ($keyword, @ourfns) = @_;
461 die unless $we_are_responder;
462 printdebug "[[ $keyword @ourfns\n";
463 responder_send_command "want $keyword";
464 foreach my $fn (@ourfns) {
465 protocol_receive_file \*PI, $fn;
468 protocol_expect { m/^files-end$/ } \*PI;
471 #---------- remote protocol support, initiator ----------
473 sub initiator_expect (&) {
475 protocol_expect { &$match } \*RO;
478 #---------- end remote code ----------
481 if ($we_are_responder) {
483 responder_send_command "progress ".length($m) or die $!;
484 print PO $m or die $!;
494 $ua = LWP::UserAgent->new();
498 progress "downloading $what...";
499 my $r = $ua->get(@_) or die $!;
500 return undef if $r->code == 404;
501 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
502 return $r->decoded_content(charset => 'none');
505 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
510 failedcmd @_ if system @_;
513 sub act_local () { return $dryrun_level <= 1; }
514 sub act_scary () { return !$dryrun_level; }
517 if (!$dryrun_level) {
518 progress "$us ok: @_";
520 progress "would be ok: @_ (but dry run only)";
525 printcmd(\*STDERR,$debugprefix."#",@_);
528 sub runcmd_ordryrun {
536 sub runcmd_ordryrun_local {
545 my ($first_shell, @cmd) = @_;
546 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
549 our $helpmsg = <<END;
551 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
552 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
553 dgit [dgit-opts] build [dpkg-buildpackage-opts]
554 dgit [dgit-opts] sbuild [sbuild-opts]
555 dgit [dgit-opts] push [dgit-opts] [suite]
556 dgit [dgit-opts] rpush build-host:build-dir ...
557 important dgit options:
558 -k<keyid> sign tag and package with <keyid> instead of default
559 --dry-run -n do not change anything, but go through the motions
560 --damp-run -L like --dry-run but make local changes, without signing
561 --new -N allow introducing a new package
562 --debug -D increase debug level
563 -c<name>=<value> set git config option (used directly by dgit too)
566 our $later_warning_msg = <<END;
567 Perhaps the upload is stuck in incoming. Using the version from git.
571 print STDERR "$us: @_\n", $helpmsg or die $!;
576 @ARGV or badusage "too few arguments";
577 return scalar shift @ARGV;
581 print $helpmsg or die $!;
585 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
587 our %defcfg = ('dgit.default.distro' => 'debian',
588 'dgit-suite.*-security.distro' => 'debian-security',
589 'dgit.default.username' => '',
590 'dgit.default.archive-query-default-component' => 'main',
591 'dgit.default.ssh' => 'ssh',
592 'dgit.default.archive-query' => 'madison:',
593 'dgit.default.sshpsql-dbname' => 'service=projectb',
594 'dgit.default.aptget-components' => 'main',
595 'dgit.default.dgit-tag-format' => 'new,old,maint',
596 # old means "repo server accepts pushes with old dgit tags"
597 # new means "repo server accepts pushes with new dgit tags"
598 # maint means "repo server accepts split brain pushes"
599 # hist means "repo server may have old pushes without new tag"
600 # ("hist" is implied by "old")
601 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
602 'dgit-distro.debian.git-check' => 'url',
603 'dgit-distro.debian.git-check-suffix' => '/info/refs',
604 'dgit-distro.debian.new-private-pushers' => 't',
605 'dgit-distro.debian/push.git-url' => '',
606 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
607 'dgit-distro.debian/push.git-user-force' => 'dgit',
608 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
609 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
610 'dgit-distro.debian/push.git-create' => 'true',
611 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
612 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
613 # 'dgit-distro.debian.archive-query-tls-key',
614 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
615 # ^ this does not work because curl is broken nowadays
616 # Fixing #790093 properly will involve providing providing the key
617 # in some pacagke and maybe updating these paths.
619 # 'dgit-distro.debian.archive-query-tls-curl-args',
620 # '--ca-path=/etc/ssl/ca-debian',
621 # ^ this is a workaround but works (only) on DSA-administered machines
622 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
623 'dgit-distro.debian.git-url-suffix' => '',
624 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
625 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
626 'dgit-distro.debian-security.archive-query' => 'aptget:',
627 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
628 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
629 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
630 'dgit-distro.debian-security.nominal-distro' => 'debian',
631 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
632 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
633 'dgit-distro.ubuntu.git-check' => 'false',
634 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
635 'dgit-distro.test-dummy.ssh' => "$td/ssh",
636 'dgit-distro.test-dummy.username' => "alice",
637 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
638 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
639 'dgit-distro.test-dummy.git-url' => "$td/git",
640 'dgit-distro.test-dummy.git-host' => "git",
641 'dgit-distro.test-dummy.git-path' => "$td/git",
642 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
643 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
644 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
645 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
649 our @gitcfgsources = qw(cmdline local global system);
651 sub git_slurp_config () {
652 local ($debuglevel) = $debuglevel-2;
655 # This algoritm is a bit subtle, but this is needed so that for
656 # options which we want to be single-valued, we allow the
657 # different config sources to override properly. See #835858.
658 foreach my $src (@gitcfgsources) {
659 next if $src eq 'cmdline';
660 # we do this ourselves since git doesn't handle it
662 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
665 open GITS, "-|", @cmd or die $!;
668 printdebug "=> ", (messagequote $_), "\n";
670 push @{ $gitcfgs{$src}{$`} }, $'; #';
674 or ($!==0 && $?==256)
679 sub git_get_config ($) {
681 foreach my $src (@gitcfgsources) {
682 my $l = $gitcfgs{$src}{$c};
683 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
686 @$l==1 or badcfg "multiple values for $c".
687 " (in $src git config)" if @$l > 1;
695 return undef if $c =~ /RETURN-UNDEF/;
696 my $v = git_get_config($c);
697 return $v if defined $v;
698 my $dv = $defcfg{$c};
699 return $dv if defined $dv;
701 badcfg "need value for one of: @_\n".
702 "$us: distro or suite appears not to be (properly) supported";
705 sub access_basedistro () {
706 if (defined $idistro) {
709 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
710 return $def if defined $def;
711 foreach my $src (@gitcfgsources, 'internal') {
712 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
714 foreach my $k (keys %$kl) {
715 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
717 next unless match_glob $dpat, $isuite;
721 return cfg("dgit.default.distro");
725 sub access_nomdistro () {
726 my $base = access_basedistro();
727 return cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
730 sub access_quirk () {
731 # returns (quirk name, distro to use instead or undef, quirk-specific info)
732 my $basedistro = access_basedistro();
733 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
735 if (defined $backports_quirk) {
736 my $re = $backports_quirk;
737 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
739 $re =~ s/\%/([-0-9a-z_]+)/
740 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
741 if ($isuite =~ m/^$re$/) {
742 return ('backports',"$basedistro-backports",$1);
745 return ('none',undef);
750 sub parse_cfg_bool ($$$) {
751 my ($what,$def,$v) = @_;
754 $v =~ m/^[ty1]/ ? 1 :
755 $v =~ m/^[fn0]/ ? 0 :
756 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
759 sub access_forpush_config () {
760 my $d = access_basedistro();
764 parse_cfg_bool('new-private-pushers', 0,
765 cfg("dgit-distro.$d.new-private-pushers",
768 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
771 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
772 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
773 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
774 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
777 sub access_forpush () {
778 $access_forpush //= access_forpush_config();
779 return $access_forpush;
783 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
784 badcfg "pushing but distro is configured readonly"
785 if access_forpush_config() eq '0';
787 $supplementary_message = <<'END' unless $we_are_responder;
788 Push failed, before we got started.
789 You can retry the push, after fixing the problem, if you like.
791 finalise_opts_opts();
795 finalise_opts_opts();
798 sub supplementary_message ($) {
800 if (!$we_are_responder) {
801 $supplementary_message = $msg;
803 } elsif ($protovsn >= 3) {
804 responder_send_command "supplementary-message ".length($msg)
806 print PO $msg or die $!;
810 sub access_distros () {
811 # Returns list of distros to try, in order
814 # 0. `instead of' distro name(s) we have been pointed to
815 # 1. the access_quirk distro, if any
816 # 2a. the user's specified distro, or failing that } basedistro
817 # 2b. the distro calculated from the suite }
818 my @l = access_basedistro();
820 my (undef,$quirkdistro) = access_quirk();
821 unshift @l, $quirkdistro;
822 unshift @l, $instead_distro;
823 @l = grep { defined } @l;
825 push @l, access_nomdistro();
827 if (access_forpush()) {
828 @l = map { ("$_/push", $_) } @l;
833 sub access_cfg_cfgs (@) {
836 # The nesting of these loops determines the search order. We put
837 # the key loop on the outside so that we search all the distros
838 # for each key, before going on to the next key. That means that
839 # if access_cfg is called with a more specific, and then a less
840 # specific, key, an earlier distro can override the less specific
841 # without necessarily overriding any more specific keys. (If the
842 # distro wants to override the more specific keys it can simply do
843 # so; whereas if we did the loop the other way around, it would be
844 # impossible to for an earlier distro to override a less specific
845 # key but not the more specific ones without restating the unknown
846 # values of the more specific keys.
849 # We have to deal with RETURN-UNDEF specially, so that we don't
850 # terminate the search prematurely.
852 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
855 foreach my $d (access_distros()) {
856 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
858 push @cfgs, map { "dgit.default.$_" } @realkeys;
865 my (@cfgs) = access_cfg_cfgs(@keys);
866 my $value = cfg(@cfgs);
870 sub access_cfg_bool ($$) {
871 my ($def, @keys) = @_;
872 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
875 sub string_to_ssh ($) {
877 if ($spec =~ m/\s/) {
878 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
884 sub access_cfg_ssh () {
885 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
886 if (!defined $gitssh) {
889 return string_to_ssh $gitssh;
893 sub access_runeinfo ($) {
895 return ": dgit ".access_basedistro()." $info ;";
898 sub access_someuserhost ($) {
900 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
901 defined($user) && length($user) or
902 $user = access_cfg("$some-user",'username');
903 my $host = access_cfg("$some-host");
904 return length($user) ? "$user\@$host" : $host;
907 sub access_gituserhost () {
908 return access_someuserhost('git');
911 sub access_giturl (;$) {
913 my $url = access_cfg('git-url','RETURN-UNDEF');
916 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
917 return undef unless defined $proto;
920 access_gituserhost().
921 access_cfg('git-path');
923 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
926 return "$url/$package$suffix";
929 sub parsecontrolfh ($$;$) {
930 my ($fh, $desc, $allowsigned) = @_;
931 our $dpkgcontrolhash_noissigned;
934 my %opts = ('name' => $desc);
935 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
936 $c = Dpkg::Control::Hash->new(%opts);
937 $c->parse($fh,$desc) or die "parsing of $desc failed";
938 last if $allowsigned;
939 last if $dpkgcontrolhash_noissigned;
940 my $issigned= $c->get_option('is_pgp_signed');
941 if (!defined $issigned) {
942 $dpkgcontrolhash_noissigned= 1;
943 seek $fh, 0,0 or die "seek $desc: $!";
944 } elsif ($issigned) {
945 fail "control file $desc is (already) PGP-signed. ".
946 " Note that dgit push needs to modify the .dsc and then".
947 " do the signature itself";
956 my ($file, $desc, $allowsigned) = @_;
957 my $fh = new IO::Handle;
958 open $fh, '<', $file or die "$file: $!";
959 my $c = parsecontrolfh($fh,$desc,$allowsigned);
960 $fh->error and die $!;
966 my ($dctrl,$field) = @_;
967 my $v = $dctrl->{$field};
968 return $v if defined $v;
969 fail "missing field $field in ".$dctrl->get_option('name');
973 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
974 my $p = new IO::Handle;
975 my @cmd = (qw(dpkg-parsechangelog), @_);
976 open $p, '-|', @cmd or die $!;
978 $?=0; $!=0; close $p or failedcmd @cmd;
982 sub commit_getclogp ($) {
983 # Returns the parsed changelog hashref for a particular commit
985 our %commit_getclogp_memo;
986 my $memo = $commit_getclogp_memo{$objid};
987 return $memo if $memo;
989 my $mclog = ".git/dgit/clog-$objid";
990 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
991 "$objid:debian/changelog";
992 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
997 defined $d or fail "getcwd failed: $!";
1001 sub parse_dscdata () {
1002 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1003 printdebug Dumper($dscdata) if $debuglevel>1;
1004 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1005 printdebug Dumper($dsc) if $debuglevel>1;
1010 sub archive_query ($;@) {
1011 my ($method) = shift @_;
1012 fail "this operation does not support multiple comma-separated suites"
1014 my $query = access_cfg('archive-query','RETURN-UNDEF');
1015 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1018 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1021 sub archive_query_prepend_mirror {
1022 my $m = access_cfg('mirror');
1023 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1026 sub pool_dsc_subpath ($$) {
1027 my ($vsn,$component) = @_; # $package is implict arg
1028 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1029 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1032 sub cfg_apply_map ($$$) {
1033 my ($varref, $what, $mapspec) = @_;
1034 return unless $mapspec;
1036 printdebug "config $what EVAL{ $mapspec; }\n";
1038 eval "package Dgit::Config; $mapspec;";
1043 #---------- `ftpmasterapi' archive query method (nascent) ----------
1045 sub archive_api_query_cmd ($) {
1047 my @cmd = (@curl, qw(-sS));
1048 my $url = access_cfg('archive-query-url');
1049 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1051 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1052 foreach my $key (split /\:/, $keys) {
1053 $key =~ s/\%HOST\%/$host/g;
1055 fail "for $url: stat $key: $!" unless $!==ENOENT;
1058 fail "config requested specific TLS key but do not know".
1059 " how to get curl to use exactly that EE key ($key)";
1060 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1061 # # Sadly the above line does not work because of changes
1062 # # to gnutls. The real fix for #790093 may involve
1063 # # new curl options.
1066 # Fixing #790093 properly will involve providing a value
1067 # for this on clients.
1068 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1069 push @cmd, split / /, $kargs if defined $kargs;
1071 push @cmd, $url.$subpath;
1075 sub api_query ($$;$) {
1077 my ($data, $subpath, $ok404) = @_;
1078 badcfg "ftpmasterapi archive query method takes no data part"
1080 my @cmd = archive_api_query_cmd($subpath);
1081 my $url = $cmd[$#cmd];
1082 push @cmd, qw(-w %{http_code});
1083 my $json = cmdoutput @cmd;
1084 unless ($json =~ s/\d+\d+\d$//) {
1085 failedcmd_report_cmd undef, @cmd;
1086 fail "curl failed to print 3-digit HTTP code";
1089 return undef if $code eq '404' && $ok404;
1090 fail "fetch of $url gave HTTP code $code"
1091 unless $url =~ m#^file://# or $code =~ m/^2/;
1092 return decode_json($json);
1095 sub canonicalise_suite_ftpmasterapi {
1096 my ($proto,$data) = @_;
1097 my $suites = api_query($data, 'suites');
1099 foreach my $entry (@$suites) {
1101 my $v = $entry->{$_};
1102 defined $v && $v eq $isuite;
1103 } qw(codename name);
1104 push @matched, $entry;
1106 fail "unknown suite $isuite" unless @matched;
1109 @matched==1 or die "multiple matches for suite $isuite\n";
1110 $cn = "$matched[0]{codename}";
1111 defined $cn or die "suite $isuite info has no codename\n";
1112 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1114 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1119 sub archive_query_ftpmasterapi {
1120 my ($proto,$data) = @_;
1121 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1123 my $digester = Digest::SHA->new(256);
1124 foreach my $entry (@$info) {
1126 my $vsn = "$entry->{version}";
1127 my ($ok,$msg) = version_check $vsn;
1128 die "bad version: $msg\n" unless $ok;
1129 my $component = "$entry->{component}";
1130 $component =~ m/^$component_re$/ or die "bad component";
1131 my $filename = "$entry->{filename}";
1132 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1133 or die "bad filename";
1134 my $sha256sum = "$entry->{sha256sum}";
1135 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1136 push @rows, [ $vsn, "/pool/$component/$filename",
1137 $digester, $sha256sum ];
1139 die "bad ftpmaster api response: $@\n".Dumper($entry)
1142 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1143 return archive_query_prepend_mirror @rows;
1146 sub file_in_archive_ftpmasterapi {
1147 my ($proto,$data,$filename) = @_;
1148 my $pat = $filename;
1151 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1152 my $info = api_query($data, "file_in_archive/$pat", 1);
1155 #---------- `aptget' archive query method ----------
1158 our $aptget_releasefile;
1159 our $aptget_configpath;
1161 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1162 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1164 sub aptget_cache_clean {
1165 runcmd_ordryrun_local qw(sh -ec),
1166 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1170 sub aptget_lock_acquire () {
1171 my $lockfile = "$aptget_base/lock";
1172 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1173 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1176 sub aptget_prep ($) {
1178 return if defined $aptget_base;
1180 badcfg "aptget archive query method takes no data part"
1183 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1186 ensuredir "$cache/dgit";
1188 access_cfg('aptget-cachekey','RETURN-UNDEF')
1189 // access_nomdistro();
1191 $aptget_base = "$cache/dgit/aptget";
1192 ensuredir $aptget_base;
1194 my $quoted_base = $aptget_base;
1195 die "$quoted_base contains bad chars, cannot continue"
1196 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1198 ensuredir $aptget_base;
1200 aptget_lock_acquire();
1202 aptget_cache_clean();
1204 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1205 my $sourceslist = "source.list#$cachekey";
1207 my $aptsuites = $isuite;
1208 cfg_apply_map(\$aptsuites, 'suite map',
1209 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1211 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1212 printf SRCS "deb-src %s %s %s\n",
1213 access_cfg('mirror'),
1215 access_cfg('aptget-components')
1218 ensuredir "$aptget_base/cache";
1219 ensuredir "$aptget_base/lists";
1221 open CONF, ">", $aptget_configpath or die $!;
1223 Debug::NoLocking "true";
1224 APT::Get::List-Cleanup "false";
1225 #clear APT::Update::Post-Invoke-Success;
1226 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1227 Dir::State::Lists "$quoted_base/lists";
1228 Dir::Etc::preferences "$quoted_base/preferences";
1229 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1230 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1233 foreach my $key (qw(
1236 Dir::Cache::Archives
1237 Dir::Etc::SourceParts
1238 Dir::Etc::preferencesparts
1240 ensuredir "$aptget_base/$key";
1241 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1244 my $oldatime = (time // die $!) - 1;
1245 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1246 next unless stat_exists $oldlist;
1247 my ($mtime) = (stat _)[9];
1248 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1251 runcmd_ordryrun_local aptget_aptget(), qw(update);
1254 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1255 next unless stat_exists $oldlist;
1256 my ($atime) = (stat _)[8];
1257 next if $atime == $oldatime;
1258 push @releasefiles, $oldlist;
1260 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1261 @releasefiles = @inreleasefiles if @inreleasefiles;
1262 die "apt updated wrong number of Release files (@releasefiles), erk"
1263 unless @releasefiles == 1;
1265 ($aptget_releasefile) = @releasefiles;
1268 sub canonicalise_suite_aptget {
1269 my ($proto,$data) = @_;
1272 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1274 foreach my $name (qw(Codename Suite)) {
1275 my $val = $release->{$name};
1277 printdebug "release file $name: $val\n";
1278 $val =~ m/^$suite_re$/o or fail
1279 "Release file ($aptget_releasefile) specifies intolerable $name";
1280 cfg_apply_map(\$val, 'suite rmap',
1281 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1288 sub archive_query_aptget {
1289 my ($proto,$data) = @_;
1292 ensuredir "$aptget_base/source";
1293 foreach my $old (<$aptget_base/source/*.dsc>) {
1294 unlink $old or die "$old: $!";
1297 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1298 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1299 # avoids apt-get source failing with ambiguous error code
1301 runcmd_ordryrun_local
1302 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1303 aptget_aptget(), qw(--download-only --only-source source), $package;
1305 my @dscs = <$aptget_base/source/*.dsc>;
1306 fail "apt-get source did not produce a .dsc" unless @dscs;
1307 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1309 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1312 my $uri = "file://". uri_escape $dscs[0];
1313 $uri =~ s{\%2f}{/}gi;
1314 return [ (getfield $pre_dsc, 'Version'), $uri ];
1317 #---------- `dummyapicat' archive query method ----------
1319 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1320 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1322 sub file_in_archive_dummycatapi ($$$) {
1323 my ($proto,$data,$filename) = @_;
1324 my $mirror = access_cfg('mirror');
1325 $mirror =~ s#^file://#/# or die "$mirror ?";
1327 my @cmd = (qw(sh -ec), '
1329 find -name "$2" -print0 |
1331 ', qw(x), $mirror, $filename);
1332 debugcmd "-|", @cmd;
1333 open FIA, "-|", @cmd or die $!;
1336 printdebug "| $_\n";
1337 m/^(\w+) (\S+)$/ or die "$_ ?";
1338 push @out, { sha256sum => $1, filename => $2 };
1340 close FIA or die failedcmd @cmd;
1344 #---------- `madison' archive query method ----------
1346 sub archive_query_madison {
1347 return archive_query_prepend_mirror
1348 map { [ @$_[0..1] ] } madison_get_parse(@_);
1351 sub madison_get_parse {
1352 my ($proto,$data) = @_;
1353 die unless $proto eq 'madison';
1354 if (!length $data) {
1355 $data= access_cfg('madison-distro','RETURN-UNDEF');
1356 $data //= access_basedistro();
1358 $rmad{$proto,$data,$package} ||= cmdoutput
1359 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1360 my $rmad = $rmad{$proto,$data,$package};
1363 foreach my $l (split /\n/, $rmad) {
1364 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1365 \s*( [^ \t|]+ )\s* \|
1366 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1367 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1368 $1 eq $package or die "$rmad $package ?";
1375 $component = access_cfg('archive-query-default-component');
1377 $5 eq 'source' or die "$rmad ?";
1378 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1380 return sort { -version_compare($a->[0],$b->[0]); } @out;
1383 sub canonicalise_suite_madison {
1384 # madison canonicalises for us
1385 my @r = madison_get_parse(@_);
1387 "unable to canonicalise suite using package $package".
1388 " which does not appear to exist in suite $isuite;".
1389 " --existing-package may help";
1393 sub file_in_archive_madison { return undef; }
1395 #---------- `sshpsql' archive query method ----------
1398 my ($data,$runeinfo,$sql) = @_;
1399 if (!length $data) {
1400 $data= access_someuserhost('sshpsql').':'.
1401 access_cfg('sshpsql-dbname');
1403 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1404 my ($userhost,$dbname) = ($`,$'); #';
1406 my @cmd = (access_cfg_ssh, $userhost,
1407 access_runeinfo("ssh-psql $runeinfo").
1408 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1409 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1411 open P, "-|", @cmd or die $!;
1414 printdebug(">|$_|\n");
1417 $!=0; $?=0; close P or failedcmd @cmd;
1419 my $nrows = pop @rows;
1420 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1421 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1422 @rows = map { [ split /\|/, $_ ] } @rows;
1423 my $ncols = scalar @{ shift @rows };
1424 die if grep { scalar @$_ != $ncols } @rows;
1428 sub sql_injection_check {
1429 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1432 sub archive_query_sshpsql ($$) {
1433 my ($proto,$data) = @_;
1434 sql_injection_check $isuite, $package;
1435 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1436 SELECT source.version, component.name, files.filename, files.sha256sum
1438 JOIN src_associations ON source.id = src_associations.source
1439 JOIN suite ON suite.id = src_associations.suite
1440 JOIN dsc_files ON dsc_files.source = source.id
1441 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1442 JOIN component ON component.id = files_archive_map.component_id
1443 JOIN files ON files.id = dsc_files.file
1444 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1445 AND source.source='$package'
1446 AND files.filename LIKE '%.dsc';
1448 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1449 my $digester = Digest::SHA->new(256);
1451 my ($vsn,$component,$filename,$sha256sum) = @$_;
1452 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1454 return archive_query_prepend_mirror @rows;
1457 sub canonicalise_suite_sshpsql ($$) {
1458 my ($proto,$data) = @_;
1459 sql_injection_check $isuite;
1460 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1461 SELECT suite.codename
1462 FROM suite where suite_name='$isuite' or codename='$isuite';
1464 @rows = map { $_->[0] } @rows;
1465 fail "unknown suite $isuite" unless @rows;
1466 die "ambiguous $isuite: @rows ?" if @rows>1;
1470 sub file_in_archive_sshpsql ($$$) { return undef; }
1472 #---------- `dummycat' archive query method ----------
1474 sub canonicalise_suite_dummycat ($$) {
1475 my ($proto,$data) = @_;
1476 my $dpath = "$data/suite.$isuite";
1477 if (!open C, "<", $dpath) {
1478 $!==ENOENT or die "$dpath: $!";
1479 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1483 chomp or die "$dpath: $!";
1485 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1489 sub archive_query_dummycat ($$) {
1490 my ($proto,$data) = @_;
1491 canonicalise_suite();
1492 my $dpath = "$data/package.$csuite.$package";
1493 if (!open C, "<", $dpath) {
1494 $!==ENOENT or die "$dpath: $!";
1495 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1503 printdebug "dummycat query $csuite $package $dpath | $_\n";
1504 my @row = split /\s+/, $_;
1505 @row==2 or die "$dpath: $_ ?";
1508 C->error and die "$dpath: $!";
1510 return archive_query_prepend_mirror
1511 sort { -version_compare($a->[0],$b->[0]); } @rows;
1514 sub file_in_archive_dummycat () { return undef; }
1516 #---------- tag format handling ----------
1518 sub access_cfg_tagformats () {
1519 split /\,/, access_cfg('dgit-tag-format');
1522 sub need_tagformat ($$) {
1523 my ($fmt, $why) = @_;
1524 fail "need to use tag format $fmt ($why) but also need".
1525 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1526 " - no way to proceed"
1527 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1528 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1531 sub select_tagformat () {
1533 return if $tagformatfn && !$tagformat_want;
1534 die 'bug' if $tagformatfn && $tagformat_want;
1535 # ... $tagformat_want assigned after previous select_tagformat
1537 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1538 printdebug "select_tagformat supported @supported\n";
1540 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1541 printdebug "select_tagformat specified @$tagformat_want\n";
1543 my ($fmt,$why,$override) = @$tagformat_want;
1545 fail "target distro supports tag formats @supported".
1546 " but have to use $fmt ($why)"
1548 or grep { $_ eq $fmt } @supported;
1550 $tagformat_want = undef;
1552 $tagformatfn = ${*::}{"debiantag_$fmt"};
1554 fail "trying to use unknown tag format \`$fmt' ($why) !"
1555 unless $tagformatfn;
1558 #---------- archive query entrypoints and rest of program ----------
1560 sub canonicalise_suite () {
1561 return if defined $csuite;
1562 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1563 $csuite = archive_query('canonicalise_suite');
1564 if ($isuite ne $csuite) {
1565 progress "canonical suite name for $isuite is $csuite";
1567 progress "canonical suite name is $csuite";
1571 sub get_archive_dsc () {
1572 canonicalise_suite();
1573 my @vsns = archive_query('archive_query');
1574 foreach my $vinfo (@vsns) {
1575 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1576 $dscurl = $vsn_dscurl;
1577 $dscdata = url_get($dscurl);
1579 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1584 $digester->add($dscdata);
1585 my $got = $digester->hexdigest();
1587 fail "$dscurl has hash $got but".
1588 " archive told us to expect $digest";
1591 my $fmt = getfield $dsc, 'Format';
1592 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1593 "unsupported source format $fmt, sorry";
1595 $dsc_checked = !!$digester;
1596 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1600 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1603 sub check_for_git ();
1604 sub check_for_git () {
1606 my $how = access_cfg('git-check');
1607 if ($how eq 'ssh-cmd') {
1609 (access_cfg_ssh, access_gituserhost(),
1610 access_runeinfo("git-check $package").
1611 " set -e; cd ".access_cfg('git-path').";".
1612 " if test -d $package.git; then echo 1; else echo 0; fi");
1613 my $r= cmdoutput @cmd;
1614 if (defined $r and $r =~ m/^divert (\w+)$/) {
1616 my ($usedistro,) = access_distros();
1617 # NB that if we are pushing, $usedistro will be $distro/push
1618 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1619 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1620 progress "diverting to $divert (using config for $instead_distro)";
1621 return check_for_git();
1623 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1625 } elsif ($how eq 'url') {
1626 my $prefix = access_cfg('git-check-url','git-url');
1627 my $suffix = access_cfg('git-check-suffix','git-suffix',
1628 'RETURN-UNDEF') // '.git';
1629 my $url = "$prefix/$package$suffix";
1630 my @cmd = (@curl, qw(-sS -I), $url);
1631 my $result = cmdoutput @cmd;
1632 $result =~ s/^\S+ 200 .*\n\r?\n//;
1633 # curl -sS -I with https_proxy prints
1634 # HTTP/1.0 200 Connection established
1635 $result =~ m/^\S+ (404|200) /s or
1636 fail "unexpected results from git check query - ".
1637 Dumper($prefix, $result);
1639 if ($code eq '404') {
1641 } elsif ($code eq '200') {
1646 } elsif ($how eq 'true') {
1648 } elsif ($how eq 'false') {
1651 badcfg "unknown git-check \`$how'";
1655 sub create_remote_git_repo () {
1656 my $how = access_cfg('git-create');
1657 if ($how eq 'ssh-cmd') {
1659 (access_cfg_ssh, access_gituserhost(),
1660 access_runeinfo("git-create $package").
1661 "set -e; cd ".access_cfg('git-path').";".
1662 " cp -a _template $package.git");
1663 } elsif ($how eq 'true') {
1666 badcfg "unknown git-create \`$how'";
1670 our ($dsc_hash,$lastpush_mergeinput);
1672 our $ud = '.git/dgit/unpack';
1682 sub mktree_in_ud_here () {
1683 runcmd qw(git init -q);
1684 runcmd qw(git config gc.auto 0);
1685 rmtree('.git/objects');
1686 symlink '../../../../objects','.git/objects' or die $!;
1689 sub git_write_tree () {
1690 my $tree = cmdoutput @git, qw(write-tree);
1691 $tree =~ m/^\w+$/ or die "$tree ?";
1695 sub git_add_write_tree () {
1696 runcmd @git, qw(add -Af .);
1697 return git_write_tree();
1700 sub remove_stray_gits ($) {
1702 my @gitscmd = qw(find -name .git -prune -print0);
1703 debugcmd "|",@gitscmd;
1704 open GITS, "-|", @gitscmd or die $!;
1709 print STDERR "$us: warning: removing from $what: ",
1710 (messagequote $_), "\n";
1714 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1717 sub mktree_in_ud_from_only_subdir ($;$) {
1718 my ($what,$raw) = @_;
1720 # changes into the subdir
1722 die "expected one subdir but found @dirs ?" unless @dirs==1;
1723 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1727 remove_stray_gits($what);
1728 mktree_in_ud_here();
1730 my ($format, $fopts) = get_source_format();
1731 if (madformat($format)) {
1736 my $tree=git_add_write_tree();
1737 return ($tree,$dir);
1740 our @files_csum_info_fields =
1741 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1742 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1743 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1745 sub dsc_files_info () {
1746 foreach my $csumi (@files_csum_info_fields) {
1747 my ($fname, $module, $method) = @$csumi;
1748 my $field = $dsc->{$fname};
1749 next unless defined $field;
1750 eval "use $module; 1;" or die $@;
1752 foreach (split /\n/, $field) {
1754 m/^(\w+) (\d+) (\S+)$/ or
1755 fail "could not parse .dsc $fname line \`$_'";
1756 my $digester = eval "$module"."->$method;" or die $@;
1761 Digester => $digester,
1766 fail "missing any supported Checksums-* or Files field in ".
1767 $dsc->get_option('name');
1771 map { $_->{Filename} } dsc_files_info();
1774 sub files_compare_inputs (@) {
1779 my $showinputs = sub {
1780 return join "; ", map { $_->get_option('name') } @$inputs;
1783 foreach my $in (@$inputs) {
1785 my $in_name = $in->get_option('name');
1787 printdebug "files_compare_inputs $in_name\n";
1789 foreach my $csumi (@files_csum_info_fields) {
1790 my ($fname) = @$csumi;
1791 printdebug "files_compare_inputs $in_name $fname\n";
1793 my $field = $in->{$fname};
1794 next unless defined $field;
1797 foreach (split /\n/, $field) {
1800 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1801 fail "could not parse $in_name $fname line \`$_'";
1803 printdebug "files_compare_inputs $in_name $fname $f\n";
1807 my $re = \ $record{$f}{$fname};
1809 $fchecked{$f}{$in_name} = 1;
1811 fail "hash or size of $f varies in $fname fields".
1812 " (between: ".$showinputs->().")";
1817 @files = sort @files;
1818 $expected_files //= \@files;
1819 "@$expected_files" eq "@files" or
1820 fail "file list in $in_name varies between hash fields!";
1823 fail "$in_name has no files list field(s)";
1825 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1828 grep { keys %$_ == @$inputs-1 } values %fchecked
1829 or fail "no file appears in all file lists".
1830 " (looked in: ".$showinputs->().")";
1833 sub is_orig_file_in_dsc ($$) {
1834 my ($f, $dsc_files_info) = @_;
1835 return 0 if @$dsc_files_info <= 1;
1836 # One file means no origs, and the filename doesn't have a "what
1837 # part of dsc" component. (Consider versions ending `.orig'.)
1838 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1842 sub is_orig_file_of_vsn ($$) {
1843 my ($f, $upstreamvsn) = @_;
1844 my $base = srcfn $upstreamvsn, '';
1845 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1849 sub changes_update_origs_from_dsc ($$$$) {
1850 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1852 printdebug "checking origs needed ($upstreamvsn)...\n";
1853 $_ = getfield $changes, 'Files';
1854 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1855 fail "cannot find section/priority from .changes Files field";
1856 my $placementinfo = $1;
1858 printdebug "checking origs needed placement '$placementinfo'...\n";
1859 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1860 $l =~ m/\S+$/ or next;
1862 printdebug "origs $file | $l\n";
1863 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1864 printdebug "origs $file is_orig\n";
1865 my $have = archive_query('file_in_archive', $file);
1866 if (!defined $have) {
1868 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1874 printdebug "origs $file \$#\$have=$#$have\n";
1875 foreach my $h (@$have) {
1878 foreach my $csumi (@files_csum_info_fields) {
1879 my ($fname, $module, $method, $archivefield) = @$csumi;
1880 next unless defined $h->{$archivefield};
1881 $_ = $dsc->{$fname};
1882 next unless defined;
1883 m/^(\w+) .* \Q$file\E$/m or
1884 fail ".dsc $fname missing entry for $file";
1885 if ($h->{$archivefield} eq $1) {
1889 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1892 die "$file ".Dumper($h)." ?!" if $same && @differ;
1895 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1898 printdebug "origs $file f.same=$found_same".
1899 " #f._differ=$#found_differ\n";
1900 if (@found_differ && !$found_same) {
1902 "archive contains $file with different checksum",
1905 # Now we edit the changes file to add or remove it
1906 foreach my $csumi (@files_csum_info_fields) {
1907 my ($fname, $module, $method, $archivefield) = @$csumi;
1908 next unless defined $changes->{$fname};
1910 # in archive, delete from .changes if it's there
1911 $changed{$file} = "removed" if
1912 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1913 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1914 # not in archive, but it's here in the .changes
1916 my $dsc_data = getfield $dsc, $fname;
1917 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1919 $extra =~ s/ \d+ /$&$placementinfo /
1920 or die "$fname $extra >$dsc_data< ?"
1921 if $fname eq 'Files';
1922 $changes->{$fname} .= "\n". $extra;
1923 $changed{$file} = "added";
1928 foreach my $file (keys %changed) {
1930 "edited .changes for archive .orig contents: %s %s",
1931 $changed{$file}, $file;
1933 my $chtmp = "$changesfile.tmp";
1934 $changes->save($chtmp);
1936 rename $chtmp,$changesfile or die "$changesfile $!";
1938 progress "[new .changes left in $changesfile]";
1941 progress "$changesfile already has appropriate .orig(s) (if any)";
1945 sub make_commit ($) {
1947 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1950 sub make_commit_text ($) {
1953 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1955 print Dumper($text) if $debuglevel > 1;
1956 my $child = open2($out, $in, @cmd) or die $!;
1959 print $in $text or die $!;
1960 close $in or die $!;
1962 $h =~ m/^\w+$/ or die;
1964 printdebug "=> $h\n";
1967 waitpid $child, 0 == $child or die "$child $!";
1968 $? and failedcmd @cmd;
1972 sub clogp_authline ($) {
1974 my $author = getfield $clogp, 'Maintainer';
1975 $author =~ s#,.*##ms;
1976 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1977 my $authline = "$author $date";
1978 $authline =~ m/$git_authline_re/o or
1979 fail "unexpected commit author line format \`$authline'".
1980 " (was generated from changelog Maintainer field)";
1981 return ($1,$2,$3) if wantarray;
1985 sub vendor_patches_distro ($$) {
1986 my ($checkdistro, $what) = @_;
1987 return unless defined $checkdistro;
1989 my $series = "debian/patches/\L$checkdistro\E.series";
1990 printdebug "checking for vendor-specific $series ($what)\n";
1992 if (!open SERIES, "<", $series) {
1993 die "$series $!" unless $!==ENOENT;
2002 Unfortunately, this source package uses a feature of dpkg-source where
2003 the same source package unpacks to different source code on different
2004 distros. dgit cannot safely operate on such packages on affected
2005 distros, because the meaning of source packages is not stable.
2007 Please ask the distro/maintainer to remove the distro-specific series
2008 files and use a different technique (if necessary, uploading actually
2009 different packages, if different distros are supposed to have
2013 fail "Found active distro-specific series file for".
2014 " $checkdistro ($what): $series, cannot continue";
2016 die "$series $!" if SERIES->error;
2020 sub check_for_vendor_patches () {
2021 # This dpkg-source feature doesn't seem to be documented anywhere!
2022 # But it can be found in the changelog (reformatted):
2024 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2025 # Author: Raphael Hertzog <hertzog@debian.org>
2026 # Date: Sun Oct 3 09:36:48 2010 +0200
2028 # dpkg-source: correctly create .pc/.quilt_series with alternate
2031 # If you have debian/patches/ubuntu.series and you were
2032 # unpacking the source package on ubuntu, quilt was still
2033 # directed to debian/patches/series instead of
2034 # debian/patches/ubuntu.series.
2036 # debian/changelog | 3 +++
2037 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2038 # 2 files changed, 6 insertions(+), 1 deletion(-)
2041 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2042 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2043 "Dpkg::Vendor \`current vendor'");
2044 vendor_patches_distro(access_basedistro(),
2045 "(base) distro being accessed");
2046 vendor_patches_distro(access_nomdistro(),
2047 "(nominal) distro being accessed");
2050 sub generate_commits_from_dsc () {
2051 # See big comment in fetch_from_archive, below.
2052 # See also README.dsc-import.
2056 my @dfi = dsc_files_info();
2057 foreach my $fi (@dfi) {
2058 my $f = $fi->{Filename};
2059 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2061 printdebug "considering linking $f: ";
2063 link_ltarget "../../../../$f", $f
2064 or ((printdebug "($!) "), 0)
2068 printdebug "linked.\n";
2070 complete_file_from_dsc('.', $fi)
2073 if (is_orig_file_in_dsc($f, \@dfi)) {
2074 link $f, "../../../../$f"
2080 # We unpack and record the orig tarballs first, so that we only
2081 # need disk space for one private copy of the unpacked source.
2082 # But we can't make them into commits until we have the metadata
2083 # from the debian/changelog, so we record the tree objects now and
2084 # make them into commits later.
2086 my $upstreamv = upstreamversion $dsc->{version};
2087 my $orig_f_base = srcfn $upstreamv, '';
2089 foreach my $fi (@dfi) {
2090 # We actually import, and record as a commit, every tarball
2091 # (unless there is only one file, in which case there seems
2094 my $f = $fi->{Filename};
2095 printdebug "import considering $f ";
2096 (printdebug "only one dfi\n"), next if @dfi == 1;
2097 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2098 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2102 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2104 printdebug "Y ", (join ' ', map { $_//"(none)" }
2105 $compr_ext, $orig_f_part
2108 my $input = new IO::File $f, '<' or die "$f $!";
2112 if (defined $compr_ext) {
2114 Dpkg::Compression::compression_guess_from_filename $f;
2115 fail "Dpkg::Compression cannot handle file $f in source package"
2116 if defined $compr_ext && !defined $cname;
2118 new Dpkg::Compression::Process compression => $cname;
2119 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2120 my $compr_fh = new IO::Handle;
2121 my $compr_pid = open $compr_fh, "-|" // die $!;
2123 open STDIN, "<&", $input or die $!;
2125 die "dgit (child): exec $compr_cmd[0]: $!\n";
2130 rmtree "_unpack-tar";
2131 mkdir "_unpack-tar" or die $!;
2132 my @tarcmd = qw(tar -x -f -
2133 --no-same-owner --no-same-permissions
2134 --no-acls --no-xattrs --no-selinux);
2135 my $tar_pid = fork // die $!;
2137 chdir "_unpack-tar" or die $!;
2138 open STDIN, "<&", $input or die $!;
2140 die "dgit (child): exec $tarcmd[0]: $!";
2142 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2143 !$? or failedcmd @tarcmd;
2146 (@compr_cmd ? failedcmd @compr_cmd
2148 # finally, we have the results in "tarball", but maybe
2149 # with the wrong permissions
2151 runcmd qw(chmod -R +rwX _unpack-tar);
2152 changedir "_unpack-tar";
2153 remove_stray_gits($f);
2154 mktree_in_ud_here();
2156 my ($tree) = git_add_write_tree();
2157 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2158 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2160 printdebug "one subtree $1\n";
2162 printdebug "multiple subtrees\n";
2165 rmtree "_unpack-tar";
2167 my $ent = [ $f, $tree ];
2169 Orig => !!$orig_f_part,
2170 Sort => (!$orig_f_part ? 2 :
2171 $orig_f_part =~ m/-/g ? 1 :
2179 # put any without "_" first (spec is not clear whether files
2180 # are always in the usual order). Tarballs without "_" are
2181 # the main orig or the debian tarball.
2182 $a->{Sort} <=> $b->{Sort} or
2186 my $any_orig = grep { $_->{Orig} } @tartrees;
2188 my $dscfn = "$package.dsc";
2190 my $treeimporthow = 'package';
2192 open D, ">", $dscfn or die "$dscfn: $!";
2193 print D $dscdata or die "$dscfn: $!";
2194 close D or die "$dscfn: $!";
2195 my @cmd = qw(dpkg-source);
2196 push @cmd, '--no-check' if $dsc_checked;
2197 if (madformat $dsc->{format}) {
2198 push @cmd, '--skip-patches';
2199 $treeimporthow = 'unpatched';
2201 push @cmd, qw(-x --), $dscfn;
2204 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2205 if (madformat $dsc->{format}) {
2206 check_for_vendor_patches();
2210 if (madformat $dsc->{format}) {
2211 my @pcmd = qw(dpkg-source --before-build .);
2212 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2214 $dappliedtree = git_add_write_tree();
2217 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2218 debugcmd "|",@clogcmd;
2219 open CLOGS, "-|", @clogcmd or die $!;
2224 printdebug "import clog search...\n";
2227 my $stanzatext = do { local $/=""; <CLOGS>; };
2228 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2229 last if !defined $stanzatext;
2231 my $desc = "package changelog, entry no.$.";
2232 open my $stanzafh, "<", \$stanzatext or die;
2233 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2234 $clogp //= $thisstanza;
2236 printdebug "import clog $thisstanza->{version} $desc...\n";
2238 last if !$any_orig; # we don't need $r1clogp
2240 # We look for the first (most recent) changelog entry whose
2241 # version number is lower than the upstream version of this
2242 # package. Then the last (least recent) previous changelog
2243 # entry is treated as the one which introduced this upstream
2244 # version and used for the synthetic commits for the upstream
2247 # One might think that a more sophisticated algorithm would be
2248 # necessary. But: we do not want to scan the whole changelog
2249 # file. Stopping when we see an earlier version, which
2250 # necessarily then is an earlier upstream version, is the only
2251 # realistic way to do that. Then, either the earliest
2252 # changelog entry we have seen so far is indeed the earliest
2253 # upload of this upstream version; or there are only changelog
2254 # entries relating to later upstream versions (which is not
2255 # possible unless the changelog and .dsc disagree about the
2256 # version). Then it remains to choose between the physically
2257 # last entry in the file, and the one with the lowest version
2258 # number. If these are not the same, we guess that the
2259 # versions were created in a non-monotic order rather than
2260 # that the changelog entries have been misordered.
2262 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2264 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2265 $r1clogp = $thisstanza;
2267 printdebug "import clog $r1clogp->{version} becomes r1\n";
2269 die $! if CLOGS->error;
2270 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2272 $clogp or fail "package changelog has no entries!";
2274 my $authline = clogp_authline $clogp;
2275 my $changes = getfield $clogp, 'Changes';
2276 my $cversion = getfield $clogp, 'Version';
2279 $r1clogp //= $clogp; # maybe there's only one entry;
2280 my $r1authline = clogp_authline $r1clogp;
2281 # Strictly, r1authline might now be wrong if it's going to be
2282 # unused because !$any_orig. Whatever.
2284 printdebug "import tartrees authline $authline\n";
2285 printdebug "import tartrees r1authline $r1authline\n";
2287 foreach my $tt (@tartrees) {
2288 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2290 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2293 committer $r1authline
2297 [dgit import orig $tt->{F}]
2305 [dgit import tarball $package $cversion $tt->{F}]
2310 printdebug "import main commit\n";
2312 open C, ">../commit.tmp" or die $!;
2313 print C <<END or die $!;
2316 print C <<END or die $! foreach @tartrees;
2319 print C <<END or die $!;
2325 [dgit import $treeimporthow $package $cversion]
2329 my $rawimport_hash = make_commit qw(../commit.tmp);
2331 if (madformat $dsc->{format}) {
2332 printdebug "import apply patches...\n";
2334 # regularise the state of the working tree so that
2335 # the checkout of $rawimport_hash works nicely.
2336 my $dappliedcommit = make_commit_text(<<END);
2343 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2345 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2347 # We need the answers to be reproducible
2348 my @authline = clogp_authline($clogp);
2349 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2350 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2351 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2352 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2353 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2354 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2356 my $path = $ENV{PATH} or die;
2358 foreach my $use_absurd (qw(0 1)) {
2359 local $ENV{PATH} = $path;
2362 progress "warning: $@";
2363 $path = "$absurdity:$path";
2364 progress "$us: trying slow absurd-git-apply...";
2365 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2370 die "forbid absurd git-apply\n" if $use_absurd
2371 && forceing [qw(import-gitapply-no-absurd)];
2372 die "only absurd git-apply!\n" if !$use_absurd
2373 && forceing [qw(import-gitapply-absurd)];
2375 local $ENV{PATH} = $path if $use_absurd;
2377 my @showcmd = (gbp_pq, qw(import));
2378 my @realcmd = shell_cmd
2379 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2380 debugcmd "+",@realcmd;
2381 if (system @realcmd) {
2382 die +(shellquote @showcmd).
2384 failedcmd_waitstatus()."\n";
2387 my $gapplied = git_rev_parse('HEAD');
2388 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2389 $gappliedtree eq $dappliedtree or
2391 gbp-pq import and dpkg-source disagree!
2392 gbp-pq import gave commit $gapplied
2393 gbp-pq import gave tree $gappliedtree
2394 dpkg-source --before-build gave tree $dappliedtree
2396 $rawimport_hash = $gapplied;
2401 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2406 progress "synthesised git commit from .dsc $cversion";
2408 my $rawimport_mergeinput = {
2409 Commit => $rawimport_hash,
2410 Info => "Import of source package",
2412 my @output = ($rawimport_mergeinput);
2414 if ($lastpush_mergeinput) {
2415 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2416 my $oversion = getfield $oldclogp, 'Version';
2418 version_compare($oversion, $cversion);
2420 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2421 { Message => <<END, ReverseParents => 1 });
2422 Record $package ($cversion) in archive suite $csuite
2424 } elsif ($vcmp > 0) {
2425 print STDERR <<END or die $!;
2427 Version actually in archive: $cversion (older)
2428 Last version pushed with dgit: $oversion (newer or same)
2431 @output = $lastpush_mergeinput;
2433 # Same version. Use what's in the server git branch,
2434 # discarding our own import. (This could happen if the
2435 # server automatically imports all packages into git.)
2436 @output = $lastpush_mergeinput;
2439 changedir '../../../..';
2444 sub complete_file_from_dsc ($$) {
2445 our ($dstdir, $fi) = @_;
2446 # Ensures that we have, in $dir, the file $fi, with the correct
2447 # contents. (Downloading it from alongside $dscurl if necessary.)
2449 my $f = $fi->{Filename};
2450 my $tf = "$dstdir/$f";
2453 if (stat_exists $tf) {
2454 progress "using existing $f";
2456 printdebug "$tf does not exist, need to fetch\n";
2458 $furl =~ s{/[^/]+$}{};
2460 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2461 die "$f ?" if $f =~ m#/#;
2462 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2463 return 0 if !act_local();
2467 open F, "<", "$tf" or die "$tf: $!";
2468 $fi->{Digester}->reset();
2469 $fi->{Digester}->addfile(*F);
2470 F->error and die $!;
2471 my $got = $fi->{Digester}->hexdigest();
2472 $got eq $fi->{Hash} or
2473 fail "file $f has hash $got but .dsc".
2474 " demands hash $fi->{Hash} ".
2475 ($downloaded ? "(got wrong file from archive!)"
2476 : "(perhaps you should delete this file?)");
2481 sub ensure_we_have_orig () {
2482 my @dfi = dsc_files_info();
2483 foreach my $fi (@dfi) {
2484 my $f = $fi->{Filename};
2485 next unless is_orig_file_in_dsc($f, \@dfi);
2486 complete_file_from_dsc('..', $fi)
2491 sub git_fetch_us () {
2492 # Want to fetch only what we are going to use, unless
2493 # deliberately-not-ff, in which case we must fetch everything.
2495 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2497 (quiltmode_splitbrain
2498 ? (map { $_->('*',access_nomdistro) }
2499 \&debiantag_new, \&debiantag_maintview)
2500 : debiantags('*',access_nomdistro));
2501 push @specs, server_branch($csuite);
2502 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2504 # This is rather miserable:
2505 # When git fetch --prune is passed a fetchspec ending with a *,
2506 # it does a plausible thing. If there is no * then:
2507 # - it matches subpaths too, even if the supplied refspec
2508 # starts refs, and behaves completely madly if the source
2509 # has refs/refs/something. (See, for example, Debian #NNNN.)
2510 # - if there is no matching remote ref, it bombs out the whole
2512 # We want to fetch a fixed ref, and we don't know in advance
2513 # if it exists, so this is not suitable.
2515 # Our workaround is to use git ls-remote. git ls-remote has its
2516 # own qairks. Notably, it has the absurd multi-tail-matching
2517 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2518 # refs/refs/foo etc.
2520 # Also, we want an idempotent snapshot, but we have to make two
2521 # calls to the remote: one to git ls-remote and to git fetch. The
2522 # solution is use git ls-remote to obtain a target state, and
2523 # git fetch to try to generate it. If we don't manage to generate
2524 # the target state, we try again.
2526 printdebug "git_fetch_us specs @specs\n";
2528 my $specre = join '|', map {
2534 printdebug "git_fetch_us specre=$specre\n";
2535 my $wanted_rref = sub {
2537 return m/^(?:$specre)$/o;
2540 my $fetch_iteration = 0;
2543 printdebug "git_fetch_us iteration $fetch_iteration\n";
2544 if (++$fetch_iteration > 10) {
2545 fail "too many iterations trying to get sane fetch!";
2548 my @look = map { "refs/$_" } @specs;
2549 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2553 open GITLS, "-|", @lcmd or die $!;
2555 printdebug "=> ", $_;
2556 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2557 my ($objid,$rrefname) = ($1,$2);
2558 if (!$wanted_rref->($rrefname)) {
2560 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2564 $wantr{$rrefname} = $objid;
2567 close GITLS or failedcmd @lcmd;
2569 # OK, now %want is exactly what we want for refs in @specs
2571 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2572 "+refs/$_:".lrfetchrefs."/$_";
2575 printdebug "git_fetch_us fspecs @fspecs\n";
2577 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2578 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2581 %lrfetchrefs_f = ();
2584 git_for_each_ref(lrfetchrefs, sub {
2585 my ($objid,$objtype,$lrefname,$reftail) = @_;
2586 $lrfetchrefs_f{$lrefname} = $objid;
2587 $objgot{$objid} = 1;
2590 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2591 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2592 if (!exists $wantr{$rrefname}) {
2593 if ($wanted_rref->($rrefname)) {
2595 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2599 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2602 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2603 delete $lrfetchrefs_f{$lrefname};
2607 foreach my $rrefname (sort keys %wantr) {
2608 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2609 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2610 my $want = $wantr{$rrefname};
2611 next if $got eq $want;
2612 if (!defined $objgot{$want}) {
2614 warning: git ls-remote suggests we want $lrefname
2615 warning: and it should refer to $want
2616 warning: but git fetch didn't fetch that object to any relevant ref.
2617 warning: This may be due to a race with someone updating the server.
2618 warning: Will try again...
2620 next FETCH_ITERATION;
2623 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2625 runcmd_ordryrun_local @git, qw(update-ref -m),
2626 "dgit fetch git fetch fixup", $lrefname, $want;
2627 $lrfetchrefs_f{$lrefname} = $want;
2631 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2632 Dumper(\%lrfetchrefs_f);
2635 my @tagpats = debiantags('*',access_nomdistro);
2637 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2638 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2639 printdebug "currently $fullrefname=$objid\n";
2640 $here{$fullrefname} = $objid;
2642 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2643 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2644 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2645 printdebug "offered $lref=$objid\n";
2646 if (!defined $here{$lref}) {
2647 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2648 runcmd_ordryrun_local @upd;
2649 lrfetchref_used $fullrefname;
2650 } elsif ($here{$lref} eq $objid) {
2651 lrfetchref_used $fullrefname;
2654 "Not updateting $lref from $here{$lref} to $objid.\n";
2659 sub mergeinfo_getclogp ($) {
2660 # Ensures thit $mi->{Clogp} exists and returns it
2662 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2665 sub mergeinfo_version ($) {
2666 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2669 sub fetch_from_archive_record_1 ($) {
2671 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2672 'DGIT_ARCHIVE', $hash;
2673 cmdoutput @git, qw(log -n2), $hash;
2674 # ... gives git a chance to complain if our commit is malformed
2677 sub fetch_from_archive_record_2 ($) {
2679 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2683 dryrun_report @upd_cmd;
2687 sub fetch_from_archive () {
2688 ensure_setup_existing_tree();
2690 # Ensures that lrref() is what is actually in the archive, one way
2691 # or another, according to us - ie this client's
2692 # appropritaely-updated archive view. Also returns the commit id.
2693 # If there is nothing in the archive, leaves lrref alone and
2694 # returns undef. git_fetch_us must have already been called.
2698 foreach my $field (@ourdscfield) {
2699 $dsc_hash = $dsc->{$field};
2700 last if defined $dsc_hash;
2702 if (defined $dsc_hash) {
2703 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2705 progress "last upload to archive specified git hash";
2707 progress "last upload to archive has NO git hash";
2710 progress "no version available from the archive";
2713 # If the archive's .dsc has a Dgit field, there are three
2714 # relevant git commitids we need to choose between and/or merge
2716 # 1. $dsc_hash: the Dgit field from the archive
2717 # 2. $lastpush_hash: the suite branch on the dgit git server
2718 # 3. $lastfetch_hash: our local tracking brach for the suite
2720 # These may all be distinct and need not be in any fast forward
2723 # If the dsc was pushed to this suite, then the server suite
2724 # branch will have been updated; but it might have been pushed to
2725 # a different suite and copied by the archive. Conversely a more
2726 # recent version may have been pushed with dgit but not appeared
2727 # in the archive (yet).
2729 # $lastfetch_hash may be awkward because archive imports
2730 # (particularly, imports of Dgit-less .dscs) are performed only as
2731 # needed on individual clients, so different clients may perform a
2732 # different subset of them - and these imports are only made
2733 # public during push. So $lastfetch_hash may represent a set of
2734 # imports different to a subsequent upload by a different dgit
2737 # Our approach is as follows:
2739 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2740 # descendant of $dsc_hash, then it was pushed by a dgit user who
2741 # had based their work on $dsc_hash, so we should prefer it.
2742 # Otherwise, $dsc_hash was installed into this suite in the
2743 # archive other than by a dgit push, and (necessarily) after the
2744 # last dgit push into that suite (since a dgit push would have
2745 # been descended from the dgit server git branch); thus, in that
2746 # case, we prefer the archive's version (and produce a
2747 # pseudo-merge to overwrite the dgit server git branch).
2749 # (If there is no Dgit field in the archive's .dsc then
2750 # generate_commit_from_dsc uses the version numbers to decide
2751 # whether the suite branch or the archive is newer. If the suite
2752 # branch is newer it ignores the archive's .dsc; otherwise it
2753 # generates an import of the .dsc, and produces a pseudo-merge to
2754 # overwrite the suite branch with the archive contents.)
2756 # The outcome of that part of the algorithm is the `public view',
2757 # and is same for all dgit clients: it does not depend on any
2758 # unpublished history in the local tracking branch.
2760 # As between the public view and the local tracking branch: The
2761 # local tracking branch is only updated by dgit fetch, and
2762 # whenever dgit fetch runs it includes the public view in the
2763 # local tracking branch. Therefore if the public view is not
2764 # descended from the local tracking branch, the local tracking
2765 # branch must contain history which was imported from the archive
2766 # but never pushed; and, its tip is now out of date. So, we make
2767 # a pseudo-merge to overwrite the old imports and stitch the old
2770 # Finally: we do not necessarily reify the public view (as
2771 # described above). This is so that we do not end up stacking two
2772 # pseudo-merges. So what we actually do is figure out the inputs
2773 # to any public view pseudo-merge and put them in @mergeinputs.
2776 # $mergeinputs[]{Commit}
2777 # $mergeinputs[]{Info}
2778 # $mergeinputs[0] is the one whose tree we use
2779 # @mergeinputs is in the order we use in the actual commit)
2782 # $mergeinputs[]{Message} is a commit message to use
2783 # $mergeinputs[]{ReverseParents} if def specifies that parent
2784 # list should be in opposite order
2785 # Such an entry has no Commit or Info. It applies only when found
2786 # in the last entry. (This ugliness is to support making
2787 # identical imports to previous dgit versions.)
2789 my $lastpush_hash = git_get_ref(lrfetchref());
2790 printdebug "previous reference hash=$lastpush_hash\n";
2791 $lastpush_mergeinput = $lastpush_hash && {
2792 Commit => $lastpush_hash,
2793 Info => "dgit suite branch on dgit git server",
2796 my $lastfetch_hash = git_get_ref(lrref());
2797 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2798 my $lastfetch_mergeinput = $lastfetch_hash && {
2799 Commit => $lastfetch_hash,
2800 Info => "dgit client's archive history view",
2803 my $dsc_mergeinput = $dsc_hash && {
2804 Commit => $dsc_hash,
2805 Info => "Dgit field in .dsc from archive",
2809 my $del_lrfetchrefs = sub {
2812 printdebug "del_lrfetchrefs...\n";
2813 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2814 my $objid = $lrfetchrefs_d{$fullrefname};
2815 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2817 $gur ||= new IO::Handle;
2818 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2820 printf $gur "delete %s %s\n", $fullrefname, $objid;
2823 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2827 if (defined $dsc_hash) {
2828 ensure_we_have_orig();
2829 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2830 @mergeinputs = $dsc_mergeinput
2831 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2832 print STDERR <<END or die $!;
2834 Git commit in archive is behind the last version allegedly pushed/uploaded.
2835 Commit referred to by archive: $dsc_hash
2836 Last version pushed with dgit: $lastpush_hash
2839 @mergeinputs = ($lastpush_mergeinput);
2841 # Archive has .dsc which is not a descendant of the last dgit
2842 # push. This can happen if the archive moves .dscs about.
2843 # Just follow its lead.
2844 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2845 progress "archive .dsc names newer git commit";
2846 @mergeinputs = ($dsc_mergeinput);
2848 progress "archive .dsc names other git commit, fixing up";
2849 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2853 @mergeinputs = generate_commits_from_dsc();
2854 # We have just done an import. Now, our import algorithm might
2855 # have been improved. But even so we do not want to generate
2856 # a new different import of the same package. So if the
2857 # version numbers are the same, just use our existing version.
2858 # If the version numbers are different, the archive has changed
2859 # (perhaps, rewound).
2860 if ($lastfetch_mergeinput &&
2861 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2862 (mergeinfo_version $mergeinputs[0]) )) {
2863 @mergeinputs = ($lastfetch_mergeinput);
2865 } elsif ($lastpush_hash) {
2866 # only in git, not in the archive yet
2867 @mergeinputs = ($lastpush_mergeinput);
2868 print STDERR <<END or die $!;
2870 Package not found in the archive, but has allegedly been pushed using dgit.
2874 printdebug "nothing found!\n";
2875 if (defined $skew_warning_vsn) {
2876 print STDERR <<END or die $!;
2878 Warning: relevant archive skew detected.
2879 Archive allegedly contains $skew_warning_vsn
2880 But we were not able to obtain any version from the archive or git.
2884 unshift @end, $del_lrfetchrefs;
2888 if ($lastfetch_hash &&
2890 my $h = $_->{Commit};
2891 $h and is_fast_fwd($lastfetch_hash, $h);
2892 # If true, one of the existing parents of this commit
2893 # is a descendant of the $lastfetch_hash, so we'll
2894 # be ff from that automatically.
2898 push @mergeinputs, $lastfetch_mergeinput;
2901 printdebug "fetch mergeinfos:\n";
2902 foreach my $mi (@mergeinputs) {
2904 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2906 printdebug sprintf " ReverseParents=%d Message=%s",
2907 $mi->{ReverseParents}, $mi->{Message};
2911 my $compat_info= pop @mergeinputs
2912 if $mergeinputs[$#mergeinputs]{Message};
2914 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2917 if (@mergeinputs > 1) {
2919 my $tree_commit = $mergeinputs[0]{Commit};
2921 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2922 $tree =~ m/\n\n/; $tree = $`;
2923 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2926 # We use the changelog author of the package in question the
2927 # author of this pseudo-merge. This is (roughly) correct if
2928 # this commit is simply representing aa non-dgit upload.
2929 # (Roughly because it does not record sponsorship - but we
2930 # don't have sponsorship info because that's in the .changes,
2931 # which isn't in the archivw.)
2933 # But, it might be that we are representing archive history
2934 # updates (including in-archive copies). These are not really
2935 # the responsibility of the person who created the .dsc, but
2936 # there is no-one whose name we should better use. (The
2937 # author of the .dsc-named commit is clearly worse.)
2939 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2940 my $author = clogp_authline $useclogp;
2941 my $cversion = getfield $useclogp, 'Version';
2943 my $mcf = ".git/dgit/mergecommit";
2944 open MC, ">", $mcf or die "$mcf $!";
2945 print MC <<END or die $!;
2949 my @parents = grep { $_->{Commit} } @mergeinputs;
2950 @parents = reverse @parents if $compat_info->{ReverseParents};
2951 print MC <<END or die $! foreach @parents;
2955 print MC <<END or die $!;
2961 if (defined $compat_info->{Message}) {
2962 print MC $compat_info->{Message} or die $!;
2964 print MC <<END or die $!;
2965 Record $package ($cversion) in archive suite $csuite
2969 my $message_add_info = sub {
2971 my $mversion = mergeinfo_version $mi;
2972 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2976 $message_add_info->($mergeinputs[0]);
2977 print MC <<END or die $!;
2978 should be treated as descended from
2980 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2984 $hash = make_commit $mcf;
2986 $hash = $mergeinputs[0]{Commit};
2988 printdebug "fetch hash=$hash\n";
2991 my ($lasth, $what) = @_;
2992 return unless $lasth;
2993 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2996 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
2998 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3000 fetch_from_archive_record_1($hash);
3002 if (defined $skew_warning_vsn) {
3004 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3005 my $gotclogp = commit_getclogp($hash);
3006 my $got_vsn = getfield $gotclogp, 'Version';
3007 printdebug "SKEW CHECK GOT $got_vsn\n";
3008 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3009 print STDERR <<END or die $!;
3011 Warning: archive skew detected. Using the available version:
3012 Archive allegedly contains $skew_warning_vsn
3013 We were able to obtain only $got_vsn
3019 if ($lastfetch_hash ne $hash) {
3020 fetch_from_archive_record_2($hash);
3023 lrfetchref_used lrfetchref();
3025 unshift @end, $del_lrfetchrefs;
3029 sub set_local_git_config ($$) {
3031 runcmd @git, qw(config), $k, $v;
3034 sub setup_mergechangelogs (;$) {
3036 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3038 my $driver = 'dpkg-mergechangelogs';
3039 my $cb = "merge.$driver";
3040 my $attrs = '.git/info/attributes';
3041 ensuredir '.git/info';
3043 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3044 if (!open ATTRS, "<", $attrs) {
3045 $!==ENOENT or die "$attrs: $!";
3049 next if m{^debian/changelog\s};
3050 print NATTRS $_, "\n" or die $!;
3052 ATTRS->error and die $!;
3055 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3058 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3059 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3061 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3064 sub setup_useremail (;$) {
3066 return unless $always || access_cfg_bool(1, 'setup-useremail');
3069 my ($k, $envvar) = @_;
3070 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3071 return unless defined $v;
3072 set_local_git_config "user.$k", $v;
3075 $setup->('email', 'DEBEMAIL');
3076 $setup->('name', 'DEBFULLNAME');
3079 sub ensure_setup_existing_tree () {
3080 my $k = "remote.$remotename.skipdefaultupdate";
3081 my $c = git_get_config $k;
3082 return if defined $c;
3083 set_local_git_config $k, 'true';
3086 sub setup_new_tree () {
3087 setup_mergechangelogs();
3091 sub multisuite_suite_child ($$$) {
3092 my ($tsuite, $merginputs, $fn) = @_;
3093 # in child, sets things up, calls $fn->(), and returns undef
3094 # in parent, returns canonical suite name for $tsuite
3095 my $canonsuitefh = IO::File::new_tmpfile;
3096 my $pid = fork // die $!;
3099 $us .= " [$isuite]";
3100 $debugprefix .= " ";
3101 progress "fetching $tsuite...";
3102 canonicalise_suite();
3103 print $canonsuitefh $csuite, "\n" or die $!;
3104 close $canonsuitefh or die $!;
3108 waitpid $pid,0 == $pid or die $!;
3109 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3110 seek $canonsuitefh,0,0 or die $!;
3111 local $csuite = <$canonsuitefh>;
3112 die $! unless defined $csuite && chomp $csuite;
3114 printdebug "multisuite $tsuite missing\n";
3117 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3118 push @$merginputs, {
3125 sub fork_for_multisuite ($) {
3126 my ($before_fetch_merge) = @_;
3127 # if nothing unusual, just returns ''
3130 # returns 0 to caller in child, to do first of the specified suites
3131 # in child, $csuite is not yet set
3133 # returns 1 to caller in parent, to finish up anything needed after
3134 # in parent, $csuite is set to canonicalised portmanteau
3136 my $org_isuite = $isuite;
3137 my @suites = split /\,/, $isuite;
3138 return '' unless @suites > 1;
3139 printdebug "fork_for_multisuite: @suites\n";
3143 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3145 return 0 unless defined $cbasesuite;
3147 fail "package $package missing in (base suite) $cbasesuite"
3148 unless @mergeinputs;
3150 my @csuites = ($cbasesuite);
3152 $before_fetch_merge->();
3154 foreach my $tsuite (@suites[1..$#suites]) {
3155 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3161 # xxx collecte the ref here
3163 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3164 push @csuites, $csubsuite;
3167 foreach my $mi (@mergeinputs) {
3168 my $ref = git_get_ref $mi->{Ref};
3169 die "$mi->{Ref} ?" unless length $ref;
3170 $mi->{Commit} = $ref;
3173 $csuite = join ",", @csuites;
3175 my $previous = git_get_ref lrref;
3177 unshift @mergeinputs, {
3178 Commit => $previous,
3179 Info => "local combined tracking branch",
3181 "archive seems to have rewound: local tracking branch is ahead!",
3185 foreach my $ix (0..$#mergeinputs) {
3186 $mergeinputs[$ix]{Index} = $ix;
3189 @mergeinputs = sort {
3190 -version_compare(mergeinfo_version $a,
3191 mergeinfo_version $b) # highest version first
3193 $a->{Index} <=> $b->{Index}; # earliest in spec first
3199 foreach my $mi (@mergeinputs) {
3200 printdebug "multisuite merge check $mi->{Info}\n";
3201 foreach my $previous (@needed) {
3202 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3203 printdebug "multisuite merge un-needed $previous->{Info}\n";
3207 printdebug "multisuite merge this-needed\n";
3208 $mi->{Character} = '+';
3211 $needed[0]{Character} = '*';
3213 my $output = $needed[0]{Commit};
3216 printdebug "multisuite merge nontrivial\n";
3217 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3219 my $commit = "tree $tree\n";
3220 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3221 "Input branches:\n";
3223 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3224 printdebug "multisuite merge include $mi->{Info}\n";
3225 $mi->{Character} //= ' ';
3226 $commit .= "parent $mi->{Commit}\n";
3227 $msg .= sprintf " %s %-25s %s\n",
3229 (mergeinfo_version $mi),
3232 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3234 " * marks the highest version branch, which choose to use\n".
3235 " + marks each branch which was not already an ancestor\n\n".
3236 "[dgit multi-suite $csuite]\n";
3238 "author $authline\n".
3239 "committer $authline\n\n";
3240 $output = make_commit_text $commit.$msg;
3241 printdebug "multisuite merge generated $output\n";
3244 fetch_from_archive_record_1($output);
3245 fetch_from_archive_record_2($output);
3247 progress "calculated combined tracking suite $csuite";
3252 sub clone_set_head () {
3253 open H, "> .git/HEAD" or die $!;
3254 print H "ref: ".lref()."\n" or die $!;
3257 sub clone_finish ($) {
3259 runcmd @git, qw(reset --hard), lrref();
3260 runcmd qw(bash -ec), <<'END';
3262 git ls-tree -r --name-only -z HEAD | \
3263 xargs -0r touch -r . --
3265 printdone "ready for work in $dstdir";
3270 badusage "dry run makes no sense with clone" unless act_local();
3272 my $multi_fetched = fork_for_multisuite(sub {
3273 printdebug "multi clone before fetch merge\n";
3276 if ($multi_fetched) {
3277 printdebug "multi clone after fetch merge\n";
3279 clone_finish($dstdir);
3282 printdebug "clone main body\n";
3284 canonicalise_suite();
3285 my $hasgit = check_for_git();
3286 mkdir $dstdir or fail "create \`$dstdir': $!";
3288 runcmd @git, qw(init -q);
3290 my $giturl = access_giturl(1);
3291 if (defined $giturl) {
3292 runcmd @git, qw(remote add), 'origin', $giturl;
3295 progress "fetching existing git history";
3297 runcmd_ordryrun_local @git, qw(fetch origin);
3299 progress "starting new git history";
3301 fetch_from_archive() or no_such_package;
3302 my $vcsgiturl = $dsc->{'Vcs-Git'};
3303 if (length $vcsgiturl) {
3304 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3305 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3308 clone_finish($dstdir);
3312 canonicalise_suite();
3313 if (check_for_git()) {
3316 fetch_from_archive() or no_such_package();
3317 printdone "fetched into ".lrref();
3321 my $multi_fetched = fork_for_multisuite(sub { });
3322 fetch() unless $multi_fetched; # parent
3323 return if $multi_fetched eq '0'; # child
3324 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3326 printdone "fetched to ".lrref()." and merged into HEAD";
3329 sub check_not_dirty () {
3330 foreach my $f (qw(local-options local-patch-header)) {
3331 if (stat_exists "debian/source/$f") {
3332 fail "git tree contains debian/source/$f";
3336 return if $ignoredirty;
3338 my @cmd = (@git, qw(diff --quiet HEAD));
3340 $!=0; $?=-1; system @cmd;
3343 fail "working tree is dirty (does not match HEAD)";
3349 sub commit_admin ($) {
3352 runcmd_ordryrun_local @git, qw(commit -m), $m;
3355 sub commit_quilty_patch () {
3356 my $output = cmdoutput @git, qw(status --porcelain);
3358 foreach my $l (split /\n/, $output) {
3359 next unless $l =~ m/\S/;
3360 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3364 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3366 progress "nothing quilty to commit, ok.";
3369 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3370 runcmd_ordryrun_local @git, qw(add -f), @adds;
3372 Commit Debian 3.0 (quilt) metadata
3374 [dgit ($our_version) quilt-fixup]
3378 sub get_source_format () {
3380 if (open F, "debian/source/options") {
3384 s/\s+$//; # ignore missing final newline
3386 my ($k, $v) = ($`, $'); #');
3387 $v =~ s/^"(.*)"$/$1/;
3393 F->error and die $!;
3396 die $! unless $!==&ENOENT;
3399 if (!open F, "debian/source/format") {
3400 die $! unless $!==&ENOENT;
3404 F->error and die $!;
3406 return ($_, \%options);
3409 sub madformat_wantfixup ($) {
3411 return 0 unless $format eq '3.0 (quilt)';
3412 our $quilt_mode_warned;
3413 if ($quilt_mode eq 'nocheck') {
3414 progress "Not doing any fixup of \`$format' due to".
3415 " ----no-quilt-fixup or --quilt=nocheck"
3416 unless $quilt_mode_warned++;
3419 progress "Format \`$format', need to check/update patch stack"
3420 unless $quilt_mode_warned++;
3424 sub maybe_split_brain_save ($$$) {
3425 my ($headref, $dgitview, $msg) = @_;
3426 # => message fragment "$saved" describing disposition of $dgitview
3427 return "commit id $dgitview" unless defined $split_brain_save;
3428 my @cmd = (shell_cmd "cd ../../../..",
3429 @git, qw(update-ref -m),
3430 "dgit --dgit-view-save $msg HEAD=$headref",
3431 $split_brain_save, $dgitview);
3433 return "and left in $split_brain_save";
3436 # An "infopair" is a tuple [ $thing, $what ]
3437 # (often $thing is a commit hash; $what is a description)
3439 sub infopair_cond_equal ($$) {
3441 $x->[0] eq $y->[0] or fail <<END;
3442 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3446 sub infopair_lrf_tag_lookup ($$) {
3447 my ($tagnames, $what) = @_;
3448 # $tagname may be an array ref
3449 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3450 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3451 foreach my $tagname (@tagnames) {
3452 my $lrefname = lrfetchrefs."/tags/$tagname";
3453 my $tagobj = $lrfetchrefs_f{$lrefname};
3454 next unless defined $tagobj;
3455 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3456 return [ git_rev_parse($tagobj), $what ];
3458 fail @tagnames==1 ? <<END : <<END;
3459 Wanted tag $what (@tagnames) on dgit server, but not found
3461 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3465 sub infopair_cond_ff ($$) {
3466 my ($anc,$desc) = @_;
3467 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3468 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3472 sub pseudomerge_version_check ($$) {
3473 my ($clogp, $archive_hash) = @_;
3475 my $arch_clogp = commit_getclogp $archive_hash;
3476 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3477 'version currently in archive' ];
3478 if (defined $overwrite_version) {
3479 if (length $overwrite_version) {
3480 infopair_cond_equal([ $overwrite_version,
3481 '--overwrite= version' ],
3484 my $v = $i_arch_v->[0];
3485 progress "Checking package changelog for archive version $v ...";
3487 my @xa = ("-f$v", "-t$v");
3488 my $vclogp = parsechangelog @xa;
3489 my $cv = [ (getfield $vclogp, 'Version'),
3490 "Version field from dpkg-parsechangelog @xa" ];
3491 infopair_cond_equal($i_arch_v, $cv);
3494 $@ =~ s/^dgit: //gm;
3496 "Perhaps debian/changelog does not mention $v ?";
3501 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3505 sub pseudomerge_make_commit ($$$$ $$) {
3506 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3507 $msg_cmd, $msg_msg) = @_;
3508 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3510 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3511 my $authline = clogp_authline $clogp;
3515 !defined $overwrite_version ? ""
3516 : !length $overwrite_version ? " --overwrite"
3517 : " --overwrite=".$overwrite_version;
3520 my $pmf = ".git/dgit/pseudomerge";
3521 open MC, ">", $pmf or die "$pmf $!";
3522 print MC <<END or die $!;
3525 parent $archive_hash
3535 return make_commit($pmf);
3538 sub splitbrain_pseudomerge ($$$$) {
3539 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3540 # => $merged_dgitview
3541 printdebug "splitbrain_pseudomerge...\n";
3543 # We: debian/PREVIOUS HEAD($maintview)
3544 # expect: o ----------------- o
3547 # a/d/PREVIOUS $dgitview
3550 # we do: `------------------ o
3554 return $dgitview unless defined $archive_hash;
3556 printdebug "splitbrain_pseudomerge...\n";
3558 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3560 if (!defined $overwrite_version) {
3561 progress "Checking that HEAD inciudes all changes in archive...";
3564 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3566 if (defined $overwrite_version) {
3568 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3569 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3570 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3571 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3572 my $i_archive = [ $archive_hash, "current archive contents" ];
3574 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3576 infopair_cond_equal($i_dgit, $i_archive);
3577 infopair_cond_ff($i_dep14, $i_dgit);
3578 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3582 $us: check failed (maybe --overwrite is needed, consult documentation)
3587 my $r = pseudomerge_make_commit
3588 $clogp, $dgitview, $archive_hash, $i_arch_v,
3589 "dgit --quilt=$quilt_mode",
3590 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3591 Declare fast forward from $i_arch_v->[0]
3593 Make fast forward from $i_arch_v->[0]
3596 maybe_split_brain_save $maintview, $r, "pseudomerge";
3598 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3602 sub plain_overwrite_pseudomerge ($$$) {
3603 my ($clogp, $head, $archive_hash) = @_;
3605 printdebug "plain_overwrite_pseudomerge...";
3607 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3609 return $head if is_fast_fwd $archive_hash, $head;
3611 my $m = "Declare fast forward from $i_arch_v->[0]";
3613 my $r = pseudomerge_make_commit
3614 $clogp, $head, $archive_hash, $i_arch_v,
3617 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3619 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3623 sub push_parse_changelog ($) {
3626 my $clogp = Dpkg::Control::Hash->new();
3627 $clogp->load($clogpfn) or die;
3629 my $clogpackage = getfield $clogp, 'Source';
3630 $package //= $clogpackage;
3631 fail "-p specified $package but changelog specified $clogpackage"
3632 unless $package eq $clogpackage;
3633 my $cversion = getfield $clogp, 'Version';
3634 my $tag = debiantag($cversion, access_nomdistro);
3635 runcmd @git, qw(check-ref-format), $tag;
3637 my $dscfn = dscfn($cversion);
3639 return ($clogp, $cversion, $dscfn);
3642 sub push_parse_dsc ($$$) {
3643 my ($dscfn,$dscfnwhat, $cversion) = @_;
3644 $dsc = parsecontrol($dscfn,$dscfnwhat);
3645 my $dversion = getfield $dsc, 'Version';
3646 my $dscpackage = getfield $dsc, 'Source';
3647 ($dscpackage eq $package && $dversion eq $cversion) or
3648 fail "$dscfn is for $dscpackage $dversion".
3649 " but debian/changelog is for $package $cversion";
3652 sub push_tagwants ($$$$) {
3653 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3656 TagFn => \&debiantag,
3661 if (defined $maintviewhead) {
3663 TagFn => \&debiantag_maintview,
3664 Objid => $maintviewhead,
3665 TfSuffix => '-maintview',
3669 foreach my $tw (@tagwants) {
3670 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3671 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3673 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3677 sub push_mktags ($$ $$ $) {
3679 $changesfile,$changesfilewhat,
3682 die unless $tagwants->[0]{View} eq 'dgit';
3684 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3685 $dsc->save("$dscfn.tmp") or die $!;
3687 my $changes = parsecontrol($changesfile,$changesfilewhat);
3688 foreach my $field (qw(Source Distribution Version)) {
3689 $changes->{$field} eq $clogp->{$field} or
3690 fail "changes field $field \`$changes->{$field}'".
3691 " does not match changelog \`$clogp->{$field}'";
3694 my $cversion = getfield $clogp, 'Version';
3695 my $clogsuite = getfield $clogp, 'Distribution';
3697 # We make the git tag by hand because (a) that makes it easier
3698 # to control the "tagger" (b) we can do remote signing
3699 my $authline = clogp_authline $clogp;
3700 my $delibs = join(" ", "",@deliberatelies);
3701 my $declaredistro = access_nomdistro();
3705 my $tfn = $tw->{Tfn};
3706 my $head = $tw->{Objid};
3707 my $tag = $tw->{Tag};
3709 open TO, '>', $tfn->('.tmp') or die $!;
3710 print TO <<END or die $!;
3717 if ($tw->{View} eq 'dgit') {
3718 print TO <<END or die $!;
3719 $package release $cversion for $clogsuite ($csuite) [dgit]
3720 [dgit distro=$declaredistro$delibs]
3722 foreach my $ref (sort keys %previously) {
3723 print TO <<END or die $!;
3724 [dgit previously:$ref=$previously{$ref}]
3727 } elsif ($tw->{View} eq 'maint') {
3728 print TO <<END or die $!;
3729 $package release $cversion for $clogsuite ($csuite)
3730 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3733 die Dumper($tw)."?";
3738 my $tagobjfn = $tfn->('.tmp');
3740 if (!defined $keyid) {
3741 $keyid = access_cfg('keyid','RETURN-UNDEF');
3743 if (!defined $keyid) {
3744 $keyid = getfield $clogp, 'Maintainer';
3746 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3747 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3748 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3749 push @sign_cmd, $tfn->('.tmp');
3750 runcmd_ordryrun @sign_cmd;
3752 $tagobjfn = $tfn->('.signed.tmp');
3753 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3754 $tfn->('.tmp'), $tfn->('.tmp.asc');
3760 my @r = map { $mktag->($_); } @$tagwants;
3764 sub sign_changes ($) {
3765 my ($changesfile) = @_;
3767 my @debsign_cmd = @debsign;
3768 push @debsign_cmd, "-k$keyid" if defined $keyid;
3769 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3770 push @debsign_cmd, $changesfile;
3771 runcmd_ordryrun @debsign_cmd;
3776 printdebug "actually entering push\n";
3778 supplementary_message(<<'END');
3779 Push failed, while checking state of the archive.
3780 You can retry the push, after fixing the problem, if you like.
3782 if (check_for_git()) {
3785 my $archive_hash = fetch_from_archive();
3786 if (!$archive_hash) {
3788 fail "package appears to be new in this suite;".
3789 " if this is intentional, use --new";
3792 supplementary_message(<<'END');
3793 Push failed, while preparing your push.
3794 You can retry the push, after fixing the problem, if you like.
3797 need_tagformat 'new', "quilt mode $quilt_mode"
3798 if quiltmode_splitbrain;
3802 access_giturl(); # check that success is vaguely likely
3805 my $clogpfn = ".git/dgit/changelog.822.tmp";
3806 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3808 responder_send_file('parsed-changelog', $clogpfn);
3810 my ($clogp, $cversion, $dscfn) =
3811 push_parse_changelog("$clogpfn");
3813 my $dscpath = "$buildproductsdir/$dscfn";
3814 stat_exists $dscpath or
3815 fail "looked for .dsc $dscpath, but $!;".
3816 " maybe you forgot to build";
3818 responder_send_file('dsc', $dscpath);
3820 push_parse_dsc($dscpath, $dscfn, $cversion);
3822 my $format = getfield $dsc, 'Format';
3823 printdebug "format $format\n";
3825 my $actualhead = git_rev_parse('HEAD');
3826 my $dgithead = $actualhead;
3827 my $maintviewhead = undef;
3829 my $upstreamversion = upstreamversion $clogp->{Version};
3831 if (madformat_wantfixup($format)) {
3832 # user might have not used dgit build, so maybe do this now:
3833 if (quiltmode_splitbrain()) {
3835 quilt_make_fake_dsc($upstreamversion);
3837 ($dgithead, $cachekey) =
3838 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3840 "--quilt=$quilt_mode but no cached dgit view:
3841 perhaps tree changed since dgit build[-source] ?";
3843 $dgithead = splitbrain_pseudomerge($clogp,
3844 $actualhead, $dgithead,
3846 $maintviewhead = $actualhead;
3847 changedir '../../../..';
3848 prep_ud(); # so _only_subdir() works, below
3850 commit_quilty_patch();
3854 if (defined $overwrite_version && !defined $maintviewhead) {
3855 $dgithead = plain_overwrite_pseudomerge($clogp,
3863 if ($archive_hash) {
3864 if (is_fast_fwd($archive_hash, $dgithead)) {
3866 } elsif (deliberately_not_fast_forward) {
3869 fail "dgit push: HEAD is not a descendant".
3870 " of the archive's version.\n".
3871 "To overwrite the archive's contents,".
3872 " pass --overwrite[=VERSION].\n".
3873 "To rewind history, if permitted by the archive,".
3874 " use --deliberately-not-fast-forward.";
3879 progress "checking that $dscfn corresponds to HEAD";
3880 runcmd qw(dpkg-source -x --),
3881 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3882 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
3883 check_for_vendor_patches() if madformat($dsc->{format});
3884 changedir '../../../..';
3885 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3886 debugcmd "+",@diffcmd;
3888 my $r = system @diffcmd;
3891 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3893 HEAD specifies a different tree to $dscfn:
3895 Perhaps you forgot to build. Or perhaps there is a problem with your
3896 source tree (see dgit(7) for some hints). To see a full diff, run
3903 if (!$changesfile) {
3904 my $pat = changespat $cversion;
3905 my @cs = glob "$buildproductsdir/$pat";
3906 fail "failed to find unique changes file".
3907 " (looked for $pat in $buildproductsdir);".
3908 " perhaps you need to use dgit -C"
3910 ($changesfile) = @cs;
3912 $changesfile = "$buildproductsdir/$changesfile";
3915 # Check that changes and .dsc agree enough
3916 $changesfile =~ m{[^/]*$};
3917 my $changes = parsecontrol($changesfile,$&);
3918 files_compare_inputs($dsc, $changes)
3919 unless forceing [qw(dsc-changes-mismatch)];
3921 # Perhaps adjust .dsc to contain right set of origs
3922 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3924 unless forceing [qw(changes-origs-exactly)];
3926 # Checks complete, we're going to try and go ahead:
3928 responder_send_file('changes',$changesfile);
3929 responder_send_command("param head $dgithead");
3930 responder_send_command("param csuite $csuite");
3931 responder_send_command("param tagformat $tagformat");
3932 if (defined $maintviewhead) {
3933 die unless ($protovsn//4) >= 4;
3934 responder_send_command("param maint-view $maintviewhead");
3937 if (deliberately_not_fast_forward) {
3938 git_for_each_ref(lrfetchrefs, sub {
3939 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3940 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3941 responder_send_command("previously $rrefname=$objid");
3942 $previously{$rrefname} = $objid;
3946 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3950 supplementary_message(<<'END');
3951 Push failed, while signing the tag.
3952 You can retry the push, after fixing the problem, if you like.
3954 # If we manage to sign but fail to record it anywhere, it's fine.
3955 if ($we_are_responder) {
3956 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3957 responder_receive_files('signed-tag', @tagobjfns);
3959 @tagobjfns = push_mktags($clogp,$dscpath,
3960 $changesfile,$changesfile,
3963 supplementary_message(<<'END');
3964 Push failed, *after* signing the tag.
3965 If you want to try again, you should use a new version number.
3968 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3970 foreach my $tw (@tagwants) {
3971 my $tag = $tw->{Tag};
3972 my $tagobjfn = $tw->{TagObjFn};
3974 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3975 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3976 runcmd_ordryrun_local
3977 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3980 supplementary_message(<<'END');
3981 Push failed, while updating the remote git repository - see messages above.
3982 If you want to try again, you should use a new version number.
3984 if (!check_for_git()) {
3985 create_remote_git_repo();
3988 my @pushrefs = $forceflag.$dgithead.":".rrref();
3989 foreach my $tw (@tagwants) {
3990 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3993 runcmd_ordryrun @git,
3994 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3995 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3997 supplementary_message(<<'END');
3998 Push failed, after updating the remote git repository.
3999 If you want to try again, you must use a new version number.
4001 if ($we_are_responder) {
4002 my $dryrunsuffix = act_local() ? "" : ".tmp";
4003 responder_receive_files('signed-dsc-changes',
4004 "$dscpath$dryrunsuffix",
4005 "$changesfile$dryrunsuffix");
4008 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4010 progress "[new .dsc left in $dscpath.tmp]";
4012 sign_changes $changesfile;
4015 supplementary_message(<<END);
4016 Push failed, while uploading package(s) to the archive server.
4017 You can retry the upload of exactly these same files with dput of:
4019 If that .changes file is broken, you will need to use a new version
4020 number for your next attempt at the upload.
4022 my $host = access_cfg('upload-host','RETURN-UNDEF');
4023 my @hostarg = defined($host) ? ($host,) : ();
4024 runcmd_ordryrun @dput, @hostarg, $changesfile;
4025 printdone "pushed and uploaded $cversion";
4027 supplementary_message('');
4028 responder_send_command("complete");
4035 badusage "-p is not allowed with clone; specify as argument instead"
4036 if defined $package;
4039 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4040 ($package,$isuite) = @ARGV;
4041 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4042 ($package,$dstdir) = @ARGV;
4043 } elsif (@ARGV==3) {
4044 ($package,$isuite,$dstdir) = @ARGV;
4046 badusage "incorrect arguments to dgit clone";
4048 $dstdir ||= "$package";
4050 if (stat_exists $dstdir) {
4051 fail "$dstdir already exists";
4055 if ($rmonerror && !$dryrun_level) {
4056 $cwd_remove= getcwd();
4058 return unless defined $cwd_remove;
4059 if (!chdir "$cwd_remove") {
4060 return if $!==&ENOENT;
4061 die "chdir $cwd_remove: $!";
4063 printdebug "clone rmonerror removing $dstdir\n";
4065 rmtree($dstdir) or die "remove $dstdir: $!\n";
4066 } elsif (grep { $! == $_ }
4067 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4069 print STDERR "check whether to remove $dstdir: $!\n";
4075 $cwd_remove = undef;
4078 sub branchsuite () {
4079 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4080 if ($branch =~ m#$lbranch_re#o) {
4087 sub fetchpullargs () {
4089 if (!defined $package) {
4090 my $sourcep = parsecontrol('debian/control','debian/control');
4091 $package = getfield $sourcep, 'Source';
4094 $isuite = branchsuite();
4096 my $clogp = parsechangelog();
4097 $isuite = getfield $clogp, 'Distribution';
4099 } elsif (@ARGV==1) {
4102 badusage "incorrect arguments to dgit fetch or dgit pull";
4109 my $multi_fetched = fork_for_multisuite(sub { });
4110 exit 0 if $multi_fetched;
4117 if (quiltmode_splitbrain()) {
4118 my ($format, $fopts) = get_source_format();
4119 madformat($format) and fail <<END
4120 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4129 badusage "-p is not allowed with dgit push" if defined $package;
4131 my $clogp = parsechangelog();
4132 $package = getfield $clogp, 'Source';
4135 } elsif (@ARGV==1) {
4136 ($specsuite) = (@ARGV);
4138 badusage "incorrect arguments to dgit push";
4140 $isuite = getfield $clogp, 'Distribution';
4142 local ($package) = $existing_package; # this is a hack
4143 canonicalise_suite();
4145 canonicalise_suite();
4147 if (defined $specsuite &&
4148 $specsuite ne $isuite &&
4149 $specsuite ne $csuite) {
4150 fail "dgit push: changelog specifies $isuite ($csuite)".
4151 " but command line specifies $specsuite";
4156 #---------- remote commands' implementation ----------
4158 sub cmd_remote_push_build_host {
4159 my ($nrargs) = shift @ARGV;
4160 my (@rargs) = @ARGV[0..$nrargs-1];
4161 @ARGV = @ARGV[$nrargs..$#ARGV];
4163 my ($dir,$vsnwant) = @rargs;
4164 # vsnwant is a comma-separated list; we report which we have
4165 # chosen in our ready response (so other end can tell if they
4168 $we_are_responder = 1;
4169 $us .= " (build host)";
4173 open PI, "<&STDIN" or die $!;
4174 open STDIN, "/dev/null" or die $!;
4175 open PO, ">&STDOUT" or die $!;
4177 open STDOUT, ">&STDERR" or die $!;
4181 ($protovsn) = grep {
4182 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4183 } @rpushprotovsn_support;
4185 fail "build host has dgit rpush protocol versions ".
4186 (join ",", @rpushprotovsn_support).
4187 " but invocation host has $vsnwant"
4188 unless defined $protovsn;
4190 responder_send_command("dgit-remote-push-ready $protovsn");
4191 rpush_handle_protovsn_bothends();
4196 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4197 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4198 # a good error message)
4200 sub rpush_handle_protovsn_bothends () {
4201 if ($protovsn < 4) {
4202 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4211 my $report = i_child_report();
4212 if (defined $report) {
4213 printdebug "($report)\n";
4214 } elsif ($i_child_pid) {
4215 printdebug "(killing build host child $i_child_pid)\n";
4216 kill 15, $i_child_pid;
4218 if (defined $i_tmp && !defined $initiator_tempdir) {
4220 eval { rmtree $i_tmp; };
4224 END { i_cleanup(); }
4227 my ($base,$selector,@args) = @_;
4228 $selector =~ s/\-/_/g;
4229 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4236 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4244 push @rargs, join ",", @rpushprotovsn_support;
4247 push @rdgit, @ropts;
4248 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4250 my @cmd = (@ssh, $host, shellquote @rdgit);
4253 if (defined $initiator_tempdir) {
4254 rmtree $initiator_tempdir;
4255 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4256 $i_tmp = $initiator_tempdir;
4260 $i_child_pid = open2(\*RO, \*RI, @cmd);
4262 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4263 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4264 $supplementary_message = '' unless $protovsn >= 3;
4266 fail "rpush negotiated protocol version $protovsn".
4267 " which does not support quilt mode $quilt_mode"
4268 if quiltmode_splitbrain;
4270 rpush_handle_protovsn_bothends();
4272 my ($icmd,$iargs) = initiator_expect {
4273 m/^(\S+)(?: (.*))?$/;
4276 i_method "i_resp", $icmd, $iargs;
4280 sub i_resp_progress ($) {
4282 my $msg = protocol_read_bytes \*RO, $rhs;
4286 sub i_resp_supplementary_message ($) {
4288 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4291 sub i_resp_complete {
4292 my $pid = $i_child_pid;
4293 $i_child_pid = undef; # prevents killing some other process with same pid
4294 printdebug "waiting for build host child $pid...\n";
4295 my $got = waitpid $pid, 0;
4296 die $! unless $got == $pid;
4297 die "build host child failed $?" if $?;
4300 printdebug "all done\n";
4304 sub i_resp_file ($) {
4306 my $localname = i_method "i_localname", $keyword;
4307 my $localpath = "$i_tmp/$localname";
4308 stat_exists $localpath and
4309 badproto \*RO, "file $keyword ($localpath) twice";
4310 protocol_receive_file \*RO, $localpath;
4311 i_method "i_file", $keyword;
4316 sub i_resp_param ($) {
4317 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4321 sub i_resp_previously ($) {
4322 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4323 or badproto \*RO, "bad previously spec";
4324 my $r = system qw(git check-ref-format), $1;
4325 die "bad previously ref spec ($r)" if $r;
4326 $previously{$1} = $2;
4331 sub i_resp_want ($) {
4333 die "$keyword ?" if $i_wanted{$keyword}++;
4334 my @localpaths = i_method "i_want", $keyword;
4335 printdebug "[[ $keyword @localpaths\n";
4336 foreach my $localpath (@localpaths) {
4337 protocol_send_file \*RI, $localpath;
4339 print RI "files-end\n" or die $!;
4342 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4344 sub i_localname_parsed_changelog {
4345 return "remote-changelog.822";
4347 sub i_file_parsed_changelog {
4348 ($i_clogp, $i_version, $i_dscfn) =
4349 push_parse_changelog "$i_tmp/remote-changelog.822";
4350 die if $i_dscfn =~ m#/|^\W#;
4353 sub i_localname_dsc {
4354 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4359 sub i_localname_changes {
4360 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4361 $i_changesfn = $i_dscfn;
4362 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4363 return $i_changesfn;
4365 sub i_file_changes { }
4367 sub i_want_signed_tag {
4368 printdebug Dumper(\%i_param, $i_dscfn);
4369 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4370 && defined $i_param{'csuite'}
4371 or badproto \*RO, "premature desire for signed-tag";
4372 my $head = $i_param{'head'};
4373 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4375 my $maintview = $i_param{'maint-view'};
4376 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4379 if ($protovsn >= 4) {
4380 my $p = $i_param{'tagformat'} // '<undef>';
4382 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4385 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4387 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4389 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4392 push_mktags $i_clogp, $i_dscfn,
4393 $i_changesfn, 'remote changes',
4397 sub i_want_signed_dsc_changes {
4398 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4399 sign_changes $i_changesfn;
4400 return ($i_dscfn, $i_changesfn);
4403 #---------- building etc. ----------
4409 #----- `3.0 (quilt)' handling -----
4411 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4413 sub quiltify_dpkg_commit ($$$;$) {
4414 my ($patchname,$author,$msg, $xinfo) = @_;
4418 my $descfn = ".git/dgit/quilt-description.tmp";
4419 open O, '>', $descfn or die "$descfn: $!";
4420 $msg =~ s/\n+/\n\n/;
4421 print O <<END or die $!;
4423 ${xinfo}Subject: $msg
4430 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4431 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4432 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4433 runcmd @dpkgsource, qw(--commit .), $patchname;
4437 sub quiltify_trees_differ ($$;$$$) {
4438 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4439 # returns true iff the two tree objects differ other than in debian/
4440 # with $finegrained,
4441 # returns bitmask 01 - differ in upstream files except .gitignore
4442 # 02 - differ in .gitignore
4443 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4444 # is set for each modified .gitignore filename $fn
4445 # if $unrepres is defined, array ref to which is appeneded
4446 # a list of unrepresentable changes (removals of upstream files
4449 my @cmd = (@git, qw(diff-tree -z));
4450 push @cmd, qw(--name-only) unless $unrepres;
4451 push @cmd, qw(-r) if $finegrained || $unrepres;
4453 my $diffs= cmdoutput @cmd;
4456 foreach my $f (split /\0/, $diffs) {
4457 if ($unrepres && !@lmodes) {
4458 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4461 my ($oldmode,$newmode) = @lmodes;
4464 next if $f =~ m#^debian(?:/.*)?$#s;
4468 die "deleted\n" unless $newmode =~ m/[^0]/;
4469 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4470 if ($oldmode =~ m/[^0]/) {
4471 die "mode changed\n" if $oldmode ne $newmode;
4473 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4477 local $/="\n"; chomp $@;
4478 push @$unrepres, [ $f, $@ ];
4482 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4483 $r |= $isignore ? 02 : 01;
4484 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4486 printdebug "quiltify_trees_differ $x $y => $r\n";
4490 sub quiltify_tree_sentinelfiles ($) {
4491 # lists the `sentinel' files present in the tree
4493 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4494 qw(-- debian/rules debian/control);
4499 sub quiltify_splitbrain_needed () {
4500 if (!$split_brain) {
4501 progress "dgit view: changes are required...";
4502 runcmd @git, qw(checkout -q -b dgit-view);
4507 sub quiltify_splitbrain ($$$$$$) {
4508 my ($clogp, $unapplied, $headref, $diffbits,
4509 $editedignores, $cachekey) = @_;
4510 if ($quilt_mode !~ m/gbp|dpm/) {
4511 # treat .gitignore just like any other upstream file
4512 $diffbits = { %$diffbits };
4513 $_ = !!$_ foreach values %$diffbits;
4515 # We would like any commits we generate to be reproducible
4516 my @authline = clogp_authline($clogp);
4517 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4518 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4519 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4520 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4521 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4522 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4524 if ($quilt_mode =~ m/gbp|unapplied/ &&
4525 ($diffbits->{O2H} & 01)) {
4527 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4528 " but git tree differs from orig in upstream files.";
4529 if (!stat_exists "debian/patches") {
4531 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4535 if ($quilt_mode =~ m/dpm/ &&
4536 ($diffbits->{H2A} & 01)) {
4538 --quilt=$quilt_mode specified, implying patches-applied git tree
4539 but git tree differs from result of applying debian/patches to upstream
4542 if ($quilt_mode =~ m/gbp|unapplied/ &&
4543 ($diffbits->{O2A} & 01)) { # some patches
4544 quiltify_splitbrain_needed();
4545 progress "dgit view: creating patches-applied version using gbp pq";
4546 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4547 # gbp pq import creates a fresh branch; push back to dgit-view
4548 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4549 runcmd @git, qw(checkout -q dgit-view);
4551 if ($quilt_mode =~ m/gbp|dpm/ &&
4552 ($diffbits->{O2A} & 02)) {
4554 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4555 tool which does not create patches for changes to upstream
4556 .gitignores: but, such patches exist in debian/patches.
4559 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4560 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4561 quiltify_splitbrain_needed();
4562 progress "dgit view: creating patch to represent .gitignore changes";
4563 ensuredir "debian/patches";
4564 my $gipatch = "debian/patches/auto-gitignore";
4565 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4566 stat GIPATCH or die "$gipatch: $!";
4567 fail "$gipatch already exists; but want to create it".
4568 " to record .gitignore changes" if (stat _)[7];
4569 print GIPATCH <<END or die "$gipatch: $!";
4570 Subject: Update .gitignore from Debian packaging branch
4572 The Debian packaging git branch contains these updates to the upstream
4573 .gitignore file(s). This patch is autogenerated, to provide these
4574 updates to users of the official Debian archive view of the package.
4576 [dgit ($our_version) update-gitignore]
4579 close GIPATCH or die "$gipatch: $!";
4580 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4581 $unapplied, $headref, "--", sort keys %$editedignores;
4582 open SERIES, "+>>", "debian/patches/series" or die $!;
4583 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4585 defined read SERIES, $newline, 1 or die $!;
4586 print SERIES "\n" or die $! unless $newline eq "\n";
4587 print SERIES "auto-gitignore\n" or die $!;
4588 close SERIES or die $!;
4589 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4591 Commit patch to update .gitignore
4593 [dgit ($our_version) update-gitignore-quilt-fixup]
4597 my $dgitview = git_rev_parse 'HEAD';
4599 changedir '../../../..';
4600 # When we no longer need to support squeeze, use --create-reflog
4602 ensuredir ".git/logs/refs/dgit-intern";
4603 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4606 my $oldcache = git_get_ref "refs/$splitbraincache";
4607 if ($oldcache eq $dgitview) {
4608 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4609 # git update-ref doesn't always update, in this case. *sigh*
4610 my $dummy = make_commit_text <<END;
4613 author Dgit <dgit\@example.com> 1000000000 +0000
4614 committer Dgit <dgit\@example.com> 1000000000 +0000
4616 Dummy commit - do not use
4618 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4619 "refs/$splitbraincache", $dummy;
4621 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4624 changedir '.git/dgit/unpack/work';
4626 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4627 progress "dgit view: created ($saved)";
4630 sub quiltify ($$$$) {
4631 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4633 # Quilt patchification algorithm
4635 # We search backwards through the history of the main tree's HEAD
4636 # (T) looking for a start commit S whose tree object is identical
4637 # to to the patch tip tree (ie the tree corresponding to the
4638 # current dpkg-committed patch series). For these purposes
4639 # `identical' disregards anything in debian/ - this wrinkle is
4640 # necessary because dpkg-source treates debian/ specially.
4642 # We can only traverse edges where at most one of the ancestors'
4643 # trees differs (in changes outside in debian/). And we cannot
4644 # handle edges which change .pc/ or debian/patches. To avoid
4645 # going down a rathole we avoid traversing edges which introduce
4646 # debian/rules or debian/control. And we set a limit on the
4647 # number of edges we are willing to look at.
4649 # If we succeed, we walk forwards again. For each traversed edge
4650 # PC (with P parent, C child) (starting with P=S and ending with
4651 # C=T) to we do this:
4653 # - dpkg-source --commit with a patch name and message derived from C
4654 # After traversing PT, we git commit the changes which
4655 # should be contained within debian/patches.
4657 # The search for the path S..T is breadth-first. We maintain a
4658 # todo list containing search nodes. A search node identifies a
4659 # commit, and looks something like this:
4661 # Commit => $git_commit_id,
4662 # Child => $c, # or undef if P=T
4663 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4664 # Nontrivial => true iff $p..$c has relevant changes
4671 my %considered; # saves being exponential on some weird graphs
4673 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4676 my ($search,$whynot) = @_;
4677 printdebug " search NOT $search->{Commit} $whynot\n";
4678 $search->{Whynot} = $whynot;
4679 push @nots, $search;
4680 no warnings qw(exiting);
4689 my $c = shift @todo;
4690 next if $considered{$c->{Commit}}++;
4692 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4694 printdebug "quiltify investigate $c->{Commit}\n";
4697 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4698 printdebug " search finished hooray!\n";
4703 if ($quilt_mode eq 'nofix') {
4704 fail "quilt fixup required but quilt mode is \`nofix'\n".
4705 "HEAD commit $c->{Commit} differs from tree implied by ".
4706 " debian/patches (tree object $oldtiptree)";
4708 if ($quilt_mode eq 'smash') {
4709 printdebug " search quitting smash\n";
4713 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4714 $not->($c, "has $c_sentinels not $t_sentinels")
4715 if $c_sentinels ne $t_sentinels;
4717 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4718 $commitdata =~ m/\n\n/;
4720 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4721 @parents = map { { Commit => $_, Child => $c } } @parents;
4723 $not->($c, "root commit") if !@parents;
4725 foreach my $p (@parents) {
4726 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4728 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4729 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4731 foreach my $p (@parents) {
4732 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4734 my @cmd= (@git, qw(diff-tree -r --name-only),
4735 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4736 my $patchstackchange = cmdoutput @cmd;
4737 if (length $patchstackchange) {
4738 $patchstackchange =~ s/\n/,/g;
4739 $not->($p, "changed $patchstackchange");
4742 printdebug " search queue P=$p->{Commit} ",
4743 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4749 printdebug "quiltify want to smash\n";
4752 my $x = $_[0]{Commit};
4753 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4756 my $reportnot = sub {
4758 my $s = $abbrev->($notp);
4759 my $c = $notp->{Child};
4760 $s .= "..".$abbrev->($c) if $c;
4761 $s .= ": ".$notp->{Whynot};
4764 if ($quilt_mode eq 'linear') {
4765 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4766 foreach my $notp (@nots) {
4767 print STDERR "$us: ", $reportnot->($notp), "\n";
4769 print STDERR "$us: $_\n" foreach @$failsuggestion;
4770 fail "quilt fixup naive history linearisation failed.\n".
4771 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4772 } elsif ($quilt_mode eq 'smash') {
4773 } elsif ($quilt_mode eq 'auto') {
4774 progress "quilt fixup cannot be linear, smashing...";
4776 die "$quilt_mode ?";
4779 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4780 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4782 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4784 quiltify_dpkg_commit "auto-$version-$target-$time",
4785 (getfield $clogp, 'Maintainer'),
4786 "Automatically generated patch ($clogp->{Version})\n".
4787 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4791 progress "quiltify linearisation planning successful, executing...";
4793 for (my $p = $sref_S;
4794 my $c = $p->{Child};
4796 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4797 next unless $p->{Nontrivial};
4799 my $cc = $c->{Commit};
4801 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4802 $commitdata =~ m/\n\n/ or die "$c ?";
4805 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4808 my $commitdate = cmdoutput
4809 @git, qw(log -n1 --pretty=format:%aD), $cc;
4811 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4813 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4820 my $gbp_check_suitable = sub {
4825 die "contains unexpected slashes\n" if m{//} || m{/$};
4826 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4827 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4828 die "too long" if length > 200;
4830 return $_ unless $@;
4831 print STDERR "quiltifying commit $cc:".
4832 " ignoring/dropping Gbp-Pq $what: $@";
4836 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4838 (\S+) \s* \n //ixm) {
4839 $patchname = $gbp_check_suitable->($1, 'Name');
4841 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4843 (\S+) \s* \n //ixm) {
4844 $patchdir = $gbp_check_suitable->($1, 'Topic');
4849 if (!defined $patchname) {
4850 $patchname = $title;
4851 $patchname =~ s/[.:]$//;
4854 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4855 my $translitname = $converter->convert($patchname);
4856 die unless defined $translitname;
4857 $patchname = $translitname;
4860 "dgit: patch title transliteration error: $@"
4862 $patchname =~ y/ A-Z/-a-z/;
4863 $patchname =~ y/-a-z0-9_.+=~//cd;
4864 $patchname =~ s/^\W/x-$&/;
4865 $patchname = substr($patchname,0,40);
4867 if (!defined $patchdir) {
4870 if (length $patchdir) {
4871 $patchname = "$patchdir/$patchname";
4873 if ($patchname =~ m{^(.*)/}) {
4874 mkpath "debian/patches/$1";
4879 stat "debian/patches/$patchname$index";
4881 $!==ENOENT or die "$patchname$index $!";
4883 runcmd @git, qw(checkout -q), $cc;
4885 # We use the tip's changelog so that dpkg-source doesn't
4886 # produce complaining messages from dpkg-parsechangelog. None
4887 # of the information dpkg-source gets from the changelog is
4888 # actually relevant - it gets put into the original message
4889 # which dpkg-source provides our stunt editor, and then
4891 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4893 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4894 "Date: $commitdate\n".
4895 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4897 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4900 runcmd @git, qw(checkout -q master);
4903 sub build_maybe_quilt_fixup () {
4904 my ($format,$fopts) = get_source_format;
4905 return unless madformat_wantfixup $format;
4908 check_for_vendor_patches();
4910 if (quiltmode_splitbrain) {
4911 foreach my $needtf (qw(new maint)) {
4912 next if grep { $_ eq $needtf } access_cfg_tagformats;
4914 quilt mode $quilt_mode requires split view so server needs to support
4915 both "new" and "maint" tag formats, but config says it doesn't.
4920 my $clogp = parsechangelog();
4921 my $headref = git_rev_parse('HEAD');
4926 my $upstreamversion = upstreamversion $version;
4928 if ($fopts->{'single-debian-patch'}) {
4929 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4931 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4934 die 'bug' if $split_brain && !$need_split_build_invocation;
4936 changedir '../../../..';
4937 runcmd_ordryrun_local
4938 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4941 sub quilt_fixup_mkwork ($) {
4944 mkdir "work" or die $!;
4946 mktree_in_ud_here();
4947 runcmd @git, qw(reset -q --hard), $headref;
4950 sub quilt_fixup_linkorigs ($$) {
4951 my ($upstreamversion, $fn) = @_;
4952 # calls $fn->($leafname);
4954 foreach my $f (<../../../../*>) { #/){
4955 my $b=$f; $b =~ s{.*/}{};
4957 local ($debuglevel) = $debuglevel-1;
4958 printdebug "QF linkorigs $b, $f ?\n";
4960 next unless is_orig_file_of_vsn $b, $upstreamversion;
4961 printdebug "QF linkorigs $b, $f Y\n";
4962 link_ltarget $f, $b or die "$b $!";
4967 sub quilt_fixup_delete_pc () {
4968 runcmd @git, qw(rm -rqf .pc);
4970 Commit removal of .pc (quilt series tracking data)
4972 [dgit ($our_version) upgrade quilt-remove-pc]
4976 sub quilt_fixup_singlepatch ($$$) {
4977 my ($clogp, $headref, $upstreamversion) = @_;
4979 progress "starting quiltify (single-debian-patch)";
4981 # dpkg-source --commit generates new patches even if
4982 # single-debian-patch is in debian/source/options. In order to
4983 # get it to generate debian/patches/debian-changes, it is
4984 # necessary to build the source package.
4986 quilt_fixup_linkorigs($upstreamversion, sub { });
4987 quilt_fixup_mkwork($headref);
4989 rmtree("debian/patches");
4991 runcmd @dpkgsource, qw(-b .);
4993 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4994 rename srcfn("$upstreamversion", "/debian/patches"),
4995 "work/debian/patches";
4998 commit_quilty_patch();
5001 sub quilt_make_fake_dsc ($) {
5002 my ($upstreamversion) = @_;
5004 my $fakeversion="$upstreamversion-~~DGITFAKE";
5006 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5007 print $fakedsc <<END or die $!;
5010 Version: $fakeversion
5014 my $dscaddfile=sub {
5017 my $md = new Digest::MD5;
5019 my $fh = new IO::File $b, '<' or die "$b $!";
5024 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5027 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5029 my @files=qw(debian/source/format debian/rules
5030 debian/control debian/changelog);
5031 foreach my $maybe (qw(debian/patches debian/source/options
5032 debian/tests/control)) {
5033 next unless stat_exists "../../../$maybe";
5034 push @files, $maybe;
5037 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5038 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5040 $dscaddfile->($debtar);
5041 close $fakedsc or die $!;
5044 sub quilt_check_splitbrain_cache ($$) {
5045 my ($headref, $upstreamversion) = @_;
5046 # Called only if we are in (potentially) split brain mode.
5048 # Computes the cache key and looks in the cache.
5049 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5051 my $splitbrain_cachekey;
5054 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5055 # we look in the reflog of dgit-intern/quilt-cache
5056 # we look for an entry whose message is the key for the cache lookup
5057 my @cachekey = (qw(dgit), $our_version);
5058 push @cachekey, $upstreamversion;
5059 push @cachekey, $quilt_mode;
5060 push @cachekey, $headref;
5062 push @cachekey, hashfile('fake.dsc');
5064 my $srcshash = Digest::SHA->new(256);
5065 my %sfs = ( %INC, '$0(dgit)' => $0 );
5066 foreach my $sfk (sort keys %sfs) {
5067 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5068 $srcshash->add($sfk," ");
5069 $srcshash->add(hashfile($sfs{$sfk}));
5070 $srcshash->add("\n");
5072 push @cachekey, $srcshash->hexdigest();
5073 $splitbrain_cachekey = "@cachekey";
5075 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5077 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5078 debugcmd "|(probably)",@cmd;
5079 my $child = open GC, "-|"; defined $child or die $!;
5081 chdir '../../..' or die $!;
5082 if (!stat ".git/logs/refs/$splitbraincache") {
5083 $! == ENOENT or die $!;
5084 printdebug ">(no reflog)\n";
5091 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5092 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5095 quilt_fixup_mkwork($headref);
5096 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5097 if ($cachehit ne $headref) {
5098 progress "dgit view: found cached ($saved)";
5099 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5101 return ($cachehit, $splitbrain_cachekey);
5103 progress "dgit view: found cached, no changes required";
5104 return ($headref, $splitbrain_cachekey);
5106 die $! if GC->error;
5107 failedcmd unless close GC;
5109 printdebug "splitbrain cache miss\n";
5110 return (undef, $splitbrain_cachekey);
5113 sub quilt_fixup_multipatch ($$$) {
5114 my ($clogp, $headref, $upstreamversion) = @_;
5116 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5119 # - honour any existing .pc in case it has any strangeness
5120 # - determine the git commit corresponding to the tip of
5121 # the patch stack (if there is one)
5122 # - if there is such a git commit, convert each subsequent
5123 # git commit into a quilt patch with dpkg-source --commit
5124 # - otherwise convert all the differences in the tree into
5125 # a single git commit
5129 # Our git tree doesn't necessarily contain .pc. (Some versions of
5130 # dgit would include the .pc in the git tree.) If there isn't
5131 # one, we need to generate one by unpacking the patches that we
5134 # We first look for a .pc in the git tree. If there is one, we
5135 # will use it. (This is not the normal case.)
5137 # Otherwise need to regenerate .pc so that dpkg-source --commit
5138 # can work. We do this as follows:
5139 # 1. Collect all relevant .orig from parent directory
5140 # 2. Generate a debian.tar.gz out of
5141 # debian/{patches,rules,source/format,source/options}
5142 # 3. Generate a fake .dsc containing just these fields:
5143 # Format Source Version Files
5144 # 4. Extract the fake .dsc
5145 # Now the fake .dsc has a .pc directory.
5146 # (In fact we do this in every case, because in future we will
5147 # want to search for a good base commit for generating patches.)
5149 # Then we can actually do the dpkg-source --commit
5150 # 1. Make a new working tree with the same object
5151 # store as our main tree and check out the main
5153 # 2. Copy .pc from the fake's extraction, if necessary
5154 # 3. Run dpkg-source --commit
5155 # 4. If the result has changes to debian/, then
5156 # - git add them them
5157 # - git add .pc if we had a .pc in-tree
5159 # 5. If we had a .pc in-tree, delete it, and git commit
5160 # 6. Back in the main tree, fast forward to the new HEAD
5162 # Another situation we may have to cope with is gbp-style
5163 # patches-unapplied trees.
5165 # We would want to detect these, so we know to escape into
5166 # quilt_fixup_gbp. However, this is in general not possible.
5167 # Consider a package with a one patch which the dgit user reverts
5168 # (with git revert or the moral equivalent).
5170 # That is indistinguishable in contents from a patches-unapplied
5171 # tree. And looking at the history to distinguish them is not
5172 # useful because the user might have made a confusing-looking git
5173 # history structure (which ought to produce an error if dgit can't
5174 # cope, not a silent reintroduction of an unwanted patch).
5176 # So gbp users will have to pass an option. But we can usually
5177 # detect their failure to do so: if the tree is not a clean
5178 # patches-applied tree, quilt linearisation fails, but the tree
5179 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5180 # they want --quilt=unapplied.
5182 # To help detect this, when we are extracting the fake dsc, we
5183 # first extract it with --skip-patches, and then apply the patches
5184 # afterwards with dpkg-source --before-build. That lets us save a
5185 # tree object corresponding to .origs.
5187 my $splitbrain_cachekey;
5189 quilt_make_fake_dsc($upstreamversion);
5191 if (quiltmode_splitbrain()) {
5193 ($cachehit, $splitbrain_cachekey) =
5194 quilt_check_splitbrain_cache($headref, $upstreamversion);
5195 return if $cachehit;
5199 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5201 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5202 rename $fakexdir, "fake" or die "$fakexdir $!";
5206 remove_stray_gits("source package");
5207 mktree_in_ud_here();
5211 my $unapplied=git_add_write_tree();
5212 printdebug "fake orig tree object $unapplied\n";
5216 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5218 if (system @bbcmd) {
5219 failedcmd @bbcmd if $? < 0;
5221 failed to apply your git tree's patch stack (from debian/patches/) to
5222 the corresponding upstream tarball(s). Your source tree and .orig
5223 are probably too inconsistent. dgit can only fix up certain kinds of
5224 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5230 quilt_fixup_mkwork($headref);
5233 if (stat_exists ".pc") {
5235 progress "Tree already contains .pc - will use it then delete it.";
5238 rename '../fake/.pc','.pc' or die $!;
5241 changedir '../fake';
5243 my $oldtiptree=git_add_write_tree();
5244 printdebug "fake o+d/p tree object $unapplied\n";
5245 changedir '../work';
5248 # We calculate some guesswork now about what kind of tree this might
5249 # be. This is mostly for error reporting.
5255 # O = orig, without patches applied
5256 # A = "applied", ie orig with H's debian/patches applied
5257 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5258 \%editedignores, \@unrepres),
5259 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5260 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5264 foreach my $b (qw(01 02)) {
5265 foreach my $v (qw(O2H O2A H2A)) {
5266 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5269 printdebug "differences \@dl @dl.\n";
5272 "$us: base trees orig=%.20s o+d/p=%.20s",
5273 $unapplied, $oldtiptree;
5275 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5276 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5277 $dl[0], $dl[1], $dl[3], $dl[4],
5281 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5283 forceable_fail [qw(unrepresentable)], <<END;
5284 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5289 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5290 push @failsuggestion, "This might be a patches-unapplied branch.";
5291 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5292 push @failsuggestion, "This might be a patches-applied branch.";
5294 push @failsuggestion, "Maybe you need to specify one of".
5295 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5297 if (quiltmode_splitbrain()) {
5298 quiltify_splitbrain($clogp, $unapplied, $headref,
5299 $diffbits, \%editedignores,
5300 $splitbrain_cachekey);
5304 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5305 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5307 if (!open P, '>>', ".pc/applied-patches") {
5308 $!==&ENOENT or die $!;
5313 commit_quilty_patch();
5315 if ($mustdeletepc) {
5316 quilt_fixup_delete_pc();
5320 sub quilt_fixup_editor () {
5321 my $descfn = $ENV{$fakeeditorenv};
5322 my $editing = $ARGV[$#ARGV];
5323 open I1, '<', $descfn or die "$descfn: $!";
5324 open I2, '<', $editing or die "$editing: $!";
5325 unlink $editing or die "$editing: $!";
5326 open O, '>', $editing or die "$editing: $!";
5327 while (<I1>) { print O or die $!; } I1->error and die $!;
5330 $copying ||= m/^\-\-\- /;
5331 next unless $copying;
5334 I2->error and die $!;
5339 sub maybe_apply_patches_dirtily () {
5340 return unless $quilt_mode =~ m/gbp|unapplied/;
5341 print STDERR <<END or die $!;
5343 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5344 dgit: Have to apply the patches - making the tree dirty.
5345 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5348 $patches_applied_dirtily = 01;
5349 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5350 runcmd qw(dpkg-source --before-build .);
5353 sub maybe_unapply_patches_again () {
5354 progress "dgit: Unapplying patches again to tidy up the tree."
5355 if $patches_applied_dirtily;
5356 runcmd qw(dpkg-source --after-build .)
5357 if $patches_applied_dirtily & 01;
5359 if $patches_applied_dirtily & 02;
5360 $patches_applied_dirtily = 0;
5363 #----- other building -----
5365 our $clean_using_builder;
5366 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5367 # clean the tree before building (perhaps invoked indirectly by
5368 # whatever we are using to run the build), rather than separately
5369 # and explicitly by us.
5372 return if $clean_using_builder;
5373 if ($cleanmode eq 'dpkg-source') {
5374 maybe_apply_patches_dirtily();
5375 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5376 } elsif ($cleanmode eq 'dpkg-source-d') {
5377 maybe_apply_patches_dirtily();
5378 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5379 } elsif ($cleanmode eq 'git') {
5380 runcmd_ordryrun_local @git, qw(clean -xdf);
5381 } elsif ($cleanmode eq 'git-ff') {
5382 runcmd_ordryrun_local @git, qw(clean -xdff);
5383 } elsif ($cleanmode eq 'check') {
5384 my $leftovers = cmdoutput @git, qw(clean -xdn);
5385 if (length $leftovers) {
5386 print STDERR $leftovers, "\n" or die $!;
5387 fail "tree contains uncommitted files and --clean=check specified";
5389 } elsif ($cleanmode eq 'none') {
5396 badusage "clean takes no additional arguments" if @ARGV;
5399 maybe_unapply_patches_again();
5402 sub build_prep_early () {
5403 our $build_prep_early_done //= 0;
5404 return if $build_prep_early_done++;
5406 badusage "-p is not allowed when building" if defined $package;
5407 my $clogp = parsechangelog();
5408 $isuite = getfield $clogp, 'Distribution';
5409 $package = getfield $clogp, 'Source';
5410 $version = getfield $clogp, 'Version';
5417 build_maybe_quilt_fixup();
5419 my $pat = changespat $version;
5420 foreach my $f (glob "$buildproductsdir/$pat") {
5422 unlink $f or fail "remove old changes file $f: $!";
5424 progress "would remove $f";
5430 sub changesopts_initial () {
5431 my @opts =@changesopts[1..$#changesopts];
5434 sub changesopts_version () {
5435 if (!defined $changes_since_version) {
5436 my @vsns = archive_query('archive_query');
5437 my @quirk = access_quirk();
5438 if ($quirk[0] eq 'backports') {
5439 local $isuite = $quirk[2];
5441 canonicalise_suite();
5442 push @vsns, archive_query('archive_query');
5445 @vsns = map { $_->[0] } @vsns;
5446 @vsns = sort { -version_compare($a, $b) } @vsns;
5447 $changes_since_version = $vsns[0];
5448 progress "changelog will contain changes since $vsns[0]";
5450 $changes_since_version = '_';
5451 progress "package seems new, not specifying -v<version>";
5454 if ($changes_since_version ne '_') {
5455 return ("-v$changes_since_version");
5461 sub changesopts () {
5462 return (changesopts_initial(), changesopts_version());
5465 sub massage_dbp_args ($;$) {
5466 my ($cmd,$xargs) = @_;
5469 # - if we're going to split the source build out so we can
5470 # do strange things to it, massage the arguments to dpkg-buildpackage
5471 # so that the main build doessn't build source (or add an argument
5472 # to stop it building source by default).
5474 # - add -nc to stop dpkg-source cleaning the source tree,
5475 # unless we're not doing a split build and want dpkg-source
5476 # as cleanmode, in which case we can do nothing
5479 # 0 - source will NOT need to be built separately by caller
5480 # +1 - source will need to be built separately by caller
5481 # +2 - source will need to be built separately by caller AND
5482 # dpkg-buildpackage should not in fact be run at all!
5483 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5484 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5485 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5486 $clean_using_builder = 1;
5489 # -nc has the side effect of specifying -b if nothing else specified
5490 # and some combinations of -S, -b, et al, are errors, rather than
5491 # later simply overriding earlie. So we need to:
5492 # - search the command line for these options
5493 # - pick the last one
5494 # - perhaps add our own as a default
5495 # - perhaps adjust it to the corresponding non-source-building version
5497 foreach my $l ($cmd, $xargs) {
5499 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5502 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5504 if ($need_split_build_invocation) {
5505 printdebug "massage split $dmode.\n";
5506 $r = $dmode =~ m/[S]/ ? +2 :
5507 $dmode =~ y/gGF/ABb/ ? +1 :
5508 $dmode =~ m/[ABb]/ ? 0 :
5511 printdebug "massage done $r $dmode.\n";
5513 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5519 my $wasdir = must_getcwd();
5525 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5526 my ($msg_if_onlyone) = @_;
5527 # If there is only one .changes file, fail with $msg_if_onlyone,
5528 # or if that is undef, be a no-op.
5529 # Returns the changes file to report to the user.
5530 my $pat = changespat $version;
5531 my @changesfiles = glob $pat;
5532 @changesfiles = sort {
5533 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5537 if (@changesfiles==1) {
5538 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5539 only one changes file from build (@changesfiles)
5541 $result = $changesfiles[0];
5542 } elsif (@changesfiles==2) {
5543 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5544 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5545 fail "$l found in binaries changes file $binchanges"
5548 runcmd_ordryrun_local @mergechanges, @changesfiles;
5549 my $multichanges = changespat $version,'multi';
5551 stat_exists $multichanges or fail "$multichanges: $!";
5552 foreach my $cf (glob $pat) {
5553 next if $cf eq $multichanges;
5554 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5557 $result = $multichanges;
5559 fail "wrong number of different changes files (@changesfiles)";
5561 printdone "build successful, results in $result\n" or die $!;
5564 sub midbuild_checkchanges () {
5565 my $pat = changespat $version;
5566 return if $rmchanges;
5567 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5568 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5570 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5571 Suggest you delete @unwanted.
5576 sub midbuild_checkchanges_vanilla ($) {
5578 midbuild_checkchanges() if $wantsrc == 1;
5581 sub postbuild_mergechanges_vanilla ($) {
5583 if ($wantsrc == 1) {
5585 postbuild_mergechanges(undef);
5588 printdone "build successful\n";
5593 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5594 my $wantsrc = massage_dbp_args \@dbp;
5597 midbuild_checkchanges_vanilla $wantsrc;
5602 push @dbp, changesopts_version();
5603 maybe_apply_patches_dirtily();
5604 runcmd_ordryrun_local @dbp;
5606 maybe_unapply_patches_again();
5607 postbuild_mergechanges_vanilla $wantsrc;
5611 $quilt_mode //= 'gbp';
5617 # gbp can make .origs out of thin air. In my tests it does this
5618 # even for a 1.0 format package, with no origs present. So I
5619 # guess it keys off just the version number. We don't know
5620 # exactly what .origs ought to exist, but let's assume that we
5621 # should run gbp if: the version has an upstream part and the main
5623 my $upstreamversion = upstreamversion $version;
5624 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5625 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5627 if ($gbp_make_orig) {
5629 $cleanmode = 'none'; # don't do it again
5630 $need_split_build_invocation = 1;
5633 my @dbp = @dpkgbuildpackage;
5635 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5637 if (!length $gbp_build[0]) {
5638 if (length executable_on_path('git-buildpackage')) {
5639 $gbp_build[0] = qw(git-buildpackage);
5641 $gbp_build[0] = 'gbp buildpackage';
5644 my @cmd = opts_opt_multi_cmd @gbp_build;
5646 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5648 if ($gbp_make_orig) {
5649 ensuredir '.git/dgit';
5650 my $ok = '.git/dgit/origs-gen-ok';
5651 unlink $ok or $!==&ENOENT or die $!;
5652 my @origs_cmd = @cmd;
5653 push @origs_cmd, qw(--git-cleaner=true);
5654 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5655 push @origs_cmd, @ARGV;
5657 debugcmd @origs_cmd;
5659 do { local $!; stat_exists $ok; }
5660 or failedcmd @origs_cmd;
5662 dryrun_report @origs_cmd;
5668 midbuild_checkchanges_vanilla $wantsrc;
5670 if (!$clean_using_builder) {
5671 push @cmd, '--git-cleaner=true';
5675 maybe_unapply_patches_again();
5677 push @cmd, changesopts();
5678 runcmd_ordryrun_local @cmd, @ARGV;
5680 postbuild_mergechanges_vanilla $wantsrc;
5682 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5685 my $our_cleanmode = $cleanmode;
5686 if ($need_split_build_invocation) {
5687 # Pretend that clean is being done some other way. This
5688 # forces us not to try to use dpkg-buildpackage to clean and
5689 # build source all in one go; and instead we run dpkg-source
5690 # (and build_prep() will do the clean since $clean_using_builder
5692 $our_cleanmode = 'ELSEWHERE';
5694 if ($our_cleanmode =~ m/^dpkg-source/) {
5695 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5696 $clean_using_builder = 1;
5699 $sourcechanges = changespat $version,'source';
5701 unlink "../$sourcechanges" or $!==ENOENT
5702 or fail "remove $sourcechanges: $!";
5704 $dscfn = dscfn($version);
5705 if ($our_cleanmode eq 'dpkg-source') {
5706 maybe_apply_patches_dirtily();
5707 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5709 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5710 maybe_apply_patches_dirtily();
5711 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5714 my @cmd = (@dpkgsource, qw(-b --));
5717 runcmd_ordryrun_local @cmd, "work";
5718 my @udfiles = <${package}_*>;
5719 changedir "../../..";
5720 foreach my $f (@udfiles) {
5721 printdebug "source copy, found $f\n";
5724 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5725 $f eq srcfn($version, $&));
5726 printdebug "source copy, found $f - renaming\n";
5727 rename "$ud/$f", "../$f" or $!==ENOENT
5728 or fail "put in place new source file ($f): $!";
5731 my $pwd = must_getcwd();
5732 my $leafdir = basename $pwd;
5734 runcmd_ordryrun_local @cmd, $leafdir;
5737 runcmd_ordryrun_local qw(sh -ec),
5738 'exec >$1; shift; exec "$@"','x',
5739 "../$sourcechanges",
5740 @dpkggenchanges, qw(-S), changesopts();
5744 sub cmd_build_source {
5745 badusage "build-source takes no additional arguments" if @ARGV;
5747 maybe_unapply_patches_again();
5748 printdone "source built, results in $dscfn and $sourcechanges";
5753 midbuild_checkchanges();
5756 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5757 stat_exists $sourcechanges
5758 or fail "$sourcechanges (in parent directory): $!";
5760 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5762 maybe_unapply_patches_again();
5764 postbuild_mergechanges(<<END);
5765 perhaps you need to pass -A ? (sbuild's default is to build only
5766 arch-specific binaries; dgit 1.4 used to override that.)
5771 sub cmd_quilt_fixup {
5772 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5773 my $clogp = parsechangelog();
5774 $version = getfield $clogp, 'Version';
5775 $package = getfield $clogp, 'Source';
5778 build_maybe_quilt_fixup();
5781 sub cmd_import_dsc {
5785 last unless $ARGV[0] =~ m/^-/;
5788 if (m/^--require-valid-signature$/) {
5791 badusage "unknown dgit import-dsc sub-option \`$_'";
5795 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5796 my ($dscfn, $dstbranch) = @ARGV;
5798 badusage "dry run makes no sense with import-dsc" unless act_local();
5800 my $force = $dstbranch =~ s/^\+// ? +1 :
5801 $dstbranch =~ s/^\.\.// ? -1 :
5803 my $info = $force ? " $&" : '';
5804 $info = "$dscfn$info";
5806 my $specbranch = $dstbranch;
5807 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5808 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5810 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5811 my $chead = cmdoutput_errok @symcmd;
5812 defined $chead or $?==256 or failedcmd @symcmd;
5814 fail "$dstbranch is checked out - will not update it"
5815 if defined $chead and $chead eq $dstbranch;
5817 my $oldhash = git_get_ref $dstbranch;
5819 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5820 $dscdata = do { local $/ = undef; <D>; };
5821 D->error and fail "read $dscfn: $!";
5824 # we don't normally need this so import it here
5825 use Dpkg::Source::Package;
5826 my $dp = new Dpkg::Source::Package filename => $dscfn,
5827 require_valid_signature => $needsig;
5829 local $SIG{__WARN__} = sub {
5831 return unless $needsig;
5832 fail "import-dsc signature check failed";
5834 if (!$dp->is_signed()) {
5835 warn "$us: warning: importing unsigned .dsc\n";
5837 my $r = $dp->check_signature();
5838 die "->check_signature => $r" if $needsig && $r;
5844 my $dgit_commit = $dsc->{$ourdscfield[0]};
5845 if (defined $dgit_commit &&
5846 !forceing [qw(import-dsc-with-dgit-field)]) {
5847 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5848 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5849 my @cmd = (qw(sh -ec),
5850 "echo $dgit_commit | git cat-file --batch-check");
5851 my $objgot = cmdoutput @cmd;
5852 if ($objgot =~ m#^\w+ missing\b#) {
5854 .dsc contains Dgit field referring to object $dgit_commit
5855 Your git tree does not have that object. Try `git fetch' from a
5856 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5859 if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
5861 progress "Not fast forward, forced update.";
5863 fail "Not fast forward to $dgit_commit";
5866 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5867 $dstbranch, $dgit_commit);
5869 progress "dgit: import-dsc updated git ref $dstbranch";
5874 Branch $dstbranch already exists
5875 Specify ..$specbranch for a pseudo-merge, binding in existing history
5876 Specify +$specbranch to overwrite, discarding existing history
5878 if $oldhash && !$force;
5880 $package = getfield $dsc, 'Source';
5881 my @dfi = dsc_files_info();
5882 foreach my $fi (@dfi) {
5883 my $f = $fi->{Filename};
5885 next if lstat $here;
5886 fail "stat $here: $!" unless $! == ENOENT;
5888 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5890 } elsif ($dscfn =~ m#^/#) {
5893 fail "cannot import $dscfn which seems to be inside working tree!";
5895 $there =~ s#/+[^/]+$## or
5896 fail "cannot import $dscfn which seems to not have a basename";
5898 symlink $there, $here or fail "symlink $there to $here: $!";
5899 progress "made symlink $here -> $there";
5900 print STDERR Dumper($fi);
5902 my @mergeinputs = generate_commits_from_dsc();
5903 die unless @mergeinputs == 1;
5905 my $newhash = $mergeinputs[0]{Commit};
5909 progress "Import, forced update - synthetic orphan git history.";
5910 } elsif ($force < 0) {
5911 progress "Import, merging.";
5912 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5913 my $version = getfield $dsc, 'Version';
5914 $newhash = make_commit_text <<END;
5919 Merge $package ($version) import into $dstbranch
5922 die; # caught earlier
5926 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5927 $dstbranch, $newhash);
5929 progress "dgit: import-dsc results are in in git ref $dstbranch";
5932 sub cmd_archive_api_query {
5933 badusage "need only 1 subpath argument" unless @ARGV==1;
5934 my ($subpath) = @ARGV;
5935 my @cmd = archive_api_query_cmd($subpath);
5938 exec @cmd or fail "exec curl: $!\n";
5941 sub cmd_clone_dgit_repos_server {
5942 badusage "need destination argument" unless @ARGV==1;
5943 my ($destdir) = @ARGV;
5944 $package = '_dgit-repos-server';
5945 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5947 exec @cmd or fail "exec git clone: $!\n";
5950 sub cmd_setup_mergechangelogs {
5951 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5952 setup_mergechangelogs(1);
5955 sub cmd_setup_useremail {
5956 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5960 sub cmd_setup_new_tree {
5961 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5965 #---------- argument parsing and main program ----------
5968 print "dgit version $our_version\n" or die $!;
5972 our (%valopts_long, %valopts_short);
5975 sub defvalopt ($$$$) {
5976 my ($long,$short,$val_re,$how) = @_;
5977 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5978 $valopts_long{$long} = $oi;
5979 $valopts_short{$short} = $oi;
5980 # $how subref should:
5981 # do whatever assignemnt or thing it likes with $_[0]
5982 # if the option should not be passed on to remote, @rvalopts=()
5983 # or $how can be a scalar ref, meaning simply assign the value
5986 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5987 defvalopt '--distro', '-d', '.+', \$idistro;
5988 defvalopt '', '-k', '.+', \$keyid;
5989 defvalopt '--existing-package','', '.*', \$existing_package;
5990 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5991 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5992 defvalopt '--package', '-p', $package_re, \$package;
5993 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5995 defvalopt '', '-C', '.+', sub {
5996 ($changesfile) = (@_);
5997 if ($changesfile =~ s#^(.*)/##) {
5998 $buildproductsdir = $1;
6002 defvalopt '--initiator-tempdir','','.*', sub {
6003 ($initiator_tempdir) = (@_);
6004 $initiator_tempdir =~ m#^/# or
6005 badusage "--initiator-tempdir must be used specify an".
6006 " absolute, not relative, directory."
6012 if (defined $ENV{'DGIT_SSH'}) {
6013 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6014 } elsif (defined $ENV{'GIT_SSH'}) {
6015 @ssh = ($ENV{'GIT_SSH'});
6023 if (!defined $val) {
6024 badusage "$what needs a value" unless @ARGV;
6026 push @rvalopts, $val;
6028 badusage "bad value \`$val' for $what" unless
6029 $val =~ m/^$oi->{Re}$(?!\n)/s;
6030 my $how = $oi->{How};
6031 if (ref($how) eq 'SCALAR') {
6036 push @ropts, @rvalopts;
6040 last unless $ARGV[0] =~ m/^-/;
6044 if (m/^--dry-run$/) {
6047 } elsif (m/^--damp-run$/) {
6050 } elsif (m/^--no-sign$/) {
6053 } elsif (m/^--help$/) {
6055 } elsif (m/^--version$/) {
6057 } elsif (m/^--new$/) {
6060 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6061 ($om = $opts_opt_map{$1}) &&
6065 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6066 !$opts_opt_cmdonly{$1} &&
6067 ($om = $opts_opt_map{$1})) {
6070 } elsif (m/^--(gbp|dpm)$/s) {
6071 push @ropts, "--quilt=$1";
6073 } elsif (m/^--ignore-dirty$/s) {
6076 } elsif (m/^--no-quilt-fixup$/s) {
6078 $quilt_mode = 'nocheck';
6079 } elsif (m/^--no-rm-on-error$/s) {
6082 } elsif (m/^--overwrite$/s) {
6084 $overwrite_version = '';
6085 } elsif (m/^--overwrite=(.+)$/s) {
6087 $overwrite_version = $1;
6088 } elsif (m/^--delayed=(\d+)$/s) {
6091 } elsif (m/^--dgit-view-save=(.+)$/s) {
6093 $split_brain_save = $1;
6094 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6095 } elsif (m/^--(no-)?rm-old-changes$/s) {
6098 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6100 push @deliberatelies, $&;
6101 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6105 } elsif (m/^--force-/) {
6107 "$us: warning: ignoring unknown force option $_\n";
6109 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6110 # undocumented, for testing
6112 $tagformat_want = [ $1, 'command line', 1 ];
6113 # 1 menas overrides distro configuration
6114 } elsif (m/^--always-split-source-build$/s) {
6115 # undocumented, for testing
6117 $need_split_build_invocation = 1;
6118 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6119 $val = $2 ? $' : undef; #';
6120 $valopt->($oi->{Long});
6122 badusage "unknown long option \`$_'";
6129 } elsif (s/^-L/-/) {
6132 } elsif (s/^-h/-/) {
6134 } elsif (s/^-D/-/) {
6138 } elsif (s/^-N/-/) {
6143 push @changesopts, $_;
6145 } elsif (s/^-wn$//s) {
6147 $cleanmode = 'none';
6148 } elsif (s/^-wg$//s) {
6151 } elsif (s/^-wgf$//s) {
6153 $cleanmode = 'git-ff';
6154 } elsif (s/^-wd$//s) {
6156 $cleanmode = 'dpkg-source';
6157 } elsif (s/^-wdd$//s) {
6159 $cleanmode = 'dpkg-source-d';
6160 } elsif (s/^-wc$//s) {
6162 $cleanmode = 'check';
6163 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6164 push @git, '-c', $&;
6165 $gitcfgs{cmdline}{$1} = [ $2 ];
6166 } elsif (s/^-c([^=]+)$//s) {
6167 push @git, '-c', $&;
6168 $gitcfgs{cmdline}{$1} = [ 'true' ];
6169 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6171 $val = undef unless length $val;
6172 $valopt->($oi->{Short});
6175 badusage "unknown short option \`$_'";
6182 sub check_env_sanity () {
6183 my $blocked = new POSIX::SigSet;
6184 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6187 foreach my $name (qw(PIPE CHLD)) {
6188 my $signame = "SIG$name";
6189 my $signum = eval "POSIX::$signame" // die;
6190 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6191 die "$signame is set to something other than SIG_DFL\n";
6192 $blocked->ismember($signum) and
6193 die "$signame is blocked\n";
6199 On entry to dgit, $@
6200 This is a bug produced by something in in your execution environment.
6206 sub finalise_opts_opts () {
6207 foreach my $k (keys %opts_opt_map) {
6208 my $om = $opts_opt_map{$k};
6210 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6212 badcfg "cannot set command for $k"
6213 unless length $om->[0];
6217 foreach my $c (access_cfg_cfgs("opts-$k")) {
6219 map { $_ ? @$_ : () }
6220 map { $gitcfgs{$_}{$c} }
6221 reverse @gitcfgsources;
6222 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6223 "\n" if $debuglevel >= 4;
6225 badcfg "cannot configure options for $k"
6226 if $opts_opt_cmdonly{$k};
6227 my $insertpos = $opts_cfg_insertpos{$k};
6228 @$om = ( @$om[0..$insertpos-1],
6230 @$om[$insertpos..$#$om] );
6235 if ($ENV{$fakeeditorenv}) {
6237 quilt_fixup_editor();
6244 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6245 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6246 if $dryrun_level == 1;
6248 print STDERR $helpmsg or die $!;
6251 my $cmd = shift @ARGV;
6254 my $pre_fn = ${*::}{"pre_$cmd"};
6255 $pre_fn->() if $pre_fn;
6257 if (!defined $rmchanges) {
6258 local $access_forpush;
6259 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6262 if (!defined $quilt_mode) {
6263 local $access_forpush;
6264 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6265 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6267 $quilt_mode =~ m/^($quilt_modes_re)$/
6268 or badcfg "unknown quilt-mode \`$quilt_mode'";
6272 $need_split_build_invocation ||= quiltmode_splitbrain();
6274 if (!defined $cleanmode) {
6275 local $access_forpush;
6276 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6277 $cleanmode //= 'dpkg-source';
6279 badcfg "unknown clean-mode \`$cleanmode'" unless
6280 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6283 my $fn = ${*::}{"cmd_$cmd"};
6284 $fn or badusage "unknown operation $cmd";