3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2018 Ian Jackson
6 # Copyright (C)2017-2018 Sean Whitton
8 # This program is free software: you can redistribute it and/or modify
9 # it under the terms of the GNU General Public License as published by
10 # the Free Software Foundation, either version 3 of the License, or
11 # (at your option) any later version.
13 # This program is distributed in the hope that it will be useful,
14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 # GNU General Public License for more details.
18 # You should have received a copy of the GNU General Public License
19 # along with this program. If not, see <http://www.gnu.org/licenses/>.
21 END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
22 use Debian::Dgit::ExitStatus;
23 use Debian::Dgit::I18n;
27 use Debian::Dgit qw(:DEFAULT :playground);
33 use Dpkg::Control::Hash;
36 use File::Temp qw(tempdir);
39 use Dpkg::Compression;
40 use Dpkg::Compression::Process;
46 use List::MoreUtils qw(pairwise);
47 use Text::Glob qw(match_glob);
48 use Fcntl qw(:DEFAULT :flock);
53 our $our_version = 'UNRELEASED'; ###substituted###
54 our $absurdity = undef; ###substituted###
56 our @rpushprotovsn_support = qw(4); # 4 is new tag format
67 our $dryrun_level = 0;
69 our $buildproductsdir;
72 our $includedirty = 0;
76 our $existing_package = 'dpkg';
78 our $changes_since_version;
80 our $overwrite_version; # undef: not specified; '': check changelog
82 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
84 our %internal_object_save;
85 our $we_are_responder;
86 our $we_are_initiator;
87 our $initiator_tempdir;
88 our $patches_applied_dirtily = 00;
89 our $chase_dsc_distro=1;
91 our %forceopts = map { $_=>0 }
92 qw(unrepresentable unsupported-source-format
93 dsc-changes-mismatch changes-origs-exactly
94 uploading-binaries uploading-source-only
95 import-gitapply-absurd
96 import-gitapply-no-absurd
97 import-dsc-with-dgit-field);
99 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
101 our $suite_re = '[-+.0-9a-z]+';
102 our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
103 | (?: git | git-ff ) (?: ,always )?
104 | check (?: ,ignores )?
108 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
109 our $splitbraincache = 'dgit-intern/quilt-cache';
110 our $rewritemap = 'dgit-rewrite/map';
112 our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
114 our (@git) = qw(git);
115 our (@dget) = qw(dget);
116 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
117 our (@dput) = qw(dput);
118 our (@debsign) = qw(debsign);
119 our (@gpg) = qw(gpg);
120 our (@sbuild) = (qw(sbuild --no-source));
122 our (@dgit) = qw(dgit);
123 our (@git_debrebase) = qw(git-debrebase);
124 our (@aptget) = qw(apt-get);
125 our (@aptcache) = qw(apt-cache);
126 our (@dpkgbuildpackage) = (qw(dpkg-buildpackage), @dpkg_source_ignores);
127 our (@dpkgsource) = (qw(dpkg-source), @dpkg_source_ignores);
128 our (@dpkggenchanges) = qw(dpkg-genchanges);
129 our (@mergechanges) = qw(mergechanges -f);
130 our (@gbp_build) = ('');
131 our (@gbp_pq) = ('gbp pq');
132 our (@changesopts) = ('');
133 our (@pbuilder) = ("sudo -E pbuilder","--no-source-only-changes");
134 our (@cowbuilder) = ("sudo -E cowbuilder","--no-source-only-changes");
136 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
139 'debsign' => \@debsign,
141 'sbuild' => \@sbuild,
145 'git-debrebase' => \@git_debrebase,
146 'apt-get' => \@aptget,
147 'apt-cache' => \@aptcache,
148 'dpkg-source' => \@dpkgsource,
149 'dpkg-buildpackage' => \@dpkgbuildpackage,
150 'dpkg-genchanges' => \@dpkggenchanges,
151 'gbp-build' => \@gbp_build,
152 'gbp-pq' => \@gbp_pq,
153 'ch' => \@changesopts,
154 'mergechanges' => \@mergechanges,
155 'pbuilder' => \@pbuilder,
156 'cowbuilder' => \@cowbuilder);
158 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
159 our %opts_cfg_insertpos = map {
161 scalar @{ $opts_opt_map{$_} }
162 } keys %opts_opt_map;
164 sub parseopts_late_defaults();
165 sub quiltify_trees_differ ($$;$$$);
166 sub setup_gitattrs(;$);
167 sub check_gitattrs($$);
174 our $supplementary_message = '';
175 our $made_split_brain = 0;
176 our $do_split_brain = 0;
178 # Interactions between quilt mode and split brain
179 # (currently, split brain only implemented iff
180 # madformat_wantfixup && quiltmode_splitbrain)
182 # source format sane `3.0 (quilt)'
183 # madformat_wantfixup()
185 # quilt mode normal quiltmode
186 # (eg linear) _splitbrain
188 # ------------ ------------------------------------------------
190 # no split no q cache no q cache forbidden,
191 # brain PM on master q fixup on master prevented
192 # !$do_split_brain PM on master
194 # split brain no q cache q fixup cached, to dgit view
195 # PM in dgit view PM in dgit view
197 # PM = pseudomerge to make ff, due to overwrite (or split view)
198 # "no q cache" = do not record in cache on build, do not check cache
199 # `3.0 (quilt)' with --quilt=nocheck is treated as sane format
203 return unless forkcheck_mainprocess();
204 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
207 our $remotename = 'dgit';
208 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
212 if (!defined $absurdity) {
214 $absurdity =~ s{/[^/]+$}{/absurd} or die;
218 my ($v,$distro) = @_;
219 return debiantag_new($v, $distro);
222 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
224 sub lbranch () { return "$branchprefix/$csuite"; }
225 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
226 sub lref () { return "refs/heads/".lbranch(); }
227 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
228 sub rrref () { return server_ref($csuite); }
231 my ($vsn, $sfx) = @_;
232 return &source_file_leafname($package, $vsn, $sfx);
234 sub is_orig_file_of_vsn ($$) {
235 my ($f, $upstreamvsn) = @_;
236 return is_orig_file_of_p_v($f, $package, $upstreamvsn);
241 return srcfn($vsn,".dsc");
244 sub changespat ($;$) {
245 my ($vsn, $arch) = @_;
246 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
255 return unless forkcheck_mainprocess();
256 foreach my $f (@end) {
258 print STDERR "$us: cleanup: $@" if length $@;
263 print STDERR f_ "%s: invalid configuration: %s\n", $us, "@_";
267 sub forceable_fail ($$) {
268 my ($forceoptsl, $msg) = @_;
269 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
270 print STDERR +(__ "warning: overriding problem due to --force:\n"). $msg;
274 my ($forceoptsl) = @_;
275 my @got = grep { $forceopts{$_} } @$forceoptsl;
276 return 0 unless @got;
278 "warning: skipping checks or functionality due to --force-%s\n",
282 sub no_such_package () {
283 print STDERR f_ "%s: source package %s does not exist in suite %s\n",
284 $us, $package, $isuite;
288 sub deliberately ($) {
290 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
293 sub deliberately_not_fast_forward () {
294 foreach (qw(not-fast-forward fresh-repo)) {
295 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
299 sub quiltmode_splitbrain () {
300 $quilt_mode =~ m/gbp|dpm|unapplied/;
303 sub opts_opt_multi_cmd {
306 push @cmd, split /\s+/, shift @_;
313 return opts_opt_multi_cmd [], @gbp_pq;
316 sub dgit_privdir () {
317 our $dgit_privdir_made //= ensure_a_playground 'dgit';
321 my $r = $buildproductsdir;
322 $r = "$maindir/$r" unless $r =~ m{^/};
326 sub get_tree_of_commit ($) {
327 my ($commitish) = @_;
328 my $cdata = cmdoutput @git, qw(cat-file commit), $commitish;
329 $cdata =~ m/\n\n/; $cdata = $`;
330 $cdata =~ m/^tree (\w+)$/m or confess "cdata $cdata ?";
334 sub branch_gdr_info ($$) {
335 my ($symref, $head) = @_;
336 my ($status, $msg, $current, $ffq_prev, $gdrlast) =
337 gdr_ffq_prev_branchinfo($symref);
338 return () unless $status eq 'branch';
339 $ffq_prev = git_get_ref $ffq_prev;
340 $gdrlast = git_get_ref $gdrlast;
341 $gdrlast &&= is_fast_fwd $gdrlast, $head;
342 return ($ffq_prev, $gdrlast);
345 sub branch_is_gdr_unstitched_ff ($$$) {
346 my ($symref, $head, $ancestor) = @_;
347 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
348 return 0 unless $ffq_prev;
349 return 0 unless !defined $ancestor or is_fast_fwd $ancestor, $ffq_prev;
353 sub branch_is_gdr ($) {
355 # This is quite like git-debrebase's keycommits.
356 # We have our own implementation because:
357 # - our algorighm can do fewer tests so is faster
358 # - it saves testing to see if gdr is installed
360 # NB we use this jsut for deciding whether to run gdr make-patches
361 # Before reusing this algorithm for somthing else, its
362 # suitability should be reconsidered.
365 local $Debian::Dgit::debugcmd_when_debuglevel = 3;
366 printdebug "branch_is_gdr $head...\n";
367 my $get_patches = sub {
368 my $t = git_cat_file "$_[0]:debian/patches", [qw(missing tree)];
371 my $tip_patches = $get_patches->($head);
374 my $cdata = git_cat_file $walk, 'commit';
375 my ($hdrs,$msg) = $cdata =~ m{\n\n} ? ($`,$') : ($cdata,'');
376 if ($msg =~ m{^\[git-debrebase\ (
377 anchor | changelog | make-patches |
378 merged-breakwater | pseudomerge
380 # no need to analyse this - it's sufficient
381 # (gdr classifications: Anchor, MergedBreakwaters)
382 # (made by gdr: Pseudomerge, Changelog)
383 printdebug "branch_is_gdr $walk gdr $1 YES\n";
386 my @parents = ($hdrs =~ m/^parent (\w+)$/gm);
388 my $walk_tree = get_tree_of_commit $walk;
389 foreach my $p (@parents) {
390 my $p_tree = get_tree_of_commit $p;
391 if ($p_tree eq $walk_tree) { # pseudomerge contriburor
392 # (gdr classification: Pseudomerge; not made by gdr)
393 printdebug "branch_is_gdr $walk unmarked pseudomerge\n"
399 # some other non-gdr merge
400 # (gdr classification: VanillaMerge, DgitImportUnpatched, ?)
401 printdebug "branch_is_gdr $walk ?-2-merge NO\n";
405 # (gdr classification: ?)
406 printdebug "branch_is_gdr $walk ?-octopus NO\n";
410 printdebug "branch_is_gdr $walk origin\n";
413 if ($get_patches->($walk) ne $tip_patches) {
414 # Our parent added, removed, or edited patches, and wasn't
415 # a gdr make-patches commit. gdr make-patches probably
416 # won't do that well, then.
417 # (gdr classification of parent: AddPatches or ?)
418 printdebug "branch_is_gdr $walk ?-patches NO\n";
421 if ($tip_patches eq '' and
422 !defined git_cat_file "$walk~:debian" and
423 !quiltify_trees_differ "$walk~", $walk
425 # (gdr classification of parent: BreakwaterStart
426 printdebug "branch_is_gdr $walk unmarked BreakwaterStart YES\n";
429 # (gdr classification: Upstream Packaging Mixed Changelog)
430 printdebug "branch_is_gdr $walk plain\n"
436 #---------- remote protocol support, common ----------
438 # remote push initiator/responder protocol:
439 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
440 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
441 # < dgit-remote-push-ready <actual-proto-vsn>
448 # > supplementary-message NBYTES
453 # > file parsed-changelog
454 # [indicates that output of dpkg-parsechangelog follows]
455 # > data-block NBYTES
456 # > [NBYTES bytes of data (no newline)]
457 # [maybe some more blocks]
466 # > param head DGIT-VIEW-HEAD
467 # > param csuite SUITE
468 # > param tagformat new # $protovsn >= 4
469 # > param maint-view MAINT-VIEW-HEAD
471 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
472 # > file buildinfo # for buildinfos to sign
474 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
475 # # goes into tag, for replay prevention
478 # [indicates that signed tag is wanted]
479 # < data-block NBYTES
480 # < [NBYTES bytes of data (no newline)]
481 # [maybe some more blocks]
485 # > want signed-dsc-changes
486 # < data-block NBYTES [transfer of signed dsc]
488 # < data-block NBYTES [transfer of signed changes]
490 # < data-block NBYTES [transfer of each signed buildinfo
491 # [etc] same number and order as "file buildinfo"]
499 sub i_child_report () {
500 # Sees if our child has died, and reap it if so. Returns a string
501 # describing how it died if it failed, or undef otherwise.
502 return undef unless $i_child_pid;
503 my $got = waitpid $i_child_pid, WNOHANG;
504 return undef if $got <= 0;
505 die unless $got == $i_child_pid;
506 $i_child_pid = undef;
507 return undef unless $?;
508 return f_ "build host child %s", waitstatusmsg();
513 fail f_ "connection lost: %s", $! if $fh->error;
514 fail f_ "protocol violation; %s not expected", $m;
517 sub badproto_badread ($$) {
519 fail f_ "connection lost: %s", $! if $!;
520 my $report = i_child_report();
521 fail $report if defined $report;
522 badproto $fh, f_ "eof (reading %s)", $wh;
525 sub protocol_expect (&$) {
526 my ($match, $fh) = @_;
529 defined && chomp or badproto_badread $fh, __ "protocol message";
537 badproto $fh, f_ "\`%s'", $_;
540 sub protocol_send_file ($$) {
541 my ($fh, $ourfn) = @_;
542 open PF, "<", $ourfn or die "$ourfn: $!";
545 my $got = read PF, $d, 65536;
546 die "$ourfn: $!" unless defined $got;
548 print $fh "data-block ".length($d)."\n" or confess "$!";
549 print $fh $d or confess "$!";
551 PF->error and die "$ourfn $!";
552 print $fh "data-end\n" or confess "$!";
556 sub protocol_read_bytes ($$) {
557 my ($fh, $nbytes) = @_;
558 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, __ "bad byte count";
560 my $got = read $fh, $d, $nbytes;
561 $got==$nbytes or badproto_badread $fh, __ "data block";
565 sub protocol_receive_file ($$) {
566 my ($fh, $ourfn) = @_;
567 printdebug "() $ourfn\n";
568 open PF, ">", $ourfn or die "$ourfn: $!";
570 my ($y,$l) = protocol_expect {
571 m/^data-block (.*)$/ ? (1,$1) :
572 m/^data-end$/ ? (0,) :
576 my $d = protocol_read_bytes $fh, $l;
577 print PF $d or confess "$!";
579 close PF or confess "$!";
582 #---------- remote protocol support, responder ----------
584 sub responder_send_command ($) {
586 return unless $we_are_responder;
587 # called even without $we_are_responder
588 printdebug ">> $command\n";
589 print PO $command, "\n" or confess "$!";
592 sub responder_send_file ($$) {
593 my ($keyword, $ourfn) = @_;
594 return unless $we_are_responder;
595 printdebug "]] $keyword $ourfn\n";
596 responder_send_command "file $keyword";
597 protocol_send_file \*PO, $ourfn;
600 sub responder_receive_files ($@) {
601 my ($keyword, @ourfns) = @_;
602 die unless $we_are_responder;
603 printdebug "[[ $keyword @ourfns\n";
604 responder_send_command "want $keyword";
605 foreach my $fn (@ourfns) {
606 protocol_receive_file \*PI, $fn;
609 protocol_expect { m/^files-end$/ } \*PI;
612 #---------- remote protocol support, initiator ----------
614 sub initiator_expect (&) {
616 protocol_expect { &$match } \*RO;
619 #---------- end remote code ----------
622 if ($we_are_responder) {
624 responder_send_command "progress ".length($m) or confess "$!";
625 print PO $m or confess "$!";
635 $ua = LWP::UserAgent->new();
639 progress "downloading $what...";
640 my $r = $ua->get(@_) or confess "$!";
641 return undef if $r->code == 404;
642 $r->is_success or fail f_ "failed to fetch %s: %s",
643 $what, $r->status_line;
644 return $r->decoded_content(charset => 'none');
647 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
649 sub act_local () { return $dryrun_level <= 1; }
650 sub act_scary () { return !$dryrun_level; }
653 if (!$dryrun_level) {
654 progress f_ "%s ok: %s", $us, "@_";
656 progress f_ "would be ok: %s (but dry run only)", "@_";
661 printcmd(\*STDERR,$debugprefix."#",@_);
664 sub runcmd_ordryrun {
672 sub runcmd_ordryrun_local {
680 our $helpmsg = i_ <<END;
682 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
683 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
684 dgit [dgit-opts] build [dpkg-buildpackage-opts]
685 dgit [dgit-opts] sbuild [sbuild-opts]
686 dgit [dgit-opts] pbuilder|cowbuilder [debbuildopts]
687 dgit [dgit-opts] push [dgit-opts] [suite]
688 dgit [dgit-opts] push-source [dgit-opts] [suite]
689 dgit [dgit-opts] rpush build-host:build-dir ...
690 important dgit options:
691 -k<keyid> sign tag and package with <keyid> instead of default
692 --dry-run -n do not change anything, but go through the motions
693 --damp-run -L like --dry-run but make local changes, without signing
694 --new -N allow introducing a new package
695 --debug -D increase debug level
696 -c<name>=<value> set git config option (used directly by dgit too)
699 our $later_warning_msg = i_ <<END;
700 Perhaps the upload is stuck in incoming. Using the version from git.
704 print STDERR f_ "%s: %s\n%s", $us, "@_", __ $helpmsg or confess "$!";
709 @ARGV or badusage __ "too few arguments";
710 return scalar shift @ARGV;
714 not_necessarily_a_tree();
717 print __ $helpmsg or confess "$!";
721 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
723 our %defcfg = ('dgit.default.distro' => 'debian',
724 'dgit.default.default-suite' => 'unstable',
725 'dgit.default.old-dsc-distro' => 'debian',
726 'dgit-suite.*-security.distro' => 'debian-security',
727 'dgit.default.username' => '',
728 'dgit.default.archive-query-default-component' => 'main',
729 'dgit.default.ssh' => 'ssh',
730 'dgit.default.archive-query' => 'madison:',
731 'dgit.default.sshpsql-dbname' => 'service=projectb',
732 'dgit.default.aptget-components' => 'main',
733 'dgit.default.source-only-uploads' => 'ok',
734 'dgit.dsc-url-proto-ok.http' => 'true',
735 'dgit.dsc-url-proto-ok.https' => 'true',
736 'dgit.dsc-url-proto-ok.git' => 'true',
737 'dgit.vcs-git.suites', => 'sid', # ;-separated
738 'dgit.default.dsc-url-proto-ok' => 'false',
739 # old means "repo server accepts pushes with old dgit tags"
740 # new means "repo server accepts pushes with new dgit tags"
741 # maint means "repo server accepts split brain pushes"
742 # hist means "repo server may have old pushes without new tag"
743 # ("hist" is implied by "old")
744 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
745 'dgit-distro.debian.git-check' => 'url',
746 'dgit-distro.debian.git-check-suffix' => '/info/refs',
747 'dgit-distro.debian.new-private-pushers' => 't',
748 'dgit-distro.debian.source-only-uploads' => 'not-wholly-new',
749 'dgit-distro.debian/push.git-url' => '',
750 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
751 'dgit-distro.debian/push.git-user-force' => 'dgit',
752 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
753 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
754 'dgit-distro.debian/push.git-create' => 'true',
755 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
756 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
757 # 'dgit-distro.debian.archive-query-tls-key',
758 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
759 # ^ this does not work because curl is broken nowadays
760 # Fixing #790093 properly will involve providing providing the key
761 # in some pacagke and maybe updating these paths.
763 # 'dgit-distro.debian.archive-query-tls-curl-args',
764 # '--ca-path=/etc/ssl/ca-debian',
765 # ^ this is a workaround but works (only) on DSA-administered machines
766 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
767 'dgit-distro.debian.git-url-suffix' => '',
768 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
769 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
770 'dgit-distro.debian-security.archive-query' => 'aptget:',
771 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
772 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
773 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
774 'dgit-distro.debian-security.nominal-distro' => 'debian',
775 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
776 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
777 'dgit-distro.ubuntu.git-check' => 'false',
778 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
779 'dgit-distro.test-dummy.ssh' => "$td/ssh",
780 'dgit-distro.test-dummy.username' => "alice",
781 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
782 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
783 'dgit-distro.test-dummy.git-url' => "$td/git",
784 'dgit-distro.test-dummy.git-host' => "git",
785 'dgit-distro.test-dummy.git-path' => "$td/git",
786 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
787 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
788 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
789 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
793 our @gitcfgsources = qw(cmdline local global system);
794 our $invoked_in_git_tree = 1;
796 sub git_slurp_config () {
797 # This algoritm is a bit subtle, but this is needed so that for
798 # options which we want to be single-valued, we allow the
799 # different config sources to override properly. See #835858.
800 foreach my $src (@gitcfgsources) {
801 next if $src eq 'cmdline';
802 # we do this ourselves since git doesn't handle it
804 $gitcfgs{$src} = git_slurp_config_src $src;
808 sub git_get_config ($) {
810 foreach my $src (@gitcfgsources) {
811 my $l = $gitcfgs{$src}{$c};
812 confess "internal error ($l $c)" if $l && !ref $l;
813 printdebug"C $c ".(defined $l ?
814 join " ", map { messagequote "'$_'" } @$l :
819 f_ "multiple values for %s (in %s git config)", $c, $src
821 $l->[0] =~ m/\n/ and badcfg f_
822 "value for config option %s (in %s git config) contains newline(s)!",
831 return undef if $c =~ /RETURN-UNDEF/;
832 printdebug "C? $c\n" if $debuglevel >= 5;
833 my $v = git_get_config($c);
834 return $v if defined $v;
835 my $dv = $defcfg{$c};
837 printdebug "CD $c $dv\n" if $debuglevel >= 4;
842 "need value for one of: %s\n".
843 "%s: distro or suite appears not to be (properly) supported",
847 sub not_necessarily_a_tree () {
848 # needs to be called from pre_*
849 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
850 $invoked_in_git_tree = 0;
853 sub access_basedistro__noalias () {
854 if (defined $idistro) {
857 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
858 return $def if defined $def;
859 foreach my $src (@gitcfgsources, 'internal') {
860 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
862 foreach my $k (keys %$kl) {
863 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
865 next unless match_glob $dpat, $isuite;
869 return cfg("dgit.default.distro");
873 sub access_basedistro () {
874 my $noalias = access_basedistro__noalias();
875 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
876 return $canon // $noalias;
879 sub access_nomdistro () {
880 my $base = access_basedistro();
881 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
882 $r =~ m/^$distro_re$/ or badcfg
883 f_ "bad syntax for (nominal) distro \`%s' (does not match %s)",
884 $r, "/^$distro_re$/";
888 sub access_quirk () {
889 # returns (quirk name, distro to use instead or undef, quirk-specific info)
890 my $basedistro = access_basedistro();
891 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
893 if (defined $backports_quirk) {
894 my $re = $backports_quirk;
895 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
897 $re =~ s/\%/([-0-9a-z_]+)/
898 or $re =~ m/[()]/ or badcfg __ "backports-quirk needs \% or ( )";
899 if ($isuite =~ m/^$re$/) {
900 return ('backports',"$basedistro-backports",$1);
903 return ('none',undef);
908 sub parse_cfg_bool ($$$) {
909 my ($what,$def,$v) = @_;
912 $v =~ m/^[ty1]/ ? 1 :
913 $v =~ m/^[fn0]/ ? 0 :
914 badcfg f_ "%s needs t (true, y, 1) or f (false, n, 0) not \`%s'",
918 sub access_forpush_config () {
919 my $d = access_basedistro();
923 parse_cfg_bool('new-private-pushers', 0,
924 cfg("dgit-distro.$d.new-private-pushers",
927 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
930 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
931 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
932 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
934 "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
937 sub access_forpush () {
938 $access_forpush //= access_forpush_config();
939 return $access_forpush;
942 sub default_from_access_cfg ($$$;$) {
943 my ($var, $keybase, $defval, $permit_re) = @_;
944 return if defined $$var;
946 $$var = access_cfg("$keybase-newer", 'RETURN-UNDEF');
947 $$var = undef if $$var && $$var !~ m/^$permit_re$/;
949 $$var //= access_cfg($keybase, 'RETURN-UNDEF');
952 badcfg f_ "unknown %s \`%s'", $keybase, $$var
953 if defined $permit_re and $$var !~ m/$permit_re/;
957 confess +(__ 'internal error').' '.Dumper($access_forpush)," ?" if
958 defined $access_forpush and !$access_forpush;
959 badcfg __ "pushing but distro is configured readonly"
960 if access_forpush_config() eq '0';
962 $supplementary_message = __ <<'END' unless $we_are_responder;
963 Push failed, before we got started.
964 You can retry the push, after fixing the problem, if you like.
966 parseopts_late_defaults();
970 parseopts_late_defaults();
973 sub supplementary_message ($) {
975 if (!$we_are_responder) {
976 $supplementary_message = $msg;
979 responder_send_command "supplementary-message ".length($msg)
981 print PO $msg or confess "$!";
985 sub access_distros () {
986 # Returns list of distros to try, in order
989 # 0. `instead of' distro name(s) we have been pointed to
990 # 1. the access_quirk distro, if any
991 # 2a. the user's specified distro, or failing that } basedistro
992 # 2b. the distro calculated from the suite }
993 my @l = access_basedistro();
995 my (undef,$quirkdistro) = access_quirk();
996 unshift @l, $quirkdistro;
997 unshift @l, $instead_distro;
998 @l = grep { defined } @l;
1000 push @l, access_nomdistro();
1002 if (access_forpush()) {
1003 @l = map { ("$_/push", $_) } @l;
1008 sub access_cfg_cfgs (@) {
1011 # The nesting of these loops determines the search order. We put
1012 # the key loop on the outside so that we search all the distros
1013 # for each key, before going on to the next key. That means that
1014 # if access_cfg is called with a more specific, and then a less
1015 # specific, key, an earlier distro can override the less specific
1016 # without necessarily overriding any more specific keys. (If the
1017 # distro wants to override the more specific keys it can simply do
1018 # so; whereas if we did the loop the other way around, it would be
1019 # impossible to for an earlier distro to override a less specific
1020 # key but not the more specific ones without restating the unknown
1021 # values of the more specific keys.
1024 # We have to deal with RETURN-UNDEF specially, so that we don't
1025 # terminate the search prematurely.
1027 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
1030 foreach my $d (access_distros()) {
1031 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
1033 push @cfgs, map { "dgit.default.$_" } @realkeys;
1034 push @cfgs, @rundef;
1038 sub access_cfg (@) {
1040 my (@cfgs) = access_cfg_cfgs(@keys);
1041 my $value = cfg(@cfgs);
1045 sub access_cfg_bool ($$) {
1046 my ($def, @keys) = @_;
1047 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
1050 sub string_to_ssh ($) {
1052 if ($spec =~ m/\s/) {
1053 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
1059 sub access_cfg_ssh () {
1060 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
1061 if (!defined $gitssh) {
1064 return string_to_ssh $gitssh;
1068 sub access_runeinfo ($) {
1070 return ": dgit ".access_basedistro()." $info ;";
1073 sub access_someuserhost ($) {
1075 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
1076 defined($user) && length($user) or
1077 $user = access_cfg("$some-user",'username');
1078 my $host = access_cfg("$some-host");
1079 return length($user) ? "$user\@$host" : $host;
1082 sub access_gituserhost () {
1083 return access_someuserhost('git');
1086 sub access_giturl (;$) {
1087 my ($optional) = @_;
1088 my $url = access_cfg('git-url','RETURN-UNDEF');
1091 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
1092 return undef unless defined $proto;
1095 access_gituserhost().
1096 access_cfg('git-path');
1098 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
1101 return "$url/$package$suffix";
1104 sub commit_getclogp ($) {
1105 # Returns the parsed changelog hashref for a particular commit
1107 our %commit_getclogp_memo;
1108 my $memo = $commit_getclogp_memo{$objid};
1109 return $memo if $memo;
1111 my $mclog = dgit_privdir()."clog";
1112 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1113 "$objid:debian/changelog";
1114 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1117 sub parse_dscdata () {
1118 my $dscfh = new IO::File \$dscdata, '<' or confess "$!";
1119 printdebug Dumper($dscdata) if $debuglevel>1;
1120 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1121 printdebug Dumper($dsc) if $debuglevel>1;
1126 sub archive_query ($;@) {
1127 my ($method) = shift @_;
1128 fail __ "this operation does not support multiple comma-separated suites"
1130 my $query = access_cfg('archive-query','RETURN-UNDEF');
1131 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1134 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1137 sub archive_query_prepend_mirror {
1138 my $m = access_cfg('mirror');
1139 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1142 sub pool_dsc_subpath ($$) {
1143 my ($vsn,$component) = @_; # $package is implict arg
1144 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1145 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1148 sub cfg_apply_map ($$$) {
1149 my ($varref, $what, $mapspec) = @_;
1150 return unless $mapspec;
1152 printdebug "config $what EVAL{ $mapspec; }\n";
1154 eval "package Dgit::Config; $mapspec;";
1159 #---------- `ftpmasterapi' archive query method (nascent) ----------
1161 sub archive_api_query_cmd ($) {
1163 my @cmd = (@curl, qw(-sS));
1164 my $url = access_cfg('archive-query-url');
1165 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1167 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1168 foreach my $key (split /\:/, $keys) {
1169 $key =~ s/\%HOST\%/$host/g;
1171 fail "for $url: stat $key: $!" unless $!==ENOENT;
1174 fail f_ "config requested specific TLS key but do not know".
1175 " how to get curl to use exactly that EE key (%s)",
1177 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1178 # # Sadly the above line does not work because of changes
1179 # # to gnutls. The real fix for #790093 may involve
1180 # # new curl options.
1183 # Fixing #790093 properly will involve providing a value
1184 # for this on clients.
1185 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1186 push @cmd, split / /, $kargs if defined $kargs;
1188 push @cmd, $url.$subpath;
1192 sub api_query ($$;$) {
1194 my ($data, $subpath, $ok404) = @_;
1195 badcfg __ "ftpmasterapi archive query method takes no data part"
1197 my @cmd = archive_api_query_cmd($subpath);
1198 my $url = $cmd[$#cmd];
1199 push @cmd, qw(-w %{http_code});
1200 my $json = cmdoutput @cmd;
1201 unless ($json =~ s/\d+\d+\d$//) {
1202 failedcmd_report_cmd undef, @cmd;
1203 fail __ "curl failed to print 3-digit HTTP code";
1206 return undef if $code eq '404' && $ok404;
1207 fail f_ "fetch of %s gave HTTP code %s", $url, $code
1208 unless $url =~ m#^file://# or $code =~ m/^2/;
1209 return decode_json($json);
1212 sub canonicalise_suite_ftpmasterapi {
1213 my ($proto,$data) = @_;
1214 my $suites = api_query($data, 'suites');
1216 foreach my $entry (@$suites) {
1218 my $v = $entry->{$_};
1219 defined $v && $v eq $isuite;
1220 } qw(codename name);
1221 push @matched, $entry;
1223 fail f_ "unknown suite %s, maybe -d would help", $isuite
1227 @matched==1 or die f_ "multiple matches for suite %s\n", $isuite;
1228 $cn = "$matched[0]{codename}";
1229 defined $cn or die f_ "suite %s info has no codename\n", $isuite;
1230 $cn =~ m/^$suite_re$/
1231 or die f_ "suite %s maps to bad codename\n", $isuite;
1233 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper(\@matched)
1238 sub archive_query_ftpmasterapi {
1239 my ($proto,$data) = @_;
1240 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1242 my $digester = Digest::SHA->new(256);
1243 foreach my $entry (@$info) {
1245 my $vsn = "$entry->{version}";
1246 my ($ok,$msg) = version_check $vsn;
1247 die f_ "bad version: %s\n", $msg unless $ok;
1248 my $component = "$entry->{component}";
1249 $component =~ m/^$component_re$/ or die __ "bad component";
1250 my $filename = "$entry->{filename}";
1251 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1252 or die __ "bad filename";
1253 my $sha256sum = "$entry->{sha256sum}";
1254 $sha256sum =~ m/^[0-9a-f]+$/ or die __ "bad sha256sum";
1255 push @rows, [ $vsn, "/pool/$component/$filename",
1256 $digester, $sha256sum ];
1258 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper($entry)
1261 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1262 return archive_query_prepend_mirror @rows;
1265 sub file_in_archive_ftpmasterapi {
1266 my ($proto,$data,$filename) = @_;
1267 my $pat = $filename;
1270 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1271 my $info = api_query($data, "file_in_archive/$pat", 1);
1274 sub package_not_wholly_new_ftpmasterapi {
1275 my ($proto,$data,$pkg) = @_;
1276 my $info = api_query($data,"madison?package=${pkg}&f=json");
1280 #---------- `aptget' archive query method ----------
1283 our $aptget_releasefile;
1284 our $aptget_configpath;
1286 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1287 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1289 sub aptget_cache_clean {
1290 runcmd_ordryrun_local qw(sh -ec),
1291 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1295 sub aptget_lock_acquire () {
1296 my $lockfile = "$aptget_base/lock";
1297 open APTGET_LOCK, '>', $lockfile or confess "open $lockfile: $!";
1298 flock APTGET_LOCK, LOCK_EX or confess "lock $lockfile: $!";
1301 sub aptget_prep ($) {
1303 return if defined $aptget_base;
1305 badcfg __ "aptget archive query method takes no data part"
1308 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1311 ensuredir "$cache/dgit";
1313 access_cfg('aptget-cachekey','RETURN-UNDEF')
1314 // access_nomdistro();
1316 $aptget_base = "$cache/dgit/aptget";
1317 ensuredir $aptget_base;
1319 my $quoted_base = $aptget_base;
1320 confess "$quoted_base contains bad chars, cannot continue"
1321 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1323 ensuredir $aptget_base;
1325 aptget_lock_acquire();
1327 aptget_cache_clean();
1329 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1330 my $sourceslist = "source.list#$cachekey";
1332 my $aptsuites = $isuite;
1333 cfg_apply_map(\$aptsuites, 'suite map',
1334 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1336 open SRCS, ">", "$aptget_base/$sourceslist" or confess "$!";
1337 printf SRCS "deb-src %s %s %s\n",
1338 access_cfg('mirror'),
1340 access_cfg('aptget-components')
1343 ensuredir "$aptget_base/cache";
1344 ensuredir "$aptget_base/lists";
1346 open CONF, ">", $aptget_configpath or confess "$!";
1348 Debug::NoLocking "true";
1349 APT::Get::List-Cleanup "false";
1350 #clear APT::Update::Post-Invoke-Success;
1351 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1352 Dir::State::Lists "$quoted_base/lists";
1353 Dir::Etc::preferences "$quoted_base/preferences";
1354 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1355 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1358 foreach my $key (qw(
1361 Dir::Cache::Archives
1362 Dir::Etc::SourceParts
1363 Dir::Etc::preferencesparts
1365 ensuredir "$aptget_base/$key";
1366 print CONF "$key \"$quoted_base/$key\";\n" or confess "$!";
1369 my $oldatime = (time // confess "$!") - 1;
1370 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1371 next unless stat_exists $oldlist;
1372 my ($mtime) = (stat _)[9];
1373 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1376 runcmd_ordryrun_local aptget_aptget(), qw(update);
1379 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1380 next unless stat_exists $oldlist;
1381 my ($atime) = (stat _)[8];
1382 next if $atime == $oldatime;
1383 push @releasefiles, $oldlist;
1385 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1386 @releasefiles = @inreleasefiles if @inreleasefiles;
1387 if (!@releasefiles) {
1388 fail f_ <<END, $isuite, $cache;
1389 apt seemed to not to update dgit's cached Release files for %s.
1391 is on a filesystem mounted `noatime'; if so, please use `relatime'.)
1394 confess "apt updated too many Release files (@releasefiles), erk"
1395 unless @releasefiles == 1;
1397 ($aptget_releasefile) = @releasefiles;
1400 sub canonicalise_suite_aptget {
1401 my ($proto,$data) = @_;
1404 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1406 foreach my $name (qw(Codename Suite)) {
1407 my $val = $release->{$name};
1409 printdebug "release file $name: $val\n";
1410 $val =~ m/^$suite_re$/o or fail f_
1411 "Release file (%s) specifies intolerable %s",
1412 $aptget_releasefile, $name;
1413 cfg_apply_map(\$val, 'suite rmap',
1414 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1421 sub archive_query_aptget {
1422 my ($proto,$data) = @_;
1425 ensuredir "$aptget_base/source";
1426 foreach my $old (<$aptget_base/source/*.dsc>) {
1427 unlink $old or die "$old: $!";
1430 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1431 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1432 # avoids apt-get source failing with ambiguous error code
1434 runcmd_ordryrun_local
1435 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1436 aptget_aptget(), qw(--download-only --only-source source), $package;
1438 my @dscs = <$aptget_base/source/*.dsc>;
1439 fail __ "apt-get source did not produce a .dsc" unless @dscs;
1440 fail f_ "apt-get source produced several .dscs (%s)", "@dscs"
1443 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1446 my $uri = "file://". uri_escape $dscs[0];
1447 $uri =~ s{\%2f}{/}gi;
1448 return [ (getfield $pre_dsc, 'Version'), $uri ];
1451 sub file_in_archive_aptget () { return undef; }
1452 sub package_not_wholly_new_aptget () { return undef; }
1454 #---------- `dummyapicat' archive query method ----------
1455 # (untranslated, because this is for testing purposes etc.)
1457 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1458 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1460 sub dummycatapi_run_in_mirror ($@) {
1461 # runs $fn with FIA open onto rune
1462 my ($rune, $argl, $fn) = @_;
1464 my $mirror = access_cfg('mirror');
1465 $mirror =~ s#^file://#/# or die "$mirror ?";
1466 my @cmd = (qw(sh -ec), 'cd "$1"; shift'."\n".$rune,
1467 qw(x), $mirror, @$argl);
1468 debugcmd "-|", @cmd;
1469 open FIA, "-|", @cmd or confess "$!";
1471 close FIA or ($!==0 && $?==141) or die failedcmd @cmd;
1475 sub file_in_archive_dummycatapi ($$$) {
1476 my ($proto,$data,$filename) = @_;
1478 dummycatapi_run_in_mirror '
1479 find -name "$1" -print0 |
1481 ', [$filename], sub {
1484 printdebug "| $_\n";
1485 m/^(\w+) (\S+)$/ or die "$_ ?";
1486 push @out, { sha256sum => $1, filename => $2 };
1492 sub package_not_wholly_new_dummycatapi {
1493 my ($proto,$data,$pkg) = @_;
1494 dummycatapi_run_in_mirror "
1495 find -name ${pkg}_*.dsc
1502 #---------- `madison' archive query method ----------
1504 sub archive_query_madison {
1505 return archive_query_prepend_mirror
1506 map { [ @$_[0..1] ] } madison_get_parse(@_);
1509 sub madison_get_parse {
1510 my ($proto,$data) = @_;
1511 die unless $proto eq 'madison';
1512 if (!length $data) {
1513 $data= access_cfg('madison-distro','RETURN-UNDEF');
1514 $data //= access_basedistro();
1516 $rmad{$proto,$data,$package} ||= cmdoutput
1517 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1518 my $rmad = $rmad{$proto,$data,$package};
1521 foreach my $l (split /\n/, $rmad) {
1522 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1523 \s*( [^ \t|]+ )\s* \|
1524 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1525 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1526 $1 eq $package or die "$rmad $package ?";
1533 $component = access_cfg('archive-query-default-component');
1535 $5 eq 'source' or die "$rmad ?";
1536 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1538 return sort { -version_compare($a->[0],$b->[0]); } @out;
1541 sub canonicalise_suite_madison {
1542 # madison canonicalises for us
1543 my @r = madison_get_parse(@_);
1545 "unable to canonicalise suite using package %s".
1546 " which does not appear to exist in suite %s;".
1547 " --existing-package may help",
1552 sub file_in_archive_madison { return undef; }
1553 sub package_not_wholly_new_madison { return undef; }
1555 #---------- `sshpsql' archive query method ----------
1556 # (untranslated, because this is obsolete)
1559 my ($data,$runeinfo,$sql) = @_;
1560 if (!length $data) {
1561 $data= access_someuserhost('sshpsql').':'.
1562 access_cfg('sshpsql-dbname');
1564 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1565 my ($userhost,$dbname) = ($`,$'); #';
1567 my @cmd = (access_cfg_ssh, $userhost,
1568 access_runeinfo("ssh-psql $runeinfo").
1569 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1570 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1572 open P, "-|", @cmd or confess "$!";
1575 printdebug(">|$_|\n");
1578 $!=0; $?=0; close P or failedcmd @cmd;
1580 my $nrows = pop @rows;
1581 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1582 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1583 @rows = map { [ split /\|/, $_ ] } @rows;
1584 my $ncols = scalar @{ shift @rows };
1585 die if grep { scalar @$_ != $ncols } @rows;
1589 sub sql_injection_check {
1590 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1593 sub archive_query_sshpsql ($$) {
1594 my ($proto,$data) = @_;
1595 sql_injection_check $isuite, $package;
1596 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1597 SELECT source.version, component.name, files.filename, files.sha256sum
1599 JOIN src_associations ON source.id = src_associations.source
1600 JOIN suite ON suite.id = src_associations.suite
1601 JOIN dsc_files ON dsc_files.source = source.id
1602 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1603 JOIN component ON component.id = files_archive_map.component_id
1604 JOIN files ON files.id = dsc_files.file
1605 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1606 AND source.source='$package'
1607 AND files.filename LIKE '%.dsc';
1609 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1610 my $digester = Digest::SHA->new(256);
1612 my ($vsn,$component,$filename,$sha256sum) = @$_;
1613 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1615 return archive_query_prepend_mirror @rows;
1618 sub canonicalise_suite_sshpsql ($$) {
1619 my ($proto,$data) = @_;
1620 sql_injection_check $isuite;
1621 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1622 SELECT suite.codename
1623 FROM suite where suite_name='$isuite' or codename='$isuite';
1625 @rows = map { $_->[0] } @rows;
1626 fail "unknown suite $isuite" unless @rows;
1627 die "ambiguous $isuite: @rows ?" if @rows>1;
1631 sub file_in_archive_sshpsql ($$$) { return undef; }
1632 sub package_not_wholly_new_sshpsql ($$$) { return undef; }
1634 #---------- `dummycat' archive query method ----------
1635 # (untranslated, because this is for testing purposes etc.)
1637 sub canonicalise_suite_dummycat ($$) {
1638 my ($proto,$data) = @_;
1639 my $dpath = "$data/suite.$isuite";
1640 if (!open C, "<", $dpath) {
1641 $!==ENOENT or die "$dpath: $!";
1642 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1646 chomp or die "$dpath: $!";
1648 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1652 sub archive_query_dummycat ($$) {
1653 my ($proto,$data) = @_;
1654 canonicalise_suite();
1655 my $dpath = "$data/package.$csuite.$package";
1656 if (!open C, "<", $dpath) {
1657 $!==ENOENT or die "$dpath: $!";
1658 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1666 printdebug "dummycat query $csuite $package $dpath | $_\n";
1667 my @row = split /\s+/, $_;
1668 @row==2 or die "$dpath: $_ ?";
1671 C->error and die "$dpath: $!";
1673 return archive_query_prepend_mirror
1674 sort { -version_compare($a->[0],$b->[0]); } @rows;
1677 sub file_in_archive_dummycat () { return undef; }
1678 sub package_not_wholly_new_dummycat () { return undef; }
1680 #---------- archive query entrypoints and rest of program ----------
1682 sub canonicalise_suite () {
1683 return if defined $csuite;
1684 fail f_ "cannot operate on %s suite", $isuite if $isuite eq 'UNRELEASED';
1685 $csuite = archive_query('canonicalise_suite');
1686 if ($isuite ne $csuite) {
1687 progress f_ "canonical suite name for %s is %s", $isuite, $csuite;
1689 progress f_ "canonical suite name is %s", $csuite;
1693 sub get_archive_dsc () {
1694 canonicalise_suite();
1695 my @vsns = archive_query('archive_query');
1696 foreach my $vinfo (@vsns) {
1697 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1698 $dscurl = $vsn_dscurl;
1699 $dscdata = url_get($dscurl);
1701 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1706 $digester->add($dscdata);
1707 my $got = $digester->hexdigest();
1709 fail f_ "%s has hash %s but archive told us to expect %s",
1710 $dscurl, $got, $digest;
1713 my $fmt = getfield $dsc, 'Format';
1714 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1715 f_ "unsupported source format %s, sorry", $fmt;
1717 $dsc_checked = !!$digester;
1718 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1722 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1725 sub check_for_git ();
1726 sub check_for_git () {
1728 my $how = access_cfg('git-check');
1729 if ($how eq 'ssh-cmd') {
1731 (access_cfg_ssh, access_gituserhost(),
1732 access_runeinfo("git-check $package").
1733 " set -e; cd ".access_cfg('git-path').";".
1734 " if test -d $package.git; then echo 1; else echo 0; fi");
1735 my $r= cmdoutput @cmd;
1736 if (defined $r and $r =~ m/^divert (\w+)$/) {
1738 my ($usedistro,) = access_distros();
1739 # NB that if we are pushing, $usedistro will be $distro/push
1740 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1741 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1742 progress f_ "diverting to %s (using config for %s)",
1743 $divert, $instead_distro;
1744 return check_for_git();
1746 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1748 } elsif ($how eq 'url') {
1749 my $prefix = access_cfg('git-check-url','git-url');
1750 my $suffix = access_cfg('git-check-suffix','git-suffix',
1751 'RETURN-UNDEF') // '.git';
1752 my $url = "$prefix/$package$suffix";
1753 my @cmd = (@curl, qw(-sS -I), $url);
1754 my $result = cmdoutput @cmd;
1755 $result =~ s/^\S+ 200 .*\n\r?\n//;
1756 # curl -sS -I with https_proxy prints
1757 # HTTP/1.0 200 Connection established
1758 $result =~ m/^\S+ (404|200) /s or
1759 fail +(__ "unexpected results from git check query - ").
1760 Dumper($prefix, $result);
1762 if ($code eq '404') {
1764 } elsif ($code eq '200') {
1769 } elsif ($how eq 'true') {
1771 } elsif ($how eq 'false') {
1774 badcfg f_ "unknown git-check \`%s'", $how;
1778 sub create_remote_git_repo () {
1779 my $how = access_cfg('git-create');
1780 if ($how eq 'ssh-cmd') {
1782 (access_cfg_ssh, access_gituserhost(),
1783 access_runeinfo("git-create $package").
1784 "set -e; cd ".access_cfg('git-path').";".
1785 " cp -a _template $package.git");
1786 } elsif ($how eq 'true') {
1789 badcfg f_ "unknown git-create \`%s'", $how;
1793 our ($dsc_hash,$lastpush_mergeinput);
1794 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1798 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1799 $playground = fresh_playground 'dgit/unpack';
1802 sub mktree_in_ud_here () {
1803 playtree_setup $gitcfgs{local};
1806 sub git_write_tree () {
1807 my $tree = cmdoutput @git, qw(write-tree);
1808 $tree =~ m/^\w+$/ or die "$tree ?";
1812 sub git_add_write_tree () {
1813 runcmd @git, qw(add -Af .);
1814 return git_write_tree();
1817 sub remove_stray_gits ($) {
1819 my @gitscmd = qw(find -name .git -prune -print0);
1820 debugcmd "|",@gitscmd;
1821 open GITS, "-|", @gitscmd or confess "$!";
1826 print STDERR f_ "%s: warning: removing from %s: %s\n",
1827 $us, $what, (messagequote $_);
1831 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1834 sub mktree_in_ud_from_only_subdir ($;$) {
1835 my ($what,$raw) = @_;
1836 # changes into the subdir
1839 confess "expected one subdir but found @dirs ?" unless @dirs==1;
1840 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1844 remove_stray_gits($what);
1845 mktree_in_ud_here();
1847 my ($format, $fopts) = get_source_format();
1848 if (madformat($format)) {
1853 my $tree=git_add_write_tree();
1854 return ($tree,$dir);
1857 our @files_csum_info_fields =
1858 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1859 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1860 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1862 sub dsc_files_info () {
1863 foreach my $csumi (@files_csum_info_fields) {
1864 my ($fname, $module, $method) = @$csumi;
1865 my $field = $dsc->{$fname};
1866 next unless defined $field;
1867 eval "use $module; 1;" or die $@;
1869 foreach (split /\n/, $field) {
1871 m/^(\w+) (\d+) (\S+)$/ or
1872 fail f_ "could not parse .dsc %s line \`%s'", $fname, $_;
1873 my $digester = eval "$module"."->$method;" or die $@;
1878 Digester => $digester,
1883 fail f_ "missing any supported Checksums-* or Files field in %s",
1884 $dsc->get_option('name');
1888 map { $_->{Filename} } dsc_files_info();
1891 sub files_compare_inputs (@) {
1896 my $showinputs = sub {
1897 return join "; ", map { $_->get_option('name') } @$inputs;
1900 foreach my $in (@$inputs) {
1902 my $in_name = $in->get_option('name');
1904 printdebug "files_compare_inputs $in_name\n";
1906 foreach my $csumi (@files_csum_info_fields) {
1907 my ($fname) = @$csumi;
1908 printdebug "files_compare_inputs $in_name $fname\n";
1910 my $field = $in->{$fname};
1911 next unless defined $field;
1914 foreach (split /\n/, $field) {
1917 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1918 fail "could not parse $in_name $fname line \`$_'";
1920 printdebug "files_compare_inputs $in_name $fname $f\n";
1924 my $re = \ $record{$f}{$fname};
1926 $fchecked{$f}{$in_name} = 1;
1929 "hash or size of %s varies in %s fields (between: %s)",
1930 $f, $fname, $showinputs->();
1935 @files = sort @files;
1936 $expected_files //= \@files;
1937 "@$expected_files" eq "@files" or
1938 fail f_ "file list in %s varies between hash fields!",
1942 fail f_ "%s has no files list field(s)", $in_name;
1944 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1947 grep { keys %$_ == @$inputs-1 } values %fchecked
1948 or fail f_ "no file appears in all file lists (looked in: %s)",
1952 sub is_orig_file_in_dsc ($$) {
1953 my ($f, $dsc_files_info) = @_;
1954 return 0 if @$dsc_files_info <= 1;
1955 # One file means no origs, and the filename doesn't have a "what
1956 # part of dsc" component. (Consider versions ending `.orig'.)
1957 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1961 # This function determines whether a .changes file is source-only from
1962 # the point of view of dak. Thus, it permits *_source.buildinfo
1965 # It does not, however, permit any other buildinfo files. After a
1966 # source-only upload, the buildds will try to upload files like
1967 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
1968 # named like this in their (otherwise) source-only upload, the uploads
1969 # of the buildd can be rejected by dak. Fixing the resultant
1970 # situation can require manual intervention. So we block such
1971 # .buildinfo files when the user tells us to perform a source-only
1972 # upload (such as when using the push-source subcommand with the -C
1973 # option, which calls this function).
1975 # Note, though, that when dgit is told to prepare a source-only
1976 # upload, such as when subcommands like build-source and push-source
1977 # without -C are used, dgit has a more restrictive notion of
1978 # source-only .changes than dak: such uploads will never include
1979 # *_source.buildinfo files. This is because there is no use for such
1980 # files when using a tool like dgit to produce the source package, as
1981 # dgit ensures the source is identical to git HEAD.
1982 sub test_source_only_changes ($) {
1984 foreach my $l (split /\n/, getfield $changes, 'Files') {
1985 $l =~ m/\S+$/ or next;
1986 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
1987 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
1988 print f_ "purportedly source-only changes polluted by %s\n", $&;
1995 sub changes_update_origs_from_dsc ($$$$) {
1996 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1998 printdebug "checking origs needed ($upstreamvsn)...\n";
1999 $_ = getfield $changes, 'Files';
2000 m/^\w+ \d+ (\S+ \S+) \S+$/m or
2001 fail __ "cannot find section/priority from .changes Files field";
2002 my $placementinfo = $1;
2004 printdebug "checking origs needed placement '$placementinfo'...\n";
2005 foreach my $l (split /\n/, getfield $dsc, 'Files') {
2006 $l =~ m/\S+$/ or next;
2008 printdebug "origs $file | $l\n";
2009 next unless is_orig_file_of_vsn $file, $upstreamvsn;
2010 printdebug "origs $file is_orig\n";
2011 my $have = archive_query('file_in_archive', $file);
2012 if (!defined $have) {
2013 print STDERR __ <<END;
2014 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
2020 printdebug "origs $file \$#\$have=$#$have\n";
2021 foreach my $h (@$have) {
2024 foreach my $csumi (@files_csum_info_fields) {
2025 my ($fname, $module, $method, $archivefield) = @$csumi;
2026 next unless defined $h->{$archivefield};
2027 $_ = $dsc->{$fname};
2028 next unless defined;
2029 m/^(\w+) .* \Q$file\E$/m or
2030 fail f_ ".dsc %s missing entry for %s", $fname, $file;
2031 if ($h->{$archivefield} eq $1) {
2035 "%s: %s (archive) != %s (local .dsc)",
2036 $archivefield, $h->{$archivefield}, $1;
2039 confess "$file ".Dumper($h)." ?!" if $same && @differ;
2043 f_ "archive %s: %s", $h->{filename}, join "; ", @differ
2046 printdebug "origs $file f.same=$found_same".
2047 " #f._differ=$#found_differ\n";
2048 if (@found_differ && !$found_same) {
2050 (f_ "archive contains %s with different checksum", $file),
2053 # Now we edit the changes file to add or remove it
2054 foreach my $csumi (@files_csum_info_fields) {
2055 my ($fname, $module, $method, $archivefield) = @$csumi;
2056 next unless defined $changes->{$fname};
2058 # in archive, delete from .changes if it's there
2059 $changed{$file} = "removed" if
2060 $changes->{$fname} =~ s/\n.* \Q$file\E$(?:)$//m;
2061 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)$/m) {
2062 # not in archive, but it's here in the .changes
2064 my $dsc_data = getfield $dsc, $fname;
2065 $dsc_data =~ m/^(.* \Q$file\E$)$/m or die "$dsc_data $file ?";
2067 $extra =~ s/ \d+ /$&$placementinfo /
2068 or confess "$fname $extra >$dsc_data< ?"
2069 if $fname eq 'Files';
2070 $changes->{$fname} .= "\n". $extra;
2071 $changed{$file} = "added";
2076 foreach my $file (keys %changed) {
2078 "edited .changes for archive .orig contents: %s %s",
2079 $changed{$file}, $file;
2081 my $chtmp = "$changesfile.tmp";
2082 $changes->save($chtmp);
2084 rename $chtmp,$changesfile or die "$changesfile $!";
2086 progress f_ "[new .changes left in %s]", $changesfile;
2089 progress f_ "%s already has appropriate .orig(s) (if any)",
2094 sub make_commit ($) {
2096 return cmdoutput @git, qw(hash-object -w -t commit), $file;
2099 sub clogp_authline ($) {
2101 my $author = getfield $clogp, 'Maintainer';
2102 if ($author =~ m/^[^"\@]+\,/) {
2103 # single entry Maintainer field with unquoted comma
2104 $author = ($& =~ y/,//rd).$'; # strip the comma
2106 # git wants a single author; any remaining commas in $author
2107 # are by now preceded by @ (or "). It seems safer to punt on
2108 # "..." for now rather than attempting to dequote or something.
2109 $author =~ s#,.*##ms unless $author =~ m/"/;
2110 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2111 my $authline = "$author $date";
2112 $authline =~ m/$git_authline_re/o or
2113 fail f_ "unexpected commit author line format \`%s'".
2114 " (was generated from changelog Maintainer field)",
2116 return ($1,$2,$3) if wantarray;
2120 sub vendor_patches_distro ($$) {
2121 my ($checkdistro, $what) = @_;
2122 return unless defined $checkdistro;
2124 my $series = "debian/patches/\L$checkdistro\E.series";
2125 printdebug "checking for vendor-specific $series ($what)\n";
2127 if (!open SERIES, "<", $series) {
2128 confess "$series $!" unless $!==ENOENT;
2135 print STDERR __ <<END;
2137 Unfortunately, this source package uses a feature of dpkg-source where
2138 the same source package unpacks to different source code on different
2139 distros. dgit cannot safely operate on such packages on affected
2140 distros, because the meaning of source packages is not stable.
2142 Please ask the distro/maintainer to remove the distro-specific series
2143 files and use a different technique (if necessary, uploading actually
2144 different packages, if different distros are supposed to have
2148 fail f_ "Found active distro-specific series file for".
2149 " %s (%s): %s, cannot continue",
2150 $checkdistro, $what, $series;
2152 die "$series $!" if SERIES->error;
2156 sub check_for_vendor_patches () {
2157 # This dpkg-source feature doesn't seem to be documented anywhere!
2158 # But it can be found in the changelog (reformatted):
2160 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2161 # Author: Raphael Hertzog <hertzog@debian.org>
2162 # Date: Sun Oct 3 09:36:48 2010 +0200
2164 # dpkg-source: correctly create .pc/.quilt_series with alternate
2167 # If you have debian/patches/ubuntu.series and you were
2168 # unpacking the source package on ubuntu, quilt was still
2169 # directed to debian/patches/series instead of
2170 # debian/patches/ubuntu.series.
2172 # debian/changelog | 3 +++
2173 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2174 # 2 files changed, 6 insertions(+), 1 deletion(-)
2177 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2178 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2179 __ "Dpkg::Vendor \`current vendor'");
2180 vendor_patches_distro(access_basedistro(),
2181 __ "(base) distro being accessed");
2182 vendor_patches_distro(access_nomdistro(),
2183 __ "(nominal) distro being accessed");
2186 sub check_bpd_exists () {
2187 stat $buildproductsdir
2188 or fail f_ "build-products-dir %s is not accessible: %s\n",
2189 $buildproductsdir, $!;
2192 sub dotdot_bpd_transfer_origs ($$$) {
2193 my ($bpd_abs, $upstreamversion, $wanted) = @_;
2194 # checks is_orig_file_of_vsn and if
2195 # calls $wanted->{$leaf} and expects boolish
2197 return if $buildproductsdir eq '..';
2200 my $dotdot = $maindir;
2201 $dotdot =~ s{/[^/]+$}{};
2202 opendir DD, $dotdot or fail "opendir .. ($dotdot): $!";
2203 while ($!=0, defined(my $leaf = readdir DD)) {
2205 local ($debuglevel) = $debuglevel-1;
2206 printdebug "DD_BPD $leaf ?\n";
2208 next unless is_orig_file_of_vsn $leaf, $upstreamversion;
2209 next unless $wanted->($leaf);
2210 next if lstat "$bpd_abs/$leaf";
2213 "%s: found orig(s) in .. missing from build-products-dir, transferring:\n",
2216 $! == &ENOENT or fail f_
2217 "check orig file %s in bpd %s: %s", $leaf, $bpd_abs, $!;
2218 lstat "$dotdot/$leaf" or fail f_
2219 "check orig file %s in ..: %s", $leaf, $!;
2221 stat "$dotdot/$leaf" or fail f_
2222 "check target of orig symlink %s in ..: %s", $leaf, $!;
2223 my $ltarget = readlink "$dotdot/$leaf" or
2224 die "readlink $dotdot/$leaf: $!";
2225 if ($ltarget !~ m{^/}) {
2226 $ltarget = "$dotdot/$ltarget";
2228 symlink $ltarget, "$bpd_abs/$leaf"
2229 or die "$ltarget $bpd_abs $leaf: $!";
2231 "%s: cloned orig symlink from ..: %s\n",
2233 } elsif (link "$dotdot/$leaf", "$bpd_abs/$leaf") {
2235 "%s: hardlinked orig from ..: %s\n",
2237 } elsif ($! != EXDEV) {
2238 fail f_ "failed to make %s a hardlink to %s: %s",
2239 "$bpd_abs/$leaf", "$dotdot/$leaf", $!;
2241 symlink "$bpd_abs/$leaf", "$dotdot/$leaf"
2242 or die "$bpd_abs $dotdot $leaf $!";
2244 "%s: symmlinked orig from .. on other filesystem: %s\n",
2248 die "$dotdot; $!" if $!;
2252 sub generate_commits_from_dsc () {
2253 # See big comment in fetch_from_archive, below.
2254 # See also README.dsc-import.
2256 changedir $playground;
2258 my $bpd_abs = bpd_abs();
2259 my $upstreamv = upstreamversion $dsc->{version};
2260 my @dfi = dsc_files_info();
2262 dotdot_bpd_transfer_origs $bpd_abs, $upstreamv,
2263 sub { grep { $_->{Filename} eq $_[0] } @dfi };
2265 foreach my $fi (@dfi) {
2266 my $f = $fi->{Filename};
2267 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2268 my $upper_f = "$bpd_abs/$f";
2270 printdebug "considering reusing $f: ";
2272 if (link_ltarget "$upper_f,fetch", $f) {
2273 printdebug "linked (using ...,fetch).\n";
2274 } elsif ((printdebug "($!) "),
2276 fail f_ "accessing %s: %s", "$buildproductsdir/$f,fetch", $!;
2277 } elsif (link_ltarget $upper_f, $f) {
2278 printdebug "linked.\n";
2279 } elsif ((printdebug "($!) "),
2281 fail f_ "accessing %s: %s", "$buildproductsdir/$f", $!;
2283 printdebug "absent.\n";
2287 complete_file_from_dsc('.', $fi, \$refetched)
2290 printdebug "considering saving $f: ";
2292 if (rename_link_xf 1, $f, $upper_f) {
2293 printdebug "linked.\n";
2294 } elsif ((printdebug "($@) "),
2296 fail f_ "saving %s: %s", "$buildproductsdir/$f", $@;
2297 } elsif (!$refetched) {
2298 printdebug "no need.\n";
2299 } elsif (rename_link_xf 1, $f, "$upper_f,fetch") {
2300 printdebug "linked (using ...,fetch).\n";
2301 } elsif ((printdebug "($@) "),
2303 fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $@;
2305 printdebug "cannot.\n";
2309 # We unpack and record the orig tarballs first, so that we only
2310 # need disk space for one private copy of the unpacked source.
2311 # But we can't make them into commits until we have the metadata
2312 # from the debian/changelog, so we record the tree objects now and
2313 # make them into commits later.
2315 my $orig_f_base = srcfn $upstreamv, '';
2317 foreach my $fi (@dfi) {
2318 # We actually import, and record as a commit, every tarball
2319 # (unless there is only one file, in which case there seems
2322 my $f = $fi->{Filename};
2323 printdebug "import considering $f ";
2324 (printdebug "only one dfi\n"), next if @dfi == 1;
2325 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2326 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2330 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2332 printdebug "Y ", (join ' ', map { $_//"(none)" }
2333 $compr_ext, $orig_f_part
2336 my $input = new IO::File $f, '<' or die "$f $!";
2340 if (defined $compr_ext) {
2342 Dpkg::Compression::compression_guess_from_filename $f;
2343 fail "Dpkg::Compression cannot handle file $f in source package"
2344 if defined $compr_ext && !defined $cname;
2346 new Dpkg::Compression::Process compression => $cname;
2347 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2348 my $compr_fh = new IO::Handle;
2349 my $compr_pid = open $compr_fh, "-|" // confess "$!";
2351 open STDIN, "<&", $input or confess "$!";
2353 die "dgit (child): exec $compr_cmd[0]: $!\n";
2358 rmtree "_unpack-tar";
2359 mkdir "_unpack-tar" or confess "$!";
2360 my @tarcmd = qw(tar -x -f -
2361 --no-same-owner --no-same-permissions
2362 --no-acls --no-xattrs --no-selinux);
2363 my $tar_pid = fork // confess "$!";
2365 chdir "_unpack-tar" or confess "$!";
2366 open STDIN, "<&", $input or confess "$!";
2368 die f_ "dgit (child): exec %s: %s", $tarcmd[0], $!;
2370 $!=0; (waitpid $tar_pid, 0) == $tar_pid or confess "$!";
2371 !$? or failedcmd @tarcmd;
2374 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2376 # finally, we have the results in "tarball", but maybe
2377 # with the wrong permissions
2379 runcmd qw(chmod -R +rwX _unpack-tar);
2380 changedir "_unpack-tar";
2381 remove_stray_gits($f);
2382 mktree_in_ud_here();
2384 my ($tree) = git_add_write_tree();
2385 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2386 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2388 printdebug "one subtree $1\n";
2390 printdebug "multiple subtrees\n";
2393 rmtree "_unpack-tar";
2395 my $ent = [ $f, $tree ];
2397 Orig => !!$orig_f_part,
2398 Sort => (!$orig_f_part ? 2 :
2399 $orig_f_part =~ m/-/g ? 1 :
2407 # put any without "_" first (spec is not clear whether files
2408 # are always in the usual order). Tarballs without "_" are
2409 # the main orig or the debian tarball.
2410 $a->{Sort} <=> $b->{Sort} or
2414 my $any_orig = grep { $_->{Orig} } @tartrees;
2416 my $dscfn = "$package.dsc";
2418 my $treeimporthow = 'package';
2420 open D, ">", $dscfn or die "$dscfn: $!";
2421 print D $dscdata or die "$dscfn: $!";
2422 close D or die "$dscfn: $!";
2423 my @cmd = qw(dpkg-source);
2424 push @cmd, '--no-check' if $dsc_checked;
2425 if (madformat $dsc->{format}) {
2426 push @cmd, '--skip-patches';
2427 $treeimporthow = 'unpatched';
2429 push @cmd, qw(-x --), $dscfn;
2432 my ($tree,$dir) = mktree_in_ud_from_only_subdir(__ "source package");
2433 if (madformat $dsc->{format}) {
2434 check_for_vendor_patches();
2438 if (madformat $dsc->{format}) {
2439 my @pcmd = qw(dpkg-source --before-build .);
2440 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2442 $dappliedtree = git_add_write_tree();
2445 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2449 printdebug "import clog search...\n";
2450 parsechangelog_loop \@clogcmd, (__ "package changelog"), sub {
2451 my ($thisstanza, $desc) = @_;
2452 no warnings qw(exiting);
2454 $clogp //= $thisstanza;
2456 printdebug "import clog $thisstanza->{version} $desc...\n";
2458 last if !$any_orig; # we don't need $r1clogp
2460 # We look for the first (most recent) changelog entry whose
2461 # version number is lower than the upstream version of this
2462 # package. Then the last (least recent) previous changelog
2463 # entry is treated as the one which introduced this upstream
2464 # version and used for the synthetic commits for the upstream
2467 # One might think that a more sophisticated algorithm would be
2468 # necessary. But: we do not want to scan the whole changelog
2469 # file. Stopping when we see an earlier version, which
2470 # necessarily then is an earlier upstream version, is the only
2471 # realistic way to do that. Then, either the earliest
2472 # changelog entry we have seen so far is indeed the earliest
2473 # upload of this upstream version; or there are only changelog
2474 # entries relating to later upstream versions (which is not
2475 # possible unless the changelog and .dsc disagree about the
2476 # version). Then it remains to choose between the physically
2477 # last entry in the file, and the one with the lowest version
2478 # number. If these are not the same, we guess that the
2479 # versions were created in a non-monotonic order rather than
2480 # that the changelog entries have been misordered.
2482 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2484 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2485 $r1clogp = $thisstanza;
2487 printdebug "import clog $r1clogp->{version} becomes r1\n";
2490 $clogp or fail __ "package changelog has no entries!";
2492 my $authline = clogp_authline $clogp;
2493 my $changes = getfield $clogp, 'Changes';
2494 $changes =~ s/^\n//; # Changes: \n
2495 my $cversion = getfield $clogp, 'Version';
2498 $r1clogp //= $clogp; # maybe there's only one entry;
2499 my $r1authline = clogp_authline $r1clogp;
2500 # Strictly, r1authline might now be wrong if it's going to be
2501 # unused because !$any_orig. Whatever.
2503 printdebug "import tartrees authline $authline\n";
2504 printdebug "import tartrees r1authline $r1authline\n";
2506 foreach my $tt (@tartrees) {
2507 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2509 my $mbody = f_ "Import %s", $tt->{F};
2510 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2513 committer $r1authline
2517 [dgit import orig $tt->{F}]
2525 [dgit import tarball $package $cversion $tt->{F}]
2530 printdebug "import main commit\n";
2532 open C, ">../commit.tmp" or confess "$!";
2533 print C <<END or confess "$!";
2536 print C <<END or confess "$!" foreach @tartrees;
2539 print C <<END or confess "$!";
2545 [dgit import $treeimporthow $package $cversion]
2548 close C or confess "$!";
2549 my $rawimport_hash = make_commit qw(../commit.tmp);
2551 if (madformat $dsc->{format}) {
2552 printdebug "import apply patches...\n";
2554 # regularise the state of the working tree so that
2555 # the checkout of $rawimport_hash works nicely.
2556 my $dappliedcommit = make_commit_text(<<END);
2563 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2565 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2567 # We need the answers to be reproducible
2568 my @authline = clogp_authline($clogp);
2569 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2570 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2571 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2572 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2573 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2574 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2576 my $path = $ENV{PATH} or die;
2578 # we use ../../gbp-pq-output, which (given that we are in
2579 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2582 foreach my $use_absurd (qw(0 1)) {
2583 runcmd @git, qw(checkout -q unpa);
2584 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2585 local $ENV{PATH} = $path;
2588 progress "warning: $@";
2589 $path = "$absurdity:$path";
2590 progress f_ "%s: trying slow absurd-git-apply...", $us;
2591 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2596 die "forbid absurd git-apply\n" if $use_absurd
2597 && forceing [qw(import-gitapply-no-absurd)];
2598 die "only absurd git-apply!\n" if !$use_absurd
2599 && forceing [qw(import-gitapply-absurd)];
2601 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2602 local $ENV{PATH} = $path if $use_absurd;
2604 my @showcmd = (gbp_pq, qw(import));
2605 my @realcmd = shell_cmd
2606 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2607 debugcmd "+",@realcmd;
2608 if (system @realcmd) {
2609 die f_ "%s failed: %s\n",
2610 +(shellquote @showcmd),
2611 failedcmd_waitstatus();
2614 my $gapplied = git_rev_parse('HEAD');
2615 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2616 $gappliedtree eq $dappliedtree or
2617 fail f_ <<END, $gapplied, $gappliedtree, $dappliedtree;
2618 gbp-pq import and dpkg-source disagree!
2619 gbp-pq import gave commit %s
2620 gbp-pq import gave tree %s
2621 dpkg-source --before-build gave tree %s
2623 $rawimport_hash = $gapplied;
2628 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2633 progress f_ "synthesised git commit from .dsc %s", $cversion;
2635 my $rawimport_mergeinput = {
2636 Commit => $rawimport_hash,
2637 Info => __ "Import of source package",
2639 my @output = ($rawimport_mergeinput);
2641 if ($lastpush_mergeinput) {
2642 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2643 my $oversion = getfield $oldclogp, 'Version';
2645 version_compare($oversion, $cversion);
2647 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2648 { ReverseParents => 1,
2649 Message => (f_ <<END, $package, $cversion, $csuite) });
2650 Record %s (%s) in archive suite %s
2652 } elsif ($vcmp > 0) {
2653 print STDERR f_ <<END, $cversion, $oversion,
2655 Version actually in archive: %s (older)
2656 Last version pushed with dgit: %s (newer or same)
2659 __ $later_warning_msg or confess "$!";
2660 @output = $lastpush_mergeinput;
2662 # Same version. Use what's in the server git branch,
2663 # discarding our own import. (This could happen if the
2664 # server automatically imports all packages into git.)
2665 @output = $lastpush_mergeinput;
2673 sub complete_file_from_dsc ($$;$) {
2674 our ($dstdir, $fi, $refetched) = @_;
2675 # Ensures that we have, in $dstdir, the file $fi, with the correct
2676 # contents. (Downloading it from alongside $dscurl if necessary.)
2677 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2678 # and will set $$refetched=1 if it did so (or tried to).
2680 my $f = $fi->{Filename};
2681 my $tf = "$dstdir/$f";
2685 my $checkhash = sub {
2686 open F, "<", "$tf" or die "$tf: $!";
2687 $fi->{Digester}->reset();
2688 $fi->{Digester}->addfile(*F);
2689 F->error and confess "$!";
2690 $got = $fi->{Digester}->hexdigest();
2691 return $got eq $fi->{Hash};
2694 if (stat_exists $tf) {
2695 if ($checkhash->()) {
2696 progress f_ "using existing %s", $f;
2700 fail f_ "file %s has hash %s but .dsc demands hash %s".
2701 " (perhaps you should delete this file?)",
2702 $f, $got, $fi->{Hash};
2704 progress f_ "need to fetch correct version of %s", $f;
2705 unlink $tf or die "$tf $!";
2708 printdebug "$tf does not exist, need to fetch\n";
2712 $furl =~ s{/[^/]+$}{};
2714 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2715 die "$f ?" if $f =~ m#/#;
2716 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2717 return 0 if !act_local();
2720 fail f_ "file %s has hash %s but .dsc demands hash %s".
2721 " (got wrong file from archive!)",
2722 $f, $got, $fi->{Hash};
2727 sub ensure_we_have_orig () {
2728 my @dfi = dsc_files_info();
2729 foreach my $fi (@dfi) {
2730 my $f = $fi->{Filename};
2731 next unless is_orig_file_in_dsc($f, \@dfi);
2732 complete_file_from_dsc($buildproductsdir, $fi)
2737 #---------- git fetch ----------
2739 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2740 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2742 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2743 # locally fetched refs because they have unhelpful names and clutter
2744 # up gitk etc. So we track whether we have "used up" head ref (ie,
2745 # whether we have made another local ref which refers to this object).
2747 # (If we deleted them unconditionally, then we might end up
2748 # re-fetching the same git objects each time dgit fetch was run.)
2750 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2751 # in git_fetch_us to fetch the refs in question, and possibly a call
2752 # to lrfetchref_used.
2754 our (%lrfetchrefs_f, %lrfetchrefs_d);
2755 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2757 sub lrfetchref_used ($) {
2758 my ($fullrefname) = @_;
2759 my $objid = $lrfetchrefs_f{$fullrefname};
2760 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2763 sub git_lrfetch_sane {
2764 my ($url, $supplementary, @specs) = @_;
2765 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2766 # at least as regards @specs. Also leave the results in
2767 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2768 # able to clean these up.
2770 # With $supplementary==1, @specs must not contain wildcards
2771 # and we add to our previous fetches (non-atomically).
2773 # This is rather miserable:
2774 # When git fetch --prune is passed a fetchspec ending with a *,
2775 # it does a plausible thing. If there is no * then:
2776 # - it matches subpaths too, even if the supplied refspec
2777 # starts refs, and behaves completely madly if the source
2778 # has refs/refs/something. (See, for example, Debian #NNNN.)
2779 # - if there is no matching remote ref, it bombs out the whole
2781 # We want to fetch a fixed ref, and we don't know in advance
2782 # if it exists, so this is not suitable.
2784 # Our workaround is to use git ls-remote. git ls-remote has its
2785 # own qairks. Notably, it has the absurd multi-tail-matching
2786 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2787 # refs/refs/foo etc.
2789 # Also, we want an idempotent snapshot, but we have to make two
2790 # calls to the remote: one to git ls-remote and to git fetch. The
2791 # solution is use git ls-remote to obtain a target state, and
2792 # git fetch to try to generate it. If we don't manage to generate
2793 # the target state, we try again.
2795 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2797 my $specre = join '|', map {
2800 my $wildcard = $x =~ s/\\\*$/.*/;
2801 die if $wildcard && $supplementary;
2804 printdebug "git_lrfetch_sane specre=$specre\n";
2805 my $wanted_rref = sub {
2807 return m/^(?:$specre)$/;
2810 my $fetch_iteration = 0;
2813 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2814 if (++$fetch_iteration > 10) {
2815 fail __ "too many iterations trying to get sane fetch!";
2818 my @look = map { "refs/$_" } @specs;
2819 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2823 open GITLS, "-|", @lcmd or confess "$!";
2825 printdebug "=> ", $_;
2826 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2827 my ($objid,$rrefname) = ($1,$2);
2828 if (!$wanted_rref->($rrefname)) {
2829 print STDERR f_ <<END, "@look", $rrefname;
2830 warning: git ls-remote %s reported %s; this is silly, ignoring it.
2834 $wantr{$rrefname} = $objid;
2837 close GITLS or failedcmd @lcmd;
2839 # OK, now %want is exactly what we want for refs in @specs
2841 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2842 "+refs/$_:".lrfetchrefs."/$_";
2845 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2847 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2848 runcmd_ordryrun_local @fcmd if @fspecs;
2850 if (!$supplementary) {
2851 %lrfetchrefs_f = ();
2855 git_for_each_ref(lrfetchrefs, sub {
2856 my ($objid,$objtype,$lrefname,$reftail) = @_;
2857 $lrfetchrefs_f{$lrefname} = $objid;
2858 $objgot{$objid} = 1;
2861 if ($supplementary) {
2865 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2866 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2867 if (!exists $wantr{$rrefname}) {
2868 if ($wanted_rref->($rrefname)) {
2870 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2873 print STDERR f_ <<END, "@fspecs", $lrefname
2874 warning: git fetch %s created %s; this is silly, deleting it.
2877 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2878 delete $lrfetchrefs_f{$lrefname};
2882 foreach my $rrefname (sort keys %wantr) {
2883 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2884 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2885 my $want = $wantr{$rrefname};
2886 next if $got eq $want;
2887 if (!defined $objgot{$want}) {
2888 fail __ <<END unless act_local();
2889 --dry-run specified but we actually wanted the results of git fetch,
2890 so this is not going to work. Try running dgit fetch first,
2891 or using --damp-run instead of --dry-run.
2893 print STDERR f_ <<END, $lrefname, $want;
2894 warning: git ls-remote suggests we want %s
2895 warning: and it should refer to %s
2896 warning: but git fetch didn't fetch that object to any relevant ref.
2897 warning: This may be due to a race with someone updating the server.
2898 warning: Will try again...
2900 next FETCH_ITERATION;
2903 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2905 runcmd_ordryrun_local @git, qw(update-ref -m),
2906 "dgit fetch git fetch fixup", $lrefname, $want;
2907 $lrfetchrefs_f{$lrefname} = $want;
2912 if (defined $csuite) {
2913 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2914 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2915 my ($objid,$objtype,$lrefname,$reftail) = @_;
2916 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2917 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2921 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2922 Dumper(\%lrfetchrefs_f);
2925 sub git_fetch_us () {
2926 # Want to fetch only what we are going to use, unless
2927 # deliberately-not-ff, in which case we must fetch everything.
2929 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2931 (quiltmode_splitbrain
2932 ? (map { $_->('*',access_nomdistro) }
2933 \&debiantag_new, \&debiantag_maintview)
2934 : debiantags('*',access_nomdistro));
2935 push @specs, server_branch($csuite);
2936 push @specs, $rewritemap;
2937 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2939 my $url = access_giturl();
2940 git_lrfetch_sane $url, 0, @specs;
2943 my @tagpats = debiantags('*',access_nomdistro);
2945 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2946 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2947 printdebug "currently $fullrefname=$objid\n";
2948 $here{$fullrefname} = $objid;
2950 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2951 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2952 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2953 printdebug "offered $lref=$objid\n";
2954 if (!defined $here{$lref}) {
2955 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2956 runcmd_ordryrun_local @upd;
2957 lrfetchref_used $fullrefname;
2958 } elsif ($here{$lref} eq $objid) {
2959 lrfetchref_used $fullrefname;
2961 print STDERR f_ "Not updating %s from %s to %s.\n",
2962 $lref, $here{$lref}, $objid;
2967 #---------- dsc and archive handling ----------
2969 sub mergeinfo_getclogp ($) {
2970 # Ensures thit $mi->{Clogp} exists and returns it
2972 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2975 sub mergeinfo_version ($) {
2976 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2979 sub fetch_from_archive_record_1 ($) {
2981 runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
2982 cmdoutput @git, qw(log -n2), $hash;
2983 # ... gives git a chance to complain if our commit is malformed
2986 sub fetch_from_archive_record_2 ($) {
2988 my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
2992 dryrun_report @upd_cmd;
2996 sub parse_dsc_field_def_dsc_distro () {
2997 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2998 dgit.default.distro);
3001 sub parse_dsc_field ($$) {
3002 my ($dsc, $what) = @_;
3004 foreach my $field (@ourdscfield) {
3005 $f = $dsc->{$field};
3010 progress f_ "%s: NO git hash", $what;
3011 parse_dsc_field_def_dsc_distro();
3012 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
3013 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
3014 progress f_ "%s: specified git info (%s)", $what, $dsc_distro;
3015 $dsc_hint_tag = [ $dsc_hint_tag ];
3016 } elsif ($f =~ m/^\w+\s*$/) {
3018 parse_dsc_field_def_dsc_distro();
3019 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
3021 progress f_ "%s: specified git hash", $what;
3023 fail f_ "%s: invalid Dgit info", $what;
3027 sub resolve_dsc_field_commit ($$) {
3028 my ($already_distro, $already_mapref) = @_;
3030 return unless defined $dsc_hash;
3033 defined $already_mapref &&
3034 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
3035 ? $already_mapref : undef;
3039 my ($what, @fetch) = @_;
3041 local $idistro = $dsc_distro;
3042 my $lrf = lrfetchrefs;
3044 if (!$chase_dsc_distro) {
3045 progress f_ "not chasing .dsc distro %s: not fetching %s",
3050 progress f_ ".dsc names distro %s: fetching %s", $dsc_distro, $what;
3052 my $url = access_giturl();
3053 if (!defined $url) {
3054 defined $dsc_hint_url or fail f_ <<END, $dsc_distro;
3055 .dsc Dgit metadata is in context of distro %s
3056 for which we have no configured url and .dsc provides no hint
3059 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
3060 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
3061 parse_cfg_bool "dsc-url-proto-ok", 'false',
3062 cfg("dgit.dsc-url-proto-ok.$proto",
3063 "dgit.default.dsc-url-proto-ok")
3064 or fail f_ <<END, $dsc_distro, $proto;
3065 .dsc Dgit metadata is in context of distro %s
3066 for which we have no configured url;
3067 .dsc provides hinted url with protocol %s which is unsafe.
3068 (can be overridden by config - consult documentation)
3070 $url = $dsc_hint_url;
3073 git_lrfetch_sane $url, 1, @fetch;
3078 my $rewrite_enable = do {
3079 local $idistro = $dsc_distro;
3080 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
3083 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
3084 if (!defined $mapref) {
3085 my $lrf = $do_fetch->((__ "rewrite map"), $rewritemap) or return;
3086 $mapref = $lrf.'/'.$rewritemap;
3088 my $rewritemapdata = git_cat_file $mapref.':map';
3089 if (defined $rewritemapdata
3090 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
3092 "server's git history rewrite map contains a relevant entry!";
3095 if (defined $dsc_hash) {
3096 progress __ "using rewritten git hash in place of .dsc value";
3098 progress __ "server data says .dsc hash is to be disregarded";
3103 if (!defined git_cat_file $dsc_hash) {
3104 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
3105 my $lrf = $do_fetch->((__ "additional commits"), @tags) &&
3106 defined git_cat_file $dsc_hash
3107 or fail f_ <<END, $dsc_hash;
3108 .dsc Dgit metadata requires commit %s
3109 but we could not obtain that object anywhere.
3111 foreach my $t (@tags) {
3112 my $fullrefname = $lrf.'/'.$t;
3113 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
3114 next unless $lrfetchrefs_f{$fullrefname};
3115 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
3116 lrfetchref_used $fullrefname;
3121 sub fetch_from_archive () {
3123 ensure_setup_existing_tree();
3125 # Ensures that lrref() is what is actually in the archive, one way
3126 # or another, according to us - ie this client's
3127 # appropritaely-updated archive view. Also returns the commit id.
3128 # If there is nothing in the archive, leaves lrref alone and
3129 # returns undef. git_fetch_us must have already been called.
3133 parse_dsc_field($dsc, __ 'last upload to archive');
3134 resolve_dsc_field_commit access_basedistro,
3135 lrfetchrefs."/".$rewritemap
3137 progress __ "no version available from the archive";
3140 # If the archive's .dsc has a Dgit field, there are three
3141 # relevant git commitids we need to choose between and/or merge
3143 # 1. $dsc_hash: the Dgit field from the archive
3144 # 2. $lastpush_hash: the suite branch on the dgit git server
3145 # 3. $lastfetch_hash: our local tracking brach for the suite
3147 # These may all be distinct and need not be in any fast forward
3150 # If the dsc was pushed to this suite, then the server suite
3151 # branch will have been updated; but it might have been pushed to
3152 # a different suite and copied by the archive. Conversely a more
3153 # recent version may have been pushed with dgit but not appeared
3154 # in the archive (yet).
3156 # $lastfetch_hash may be awkward because archive imports
3157 # (particularly, imports of Dgit-less .dscs) are performed only as
3158 # needed on individual clients, so different clients may perform a
3159 # different subset of them - and these imports are only made
3160 # public during push. So $lastfetch_hash may represent a set of
3161 # imports different to a subsequent upload by a different dgit
3164 # Our approach is as follows:
3166 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3167 # descendant of $dsc_hash, then it was pushed by a dgit user who
3168 # had based their work on $dsc_hash, so we should prefer it.
3169 # Otherwise, $dsc_hash was installed into this suite in the
3170 # archive other than by a dgit push, and (necessarily) after the
3171 # last dgit push into that suite (since a dgit push would have
3172 # been descended from the dgit server git branch); thus, in that
3173 # case, we prefer the archive's version (and produce a
3174 # pseudo-merge to overwrite the dgit server git branch).
3176 # (If there is no Dgit field in the archive's .dsc then
3177 # generate_commit_from_dsc uses the version numbers to decide
3178 # whether the suite branch or the archive is newer. If the suite
3179 # branch is newer it ignores the archive's .dsc; otherwise it
3180 # generates an import of the .dsc, and produces a pseudo-merge to
3181 # overwrite the suite branch with the archive contents.)
3183 # The outcome of that part of the algorithm is the `public view',
3184 # and is same for all dgit clients: it does not depend on any
3185 # unpublished history in the local tracking branch.
3187 # As between the public view and the local tracking branch: The
3188 # local tracking branch is only updated by dgit fetch, and
3189 # whenever dgit fetch runs it includes the public view in the
3190 # local tracking branch. Therefore if the public view is not
3191 # descended from the local tracking branch, the local tracking
3192 # branch must contain history which was imported from the archive
3193 # but never pushed; and, its tip is now out of date. So, we make
3194 # a pseudo-merge to overwrite the old imports and stitch the old
3197 # Finally: we do not necessarily reify the public view (as
3198 # described above). This is so that we do not end up stacking two
3199 # pseudo-merges. So what we actually do is figure out the inputs
3200 # to any public view pseudo-merge and put them in @mergeinputs.
3203 # $mergeinputs[]{Commit}
3204 # $mergeinputs[]{Info}
3205 # $mergeinputs[0] is the one whose tree we use
3206 # @mergeinputs is in the order we use in the actual commit)
3209 # $mergeinputs[]{Message} is a commit message to use
3210 # $mergeinputs[]{ReverseParents} if def specifies that parent
3211 # list should be in opposite order
3212 # Such an entry has no Commit or Info. It applies only when found
3213 # in the last entry. (This ugliness is to support making
3214 # identical imports to previous dgit versions.)
3216 my $lastpush_hash = git_get_ref(lrfetchref());
3217 printdebug "previous reference hash=$lastpush_hash\n";
3218 $lastpush_mergeinput = $lastpush_hash && {
3219 Commit => $lastpush_hash,
3220 Info => (__ "dgit suite branch on dgit git server"),
3223 my $lastfetch_hash = git_get_ref(lrref());
3224 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3225 my $lastfetch_mergeinput = $lastfetch_hash && {
3226 Commit => $lastfetch_hash,
3227 Info => (__ "dgit client's archive history view"),
3230 my $dsc_mergeinput = $dsc_hash && {
3231 Commit => $dsc_hash,
3232 Info => (__ "Dgit field in .dsc from archive"),
3236 my $del_lrfetchrefs = sub {
3239 printdebug "del_lrfetchrefs...\n";
3240 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3241 my $objid = $lrfetchrefs_d{$fullrefname};
3242 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3244 $gur ||= new IO::Handle;
3245 open $gur, "|-", qw(git update-ref --stdin) or confess "$!";
3247 printf $gur "delete %s %s\n", $fullrefname, $objid;
3250 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3254 if (defined $dsc_hash) {
3255 ensure_we_have_orig();
3256 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3257 @mergeinputs = $dsc_mergeinput
3258 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3259 print STDERR f_ <<END, $dsc_hash, $lastpush_hash,
3261 Git commit in archive is behind the last version allegedly pushed/uploaded.
3262 Commit referred to by archive: %s
3263 Last version pushed with dgit: %s
3266 __ $later_warning_msg or confess "$!";
3267 @mergeinputs = ($lastpush_mergeinput);
3269 # Archive has .dsc which is not a descendant of the last dgit
3270 # push. This can happen if the archive moves .dscs about.
3271 # Just follow its lead.
3272 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3273 progress __ "archive .dsc names newer git commit";
3274 @mergeinputs = ($dsc_mergeinput);
3276 progress __ "archive .dsc names other git commit, fixing up";
3277 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3281 @mergeinputs = generate_commits_from_dsc();
3282 # We have just done an import. Now, our import algorithm might
3283 # have been improved. But even so we do not want to generate
3284 # a new different import of the same package. So if the
3285 # version numbers are the same, just use our existing version.
3286 # If the version numbers are different, the archive has changed
3287 # (perhaps, rewound).
3288 if ($lastfetch_mergeinput &&
3289 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3290 (mergeinfo_version $mergeinputs[0]) )) {
3291 @mergeinputs = ($lastfetch_mergeinput);
3293 } elsif ($lastpush_hash) {
3294 # only in git, not in the archive yet
3295 @mergeinputs = ($lastpush_mergeinput);
3296 print STDERR f_ <<END,
3298 Package not found in the archive, but has allegedly been pushed using dgit.
3301 __ $later_warning_msg or confess "$!";
3303 printdebug "nothing found!\n";
3304 if (defined $skew_warning_vsn) {
3305 print STDERR f_ <<END, $skew_warning_vsn or confess "$!";
3307 Warning: relevant archive skew detected.
3308 Archive allegedly contains %s
3309 But we were not able to obtain any version from the archive or git.
3313 unshift @end, $del_lrfetchrefs;
3317 if ($lastfetch_hash &&
3319 my $h = $_->{Commit};
3320 $h and is_fast_fwd($lastfetch_hash, $h);
3321 # If true, one of the existing parents of this commit
3322 # is a descendant of the $lastfetch_hash, so we'll
3323 # be ff from that automatically.
3327 push @mergeinputs, $lastfetch_mergeinput;
3330 printdebug "fetch mergeinfos:\n";
3331 foreach my $mi (@mergeinputs) {
3333 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3335 printdebug sprintf " ReverseParents=%d Message=%s",
3336 $mi->{ReverseParents}, $mi->{Message};
3340 my $compat_info= pop @mergeinputs
3341 if $mergeinputs[$#mergeinputs]{Message};
3343 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3346 if (@mergeinputs > 1) {
3348 my $tree_commit = $mergeinputs[0]{Commit};
3350 my $tree = get_tree_of_commit $tree_commit;;
3352 # We use the changelog author of the package in question the
3353 # author of this pseudo-merge. This is (roughly) correct if
3354 # this commit is simply representing aa non-dgit upload.
3355 # (Roughly because it does not record sponsorship - but we
3356 # don't have sponsorship info because that's in the .changes,
3357 # which isn't in the archivw.)
3359 # But, it might be that we are representing archive history
3360 # updates (including in-archive copies). These are not really
3361 # the responsibility of the person who created the .dsc, but
3362 # there is no-one whose name we should better use. (The
3363 # author of the .dsc-named commit is clearly worse.)
3365 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3366 my $author = clogp_authline $useclogp;
3367 my $cversion = getfield $useclogp, 'Version';
3369 my $mcf = dgit_privdir()."/mergecommit";
3370 open MC, ">", $mcf or die "$mcf $!";
3371 print MC <<END or confess "$!";
3375 my @parents = grep { $_->{Commit} } @mergeinputs;
3376 @parents = reverse @parents if $compat_info->{ReverseParents};
3377 print MC <<END or confess "$!" foreach @parents;
3381 print MC <<END or confess "$!";
3387 if (defined $compat_info->{Message}) {
3388 print MC $compat_info->{Message} or confess "$!";
3390 print MC f_ <<END, $package, $cversion, $csuite or confess "$!";
3391 Record %s (%s) in archive suite %s
3395 my $message_add_info = sub {
3397 my $mversion = mergeinfo_version $mi;
3398 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3402 $message_add_info->($mergeinputs[0]);
3403 print MC __ <<END or confess "$!";
3404 should be treated as descended from
3406 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3409 close MC or confess "$!";
3410 $hash = make_commit $mcf;
3412 $hash = $mergeinputs[0]{Commit};
3414 printdebug "fetch hash=$hash\n";
3417 my ($lasth, $what) = @_;
3418 return unless $lasth;
3419 confess "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3422 $chkff->($lastpush_hash, __ 'dgit repo server tip (last push)')
3424 $chkff->($lastfetch_hash, __ 'local tracking tip (last fetch)');
3426 fetch_from_archive_record_1($hash);
3428 if (defined $skew_warning_vsn) {
3429 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3430 my $gotclogp = commit_getclogp($hash);
3431 my $got_vsn = getfield $gotclogp, 'Version';
3432 printdebug "SKEW CHECK GOT $got_vsn\n";
3433 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3434 print STDERR f_ <<END, $skew_warning_vsn, $got_vsn or confess "$!";
3436 Warning: archive skew detected. Using the available version:
3437 Archive allegedly contains %s
3438 We were able to obtain only %s
3444 if ($lastfetch_hash ne $hash) {
3445 fetch_from_archive_record_2($hash);
3448 lrfetchref_used lrfetchref();
3450 check_gitattrs($hash, __ "fetched source tree");
3452 unshift @end, $del_lrfetchrefs;
3456 sub set_local_git_config ($$) {
3458 runcmd @git, qw(config), $k, $v;
3461 sub setup_mergechangelogs (;$) {
3463 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3465 my $driver = 'dpkg-mergechangelogs';
3466 my $cb = "merge.$driver";
3467 confess unless defined $maindir;
3468 my $attrs = "$maindir_gitcommon/info/attributes";
3469 ensuredir "$maindir_gitcommon/info";
3471 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3472 if (!open ATTRS, "<", $attrs) {
3473 $!==ENOENT or die "$attrs: $!";
3477 next if m{^debian/changelog\s};
3478 print NATTRS $_, "\n" or confess "$!";
3480 ATTRS->error and confess "$!";
3483 print NATTRS "debian/changelog merge=$driver\n" or confess "$!";
3486 set_local_git_config "$cb.name", __ 'debian/changelog merge driver';
3487 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3489 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3492 sub setup_useremail (;$) {
3494 return unless $always || access_cfg_bool(1, 'setup-useremail');
3497 my ($k, $envvar) = @_;
3498 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3499 return unless defined $v;
3500 set_local_git_config "user.$k", $v;
3503 $setup->('email', 'DEBEMAIL');
3504 $setup->('name', 'DEBFULLNAME');
3507 sub ensure_setup_existing_tree () {
3508 my $k = "remote.$remotename.skipdefaultupdate";
3509 my $c = git_get_config $k;
3510 return if defined $c;
3511 set_local_git_config $k, 'true';
3514 sub open_main_gitattrs () {
3515 confess 'internal error no maindir' unless defined $maindir;
3516 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3518 or die "open $maindir_gitcommon/info/attributes: $!";
3522 our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
3524 sub is_gitattrs_setup () {
3527 # 1: gitattributes set up and should be left alone
3529 # 0: there is a dgit-defuse-attrs but it needs fixing
3530 # undef: there is none
3531 my $gai = open_main_gitattrs();
3532 return 0 unless $gai;
3534 next unless m{$gitattrs_ourmacro_re};
3535 return 1 if m{\s-working-tree-encoding\s};
3536 printdebug "is_gitattrs_setup: found old macro\n";
3539 $gai->error and confess "$!";
3540 printdebug "is_gitattrs_setup: found nothing\n";
3544 sub setup_gitattrs (;$) {
3546 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3548 my $already = is_gitattrs_setup();
3551 [attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
3552 not doing further gitattributes setup
3556 my $new = "[attr]dgit-defuse-attrs $negate_harmful_gitattrs";
3557 my $af = "$maindir_gitcommon/info/attributes";
3558 ensuredir "$maindir_gitcommon/info";
3560 open GAO, "> $af.new" or confess "$!";
3561 print GAO <<END, __ <<ENDT or confess "$!" unless defined $already;
3565 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3567 my $gai = open_main_gitattrs();
3570 if (m{$gitattrs_ourmacro_re}) {
3571 die unless defined $already;
3575 print GAO $_, "\n" or confess "$!";
3577 $gai->error and confess "$!";
3579 close GAO or confess "$!";
3580 rename "$af.new", "$af" or fail f_ "install %s: %s", $af, $!;
3583 sub setup_new_tree () {
3584 setup_mergechangelogs();
3589 sub check_gitattrs ($$) {
3590 my ($treeish, $what) = @_;
3592 return if is_gitattrs_setup;
3595 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3597 my $gafl = new IO::File;
3598 open $gafl, "-|", @cmd or confess "$!";
3601 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3603 next unless m{(?:^|/)\.gitattributes$};
3605 # oh dear, found one
3606 print STDERR f_ <<END, $what;
3607 dgit: warning: %s contains .gitattributes
3608 dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree.
3613 # tree contains no .gitattributes files
3614 $?=0; $!=0; close $gafl or failedcmd @cmd;
3618 sub multisuite_suite_child ($$$) {
3619 my ($tsuite, $mergeinputs, $fn) = @_;
3620 # in child, sets things up, calls $fn->(), and returns undef
3621 # in parent, returns canonical suite name for $tsuite
3622 my $canonsuitefh = IO::File::new_tmpfile;
3623 my $pid = fork // confess "$!";
3627 $us .= " [$isuite]";
3628 $debugprefix .= " ";
3629 progress f_ "fetching %s...", $tsuite;
3630 canonicalise_suite();
3631 print $canonsuitefh $csuite, "\n" or confess "$!";
3632 close $canonsuitefh or confess "$!";
3636 waitpid $pid,0 == $pid or confess "$!";
3637 fail f_ "failed to obtain %s: %s", $tsuite, waitstatusmsg()
3639 seek $canonsuitefh,0,0 or confess "$!";
3640 local $csuite = <$canonsuitefh>;
3641 confess "$!" unless defined $csuite && chomp $csuite;
3643 printdebug "multisuite $tsuite missing\n";
3646 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3647 push @$mergeinputs, {
3654 sub fork_for_multisuite ($) {
3655 my ($before_fetch_merge) = @_;
3656 # if nothing unusual, just returns ''
3659 # returns 0 to caller in child, to do first of the specified suites
3660 # in child, $csuite is not yet set
3662 # returns 1 to caller in parent, to finish up anything needed after
3663 # in parent, $csuite is set to canonicalised portmanteau
3665 my $org_isuite = $isuite;
3666 my @suites = split /\,/, $isuite;
3667 return '' unless @suites > 1;
3668 printdebug "fork_for_multisuite: @suites\n";
3672 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3674 return 0 unless defined $cbasesuite;
3676 fail f_ "package %s missing in (base suite) %s", $package, $cbasesuite
3677 unless @mergeinputs;
3679 my @csuites = ($cbasesuite);
3681 $before_fetch_merge->();
3683 foreach my $tsuite (@suites[1..$#suites]) {
3684 $tsuite =~ s/^-/$cbasesuite-/;
3685 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3692 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3693 push @csuites, $csubsuite;
3696 foreach my $mi (@mergeinputs) {
3697 my $ref = git_get_ref $mi->{Ref};
3698 die "$mi->{Ref} ?" unless length $ref;
3699 $mi->{Commit} = $ref;
3702 $csuite = join ",", @csuites;
3704 my $previous = git_get_ref lrref;
3706 unshift @mergeinputs, {
3707 Commit => $previous,
3708 Info => (__ "local combined tracking branch"),
3710 "archive seems to have rewound: local tracking branch is ahead!"),
3714 foreach my $ix (0..$#mergeinputs) {
3715 $mergeinputs[$ix]{Index} = $ix;
3718 @mergeinputs = sort {
3719 -version_compare(mergeinfo_version $a,
3720 mergeinfo_version $b) # highest version first
3722 $a->{Index} <=> $b->{Index}; # earliest in spec first
3728 foreach my $mi (@mergeinputs) {
3729 printdebug "multisuite merge check $mi->{Info}\n";
3730 foreach my $previous (@needed) {
3731 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3732 printdebug "multisuite merge un-needed $previous->{Info}\n";
3736 printdebug "multisuite merge this-needed\n";
3737 $mi->{Character} = '+';
3740 $needed[0]{Character} = '*';
3742 my $output = $needed[0]{Commit};
3745 printdebug "multisuite merge nontrivial\n";
3746 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3748 my $commit = "tree $tree\n";
3749 my $msg = f_ "Combine archive branches %s [dgit]\n\n".
3750 "Input branches:\n",
3753 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3754 printdebug "multisuite merge include $mi->{Info}\n";
3755 $mi->{Character} //= ' ';
3756 $commit .= "parent $mi->{Commit}\n";
3757 $msg .= sprintf " %s %-25s %s\n",
3759 (mergeinfo_version $mi),
3762 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3763 $msg .= __ "\nKey\n".
3764 " * marks the highest version branch, which choose to use\n".
3765 " + marks each branch which was not already an ancestor\n\n";
3767 "[dgit multi-suite $csuite]\n";
3769 "author $authline\n".
3770 "committer $authline\n\n";
3771 $output = make_commit_text $commit.$msg;
3772 printdebug "multisuite merge generated $output\n";
3775 fetch_from_archive_record_1($output);
3776 fetch_from_archive_record_2($output);
3778 progress f_ "calculated combined tracking suite %s", $csuite;
3783 sub clone_set_head () {
3784 open H, "> .git/HEAD" or confess "$!";
3785 print H "ref: ".lref()."\n" or confess "$!";
3786 close H or confess "$!";
3788 sub clone_finish ($) {
3790 runcmd @git, qw(reset --hard), lrref();
3791 runcmd qw(bash -ec), <<'END';
3793 git ls-tree -r --name-only -z HEAD | \
3794 xargs -0r touch -h -r . --
3796 printdone f_ "ready for work in %s", $dstdir;
3800 # in multisuite, returns twice!
3801 # once in parent after first suite fetched,
3802 # and then again in child after everything is finished
3804 badusage __ "dry run makes no sense with clone" unless act_local();
3806 my $multi_fetched = fork_for_multisuite(sub {
3807 printdebug "multi clone before fetch merge\n";
3811 if ($multi_fetched) {
3812 printdebug "multi clone after fetch merge\n";
3814 clone_finish($dstdir);
3817 printdebug "clone main body\n";
3819 mkdir $dstdir or fail f_ "create \`%s': %s", $dstdir, $!;
3823 canonicalise_suite();
3824 my $hasgit = check_for_git();
3826 runcmd @git, qw(init -q);
3830 my $giturl = access_giturl(1);
3831 if (defined $giturl) {
3832 runcmd @git, qw(remote add), 'origin', $giturl;
3835 progress __ "fetching existing git history";
3837 runcmd_ordryrun_local @git, qw(fetch origin);
3839 progress __ "starting new git history";
3841 fetch_from_archive() or no_such_package;
3842 my $vcsgiturl = $dsc->{'Vcs-Git'};
3843 if (length $vcsgiturl) {
3844 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3845 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3847 clone_finish($dstdir);
3851 canonicalise_suite();
3852 if (check_for_git()) {
3855 fetch_from_archive() or no_such_package();
3857 my $vcsgiturl = $dsc && $dsc->{'Vcs-Git'};
3858 if (length $vcsgiturl and
3859 (grep { $csuite eq $_ }
3861 cfg 'dgit.vcs-git.suites')) {
3862 my $current = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
3863 if (defined $current && $current ne $vcsgiturl) {
3864 print STDERR f_ <<END, $csuite;
3865 FYI: Vcs-Git in %s has different url to your vcs-git remote.
3866 Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?
3870 printdone f_ "fetched into %s", lrref();
3874 my $multi_fetched = fork_for_multisuite(sub { });
3875 fetch_one() unless $multi_fetched; # parent
3876 finish 0 if $multi_fetched eq '0'; # child
3881 runcmd_ordryrun_local @git, qw(merge -m),
3882 (f_ "Merge from %s [dgit]", $csuite),
3884 printdone f_ "fetched to %s and merged into HEAD", lrref();
3887 sub check_not_dirty () {
3888 my @forbid = qw(local-options local-patch-header);
3889 @forbid = map { "debian/source/$_" } @forbid;
3890 foreach my $f (@forbid) {
3891 if (stat_exists $f) {
3892 fail f_ "git tree contains %s", $f;
3896 my @cmd = (@git, qw(status -uall --ignored --porcelain));
3897 push @cmd, qw(debian/source/format debian/source/options);
3900 my $bad = cmdoutput @cmd;
3903 "you have uncommitted changes to critical files, cannot continue:\n").
3907 return if $includedirty;
3909 git_check_unmodified();
3912 sub commit_admin ($) {
3915 runcmd_ordryrun_local @git, qw(commit -m), $m;
3918 sub quiltify_nofix_bail ($$) {
3919 my ($headinfo, $xinfo) = @_;
3920 if ($quilt_mode eq 'nofix') {
3922 "quilt fixup required but quilt mode is \`nofix'\n".
3923 "HEAD commit%s differs from tree implied by debian/patches%s",
3928 sub commit_quilty_patch () {
3929 my $output = cmdoutput @git, qw(status --ignored --porcelain);
3931 foreach my $l (split /\n/, $output) {
3932 next unless $l =~ m/\S/;
3933 if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
3937 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3939 progress __ "nothing quilty to commit, ok.";
3942 quiltify_nofix_bail "", __ " (wanted to commit patch update)";
3943 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3944 runcmd_ordryrun_local @git, qw(add -f), @adds;
3945 commit_admin +(__ <<ENDT).<<END
3946 Commit Debian 3.0 (quilt) metadata
3949 [dgit ($our_version) quilt-fixup]
3953 sub get_source_format () {
3955 if (open F, "debian/source/options") {
3959 s/\s+$//; # ignore missing final newline
3961 my ($k, $v) = ($`, $'); #');
3962 $v =~ s/^"(.*)"$/$1/;
3968 F->error and confess "$!";
3971 confess "$!" unless $!==&ENOENT;
3974 if (!open F, "debian/source/format") {
3975 confess "$!" unless $!==&ENOENT;
3979 F->error and confess "$!";
3981 return ($_, \%options);
3984 sub madformat_wantfixup ($) {
3986 return 0 unless $format eq '3.0 (quilt)';
3987 our $quilt_mode_warned;
3988 if ($quilt_mode eq 'nocheck') {
3989 progress f_ "Not doing any fixup of \`%s'".
3990 " due to ----no-quilt-fixup or --quilt=nocheck", $format
3991 unless $quilt_mode_warned++;
3994 progress f_ "Format \`%s', need to check/update patch stack", $format
3995 unless $quilt_mode_warned++;
3999 sub maybe_split_brain_save ($$$) {
4000 my ($headref, $dgitview, $msg) = @_;
4001 # => message fragment "$saved" describing disposition of $dgitview
4002 # (used inside parens, in the English texts)
4003 my $save = $internal_object_save{'dgit-view'};
4004 return f_ "commit id %s", $dgitview unless defined $save;
4005 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
4007 "dgit --dgit-view-save $msg HEAD=$headref",
4010 return f_ "and left in %s", $save;
4013 # An "infopair" is a tuple [ $thing, $what ]
4014 # (often $thing is a commit hash; $what is a description)
4016 sub infopair_cond_equal ($$) {
4018 $x->[0] eq $y->[0] or fail <<END;
4019 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
4023 sub infopair_lrf_tag_lookup ($$) {
4024 my ($tagnames, $what) = @_;
4025 # $tagname may be an array ref
4026 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
4027 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
4028 foreach my $tagname (@tagnames) {
4029 my $lrefname = lrfetchrefs."/tags/$tagname";
4030 my $tagobj = $lrfetchrefs_f{$lrefname};
4031 next unless defined $tagobj;
4032 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
4033 return [ git_rev_parse($tagobj), $what ];
4035 fail @tagnames==1 ? (f_ <<END, $what, "@tagnames")
4036 Wanted tag %s (%s) on dgit server, but not found
4038 : (f_ <<END, $what, "@tagnames");
4039 Wanted tag %s (one of: %s) on dgit server, but not found
4043 sub infopair_cond_ff ($$) {
4044 my ($anc,$desc) = @_;
4045 is_fast_fwd($anc->[0], $desc->[0]) or
4046 fail f_ <<END, $anc->[1], $anc->[0], $desc->[1], $desc->[0];
4047 %s (%s) .. %s (%s) is not fast forward
4051 sub pseudomerge_version_check ($$) {
4052 my ($clogp, $archive_hash) = @_;
4054 my $arch_clogp = commit_getclogp $archive_hash;
4055 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
4056 __ 'version currently in archive' ];
4057 if (defined $overwrite_version) {
4058 if (length $overwrite_version) {
4059 infopair_cond_equal([ $overwrite_version,
4060 '--overwrite= version' ],
4063 my $v = $i_arch_v->[0];
4065 "Checking package changelog for archive version %s ...", $v;
4068 my @xa = ("-f$v", "-t$v");
4069 my $vclogp = parsechangelog @xa;
4072 [ (getfield $vclogp, $fn),
4073 (f_ "%s field from dpkg-parsechangelog %s",
4076 my $cv = $gf->('Version');
4077 infopair_cond_equal($i_arch_v, $cv);
4078 $cd = $gf->('Distribution');
4082 $@ =~ s/^dgit: //gm;
4084 f_ "Perhaps debian/changelog does not mention %s ?", $v;
4086 fail f_ <<END, $cd->[1], $cd->[0], $v
4088 Your tree seems to based on earlier (not uploaded) %s.
4090 if $cd->[0] =~ m/UNRELEASED/;
4094 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
4098 sub pseudomerge_make_commit ($$$$ $$) {
4099 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
4100 $msg_cmd, $msg_msg) = @_;
4101 progress f_ "Declaring that HEAD includes all changes in %s...",
4104 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
4105 my $authline = clogp_authline $clogp;
4109 !defined $overwrite_version ? ""
4110 : !length $overwrite_version ? " --overwrite"
4111 : " --overwrite=".$overwrite_version;
4113 # Contributing parent is the first parent - that makes
4114 # git rev-list --first-parent DTRT.
4115 my $pmf = dgit_privdir()."/pseudomerge";
4116 open MC, ">", $pmf or die "$pmf $!";
4117 print MC <<END or confess "$!";
4120 parent $archive_hash
4128 close MC or confess "$!";
4130 return make_commit($pmf);
4133 sub splitbrain_pseudomerge ($$$$) {
4134 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
4135 # => $merged_dgitview
4136 printdebug "splitbrain_pseudomerge...\n";
4138 # We: debian/PREVIOUS HEAD($maintview)
4139 # expect: o ----------------- o
4142 # a/d/PREVIOUS $dgitview
4145 # we do: `------------------ o
4149 return $dgitview unless defined $archive_hash;
4150 return $dgitview if deliberately_not_fast_forward();
4152 printdebug "splitbrain_pseudomerge...\n";
4154 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4156 if (!defined $overwrite_version) {
4157 progress __ "Checking that HEAD includes all changes in archive...";
4160 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
4162 if (defined $overwrite_version) {
4164 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
4165 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14,
4166 __ "maintainer view tag");
4167 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
4168 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, __ "dgit view tag");
4169 my $i_archive = [ $archive_hash, __ "current archive contents" ];
4171 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
4173 infopair_cond_equal($i_dgit, $i_archive);
4174 infopair_cond_ff($i_dep14, $i_dgit);
4175 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
4178 $@ =~ s/^\n//; chomp $@;
4179 print STDERR <<END.(__ <<ENDT);
4182 | Not fast forward; maybe --overwrite is needed ? Please see dgit(1).
4187 my $arch_v = $i_arch_v->[0];
4188 my $r = pseudomerge_make_commit
4189 $clogp, $dgitview, $archive_hash, $i_arch_v,
4190 "dgit --quilt=$quilt_mode",
4191 (defined $overwrite_version
4192 ? f_ "Declare fast forward from %s\n", $arch_v
4193 : f_ "Make fast forward from %s\n", $arch_v);
4195 maybe_split_brain_save $maintview, $r, "pseudomerge";
4197 progress f_ "Made pseudo-merge of %s into dgit view.", $arch_v;
4201 sub plain_overwrite_pseudomerge ($$$) {
4202 my ($clogp, $head, $archive_hash) = @_;
4204 printdebug "plain_overwrite_pseudomerge...";
4206 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4208 return $head if is_fast_fwd $archive_hash, $head;
4210 my $m = f_ "Declare fast forward from %s", $i_arch_v->[0];
4212 my $r = pseudomerge_make_commit
4213 $clogp, $head, $archive_hash, $i_arch_v,
4216 runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
4218 progress f_ "Make pseudo-merge of %s into your HEAD.", $i_arch_v->[0];
4222 sub push_parse_changelog ($) {
4225 my $clogp = Dpkg::Control::Hash->new();
4226 $clogp->load($clogpfn) or die;
4228 my $clogpackage = getfield $clogp, 'Source';
4229 $package //= $clogpackage;
4230 fail f_ "-p specified %s but changelog specified %s",
4231 $package, $clogpackage
4232 unless $package eq $clogpackage;
4233 my $cversion = getfield $clogp, 'Version';
4235 if (!$we_are_initiator) {
4236 # rpush initiator can't do this because it doesn't have $isuite yet
4237 my $tag = debiantag($cversion, access_nomdistro);
4238 runcmd @git, qw(check-ref-format), $tag;
4241 my $dscfn = dscfn($cversion);
4243 return ($clogp, $cversion, $dscfn);
4246 sub push_parse_dsc ($$$) {
4247 my ($dscfn,$dscfnwhat, $cversion) = @_;
4248 $dsc = parsecontrol($dscfn,$dscfnwhat);
4249 my $dversion = getfield $dsc, 'Version';
4250 my $dscpackage = getfield $dsc, 'Source';
4251 ($dscpackage eq $package && $dversion eq $cversion) or
4252 fail f_ "%s is for %s %s but debian/changelog is for %s %s",
4253 $dscfn, $dscpackage, $dversion,
4254 $package, $cversion;
4257 sub push_tagwants ($$$$) {
4258 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4261 TagFn => \&debiantag,
4266 if (defined $maintviewhead) {
4268 TagFn => \&debiantag_maintview,
4269 Objid => $maintviewhead,
4270 TfSuffix => '-maintview',
4273 } elsif ($dodep14tag eq 'no' ? 0
4274 : $dodep14tag eq 'want' ? 1
4275 : $dodep14tag eq 'always' ? 1
4276 : die "$dodep14tag ?") {
4278 TagFn => \&debiantag_maintview,
4280 TfSuffix => '-dgit',
4284 foreach my $tw (@tagwants) {
4285 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4286 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4288 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4292 sub push_mktags ($$ $$ $) {
4294 $changesfile,$changesfilewhat,
4297 die unless $tagwants->[0]{View} eq 'dgit';
4299 my $declaredistro = access_nomdistro();
4300 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4301 $dsc->{$ourdscfield[0]} = join " ",
4302 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4304 $dsc->save("$dscfn.tmp") or confess "$!";
4306 my $changes = parsecontrol($changesfile,$changesfilewhat);
4307 foreach my $field (qw(Source Distribution Version)) {
4308 $changes->{$field} eq $clogp->{$field} or
4309 fail f_ "changes field %s \`%s' does not match changelog \`%s'",
4310 $field, $changes->{$field}, $clogp->{$field};
4313 my $cversion = getfield $clogp, 'Version';
4314 my $clogsuite = getfield $clogp, 'Distribution';
4316 # We make the git tag by hand because (a) that makes it easier
4317 # to control the "tagger" (b) we can do remote signing
4318 my $authline = clogp_authline $clogp;
4319 my $delibs = join(" ", "",@deliberatelies);
4323 my $tfn = $tw->{Tfn};
4324 my $head = $tw->{Objid};
4325 my $tag = $tw->{Tag};
4327 open TO, '>', $tfn->('.tmp') or confess "$!";
4328 print TO <<END or confess "$!";
4335 if ($tw->{View} eq 'dgit') {
4336 print TO f_ <<ENDT, $package, $cversion, $clogsuite, $csuite
4337 %s release %s for %s (%s) [dgit]
4340 print TO <<END or confess "$!";
4341 [dgit distro=$declaredistro$delibs]
4343 foreach my $ref (sort keys %previously) {
4344 print TO <<END or confess "$!";
4345 [dgit previously:$ref=$previously{$ref}]
4348 } elsif ($tw->{View} eq 'maint') {
4349 print TO f_ <<END, $package, $cversion, $clogsuite, $csuite,
4350 %s release %s for %s (%s)
4351 (maintainer view tag generated by dgit --quilt=%s)
4356 confess Dumper($tw)."?";
4359 close TO or confess "$!";
4361 my $tagobjfn = $tfn->('.tmp');
4363 if (!defined $keyid) {
4364 $keyid = access_cfg('keyid','RETURN-UNDEF');
4366 if (!defined $keyid) {
4367 $keyid = getfield $clogp, 'Maintainer';
4369 unlink $tfn->('.tmp.asc') or $!==&ENOENT or confess "$!";
4370 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4371 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4372 push @sign_cmd, $tfn->('.tmp');
4373 runcmd_ordryrun @sign_cmd;
4375 $tagobjfn = $tfn->('.signed.tmp');
4376 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4377 $tfn->('.tmp'), $tfn->('.tmp.asc');
4383 my @r = map { $mktag->($_); } @$tagwants;
4387 sub sign_changes ($) {
4388 my ($changesfile) = @_;
4390 my @debsign_cmd = @debsign;
4391 push @debsign_cmd, "-k$keyid" if defined $keyid;
4392 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4393 push @debsign_cmd, $changesfile;
4394 runcmd_ordryrun @debsign_cmd;
4399 printdebug "actually entering push\n";
4401 supplementary_message(__ <<'END');
4402 Push failed, while checking state of the archive.
4403 You can retry the push, after fixing the problem, if you like.
4405 if (check_for_git()) {
4408 my $archive_hash = fetch_from_archive();
4409 if (!$archive_hash) {
4411 fail __ "package appears to be new in this suite;".
4412 " if this is intentional, use --new";
4415 supplementary_message(__ <<'END');
4416 Push failed, while preparing your push.
4417 You can retry the push, after fixing the problem, if you like.
4422 access_giturl(); # check that success is vaguely likely
4423 rpush_handle_protovsn_bothends() if $we_are_initiator;
4425 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4426 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4428 responder_send_file('parsed-changelog', $clogpfn);
4430 my ($clogp, $cversion, $dscfn) =
4431 push_parse_changelog("$clogpfn");
4433 my $dscpath = "$buildproductsdir/$dscfn";
4434 stat_exists $dscpath or
4435 fail f_ "looked for .dsc %s, but %s; maybe you forgot to build",
4438 responder_send_file('dsc', $dscpath);
4440 push_parse_dsc($dscpath, $dscfn, $cversion);
4442 my $format = getfield $dsc, 'Format';
4444 my $symref = git_get_symref();
4445 my $actualhead = git_rev_parse('HEAD');
4447 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4448 if (quiltmode_splitbrain()) {
4449 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $actualhead);
4450 fail f_ <<END, $ffq_prev, $quilt_mode;
4451 Branch is managed by git-debrebase (%s
4452 exists), but quilt mode (%s) implies a split view.
4453 Pass the right --quilt option or adjust your git config.
4454 Or, maybe, run git-debrebase forget-was-ever-debrebase.
4457 runcmd_ordryrun_local @git_debrebase, 'stitch';
4458 $actualhead = git_rev_parse('HEAD');
4461 my $dgithead = $actualhead;
4462 my $maintviewhead = undef;
4464 my $upstreamversion = upstreamversion $clogp->{Version};
4466 if (madformat_wantfixup($format)) {
4467 # user might have not used dgit build, so maybe do this now:
4468 if ($do_split_brain) {
4469 changedir $playground;
4471 ($dgithead, $cachekey) =
4472 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4473 $dgithead or fail f_
4474 "--quilt=%s but no cached dgit view:
4475 perhaps HEAD changed since dgit build[-source] ?",
4478 if (!$do_split_brain) {
4479 # In split brain mode, do not attempt to incorporate dirty
4480 # stuff from the user's working tree. That would be mad.
4481 commit_quilty_patch();
4484 if ($do_split_brain) {
4485 $made_split_brain = 1;
4486 $dgithead = splitbrain_pseudomerge($clogp,
4487 $actualhead, $dgithead,
4489 $maintviewhead = $actualhead;
4491 prep_ud(); # so _only_subdir() works, below
4494 if (defined $overwrite_version && !defined $maintviewhead
4496 $dgithead = plain_overwrite_pseudomerge($clogp,
4504 if ($archive_hash) {
4505 if (is_fast_fwd($archive_hash, $dgithead)) {
4507 } elsif (deliberately_not_fast_forward) {
4510 fail __ "dgit push: HEAD is not a descendant".
4511 " of the archive's version.\n".
4512 "To overwrite the archive's contents,".
4513 " pass --overwrite[=VERSION].\n".
4514 "To rewind history, if permitted by the archive,".
4515 " use --deliberately-not-fast-forward.";
4519 confess unless !!$made_split_brain == !!$do_split_brain;
4521 changedir $playground;
4522 progress f_ "checking that %s corresponds to HEAD", $dscfn;
4523 runcmd qw(dpkg-source -x --),
4524 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4525 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4526 check_for_vendor_patches() if madformat($dsc->{format});
4528 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4529 debugcmd "+",@diffcmd;
4531 my $r = system @diffcmd;
4534 my $referent = $made_split_brain ? $dgithead : 'HEAD';
4535 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4538 my $raw = cmdoutput @git,
4539 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4541 foreach (split /\0/, $raw) {
4542 if (defined $changed) {
4543 push @mode_changes, "$changed: $_\n" if $changed;
4546 } elsif (m/^:0+ 0+ /) {
4548 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4549 $changed = "Mode change from $1 to $2"
4554 if (@mode_changes) {
4555 fail +(f_ <<ENDT, $dscfn).<<END
4556 HEAD specifies a different tree to %s:
4560 .(join '', @mode_changes)
4561 .(f_ <<ENDT, $tree, $referent);
4562 There is a problem with your source tree (see dgit(7) for some hints).
4563 To see a full diff, run git diff %s %s
4567 fail +(f_ <<ENDT, $dscfn).<<END.(f_ <<ENDT, $tree, $referent);
4568 HEAD specifies a different tree to %s:
4572 Perhaps you forgot to build. Or perhaps there is a problem with your
4573 source tree (see dgit(7) for some hints). To see a full diff, run
4580 if (!$changesfile) {
4581 my $pat = changespat $cversion;
4582 my @cs = glob "$buildproductsdir/$pat";
4583 fail f_ "failed to find unique changes file".
4584 " (looked for %s in %s);".
4585 " perhaps you need to use dgit -C",
4586 $pat, $buildproductsdir
4588 ($changesfile) = @cs;
4590 $changesfile = "$buildproductsdir/$changesfile";
4593 # Check that changes and .dsc agree enough
4594 $changesfile =~ m{[^/]*$};
4595 my $changes = parsecontrol($changesfile,$&);
4596 files_compare_inputs($dsc, $changes)
4597 unless forceing [qw(dsc-changes-mismatch)];
4599 # Check whether this is a source only upload
4600 my $hasdebs = $changes->{Files} =~ m{\.deb$}m;
4601 my $sourceonlypolicy = access_cfg 'source-only-uploads';
4602 if ($sourceonlypolicy eq 'ok') {
4603 } elsif ($sourceonlypolicy eq 'always') {
4604 forceable_fail [qw(uploading-binaries)],
4605 __ "uploading binaries, although distro policy is source only"
4607 } elsif ($sourceonlypolicy eq 'never') {
4608 forceable_fail [qw(uploading-source-only)],
4609 __ "source-only upload, although distro policy requires .debs"
4611 } elsif ($sourceonlypolicy eq 'not-wholly-new') {
4612 forceable_fail [qw(uploading-source-only)],
4613 f_ "source-only upload, even though package is entirely NEW\n".
4614 "(this is contrary to policy in %s)",
4618 && !(archive_query('package_not_wholly_new', $package) // 1);
4620 badcfg f_ "unknown source-only-uploads policy \`%s'",
4624 # Perhaps adjust .dsc to contain right set of origs
4625 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4627 unless forceing [qw(changes-origs-exactly)];
4629 # Checks complete, we're going to try and go ahead:
4631 responder_send_file('changes',$changesfile);
4632 responder_send_command("param head $dgithead");
4633 responder_send_command("param csuite $csuite");
4634 responder_send_command("param isuite $isuite");
4635 responder_send_command("param tagformat new");
4636 if (defined $maintviewhead) {
4637 responder_send_command("param maint-view $maintviewhead");
4640 # Perhaps send buildinfo(s) for signing
4641 my $changes_files = getfield $changes, 'Files';
4642 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4643 foreach my $bi (@buildinfos) {
4644 responder_send_command("param buildinfo-filename $bi");
4645 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4648 if (deliberately_not_fast_forward) {
4649 git_for_each_ref(lrfetchrefs, sub {
4650 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4651 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4652 responder_send_command("previously $rrefname=$objid");
4653 $previously{$rrefname} = $objid;
4657 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4658 dgit_privdir()."/tag");
4661 supplementary_message(__ <<'END');
4662 Push failed, while signing the tag.
4663 You can retry the push, after fixing the problem, if you like.
4665 # If we manage to sign but fail to record it anywhere, it's fine.
4666 if ($we_are_responder) {
4667 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4668 responder_receive_files('signed-tag', @tagobjfns);
4670 @tagobjfns = push_mktags($clogp,$dscpath,
4671 $changesfile,$changesfile,
4674 supplementary_message(__ <<'END');
4675 Push failed, *after* signing the tag.
4676 If you want to try again, you should use a new version number.
4679 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4681 foreach my $tw (@tagwants) {
4682 my $tag = $tw->{Tag};
4683 my $tagobjfn = $tw->{TagObjFn};
4685 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4686 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4687 runcmd_ordryrun_local
4688 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4691 supplementary_message(__ <<'END');
4692 Push failed, while updating the remote git repository - see messages above.
4693 If you want to try again, you should use a new version number.
4695 if (!check_for_git()) {
4696 create_remote_git_repo();
4699 my @pushrefs = $forceflag.$dgithead.":".rrref();
4700 foreach my $tw (@tagwants) {
4701 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4704 runcmd_ordryrun @git,
4705 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4706 runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
4708 supplementary_message(__ <<'END');
4709 Push failed, while obtaining signatures on the .changes and .dsc.
4710 If it was just that the signature failed, you may try again by using
4711 debsign by hand to sign the changes file (see the command dgit tried,
4712 above), and then dput that changes file to complete the upload.
4713 If you need to change the package, you must use a new version number.
4715 if ($we_are_responder) {
4716 my $dryrunsuffix = act_local() ? "" : ".tmp";
4717 my @rfiles = ($dscpath, $changesfile);
4718 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4719 responder_receive_files('signed-dsc-changes',
4720 map { "$_$dryrunsuffix" } @rfiles);
4723 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4725 progress f_ "[new .dsc left in %s.tmp]", $dscpath;
4727 sign_changes $changesfile;
4730 supplementary_message(f_ <<END, $changesfile);
4731 Push failed, while uploading package(s) to the archive server.
4732 You can retry the upload of exactly these same files with dput of:
4734 If that .changes file is broken, you will need to use a new version
4735 number for your next attempt at the upload.
4737 my $host = access_cfg('upload-host','RETURN-UNDEF');
4738 my @hostarg = defined($host) ? ($host,) : ();
4739 runcmd_ordryrun @dput, @hostarg, $changesfile;
4740 printdone f_ "pushed and uploaded %s", $cversion;
4742 supplementary_message('');
4743 responder_send_command("complete");
4747 not_necessarily_a_tree();
4752 badusage __ "-p is not allowed with clone; specify as argument instead"
4753 if defined $package;
4756 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4757 ($package,$isuite) = @ARGV;
4758 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4759 ($package,$dstdir) = @ARGV;
4760 } elsif (@ARGV==3) {
4761 ($package,$isuite,$dstdir) = @ARGV;
4763 badusage __ "incorrect arguments to dgit clone";
4767 $dstdir ||= "$package";
4768 if (stat_exists $dstdir) {
4769 fail f_ "%s already exists", $dstdir;
4773 if ($rmonerror && !$dryrun_level) {
4774 $cwd_remove= getcwd();
4776 return unless defined $cwd_remove;
4777 if (!chdir "$cwd_remove") {
4778 return if $!==&ENOENT;
4779 confess "chdir $cwd_remove: $!";
4781 printdebug "clone rmonerror removing $dstdir\n";
4783 rmtree($dstdir) or fail f_ "remove %s: %s\n", $dstdir, $!;
4784 } elsif (grep { $! == $_ }
4785 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4787 print STDERR f_ "check whether to remove %s: %s\n",
4794 $cwd_remove = undef;
4797 sub branchsuite () {
4798 my $branch = git_get_symref();
4799 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4806 sub package_from_d_control () {
4807 if (!defined $package) {
4808 my $sourcep = parsecontrol('debian/control','debian/control');
4809 $package = getfield $sourcep, 'Source';
4813 sub fetchpullargs () {
4814 package_from_d_control();
4816 $isuite = branchsuite();
4818 my $clogp = parsechangelog();
4819 my $clogsuite = getfield $clogp, 'Distribution';
4820 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4822 } elsif (@ARGV==1) {
4825 badusage __ "incorrect arguments to dgit fetch or dgit pull";
4839 if (quiltmode_splitbrain()) {
4840 my ($format, $fopts) = get_source_format();
4841 madformat($format) and fail f_ <<END, $quilt_mode
4842 dgit pull not yet supported in split view mode (--quilt=%s)
4850 package_from_d_control();
4851 @ARGV==1 or badusage __ "dgit checkout needs a suite argument";
4855 foreach my $canon (qw(0 1)) {
4860 canonicalise_suite();
4862 if (length git_get_ref lref()) {
4863 # local branch already exists, yay
4866 if (!length git_get_ref lrref()) {
4874 runcmd (@git, qw(update-ref), lref(), lrref(), '');
4877 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
4878 "dgit checkout $isuite";
4879 runcmd (@git, qw(checkout), lbranch());
4882 sub cmd_update_vcs_git () {
4884 if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
4885 ($specsuite,) = split /\;/, cfg 'dgit.vcs-git.suites';
4887 ($specsuite) = (@ARGV);
4892 if ($ARGV[0] eq '-') {
4894 } elsif ($ARGV[0] eq '-') {
4899 package_from_d_control();
4901 if ($specsuite eq '.') {
4902 $ctrl = parsecontrol 'debian/control', 'debian/control';
4904 $isuite = $specsuite;
4908 my $url = getfield $ctrl, 'Vcs-Git';
4911 my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
4912 if (!defined $orgurl) {
4913 print STDERR f_ "setting up vcs-git: %s\n", $url;
4914 @cmd = (@git, qw(remote add vcs-git), $url);
4915 } elsif ($orgurl eq $url) {
4916 print STDERR f_ "vcs git already configured: %s\n", $url;
4918 print STDERR f_ "changing vcs-git url to: %s\n", $url;
4919 @cmd = (@git, qw(remote set-url vcs-git), $url);
4921 runcmd_ordryrun_local @cmd;
4923 print f_ "fetching (%s)\n", "@ARGV";
4924 runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
4930 build_or_push_prep_early();
4932 build_or_push_prep_modes();
4936 } elsif (@ARGV==1) {
4937 ($specsuite) = (@ARGV);
4939 badusage f_ "incorrect arguments to dgit %s", $subcommand;
4942 local ($package) = $existing_package; # this is a hack
4943 canonicalise_suite();
4945 canonicalise_suite();
4947 if (defined $specsuite &&
4948 $specsuite ne $isuite &&
4949 $specsuite ne $csuite) {
4950 fail f_ "dgit %s: changelog specifies %s (%s)".
4951 " but command line specifies %s",
4952 $subcommand, $isuite, $csuite, $specsuite;
4961 #---------- remote commands' implementation ----------
4963 sub pre_remote_push_build_host {
4964 my ($nrargs) = shift @ARGV;
4965 my (@rargs) = @ARGV[0..$nrargs-1];
4966 @ARGV = @ARGV[$nrargs..$#ARGV];
4968 my ($dir,$vsnwant) = @rargs;
4969 # vsnwant is a comma-separated list; we report which we have
4970 # chosen in our ready response (so other end can tell if they
4973 $we_are_responder = 1;
4974 $us .= " (build host)";
4976 open PI, "<&STDIN" or confess "$!";
4977 open STDIN, "/dev/null" or confess "$!";
4978 open PO, ">&STDOUT" or confess "$!";
4980 open STDOUT, ">&STDERR" or confess "$!";
4984 ($protovsn) = grep {
4985 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4986 } @rpushprotovsn_support;
4988 fail f_ "build host has dgit rpush protocol versions %s".
4989 " but invocation host has %s",
4990 (join ",", @rpushprotovsn_support), $vsnwant
4991 unless defined $protovsn;
4995 sub cmd_remote_push_build_host {
4996 responder_send_command("dgit-remote-push-ready $protovsn");
5000 sub pre_remote_push_responder { pre_remote_push_build_host(); }
5001 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
5002 # ... for compatibility with proto vsn.1 dgit (just so that user gets
5003 # a good error message)
5005 sub rpush_handle_protovsn_bothends () {
5012 my $report = i_child_report();
5013 if (defined $report) {
5014 printdebug "($report)\n";
5015 } elsif ($i_child_pid) {
5016 printdebug "(killing build host child $i_child_pid)\n";
5017 kill 15, $i_child_pid;
5019 if (defined $i_tmp && !defined $initiator_tempdir) {
5021 eval { rmtree $i_tmp; };
5026 return unless forkcheck_mainprocess();
5031 my ($base,$selector,@args) = @_;
5032 $selector =~ s/\-/_/g;
5033 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
5037 not_necessarily_a_tree();
5042 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
5050 push @rargs, join ",", @rpushprotovsn_support;
5053 push @rdgit, @ropts;
5054 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
5056 my @cmd = (@ssh, $host, shellquote @rdgit);
5059 $we_are_initiator=1;
5061 if (defined $initiator_tempdir) {
5062 rmtree $initiator_tempdir;
5063 mkdir $initiator_tempdir, 0700
5064 or fail f_ "create %s: %s", $initiator_tempdir, $!;
5065 $i_tmp = $initiator_tempdir;
5069 $i_child_pid = open2(\*RO, \*RI, @cmd);
5071 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
5072 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
5075 my ($icmd,$iargs) = initiator_expect {
5076 m/^(\S+)(?: (.*))?$/;
5079 i_method "i_resp", $icmd, $iargs;
5083 sub i_resp_progress ($) {
5085 my $msg = protocol_read_bytes \*RO, $rhs;
5089 sub i_resp_supplementary_message ($) {
5091 $supplementary_message = protocol_read_bytes \*RO, $rhs;
5094 sub i_resp_complete {
5095 my $pid = $i_child_pid;
5096 $i_child_pid = undef; # prevents killing some other process with same pid
5097 printdebug "waiting for build host child $pid...\n";
5098 my $got = waitpid $pid, 0;
5099 confess "$!" unless $got == $pid;
5100 fail f_ "build host child failed: %s", waitstatusmsg() if $?;
5103 printdebug __ "all done\n";
5107 sub i_resp_file ($) {
5109 my $localname = i_method "i_localname", $keyword;
5110 my $localpath = "$i_tmp/$localname";
5111 stat_exists $localpath and
5112 badproto \*RO, f_ "file %s (%s) twice", $keyword, $localpath;
5113 protocol_receive_file \*RO, $localpath;
5114 i_method "i_file", $keyword;
5119 sub i_resp_param ($) {
5120 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, __ "bad param spec";
5124 sub i_resp_previously ($) {
5125 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
5126 or badproto \*RO, __ "bad previously spec";
5127 my $r = system qw(git check-ref-format), $1;
5128 confess "bad previously ref spec ($r)" if $r;
5129 $previously{$1} = $2;
5134 sub i_resp_want ($) {
5136 die "$keyword ?" if $i_wanted{$keyword}++;
5138 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
5139 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
5140 die unless $isuite =~ m/^$suite_re$/;
5143 rpush_handle_protovsn_bothends();
5145 my @localpaths = i_method "i_want", $keyword;
5146 printdebug "[[ $keyword @localpaths\n";
5147 foreach my $localpath (@localpaths) {
5148 protocol_send_file \*RI, $localpath;
5150 print RI "files-end\n" or confess "$!";
5153 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
5155 sub i_localname_parsed_changelog {
5156 return "remote-changelog.822";
5158 sub i_file_parsed_changelog {
5159 ($i_clogp, $i_version, $i_dscfn) =
5160 push_parse_changelog "$i_tmp/remote-changelog.822";
5161 die if $i_dscfn =~ m#/|^\W#;
5164 sub i_localname_dsc {
5165 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5170 sub i_localname_buildinfo ($) {
5171 my $bi = $i_param{'buildinfo-filename'};
5172 defined $bi or badproto \*RO, "buildinfo before filename";
5173 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
5174 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
5175 or badproto \*RO, "improper buildinfo filename";
5178 sub i_file_buildinfo {
5179 my $bi = $i_param{'buildinfo-filename'};
5180 my $bd = parsecontrol "$i_tmp/$bi", $bi;
5181 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
5182 if (!forceing [qw(buildinfo-changes-mismatch)]) {
5183 files_compare_inputs($bd, $ch);
5184 (getfield $bd, $_) eq (getfield $ch, $_) or
5185 fail f_ "buildinfo mismatch in field %s", $_
5186 foreach qw(Source Version);
5187 !defined $bd->{$_} or
5188 fail f_ "buildinfo contains forbidden field %s", $_
5189 foreach qw(Changes Changed-by Distribution);
5191 push @i_buildinfos, $bi;
5192 delete $i_param{'buildinfo-filename'};
5195 sub i_localname_changes {
5196 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5197 $i_changesfn = $i_dscfn;
5198 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
5199 return $i_changesfn;
5201 sub i_file_changes { }
5203 sub i_want_signed_tag {
5204 printdebug Dumper(\%i_param, $i_dscfn);
5205 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
5206 && defined $i_param{'csuite'}
5207 or badproto \*RO, "premature desire for signed-tag";
5208 my $head = $i_param{'head'};
5209 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
5211 my $maintview = $i_param{'maint-view'};
5212 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
5214 if ($protovsn >= 4) {
5215 my $p = $i_param{'tagformat'} // '<undef>';
5217 or badproto \*RO, "tag format mismatch: $p vs. new";
5220 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
5222 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
5224 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
5227 push_mktags $i_clogp, $i_dscfn,
5228 $i_changesfn, (__ 'remote changes file'),
5232 sub i_want_signed_dsc_changes {
5233 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
5234 sign_changes $i_changesfn;
5235 return ($i_dscfn, $i_changesfn, @i_buildinfos);
5238 #---------- building etc. ----------
5244 #----- `3.0 (quilt)' handling -----
5246 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
5248 sub quiltify_dpkg_commit ($$$;$) {
5249 my ($patchname,$author,$msg, $xinfo) = @_;
5252 mkpath '.git/dgit'; # we are in playtree
5253 my $descfn = ".git/dgit/quilt-description.tmp";
5254 open O, '>', $descfn or confess "$descfn: $!";
5255 $msg =~ s/\n+/\n\n/;
5256 print O <<END or confess "$!";
5258 ${xinfo}Subject: $msg
5262 close O or confess "$!";
5265 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
5266 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
5267 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
5268 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
5272 sub quiltify_trees_differ ($$;$$$) {
5273 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
5274 # returns true iff the two tree objects differ other than in debian/
5275 # with $finegrained,
5276 # returns bitmask 01 - differ in upstream files except .gitignore
5277 # 02 - differ in .gitignore
5278 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
5279 # is set for each modified .gitignore filename $fn
5280 # if $unrepres is defined, array ref to which is appeneded
5281 # a list of unrepresentable changes (removals of upstream files
5284 my @cmd = (@git, qw(diff-tree -z --no-renames));
5285 push @cmd, qw(--name-only) unless $unrepres;
5286 push @cmd, qw(-r) if $finegrained || $unrepres;
5288 my $diffs= cmdoutput @cmd;
5291 foreach my $f (split /\0/, $diffs) {
5292 if ($unrepres && !@lmodes) {
5293 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
5296 my ($oldmode,$newmode) = @lmodes;
5299 next if $f =~ m#^debian(?:/.*)?$#s;
5303 die __ "not a plain file or symlink\n"
5304 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5305 $oldmode =~ m/^(?:10|12)\d{4}$/;
5306 if ($oldmode =~ m/[^0]/ &&
5307 $newmode =~ m/[^0]/) {
5308 # both old and new files exist
5309 die __ "mode or type changed\n" if $oldmode ne $newmode;
5310 die __ "modified symlink\n" unless $newmode =~ m/^10/;
5311 } elsif ($oldmode =~ m/[^0]/) {
5313 die __ "deletion of symlink\n"
5314 unless $oldmode =~ m/^10/;
5317 die __ "creation with non-default mode\n"
5318 unless $newmode =~ m/^100644$/ or
5319 $newmode =~ m/^120000$/;
5323 local $/="\n"; chomp $@;
5324 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5328 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5329 $r |= $isignore ? 02 : 01;
5330 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5332 printdebug "quiltify_trees_differ $x $y => $r\n";
5336 sub quiltify_tree_sentinelfiles ($) {
5337 # lists the `sentinel' files present in the tree
5339 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5340 qw(-- debian/rules debian/control);
5345 sub quiltify_splitbrain ($$$$$$$) {
5346 my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
5347 $editedignores, $cachekey) = @_;
5348 my $gitignore_special = 1;
5349 if ($quilt_mode !~ m/gbp|dpm/) {
5350 # treat .gitignore just like any other upstream file
5351 $diffbits = { %$diffbits };
5352 $_ = !!$_ foreach values %$diffbits;
5353 $gitignore_special = 0;
5355 # We would like any commits we generate to be reproducible
5356 my @authline = clogp_authline($clogp);
5357 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5358 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5359 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5360 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5361 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5362 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5364 confess unless $do_split_brain;
5366 my $fulldiffhint = sub {
5368 my $cmd = "git diff $x $y -- :/ ':!debian'";
5369 $cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special;
5370 return f_ "\nFor full diff showing the problem(s), type:\n %s\n",
5374 if ($quilt_mode =~ m/gbp|unapplied/ &&
5375 ($diffbits->{O2H} & 01)) {
5377 "--quilt=%s specified, implying patches-unapplied git tree\n".
5378 " but git tree differs from orig in upstream files.",
5380 $msg .= $fulldiffhint->($unapplied, 'HEAD');
5381 if (!stat_exists "debian/patches") {
5383 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5387 if ($quilt_mode =~ m/dpm/ &&
5388 ($diffbits->{H2A} & 01)) {
5389 fail +(f_ <<END, $quilt_mode). $fulldiffhint->($oldtiptree,'HEAD');
5390 --quilt=%s specified, implying patches-applied git tree
5391 but git tree differs from result of applying debian/patches to upstream
5394 if ($quilt_mode =~ m/gbp|unapplied/ &&
5395 ($diffbits->{O2A} & 01)) { # some patches
5396 progress __ "dgit view: creating patches-applied version using gbp pq";
5397 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5398 # gbp pq import creates a fresh branch; push back to dgit-view
5399 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5400 runcmd @git, qw(checkout -q dgit-view);
5402 if ($quilt_mode =~ m/gbp|dpm/ &&
5403 ($diffbits->{O2A} & 02)) {
5404 fail f_ <<END, $quilt_mode;
5405 --quilt=%s specified, implying that HEAD is for use with a
5406 tool which does not create patches for changes to upstream
5407 .gitignores: but, such patches exist in debian/patches.
5410 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5411 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5413 "dgit view: creating patch to represent .gitignore changes";
5414 ensuredir "debian/patches";
5415 my $gipatch = "debian/patches/auto-gitignore";
5416 open GIPATCH, ">>", "$gipatch" or confess "$gipatch: $!";
5417 stat GIPATCH or confess "$gipatch: $!";
5418 fail f_ "%s already exists; but want to create it".
5419 " to record .gitignore changes",
5422 print GIPATCH +(__ <<END).<<ENDU or die "$gipatch: $!";
5423 Subject: Update .gitignore from Debian packaging branch
5425 The Debian packaging git branch contains these updates to the upstream
5426 .gitignore file(s). This patch is autogenerated, to provide these
5427 updates to users of the official Debian archive view of the package.
5430 [dgit ($our_version) update-gitignore]
5433 close GIPATCH or die "$gipatch: $!";
5434 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5435 $unapplied, $headref, "--", sort keys %$editedignores;
5436 open SERIES, "+>>", "debian/patches/series" or confess "$!";
5437 defined seek SERIES, -1, 2 or $!==EINVAL or confess "$!";
5439 defined read SERIES, $newline, 1 or confess "$!";
5440 print SERIES "\n" or confess "$!" unless $newline eq "\n";
5441 print SERIES "auto-gitignore\n" or confess "$!";
5442 close SERIES or die $!;
5443 runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
5444 commit_admin +(__ <<END).<<ENDU
5445 Commit patch to update .gitignore
5448 [dgit ($our_version) update-gitignore-quilt-fixup]
5453 sub quiltify ($$$$) {
5454 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5456 # Quilt patchification algorithm
5458 # We search backwards through the history of the main tree's HEAD
5459 # (T) looking for a start commit S whose tree object is identical
5460 # to to the patch tip tree (ie the tree corresponding to the
5461 # current dpkg-committed patch series). For these purposes
5462 # `identical' disregards anything in debian/ - this wrinkle is
5463 # necessary because dpkg-source treates debian/ specially.
5465 # We can only traverse edges where at most one of the ancestors'
5466 # trees differs (in changes outside in debian/). And we cannot
5467 # handle edges which change .pc/ or debian/patches. To avoid
5468 # going down a rathole we avoid traversing edges which introduce
5469 # debian/rules or debian/control. And we set a limit on the
5470 # number of edges we are willing to look at.
5472 # If we succeed, we walk forwards again. For each traversed edge
5473 # PC (with P parent, C child) (starting with P=S and ending with
5474 # C=T) to we do this:
5476 # - dpkg-source --commit with a patch name and message derived from C
5477 # After traversing PT, we git commit the changes which
5478 # should be contained within debian/patches.
5480 # The search for the path S..T is breadth-first. We maintain a
5481 # todo list containing search nodes. A search node identifies a
5482 # commit, and looks something like this:
5484 # Commit => $git_commit_id,
5485 # Child => $c, # or undef if P=T
5486 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5487 # Nontrivial => true iff $p..$c has relevant changes
5494 my %considered; # saves being exponential on some weird graphs
5496 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5499 my ($search,$whynot) = @_;
5500 printdebug " search NOT $search->{Commit} $whynot\n";
5501 $search->{Whynot} = $whynot;
5502 push @nots, $search;
5503 no warnings qw(exiting);
5512 my $c = shift @todo;
5513 next if $considered{$c->{Commit}}++;
5515 $not->($c, __ "maximum search space exceeded") if --$max_work <= 0;
5517 printdebug "quiltify investigate $c->{Commit}\n";
5520 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5521 printdebug " search finished hooray!\n";
5526 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5527 if ($quilt_mode eq 'smash') {
5528 printdebug " search quitting smash\n";
5532 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5533 $not->($c, f_ "has %s not %s", $c_sentinels, $t_sentinels)
5534 if $c_sentinels ne $t_sentinels;
5536 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5537 $commitdata =~ m/\n\n/;
5539 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5540 @parents = map { { Commit => $_, Child => $c } } @parents;
5542 $not->($c, __ "root commit") if !@parents;
5544 foreach my $p (@parents) {
5545 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5547 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5548 $not->($c, f_ "merge (%s nontrivial parents)", $ndiffers)
5551 foreach my $p (@parents) {
5552 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5554 my @cmd= (@git, qw(diff-tree -r --name-only),
5555 $p->{Commit},$c->{Commit},
5556 qw(-- debian/patches .pc debian/source/format));
5557 my $patchstackchange = cmdoutput @cmd;
5558 if (length $patchstackchange) {
5559 $patchstackchange =~ s/\n/,/g;
5560 $not->($p, f_ "changed %s", $patchstackchange);
5563 printdebug " search queue P=$p->{Commit} ",
5564 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5570 printdebug "quiltify want to smash\n";
5573 my $x = $_[0]{Commit};
5574 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5577 if ($quilt_mode eq 'linear') {
5579 "\n%s: error: quilt fixup cannot be linear. Stopped at:\n",
5581 my $all_gdr = !!@nots;
5582 foreach my $notp (@nots) {
5583 my $c = $notp->{Child};
5584 my $cprange = $abbrev->($notp);
5585 $cprange .= "..".$abbrev->($c) if $c;
5586 print STDERR f_ "%s: %s: %s\n",
5587 $us, $cprange, $notp->{Whynot};
5588 $all_gdr &&= $notp->{Child} &&
5589 (git_cat_file $notp->{Child}{Commit}, 'commit')
5590 =~ m{^\[git-debrebase(?! split[: ]).*\]$}m;
5594 [ grep { $_->[0] ne 'quilt-mode' } @$failsuggestion ]
5596 print STDERR "$us: $_->[1]\n" foreach @$failsuggestion;
5598 "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n";
5599 } elsif ($quilt_mode eq 'smash') {
5600 } elsif ($quilt_mode eq 'auto') {
5601 progress __ "quilt fixup cannot be linear, smashing...";
5603 confess "$quilt_mode ?";
5606 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5607 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5609 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5611 quiltify_dpkg_commit "auto-$version-$target-$time",
5612 (getfield $clogp, 'Maintainer'),
5613 (f_ "Automatically generated patch (%s)\n".
5614 "Last (up to) %s git changes, FYI:\n\n",
5615 $clogp->{Version}, $ncommits).
5620 progress __ "quiltify linearisation planning successful, executing...";
5622 for (my $p = $sref_S;
5623 my $c = $p->{Child};
5625 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5626 next unless $p->{Nontrivial};
5628 my $cc = $c->{Commit};
5630 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5631 $commitdata =~ m/\n\n/ or die "$c ?";
5634 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5637 my $commitdate = cmdoutput
5638 @git, qw(log -n1 --pretty=format:%aD), $cc;
5640 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5642 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5649 my $gbp_check_suitable = sub {
5654 die __ "contains unexpected slashes\n" if m{//} || m{/$};
5655 die __ "contains leading punctuation\n" if m{^\W} || m{/\W};
5656 die __ "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5657 die __ "is series file\n" if m{$series_filename_re}o;
5658 die __ "too long\n" if length > 200;
5660 return $_ unless $@;
5662 "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s",
5667 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5669 (\S+) \s* \n //ixm) {
5670 $patchname = $gbp_check_suitable->($1, 'Name');
5672 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5674 (\S+) \s* \n //ixm) {
5675 $patchdir = $gbp_check_suitable->($1, 'Topic');
5680 if (!defined $patchname) {
5681 $patchname = $title;
5682 $patchname =~ s/[.:]$//;
5685 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5686 my $translitname = $converter->convert($patchname);
5687 die unless defined $translitname;
5688 $patchname = $translitname;
5691 +(f_ "dgit: patch title transliteration error: %s", $@)
5693 $patchname =~ y/ A-Z/-a-z/;
5694 $patchname =~ y/-a-z0-9_.+=~//cd;
5695 $patchname =~ s/^\W/x-$&/;
5696 $patchname = substr($patchname,0,40);
5697 $patchname .= ".patch";
5699 if (!defined $patchdir) {
5702 if (length $patchdir) {
5703 $patchname = "$patchdir/$patchname";
5705 if ($patchname =~ m{^(.*)/}) {
5706 mkpath "debian/patches/$1";
5711 stat "debian/patches/$patchname$index";
5713 $!==ENOENT or confess "$patchname$index $!";
5715 runcmd @git, qw(checkout -q), $cc;
5717 # We use the tip's changelog so that dpkg-source doesn't
5718 # produce complaining messages from dpkg-parsechangelog. None
5719 # of the information dpkg-source gets from the changelog is
5720 # actually relevant - it gets put into the original message
5721 # which dpkg-source provides our stunt editor, and then
5723 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5725 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5726 "Date: $commitdate\n".
5727 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5729 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5733 sub build_maybe_quilt_fixup () {
5734 my ($format,$fopts) = get_source_format;
5735 return unless madformat_wantfixup $format;
5738 check_for_vendor_patches();
5740 my $clogp = parsechangelog();
5741 my $headref = git_rev_parse('HEAD');
5742 my $symref = git_get_symref();
5743 my $upstreamversion = upstreamversion $version;
5746 changedir $playground;
5748 my $splitbrain_cachekey;
5750 if ($do_split_brain) {
5752 ($cachehit, $splitbrain_cachekey) =
5753 quilt_check_splitbrain_cache($headref, $upstreamversion);
5760 unpack_playtree_need_cd_work($headref);
5761 if ($do_split_brain) {
5762 runcmd @git, qw(checkout -q -b dgit-view);
5763 # so long as work is not deleted, its current branch will
5764 # remain dgit-view, rather than master, so subsequent calls to
5765 # unpack_playtree_need_cd_work
5766 # will DTRT, resetting dgit-view.
5767 confess if $made_split_brain;
5768 $made_split_brain = 1;
5772 if ($fopts->{'single-debian-patch'}) {
5774 "quilt mode %s does not make sense (or is not supported) with single-debian-patch",
5776 if quiltmode_splitbrain();
5777 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5779 quilt_fixup_multipatch($clogp, $headref, $upstreamversion,
5780 $splitbrain_cachekey);
5783 if ($do_split_brain) {
5784 my $dgitview = git_rev_parse 'HEAD';
5787 reflog_cache_insert "refs/$splitbraincache",
5788 $splitbrain_cachekey, $dgitview;
5790 changedir "$playground/work";
5792 my $saved = maybe_split_brain_save $headref, $dgitview, __ "converted";
5793 progress f_ "dgit view: created (%s)", $saved;
5797 runcmd_ordryrun_local
5798 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5801 sub build_check_quilt_splitbrain () {
5802 build_maybe_quilt_fixup();
5805 sub unpack_playtree_need_cd_work ($) {
5808 # prep_ud() must have been called already.
5809 if (!chdir "work") {
5810 # Check in the filesystem because sometimes we run prep_ud
5811 # in between multiple calls to unpack_playtree_need_cd_work.
5812 confess "$!" unless $!==ENOENT;
5813 mkdir "work" or confess "$!";
5815 mktree_in_ud_here();
5817 runcmd @git, qw(reset -q --hard), $headref;
5820 sub unpack_playtree_linkorigs ($$) {
5821 my ($upstreamversion, $fn) = @_;
5822 # calls $fn->($leafname);
5824 my $bpd_abs = bpd_abs();
5826 dotdot_bpd_transfer_origs $bpd_abs, $upstreamversion, sub { 1 };
5828 opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!";
5829 while ($!=0, defined(my $leaf = readdir QFD)) {
5830 my $f = bpd_abs()."/".$leaf;
5832 local ($debuglevel) = $debuglevel-1;
5833 printdebug "QF linkorigs bpd $leaf, $f ?\n";
5835 next unless is_orig_file_of_vsn $leaf, $upstreamversion;
5836 printdebug "QF linkorigs $leaf, $f Y\n";
5837 link_ltarget $f, $leaf or die "$leaf $!";
5840 die "$buildproductsdir: $!" if $!;
5844 sub quilt_fixup_delete_pc () {
5845 runcmd @git, qw(rm -rqf .pc);
5846 commit_admin +(__ <<END).<<ENDU
5847 Commit removal of .pc (quilt series tracking data)
5850 [dgit ($our_version) upgrade quilt-remove-pc]
5854 sub quilt_fixup_singlepatch ($$$) {
5855 my ($clogp, $headref, $upstreamversion) = @_;
5857 progress __ "starting quiltify (single-debian-patch)";
5859 # dpkg-source --commit generates new patches even if
5860 # single-debian-patch is in debian/source/options. In order to
5861 # get it to generate debian/patches/debian-changes, it is
5862 # necessary to build the source package.
5864 unpack_playtree_linkorigs($upstreamversion, sub { });
5865 unpack_playtree_need_cd_work($headref);
5867 rmtree("debian/patches");
5869 runcmd @dpkgsource, qw(-b .);
5871 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5872 rename srcfn("$upstreamversion", "/debian/patches"),
5873 "work/debian/patches"
5875 or confess "install d/patches: $!";
5878 commit_quilty_patch();
5881 sub quilt_need_fake_dsc ($) {
5882 # cwd should be playground
5883 my ($upstreamversion) = @_;
5885 return if stat_exists "fake.dsc";
5886 # ^ OK to test this as a sentinel because if we created it
5887 # we must either have done the rest too, or crashed.
5889 my $fakeversion="$upstreamversion-~~DGITFAKE";
5891 my $fakedsc=new IO::File 'fake.dsc', '>' or confess "$!";
5892 print $fakedsc <<END or confess "$!";
5895 Version: $fakeversion
5899 my $dscaddfile=sub {
5902 my $md = new Digest::MD5;
5904 my $fh = new IO::File $leaf, '<' or die "$leaf $!";
5905 stat $fh or confess "$!";
5909 print $fakedsc " ".$md->hexdigest." $size $leaf\n" or confess "$!";
5912 unpack_playtree_linkorigs($upstreamversion, $dscaddfile);
5914 my @files=qw(debian/source/format debian/rules
5915 debian/control debian/changelog);
5916 foreach my $maybe (qw(debian/patches debian/source/options
5917 debian/tests/control)) {
5918 next unless stat_exists "$maindir/$maybe";
5919 push @files, $maybe;
5922 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5923 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5925 $dscaddfile->($debtar);
5926 close $fakedsc or confess "$!";
5929 sub quilt_fakedsc2unapplied ($$) {
5930 my ($headref, $upstreamversion) = @_;
5931 # must be run in the playground
5932 # quilt_need_fake_dsc must have been called
5934 quilt_need_fake_dsc($upstreamversion);
5936 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5938 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5939 rename $fakexdir, "fake" or die "$fakexdir $!";
5943 remove_stray_gits(__ "source package");
5944 mktree_in_ud_here();
5948 rmtree 'debian'; # git checkout commitish paths does not delete!
5949 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5950 my $unapplied=git_add_write_tree();
5951 printdebug "fake orig tree object $unapplied\n";
5955 sub quilt_check_splitbrain_cache ($$) {
5956 my ($headref, $upstreamversion) = @_;
5957 # Called only if we are in (potentially) split brain mode.
5958 # Called in playground.
5959 # Computes the cache key and looks in the cache.
5960 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5962 quilt_need_fake_dsc($upstreamversion);
5964 my $splitbrain_cachekey;
5967 "dgit: split brain (separate dgit view) may be needed (--quilt=%s).",
5969 # we look in the reflog of dgit-intern/quilt-cache
5970 # we look for an entry whose message is the key for the cache lookup
5971 my @cachekey = (qw(dgit), $our_version);
5972 push @cachekey, $upstreamversion;
5973 push @cachekey, $quilt_mode;
5974 push @cachekey, $headref;
5976 push @cachekey, hashfile('fake.dsc');
5978 my $srcshash = Digest::SHA->new(256);
5979 my %sfs = ( %INC, '$0(dgit)' => $0 );
5980 foreach my $sfk (sort keys %sfs) {
5981 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5982 $srcshash->add($sfk," ");
5983 $srcshash->add(hashfile($sfs{$sfk}));
5984 $srcshash->add("\n");
5986 push @cachekey, $srcshash->hexdigest();
5987 $splitbrain_cachekey = "@cachekey";
5989 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5991 my $cachehit = reflog_cache_lookup
5992 "refs/$splitbraincache", $splitbrain_cachekey;
5995 unpack_playtree_need_cd_work($headref);
5996 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5997 if ($cachehit ne $headref) {
5998 progress f_ "dgit view: found cached (%s)", $saved;
5999 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
6000 $made_split_brain = 1;
6001 return ($cachehit, $splitbrain_cachekey);
6003 progress __ "dgit view: found cached, no changes required";
6004 return ($headref, $splitbrain_cachekey);
6007 printdebug "splitbrain cache miss\n";
6008 return (undef, $splitbrain_cachekey);
6011 sub quilt_fixup_multipatch ($$$) {
6012 my ($clogp, $headref, $upstreamversion, $splitbrain_cachekey) = @_;
6014 progress f_ "examining quilt state (multiple patches, %s mode)",
6018 # - honour any existing .pc in case it has any strangeness
6019 # - determine the git commit corresponding to the tip of
6020 # the patch stack (if there is one)
6021 # - if there is such a git commit, convert each subsequent
6022 # git commit into a quilt patch with dpkg-source --commit
6023 # - otherwise convert all the differences in the tree into
6024 # a single git commit
6028 # Our git tree doesn't necessarily contain .pc. (Some versions of
6029 # dgit would include the .pc in the git tree.) If there isn't
6030 # one, we need to generate one by unpacking the patches that we
6033 # We first look for a .pc in the git tree. If there is one, we
6034 # will use it. (This is not the normal case.)
6036 # Otherwise need to regenerate .pc so that dpkg-source --commit
6037 # can work. We do this as follows:
6038 # 1. Collect all relevant .orig from parent directory
6039 # 2. Generate a debian.tar.gz out of
6040 # debian/{patches,rules,source/format,source/options}
6041 # 3. Generate a fake .dsc containing just these fields:
6042 # Format Source Version Files
6043 # 4. Extract the fake .dsc
6044 # Now the fake .dsc has a .pc directory.
6045 # (In fact we do this in every case, because in future we will
6046 # want to search for a good base commit for generating patches.)
6048 # Then we can actually do the dpkg-source --commit
6049 # 1. Make a new working tree with the same object
6050 # store as our main tree and check out the main
6052 # 2. Copy .pc from the fake's extraction, if necessary
6053 # 3. Run dpkg-source --commit
6054 # 4. If the result has changes to debian/, then
6055 # - git add them them
6056 # - git add .pc if we had a .pc in-tree
6058 # 5. If we had a .pc in-tree, delete it, and git commit
6059 # 6. Back in the main tree, fast forward to the new HEAD
6061 # Another situation we may have to cope with is gbp-style
6062 # patches-unapplied trees.
6064 # We would want to detect these, so we know to escape into
6065 # quilt_fixup_gbp. However, this is in general not possible.
6066 # Consider a package with a one patch which the dgit user reverts
6067 # (with git revert or the moral equivalent).
6069 # That is indistinguishable in contents from a patches-unapplied
6070 # tree. And looking at the history to distinguish them is not
6071 # useful because the user might have made a confusing-looking git
6072 # history structure (which ought to produce an error if dgit can't
6073 # cope, not a silent reintroduction of an unwanted patch).
6075 # So gbp users will have to pass an option. But we can usually
6076 # detect their failure to do so: if the tree is not a clean
6077 # patches-applied tree, quilt linearisation fails, but the tree
6078 # _is_ a clean patches-unapplied tree, we can suggest that maybe
6079 # they want --quilt=unapplied.
6081 # To help detect this, when we are extracting the fake dsc, we
6082 # first extract it with --skip-patches, and then apply the patches
6083 # afterwards with dpkg-source --before-build. That lets us save a
6084 # tree object corresponding to .origs.
6086 if ($quilt_mode eq 'linear'
6087 && branch_is_gdr($headref)) {
6088 # This is much faster. It also makes patches that gdr
6089 # likes better for future updates without laundering.
6091 # However, it can fail in some casses where we would
6092 # succeed: if there are existing patches, which correspond
6093 # to a prefix of the branch, but are not in gbp/gdr
6094 # format, gdr will fail (exiting status 7), but we might
6095 # be able to figure out where to start linearising. That
6096 # will be slower so hopefully there's not much to do.
6098 unpack_playtree_need_cd_work $headref;
6100 my @cmd = (@git_debrebase,
6101 qw(--noop-ok -funclean-mixed -funclean-ordering
6102 make-patches --quiet-would-amend));
6103 # We tolerate soe snags that gdr wouldn't, by default.
6109 and not ($? == 7*256 or
6110 $? == -1 && $!==ENOENT);
6114 $headref = git_rev_parse('HEAD');
6119 my $unapplied=quilt_fakedsc2unapplied($headref, $upstreamversion);
6123 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
6125 if (system @bbcmd) {
6126 failedcmd @bbcmd if $? < 0;
6128 failed to apply your git tree's patch stack (from debian/patches/) to
6129 the corresponding upstream tarball(s). Your source tree and .orig
6130 are probably too inconsistent. dgit can only fix up certain kinds of
6131 anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).
6137 unpack_playtree_need_cd_work($headref);
6140 if (stat_exists ".pc") {
6142 progress __ "Tree already contains .pc - will use it then delete it.";
6145 rename '../fake/.pc','.pc' or confess "$!";
6148 changedir '../fake';
6150 my $oldtiptree=git_add_write_tree();
6151 printdebug "fake o+d/p tree object $unapplied\n";
6152 changedir '../work';
6155 # We calculate some guesswork now about what kind of tree this might
6156 # be. This is mostly for error reporting.
6162 # O = orig, without patches applied
6163 # A = "applied", ie orig with H's debian/patches applied
6164 O2H => quiltify_trees_differ($unapplied,$headref, 1,
6165 \%editedignores, \@unrepres),
6166 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
6167 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
6171 foreach my $bits (qw(01 02)) {
6172 foreach my $v (qw(O2H O2A H2A)) {
6173 push @dl, ($diffbits->{$v} & $bits) ? '##' : '==';
6176 printdebug "differences \@dl @dl.\n";
6179 "%s: base trees orig=%.20s o+d/p=%.20s",
6180 $us, $unapplied, $oldtiptree;
6182 "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
6183 "%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
6184 $us, $dl[0], $dl[1], $dl[3], $dl[4],
6185 $us, $dl[2], $dl[5];
6188 print STDERR f_ "dgit: cannot represent change: %s: %s\n",
6191 forceable_fail [qw(unrepresentable)], __ <<END;
6192 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
6197 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
6198 push @failsuggestion, [ 'unapplied', __
6199 "This might be a patches-unapplied branch." ];
6200 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
6201 push @failsuggestion, [ 'applied', __
6202 "This might be a patches-applied branch." ];
6204 push @failsuggestion, [ 'quilt-mode', __
6205 "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" ];
6207 push @failsuggestion, [ 'gitattrs', __
6208 "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." ]
6209 if stat_exists '.gitattributes';
6211 push @failsuggestion, [ 'origs', __
6212 "Maybe orig tarball(s) are not identical to git representation?" ];
6214 if (quiltmode_splitbrain()) {
6215 quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,
6216 $diffbits, \%editedignores,
6217 $splitbrain_cachekey);
6221 progress f_ "starting quiltify (multiple patches, %s mode)", $quilt_mode;
6222 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
6223 runcmd @git, qw(checkout -q), (qw(master dgit-view)[!!$do_split_brain]);
6225 if (!open P, '>>', ".pc/applied-patches") {
6226 $!==&ENOENT or confess "$!";
6231 commit_quilty_patch();
6233 if ($mustdeletepc) {
6234 quilt_fixup_delete_pc();
6238 sub quilt_fixup_editor () {
6239 my $descfn = $ENV{$fakeeditorenv};
6240 my $editing = $ARGV[$#ARGV];
6241 open I1, '<', $descfn or confess "$descfn: $!";
6242 open I2, '<', $editing or confess "$editing: $!";
6243 unlink $editing or confess "$editing: $!";
6244 open O, '>', $editing or confess "$editing: $!";
6245 while (<I1>) { print O or confess "$!"; } I1->error and confess "$!";
6248 $copying ||= m/^\-\-\- /;
6249 next unless $copying;
6250 print O or confess "$!";
6252 I2->error and confess "$!";
6257 sub maybe_apply_patches_dirtily () {
6258 return unless $quilt_mode =~ m/gbp|unapplied/;
6259 print STDERR __ <<END or confess "$!";
6261 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
6262 dgit: Have to apply the patches - making the tree dirty.
6263 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
6266 $patches_applied_dirtily = 01;
6267 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
6268 runcmd qw(dpkg-source --before-build .);
6271 sub maybe_unapply_patches_again () {
6272 progress __ "dgit: Unapplying patches again to tidy up the tree."
6273 if $patches_applied_dirtily;
6274 runcmd qw(dpkg-source --after-build .)
6275 if $patches_applied_dirtily & 01;
6277 if $patches_applied_dirtily & 02;
6278 $patches_applied_dirtily = 0;
6281 #----- other building -----
6283 sub clean_tree_check_git ($$$) {
6284 my ($honour_ignores, $message, $ignmessage) = @_;
6285 my @cmd = (@git, qw(clean -dn));
6286 push @cmd, qw(-x) unless $honour_ignores;
6287 my $leftovers = cmdoutput @cmd;
6288 if (length $leftovers) {
6289 print STDERR $leftovers, "\n" or confess "$!";
6290 $message .= $ignmessage if $honour_ignores;
6295 sub clean_tree_check_git_wd ($) {
6297 return if $cleanmode =~ m{no-check};
6298 return if $patches_applied_dirtily; # yuk
6299 clean_tree_check_git +($cleanmode !~ m{all-check}),
6300 $message, "\n".__ <<END;
6301 If this is just missing .gitignore entries, use a different clean
6302 mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them
6303 or --clean=git (-wg/-wgf) to use \`git clean' instead.
6307 sub clean_tree_check () {
6308 # This function needs to not care about modified but tracked files.
6309 # That was done by check_not_dirty, and by now we may have run
6310 # the rules clean target which might modify tracked files (!)
6311 if ($cleanmode =~ m{^check}) {
6312 clean_tree_check_git +($cleanmode =~ m{ignores}), __
6313 "tree contains uncommitted files and --clean=check specified", '';
6314 } elsif ($cleanmode =~ m{^dpkg-source}) {
6315 clean_tree_check_git_wd __
6316 "tree contains uncommitted files (NB dgit didn't run rules clean)";
6317 } elsif ($cleanmode =~ m{^git}) {
6318 clean_tree_check_git 1, __
6319 "tree contains uncommited, untracked, unignored files\n".
6320 "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.", '';
6321 } elsif ($cleanmode eq 'none') {
6323 confess "$cleanmode ?";
6328 # We always clean the tree ourselves, rather than leave it to the
6329 # builder (dpkg-source, or soemthing which calls dpkg-source).
6330 if ($cleanmode =~ m{^dpkg-source}) {
6331 my @cmd = @dpkgbuildpackage;
6332 push @cmd, qw(-d) if $cleanmode =~ m{^dpkg-source-d};
6333 push @cmd, qw(-T clean);
6334 maybe_apply_patches_dirtily();
6335 runcmd_ordryrun_local @cmd;
6336 clean_tree_check_git_wd __
6337 "tree contains uncommitted files (after running rules clean)";
6338 } elsif ($cleanmode =~ m{^git(?!-)}) {
6339 runcmd_ordryrun_local @git, qw(clean -xdf);
6340 } elsif ($cleanmode =~ m{^git-ff}) {
6341 runcmd_ordryrun_local @git, qw(clean -xdff);
6342 } elsif ($cleanmode =~ m{^check}) {
6344 } elsif ($cleanmode eq 'none') {
6346 confess "$cleanmode ?";
6351 badusage __ "clean takes no additional arguments" if @ARGV;
6354 maybe_unapply_patches_again();
6357 # return values from massage_dbp_args are one or both of these flags
6358 sub WANTSRC_SOURCE () { 01; } # caller should build source (separately)
6359 sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
6361 sub build_or_push_prep_early () {
6362 our $build_or_push_prep_early_done //= 0;
6363 return if $build_or_push_prep_early_done++;
6364 badusage f_ "-p is not allowed with dgit %s", $subcommand
6365 if defined $package;
6366 my $clogp = parsechangelog();
6367 $isuite = getfield $clogp, 'Distribution';
6368 $package = getfield $clogp, 'Source';
6369 $version = getfield $clogp, 'Version';
6370 $dscfn = dscfn($version);
6373 sub build_or_push_prep_modes () {
6374 my ($format,) = get_source_format();
6375 printdebug "format $format, quilt mode $quilt_mode\n";
6376 if (madformat_wantfixup($format) && quiltmode_splitbrain()) {
6377 $do_split_brain = 1;
6379 fail __ "dgit: --include-dirty is not supported in split view quilt mode"
6380 if $do_split_brain && $includedirty;
6383 sub build_prep_early () {
6384 build_or_push_prep_early();
6386 build_or_push_prep_modes();
6390 sub build_prep ($) {
6394 if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)
6395 # Clean the tree because we're going to use the contents of
6396 # $maindir. (We trying to include dirty changes in the source
6397 # package, or we are running the builder in $maindir.)
6398 || $cleanmode =~ m{always}) {
6399 # Or because the user asked us to.
6402 # We don't actually need to do anything in $maindir, but we
6403 # should do some kind of cleanliness check because (i) the
6404 # user may have forgotten a `git add', and (ii) if the user
6405 # said -wc we should still do the check.
6408 build_check_quilt_splitbrain();
6410 my $pat = changespat $version;
6411 foreach my $f (glob "$buildproductsdir/$pat") {
6414 fail f_ "remove old changes file %s: %s", $f, $!;
6416 progress f_ "would remove %s", $f;
6422 sub changesopts_initial () {
6423 my @opts =@changesopts[1..$#changesopts];
6426 sub changesopts_version () {
6427 if (!defined $changes_since_version) {
6430 @vsns = archive_query('archive_query');
6431 my @quirk = access_quirk();
6432 if ($quirk[0] eq 'backports') {
6433 local $isuite = $quirk[2];
6435 canonicalise_suite();
6436 push @vsns, archive_query('archive_query');
6442 "archive query failed (queried because --since-version not specified)";
6445 @vsns = map { $_->[0] } @vsns;
6446 @vsns = sort { -version_compare($a, $b) } @vsns;
6447 $changes_since_version = $vsns[0];
6448 progress f_ "changelog will contain changes since %s", $vsns[0];
6450 $changes_since_version = '_';
6451 progress __ "package seems new, not specifying -v<version>";
6454 if ($changes_since_version ne '_') {
6455 return ("-v$changes_since_version");
6461 sub changesopts () {
6462 return (changesopts_initial(), changesopts_version());
6465 sub massage_dbp_args ($;$) {
6466 my ($cmd,$xargs) = @_;
6467 # Since we split the source build out so we can do strange things
6468 # to it, massage the arguments to dpkg-buildpackage so that the
6469 # main build doessn't build source (or add an argument to stop it
6470 # building source by default).
6471 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6472 # -nc has the side effect of specifying -b if nothing else specified
6473 # and some combinations of -S, -b, et al, are errors, rather than
6474 # later simply overriding earlie. So we need to:
6475 # - search the command line for these options
6476 # - pick the last one
6477 # - perhaps add our own as a default
6478 # - perhaps adjust it to the corresponding non-source-building version
6480 foreach my $l ($cmd, $xargs) {
6482 @$l = grep { !(m/^-[SgGFABb]$|^--build=/s and $dmode=$_) } @$l;
6485 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6486 my $r = WANTSRC_BUILDER;
6487 printdebug "massage split $dmode.\n";
6488 if ($dmode =~ s/^--build=//) {
6490 my @d = split /,/, $dmode;
6491 $r |= WANTSRC_SOURCE if grep { s/^full$/binary/ } @d;
6492 $r |= WANTSRC_SOURCE if grep { s/^source$// } @d;
6493 $r |= WANTSRC_BUILDER if grep { m/./ } @d;
6494 fail __ "Wanted to build nothing!" unless $r;
6495 $dmode = '--build='. join ',', grep m/./, @d;
6498 $dmode =~ m/[S]/ ? WANTSRC_SOURCE :
6499 $dmode =~ y/gGF/ABb/ ? WANTSRC_SOURCE | WANTSRC_BUILDER :
6500 $dmode =~ m/[ABb]/ ? WANTSRC_BUILDER :
6503 printdebug "massage done $r $dmode.\n";
6505 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6511 my $wasdir = must_getcwd();
6512 changedir $buildproductsdir;
6517 # this sub must run with CWD=$buildproductsdir (eg in in_bpd)
6518 sub postbuild_mergechanges ($) {
6519 my ($msg_if_onlyone) = @_;
6520 # If there is only one .changes file, fail with $msg_if_onlyone,
6521 # or if that is undef, be a no-op.
6522 # Returns the changes file to report to the user.
6523 my $pat = changespat $version;
6524 my @changesfiles = grep { !m/_multi\.changes/ } glob $pat;
6525 @changesfiles = sort {
6526 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6530 if (@changesfiles==1) {
6531 fail +(f_ <<END, "@changesfiles").$msg_if_onlyone
6532 only one changes file from build (%s)
6534 if defined $msg_if_onlyone;
6535 $result = $changesfiles[0];
6536 } elsif (@changesfiles==2) {
6537 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6538 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6539 fail f_ "%s found in binaries changes file %s", $l, $binchanges
6542 runcmd_ordryrun_local @mergechanges, @changesfiles;
6543 my $multichanges = changespat $version,'multi';
6545 stat_exists $multichanges or fail f_
6546 "%s unexpectedly not created by build", $multichanges;
6547 foreach my $cf (glob $pat) {
6548 next if $cf eq $multichanges;
6549 rename "$cf", "$cf.inmulti" or fail f_
6550 "install new changes %s\{,.inmulti}: %s", $cf, $!;
6553 $result = $multichanges;
6555 fail f_ "wrong number of different changes files (%s)",
6558 printdone f_ "build successful, results in %s\n", $result
6562 sub midbuild_checkchanges () {
6563 my $pat = changespat $version;
6564 return if $rmchanges;
6565 my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
6567 $_ ne changespat $version,'source' and
6568 $_ ne changespat $version,'multi'
6570 fail +(f_ <<END, $pat, "@unwanted")
6571 changes files other than source matching %s already present; building would result in ambiguity about the intended results.
6572 Suggest you delete %s.
6577 sub midbuild_checkchanges_vanilla ($) {
6579 midbuild_checkchanges() if $wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER);
6582 sub postbuild_mergechanges_vanilla ($) {
6584 if ($wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER)) {
6586 postbuild_mergechanges(undef);
6589 printdone __ "build successful\n";
6595 $buildproductsdir eq '..' or print STDERR +(f_ <<END, $us, $us);
6596 %s: warning: build-products-dir set, but not supported by dpkg-buildpackage
6597 %s: warning: build-products-dir will be ignored; files will go to ..
6599 $buildproductsdir = '..';
6600 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6601 my $wantsrc = massage_dbp_args \@dbp;
6602 build_prep($wantsrc);
6603 if ($wantsrc & WANTSRC_SOURCE) {
6605 midbuild_checkchanges_vanilla $wantsrc;
6607 if ($wantsrc & WANTSRC_BUILDER) {
6608 push @dbp, changesopts_version();
6609 maybe_apply_patches_dirtily();
6610 runcmd_ordryrun_local @dbp;
6612 maybe_unapply_patches_again();
6613 postbuild_mergechanges_vanilla $wantsrc;
6617 $quilt_mode //= 'gbp';
6623 # gbp can make .origs out of thin air. In my tests it does this
6624 # even for a 1.0 format package, with no origs present. So I
6625 # guess it keys off just the version number. We don't know
6626 # exactly what .origs ought to exist, but let's assume that we
6627 # should run gbp if: the version has an upstream part and the main
6629 my $upstreamversion = upstreamversion $version;
6630 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6631 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "$bpd_glob/$origfnpat");
6633 if ($gbp_make_orig) {
6635 $cleanmode = 'none'; # don't do it again
6638 my @dbp = @dpkgbuildpackage;
6640 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6642 if (!length $gbp_build[0]) {
6643 if (length executable_on_path('git-buildpackage')) {
6644 $gbp_build[0] = qw(git-buildpackage);
6646 $gbp_build[0] = 'gbp buildpackage';
6649 my @cmd = opts_opt_multi_cmd [], @gbp_build;
6651 push @cmd, (qw(-us -uc --git-no-sign-tags),
6652 "--git-builder=".(shellquote @dbp));
6654 if ($gbp_make_orig) {
6655 my $priv = dgit_privdir();
6656 my $ok = "$priv/origs-gen-ok";
6657 unlink $ok or $!==&ENOENT or confess "$!";
6658 my @origs_cmd = @cmd;
6659 push @origs_cmd, qw(--git-cleaner=true);
6660 push @origs_cmd, "--git-prebuild=".
6661 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6662 push @origs_cmd, @ARGV;
6664 debugcmd @origs_cmd;
6666 do { local $!; stat_exists $ok; }
6667 or failedcmd @origs_cmd;
6669 dryrun_report @origs_cmd;
6673 build_prep($wantsrc);
6674 if ($wantsrc & WANTSRC_SOURCE) {
6676 midbuild_checkchanges_vanilla $wantsrc;
6678 push @cmd, '--git-cleaner=true';
6680 maybe_unapply_patches_again();
6681 if ($wantsrc & WANTSRC_BUILDER) {
6682 push @cmd, changesopts();
6683 runcmd_ordryrun_local @cmd, @ARGV;
6685 postbuild_mergechanges_vanilla $wantsrc;
6687 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6689 sub building_source_in_playtree {
6690 # If $includedirty, we have to build the source package from the
6691 # working tree, not a playtree, so that uncommitted changes are
6692 # included (copying or hardlinking them into the playtree could
6695 # Note that if we are building a source package in split brain
6696 # mode we do not support including uncommitted changes, because
6697 # that makes quilt fixup too hard. I.e. ($made_split_brain && (dgit is
6698 # building a source package)) => !$includedirty
6699 return !$includedirty;
6703 $sourcechanges = changespat $version,'source';
6705 unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
6706 or fail f_ "remove %s: %s", $sourcechanges, $!;
6708 # confess unless !!$made_split_brain == !!$do_split_brain;
6710 my @cmd = (@dpkgsource, qw(-b --));
6712 if (building_source_in_playtree()) {
6714 my $headref = git_rev_parse('HEAD');
6715 # If we are in split brain, there is already a playtree with
6716 # the thing we should package into a .dsc (thanks to quilt
6717 # fixup). If not, make a playtree
6718 prep_ud() unless $made_split_brain;
6719 changedir $playground;
6720 unless ($made_split_brain) {
6721 my $upstreamversion = upstreamversion $version;
6722 unpack_playtree_linkorigs($upstreamversion, sub { });
6723 unpack_playtree_need_cd_work($headref);
6727 $leafdir = basename $maindir;
6729 if ($buildproductsdir ne '..') {
6730 # Well, we are going to run dpkg-source -b which consumes
6731 # origs from .. and generates output there. To make this
6732 # work when the bpd is not .. , we would have to (i) link
6733 # origs from bpd to .. , (ii) check for files that
6734 # dpkg-source -b would/might overwrite, and afterwards
6735 # (iii) move all the outputs back to the bpd (iv) except
6736 # for the origs which should be deleted from .. if they
6737 # weren't there beforehand. And if there is an error and
6738 # we don't run to completion we would necessarily leave a
6739 # mess. This is too much. The real way to fix this
6740 # is for dpkg-source to have bpd support.
6741 confess unless $includedirty;
6743 "--include-dirty not supported with --build-products-dir, sorry";
6748 runcmd_ordryrun_local @cmd, $leafdir;
6751 runcmd_ordryrun_local qw(sh -ec),
6752 'exec >../$1; shift; exec "$@"','x', $sourcechanges,
6753 @dpkggenchanges, qw(-S), changesopts();
6756 printdebug "moving $dscfn, $sourcechanges, etc. to ".bpd_abs()."\n";
6757 $dsc = parsecontrol($dscfn, "source package");
6761 printdebug " renaming ($why) $l\n";
6762 rename_link_xf 0, "$l", bpd_abs()."/$l"
6763 or fail f_ "put in place new built file (%s): %s", $l, $@;
6765 foreach my $l (split /\n/, getfield $dsc, 'Files') {
6766 $l =~ m/\S+$/ or next;
6769 $mv->('dsc', $dscfn);
6770 $mv->('changes', $sourcechanges);
6775 sub cmd_build_source {
6776 badusage __ "build-source takes no additional arguments" if @ARGV;
6777 build_prep(WANTSRC_SOURCE);
6779 maybe_unapply_patches_again();
6780 printdone f_ "source built, results in %s and %s",
6781 $dscfn, $sourcechanges;
6784 sub cmd_push_source {
6787 "dgit push-source: --include-dirty/--ignore-dirty does not make".
6788 "sense with push-source!"
6790 build_check_quilt_splitbrain();
6792 my $changes = parsecontrol("$buildproductsdir/$changesfile",
6793 __ "source changes file");
6794 unless (test_source_only_changes($changes)) {
6795 fail __ "user-specified changes file is not source-only";
6798 # Building a source package is very fast, so just do it
6800 confess "er, patches are applied dirtily but shouldn't be.."
6801 if $patches_applied_dirtily;
6802 $changesfile = $sourcechanges;
6807 sub binary_builder {
6808 my ($bbuilder, $pbmc_msg, @args) = @_;
6809 build_prep(WANTSRC_SOURCE);
6811 midbuild_checkchanges();
6814 stat_exists $dscfn or fail f_
6815 "%s (in build products dir): %s", $dscfn, $!;
6816 stat_exists $sourcechanges or fail f_
6817 "%s (in build products dir): %s", $sourcechanges, $!;
6819 runcmd_ordryrun_local @$bbuilder, @args;
6821 maybe_unapply_patches_again();
6823 postbuild_mergechanges($pbmc_msg);
6829 binary_builder(\@sbuild, (__ <<END), qw(-d), $isuite, @ARGV, $dscfn);
6830 perhaps you need to pass -A ? (sbuild's default is to build only
6831 arch-specific binaries; dgit 1.4 used to override that.)
6836 my ($pbuilder) = @_;
6838 # @ARGV is allowed to contain only things that should be passed to
6839 # pbuilder under debbuildopts; just massage those
6840 my $wantsrc = massage_dbp_args \@ARGV;
6842 "you asked for a builder but your debbuildopts didn't ask for".
6843 " any binaries -- is this really what you meant?"
6844 unless $wantsrc & WANTSRC_BUILDER;
6846 "we must build a .dsc to pass to the builder but your debbuiltopts".
6847 " forbids the building of a source package; cannot continue"
6848 unless $wantsrc & WANTSRC_SOURCE;
6849 # We do not want to include the verb "build" in @pbuilder because
6850 # the user can customise @pbuilder and they shouldn't be required
6851 # to include "build" in their customised value. However, if the
6852 # user passes any additional args to pbuilder using the dgit
6853 # option --pbuilder:foo, such args need to come after the "build"
6854 # verb. opts_opt_multi_cmd does all of that.
6855 binary_builder([opts_opt_multi_cmd ["build"], @$pbuilder], undef,
6856 qw(--debbuildopts), "@ARGV", qw(--distribution), $isuite,
6861 pbuilder(\@pbuilder);
6864 sub cmd_cowbuilder {
6865 pbuilder(\@cowbuilder);
6868 sub cmd_quilt_fixup {
6869 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6872 build_maybe_quilt_fixup();
6875 sub cmd_print_unapplied_treeish {
6876 badusage __ "incorrect arguments to dgit print-unapplied-treeish"
6878 my $headref = git_rev_parse('HEAD');
6879 my $clogp = commit_getclogp $headref;
6880 $package = getfield $clogp, 'Source';
6881 $version = getfield $clogp, 'Version';
6882 $isuite = getfield $clogp, 'Distribution';
6883 $csuite = $isuite; # we want this to be offline!
6887 changedir $playground;
6888 my $uv = upstreamversion $version;
6889 my $u = quilt_fakedsc2unapplied($headref, $uv);
6890 print $u, "\n" or confess "$!";
6893 sub import_dsc_result {
6894 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6895 my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
6897 check_gitattrs($newhash, __ "source tree");
6899 progress f_ "dgit: import-dsc: %s", $what_msg;
6902 sub cmd_import_dsc {
6906 last unless $ARGV[0] =~ m/^-/;
6909 if (m/^--require-valid-signature$/) {
6912 badusage f_ "unknown dgit import-dsc sub-option \`%s'", $_;
6916 badusage __ "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
6918 my ($dscfn, $dstbranch) = @ARGV;
6920 badusage __ "dry run makes no sense with import-dsc"
6923 my $force = $dstbranch =~ s/^\+// ? +1 :
6924 $dstbranch =~ s/^\.\.// ? -1 :
6926 my $info = $force ? " $&" : '';
6927 $info = "$dscfn$info";
6929 my $specbranch = $dstbranch;
6930 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6931 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6933 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6934 my $chead = cmdoutput_errok @symcmd;
6935 defined $chead or $?==256 or failedcmd @symcmd;
6937 fail f_ "%s is checked out - will not update it", $dstbranch
6938 if defined $chead and $chead eq $dstbranch;
6940 my $oldhash = git_get_ref $dstbranch;
6942 open D, "<", $dscfn or fail f_ "open import .dsc (%s): %s", $dscfn, $!;
6943 $dscdata = do { local $/ = undef; <D>; };
6944 D->error and fail f_ "read %s: %s", $dscfn, $!;
6947 # we don't normally need this so import it here
6948 use Dpkg::Source::Package;
6949 my $dp = new Dpkg::Source::Package filename => $dscfn,
6950 require_valid_signature => $needsig;
6952 local $SIG{__WARN__} = sub {
6954 return unless $needsig;
6955 fail __ "import-dsc signature check failed";
6957 if (!$dp->is_signed()) {
6958 warn f_ "%s: warning: importing unsigned .dsc\n", $us;
6960 my $r = $dp->check_signature();
6961 confess "->check_signature => $r" if $needsig && $r;
6967 $package = getfield $dsc, 'Source';
6969 parse_dsc_field($dsc, __ "Dgit metadata in .dsc")
6970 unless forceing [qw(import-dsc-with-dgit-field)];
6971 parse_dsc_field_def_dsc_distro();
6973 $isuite = 'DGIT-IMPORT-DSC';
6974 $idistro //= $dsc_distro;
6978 if (defined $dsc_hash) {
6980 "dgit: import-dsc of .dsc with Dgit field, using git hash";
6981 resolve_dsc_field_commit undef, undef;
6983 if (defined $dsc_hash) {
6984 my @cmd = (qw(sh -ec),
6985 "echo $dsc_hash | git cat-file --batch-check");
6986 my $objgot = cmdoutput @cmd;
6987 if ($objgot =~ m#^\w+ missing\b#) {
6988 fail f_ <<END, $dsc_hash
6989 .dsc contains Dgit field referring to object %s
6990 Your git tree does not have that object. Try `git fetch' from a
6991 plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.
6994 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6996 progress __ "Not fast forward, forced update.";
6998 fail f_ "Not fast forward to %s", $dsc_hash;
7001 import_dsc_result $dstbranch, $dsc_hash,
7002 "dgit import-dsc (Dgit): $info",
7003 f_ "updated git ref %s", $dstbranch;
7007 fail f_ <<END, $dstbranch, $specbranch, $specbranch
7008 Branch %s already exists
7009 Specify ..%s for a pseudo-merge, binding in existing history
7010 Specify +%s to overwrite, discarding existing history
7012 if $oldhash && !$force;
7014 my @dfi = dsc_files_info();
7015 foreach my $fi (@dfi) {
7016 my $f = $fi->{Filename};
7017 # We transfer all the pieces of the dsc to the bpd, not just
7018 # origs. This is by analogy with dgit fetch, which wants to
7019 # keep them somewhere to avoid downloading them again.
7020 # We make symlinks, though. If the user wants copies, then
7021 # they can copy the parts of the dsc to the bpd using dcmd,
7023 my $here = "$buildproductsdir/$f";
7028 fail f_ "lstat %s works but stat gives %s !", $here, $!;
7030 fail f_ "stat %s: %s", $here, $! unless $! == ENOENT;
7031 printdebug "not in bpd, $f ...\n";
7032 # $f does not exist in bpd, we need to transfer it
7034 $there =~ s{[^/]+$}{$f} or confess "$there ?";
7035 # $there is file we want, relative to user's cwd, or abs
7036 printdebug "not in bpd, $f, test $there ...\n";
7037 stat $there or fail f_
7038 "import %s requires %s, but: %s", $dscfn, $there, $!;
7039 if ($there =~ m#^(?:\./+)?\.\./+#) {
7040 # $there is relative to user's cwd
7041 my $there_from_parent = $';
7042 if ($buildproductsdir !~ m{^/}) {
7043 # abs2rel, despite its name, can take two relative paths
7044 $there = File::Spec->abs2rel($there,$buildproductsdir);
7045 # now $there is relative to bpd, great
7046 printdebug "not in bpd, $f, abs2rel, $there ...\n";
7048 $there = (dirname $maindir)."/$there_from_parent";
7049 # now $there is absoute
7050 printdebug "not in bpd, $f, rel2rel, $there ...\n";
7052 } elsif ($there =~ m#^/#) {
7053 # $there is absolute already
7054 printdebug "not in bpd, $f, abs, $there ...\n";
7057 "cannot import %s which seems to be inside working tree!",
7060 symlink $there, $here or fail f_
7061 "symlink %s to %s: %s", $there, $here, $!;
7062 progress f_ "made symlink %s -> %s", $here, $there;
7063 # print STDERR Dumper($fi);
7065 my @mergeinputs = generate_commits_from_dsc();
7066 die unless @mergeinputs == 1;
7068 my $newhash = $mergeinputs[0]{Commit};
7073 "Import, forced update - synthetic orphan git history.";
7074 } elsif ($force < 0) {
7075 progress __ "Import, merging.";
7076 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
7077 my $version = getfield $dsc, 'Version';
7078 my $clogp = commit_getclogp $newhash;
7079 my $authline = clogp_authline $clogp;
7080 $newhash = make_commit_text <<ENDU
7088 .(f_ <<END, $package, $version, $dstbranch);
7089 Merge %s (%s) import into %s
7092 die; # caught earlier
7096 import_dsc_result $dstbranch, $newhash,
7097 "dgit import-dsc: $info",
7098 f_ "results are in git ref %s", $dstbranch;
7101 sub pre_archive_api_query () {
7102 not_necessarily_a_tree();
7104 sub cmd_archive_api_query {
7105 badusage __ "need only 1 subpath argument" unless @ARGV==1;
7106 my ($subpath) = @ARGV;
7107 local $isuite = 'DGIT-API-QUERY-CMD';
7108 my @cmd = archive_api_query_cmd($subpath);
7111 exec @cmd or fail f_ "exec curl: %s\n", $!;
7114 sub repos_server_url () {
7115 $package = '_dgit-repos-server';
7116 local $access_forpush = 1;
7117 local $isuite = 'DGIT-REPOS-SERVER';
7118 my $url = access_giturl();
7121 sub pre_clone_dgit_repos_server () {
7122 not_necessarily_a_tree();
7124 sub cmd_clone_dgit_repos_server {
7125 badusage __ "need destination argument" unless @ARGV==1;
7126 my ($destdir) = @ARGV;
7127 my $url = repos_server_url();
7128 my @cmd = (@git, qw(clone), $url, $destdir);
7130 exec @cmd or fail f_ "exec git clone: %s\n", $!;
7133 sub pre_print_dgit_repos_server_source_url () {
7134 not_necessarily_a_tree();
7136 sub cmd_print_dgit_repos_server_source_url {
7138 "no arguments allowed to dgit print-dgit-repos-server-source-url"
7140 my $url = repos_server_url();
7141 print $url, "\n" or confess "$!";
7144 sub pre_print_dpkg_source_ignores {
7145 not_necessarily_a_tree();
7147 sub cmd_print_dpkg_source_ignores {
7149 "no arguments allowed to dgit print-dpkg-source-ignores"
7151 print "@dpkg_source_ignores\n" or confess "$!";
7154 sub cmd_setup_mergechangelogs {
7155 badusage __ "no arguments allowed to dgit setup-mergechangelogs"
7157 local $isuite = 'DGIT-SETUP-TREE';
7158 setup_mergechangelogs(1);
7161 sub cmd_setup_useremail {
7162 badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
7163 local $isuite = 'DGIT-SETUP-TREE';
7167 sub cmd_setup_gitattributes {
7168 badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
7169 local $isuite = 'DGIT-SETUP-TREE';
7173 sub cmd_setup_new_tree {
7174 badusage __ "no arguments allowed to dgit setup-tree" if @ARGV;
7175 local $isuite = 'DGIT-SETUP-TREE';
7179 #---------- argument parsing and main program ----------
7182 print "dgit version $our_version\n" or confess "$!";
7186 our (%valopts_long, %valopts_short);
7187 our (%funcopts_long);
7189 our (@modeopt_cfgs);
7191 sub defvalopt ($$$$) {
7192 my ($long,$short,$val_re,$how) = @_;
7193 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
7194 $valopts_long{$long} = $oi;
7195 $valopts_short{$short} = $oi;
7196 # $how subref should:
7197 # do whatever assignemnt or thing it likes with $_[0]
7198 # if the option should not be passed on to remote, @rvalopts=()
7199 # or $how can be a scalar ref, meaning simply assign the value
7202 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
7203 defvalopt '--distro', '-d', '.+', \$idistro;
7204 defvalopt '', '-k', '.+', \$keyid;
7205 defvalopt '--existing-package','', '.*', \$existing_package;
7206 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
7207 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
7208 defvalopt '--package', '-p', $package_re, \$package;
7209 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
7211 defvalopt '', '-C', '.+', sub {
7212 ($changesfile) = (@_);
7213 if ($changesfile =~ s#^(.*)/##) {
7214 $buildproductsdir = $1;
7218 defvalopt '--initiator-tempdir','','.*', sub {
7219 ($initiator_tempdir) = (@_);
7220 $initiator_tempdir =~ m#^/# or
7221 badusage __ "--initiator-tempdir must be used specify an".
7222 " absolute, not relative, directory."
7225 sub defoptmodes ($@) {
7226 my ($varref, $cfgkey, $default, %optmap) = @_;
7228 while (my ($opt,$val) = each %optmap) {
7229 $funcopts_long{$opt} = sub { $$varref = $val; };
7230 $permit{$val} = $val;
7232 push @modeopt_cfgs, {
7235 Default => $default,
7240 defoptmodes \$dodep14tag, qw( dep14tag want
7243 --always-dep14tag always );
7248 if (defined $ENV{'DGIT_SSH'}) {
7249 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
7250 } elsif (defined $ENV{'GIT_SSH'}) {
7251 @ssh = ($ENV{'GIT_SSH'});
7259 if (!defined $val) {
7260 badusage f_ "%s needs a value", $what unless @ARGV;
7262 push @rvalopts, $val;
7264 badusage f_ "bad value \`%s' for %s", $val, $what unless
7265 $val =~ m/^$oi->{Re}$(?!\n)/s;
7266 my $how = $oi->{How};
7267 if (ref($how) eq 'SCALAR') {
7272 push @ropts, @rvalopts;
7276 last unless $ARGV[0] =~ m/^-/;
7280 if (m/^--dry-run$/) {
7283 } elsif (m/^--damp-run$/) {
7286 } elsif (m/^--no-sign$/) {
7289 } elsif (m/^--help$/) {
7291 } elsif (m/^--version$/) {
7293 } elsif (m/^--new$/) {
7296 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
7297 ($om = $opts_opt_map{$1}) &&
7301 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
7302 !$opts_opt_cmdonly{$1} &&
7303 ($om = $opts_opt_map{$1})) {
7306 } elsif (m/^--([-0-9a-z]+)\!:(.*)/s &&
7307 !$opts_opt_cmdonly{$1} &&
7308 ($om = $opts_opt_map{$1})) {
7310 my $cmd = shift @$om;
7311 @$om = ($cmd, grep { $_ ne $2 } @$om);
7312 } elsif (m/^--(gbp|dpm)$/s) {
7313 push @ropts, "--quilt=$1";
7315 } elsif (m/^--(?:ignore|include)-dirty$/s) {
7318 } elsif (m/^--no-quilt-fixup$/s) {
7320 $quilt_mode = 'nocheck';
7321 } elsif (m/^--no-rm-on-error$/s) {
7324 } elsif (m/^--no-chase-dsc-distro$/s) {
7326 $chase_dsc_distro = 0;
7327 } elsif (m/^--overwrite$/s) {
7329 $overwrite_version = '';
7330 } elsif (m/^--overwrite=(.+)$/s) {
7332 $overwrite_version = $1;
7333 } elsif (m/^--delayed=(\d+)$/s) {
7336 } elsif (m/^--save-(dgit-view)=(.+)$/s ||
7337 m/^--(dgit-view)-save=(.+)$/s
7339 my ($k,$v) = ($1,$2);
7341 $v =~ s#^(?!refs/)#refs/heads/#;
7342 $internal_object_save{$k} = $v;
7343 } elsif (m/^--(no-)?rm-old-changes$/s) {
7346 } elsif (m/^--deliberately-($deliberately_re)$/s) {
7348 push @deliberatelies, $&;
7349 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
7353 } elsif (m/^--force-/) {
7355 f_ "%s: warning: ignoring unknown force option %s\n",
7358 } elsif (m/^--config-lookup-explode=(.+)$/s) {
7359 # undocumented, for testing
7361 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
7362 # ^ it's supposed to be an array ref
7363 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
7364 $val = $2 ? $' : undef; #';
7365 $valopt->($oi->{Long});
7366 } elsif ($funcopts_long{$_}) {
7368 $funcopts_long{$_}();
7370 badusage f_ "unknown long option \`%s'", $_;
7377 } elsif (s/^-L/-/) {
7380 } elsif (s/^-h/-/) {
7382 } elsif (s/^-D/-/) {
7386 } elsif (s/^-N/-/) {
7391 push @changesopts, $_;
7393 } elsif (s/^-wn$//s) {
7395 $cleanmode = 'none';
7396 } elsif (s/^-wg(f?)(a?)$//s) {
7399 $cleanmode .= '-ff' if $1;
7400 $cleanmode .= ',always' if $2;
7401 } elsif (s/^-wd(d?)([na]?)$//s) {
7403 $cleanmode = 'dpkg-source';
7404 $cleanmode .= '-d' if $1;
7405 $cleanmode .= ',no-check' if $2 eq 'n';
7406 $cleanmode .= ',all-check' if $2 eq 'a';
7407 } elsif (s/^-wc$//s) {
7409 $cleanmode = 'check';
7410 } elsif (s/^-wci$//s) {
7412 $cleanmode = 'check,ignores';
7413 } elsif (s/^-c([^=]*)\=(.*)$//s) {
7414 push @git, '-c', $&;
7415 $gitcfgs{cmdline}{$1} = [ $2 ];
7416 } elsif (s/^-c([^=]+)$//s) {
7417 push @git, '-c', $&;
7418 $gitcfgs{cmdline}{$1} = [ 'true' ];
7419 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
7421 $val = undef unless length $val;
7422 $valopt->($oi->{Short});
7425 badusage f_ "unknown short option \`%s'", $_;
7432 sub check_env_sanity () {
7433 my $blocked = new POSIX::SigSet;
7434 sigprocmask SIG_UNBLOCK, $blocked, $blocked or confess "$!";
7437 foreach my $name (qw(PIPE CHLD)) {
7438 my $signame = "SIG$name";
7439 my $signum = eval "POSIX::$signame" // die;
7440 die f_ "%s is set to something other than SIG_DFL\n",
7442 if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT';
7443 $blocked->ismember($signum) and
7444 die f_ "%s is blocked\n", $signame;
7450 On entry to dgit, %s
7451 This is a bug produced by something in your execution environment.
7457 sub parseopts_late_defaults () {
7458 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
7459 if defined $idistro;
7460 $isuite //= cfg('dgit.default.default-suite');
7462 foreach my $k (keys %opts_opt_map) {
7463 my $om = $opts_opt_map{$k};
7465 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
7467 badcfg f_ "cannot set command for %s", $k
7468 unless length $om->[0];
7472 foreach my $c (access_cfg_cfgs("opts-$k")) {
7474 map { $_ ? @$_ : () }
7475 map { $gitcfgs{$_}{$c} }
7476 reverse @gitcfgsources;
7477 printdebug "CL $c ", (join " ", map { shellquote } @vl),
7478 "\n" if $debuglevel >= 4;
7480 badcfg f_ "cannot configure options for %s", $k
7481 if $opts_opt_cmdonly{$k};
7482 my $insertpos = $opts_cfg_insertpos{$k};
7483 @$om = ( @$om[0..$insertpos-1],
7485 @$om[$insertpos..$#$om] );
7489 if (!defined $rmchanges) {
7490 local $access_forpush;
7491 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
7494 if (!defined $quilt_mode) {
7495 local $access_forpush;
7496 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
7497 // access_cfg('quilt-mode', 'RETURN-UNDEF')
7499 $quilt_mode =~ m/^($quilt_modes_re)$/
7500 or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
7504 foreach my $moc (@modeopt_cfgs) {
7505 local $access_forpush;
7506 my $vr = $moc->{Var};
7507 next if defined $$vr;
7508 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
7509 my $v = $moc->{Vals}{$$vr};
7510 badcfg f_ "unknown %s setting \`%s'", $moc->{Key}, $$vr
7516 local $access_forpush;
7517 default_from_access_cfg(\$cleanmode, 'clean-mode', 'dpkg-source',
7521 $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
7522 $buildproductsdir //= '..';
7523 $bpd_glob = $buildproductsdir;
7524 $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
7527 setlocale(LC_MESSAGES, "");
7530 if ($ENV{$fakeeditorenv}) {
7532 quilt_fixup_editor();
7538 print STDERR __ "DRY RUN ONLY\n" if $dryrun_level > 1;
7539 print STDERR __ "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
7540 if $dryrun_level == 1;
7542 print STDERR __ $helpmsg or confess "$!";
7545 $cmd = $subcommand = shift @ARGV;
7548 my $pre_fn = ${*::}{"pre_$cmd"};
7549 $pre_fn->() if $pre_fn;
7551 if ($invoked_in_git_tree) {
7552 changedir_git_toplevel();
7557 my $fn = ${*::}{"cmd_$cmd"};
7558 $fn or badusage f_ "unknown operation %s", $cmd;