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 5); # 5 drops tag format specification
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_upstream_commitish;
83 our $quilt_upstream_commitish_used;
84 our $quilt_upstream_commitish_message;
85 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied|baredebian';
87 our $splitview_modes_re = qr{auto|always|never};
89 our %internal_object_save;
90 our $we_are_responder;
91 our $we_are_initiator;
92 our $initiator_tempdir;
93 our $patches_applied_dirtily = 00;
94 our $chase_dsc_distro=1;
96 our %forceopts = map { $_=>0 }
97 qw(unrepresentable unsupported-source-format
98 dsc-changes-mismatch changes-origs-exactly
99 uploading-binaries uploading-source-only
100 import-gitapply-absurd
101 import-gitapply-no-absurd
102 import-dsc-with-dgit-field);
104 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
106 our $suite_re = '[-+.0-9a-z]+';
107 our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
108 | (?: git | git-ff ) (?: ,always )?
109 | check (?: ,ignores )?
113 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
114 our $splitbraincache = 'dgit-intern/quilt-cache';
115 our $rewritemap = 'dgit-rewrite/map';
117 our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
119 our (@git) = qw(git);
120 our (@dget) = qw(dget);
121 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
122 our (@dput) = qw(dput);
123 our (@debsign) = qw(debsign);
124 our (@gpg) = qw(gpg);
125 our (@sbuild) = (qw(sbuild --no-source));
127 our (@dgit) = qw(dgit);
128 our (@git_debrebase) = qw(git-debrebase);
129 our (@aptget) = qw(apt-get);
130 our (@aptcache) = qw(apt-cache);
131 our (@dpkgbuildpackage) = (qw(dpkg-buildpackage), @dpkg_source_ignores);
132 our (@dpkgsource) = (qw(dpkg-source), @dpkg_source_ignores);
133 our (@dpkggenchanges) = qw(dpkg-genchanges);
134 our (@mergechanges) = qw(mergechanges -f);
135 our (@gbp_build) = ('');
136 our (@gbp_pq) = ('gbp pq');
137 our (@changesopts) = ('');
138 our (@pbuilder) = ("sudo -E pbuilder","--no-source-only-changes");
139 our (@cowbuilder) = ("sudo -E cowbuilder","--no-source-only-changes");
141 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
144 'debsign' => \@debsign,
146 'sbuild' => \@sbuild,
150 'git-debrebase' => \@git_debrebase,
151 'apt-get' => \@aptget,
152 'apt-cache' => \@aptcache,
153 'dpkg-source' => \@dpkgsource,
154 'dpkg-buildpackage' => \@dpkgbuildpackage,
155 'dpkg-genchanges' => \@dpkggenchanges,
156 'gbp-build' => \@gbp_build,
157 'gbp-pq' => \@gbp_pq,
158 'ch' => \@changesopts,
159 'mergechanges' => \@mergechanges,
160 'pbuilder' => \@pbuilder,
161 'cowbuilder' => \@cowbuilder);
163 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
164 our %opts_cfg_insertpos = map {
166 scalar @{ $opts_opt_map{$_} }
167 } keys %opts_opt_map;
169 sub parseopts_late_defaults();
170 sub quiltify_trees_differ ($$;$$$);
171 sub setup_gitattrs(;$);
172 sub check_gitattrs($$);
179 our $supplementary_message = '';
180 our $made_split_brain = 0;
183 # Interactions between quilt mode and split brain
184 # (currently, split brain only implemented iff
185 # madformat_wantfixup && quiltmode_splitting)
187 # source format sane `3.0 (quilt)'
188 # madformat_wantfixup()
190 # quilt mode normal quiltmode
191 # (eg linear) _splitbrain
193 # ------------ ------------------------------------------------
195 # no split no q cache no q cache forbidden,
196 # brain PM on master q fixup on master prevented
197 # !do_split_brain() PM on master
199 # split brain no q cache q fixup cached, to dgit view
200 # PM in dgit view PM in dgit view
202 # PM = pseudomerge to make ff, due to overwrite (or split view)
203 # "no q cache" = do not record in cache on build, do not check cache
204 # `3.0 (quilt)' with --quilt=nocheck is treated as sane format
208 return unless forkcheck_mainprocess();
209 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
212 our $remotename = 'dgit';
213 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
217 if (!defined $absurdity) {
219 $absurdity =~ s{/[^/]+$}{/absurd} or die;
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_splitting () {
300 $quilt_mode =~ m/gbp|dpm|unapplied|baredebian/;
303 sub do_split_brain () { !!($do_split_brain // confess) }
305 sub opts_opt_multi_cmd {
308 push @cmd, split /\s+/, shift @_;
315 return opts_opt_multi_cmd [], @gbp_pq;
318 sub dgit_privdir () {
319 our $dgit_privdir_made //= ensure_a_playground 'dgit';
323 my $r = $buildproductsdir;
324 $r = "$maindir/$r" unless $r =~ m{^/};
328 sub get_tree_of_commit ($) {
329 my ($commitish) = @_;
330 my $cdata = cmdoutput @git, qw(cat-file commit), $commitish;
331 $cdata =~ m/\n\n/; $cdata = $`;
332 $cdata =~ m/^tree (\w+)$/m or confess "cdata $cdata ?";
336 sub branch_gdr_info ($$) {
337 my ($symref, $head) = @_;
338 my ($status, $msg, $current, $ffq_prev, $gdrlast) =
339 gdr_ffq_prev_branchinfo($symref);
340 return () unless $status eq 'branch';
341 $ffq_prev = git_get_ref $ffq_prev;
342 $gdrlast = git_get_ref $gdrlast;
343 $gdrlast &&= is_fast_fwd $gdrlast, $head;
344 return ($ffq_prev, $gdrlast);
347 sub branch_is_gdr_unstitched_ff ($$$) {
348 my ($symref, $head, $ancestor) = @_;
349 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
350 return 0 unless $ffq_prev;
351 return 0 unless !defined $ancestor or is_fast_fwd $ancestor, $ffq_prev;
355 sub branch_is_gdr ($) {
357 # This is quite like git-debrebase's keycommits.
358 # We have our own implementation because:
359 # - our algorighm can do fewer tests so is faster
360 # - it saves testing to see if gdr is installed
362 # NB we use this jsut for deciding whether to run gdr make-patches
363 # Before reusing this algorithm for somthing else, its
364 # suitability should be reconsidered.
367 local $Debian::Dgit::debugcmd_when_debuglevel = 3;
368 printdebug "branch_is_gdr $head...\n";
369 my $get_patches = sub {
370 my $t = git_cat_file "$_[0]:debian/patches", [qw(missing tree)];
373 my $tip_patches = $get_patches->($head);
376 my $cdata = git_cat_file $walk, 'commit';
377 my ($hdrs,$msg) = $cdata =~ m{\n\n} ? ($`,$') : ($cdata,'');
378 if ($msg =~ m{^\[git-debrebase\ (
379 anchor | changelog | make-patches |
380 merged-breakwater | pseudomerge
382 # no need to analyse this - it's sufficient
383 # (gdr classifications: Anchor, MergedBreakwaters)
384 # (made by gdr: Pseudomerge, Changelog)
385 printdebug "branch_is_gdr $walk gdr $1 YES\n";
388 my @parents = ($hdrs =~ m/^parent (\w+)$/gm);
390 my $walk_tree = get_tree_of_commit $walk;
391 foreach my $p (@parents) {
392 my $p_tree = get_tree_of_commit $p;
393 if ($p_tree eq $walk_tree) { # pseudomerge contriburor
394 # (gdr classification: Pseudomerge; not made by gdr)
395 printdebug "branch_is_gdr $walk unmarked pseudomerge\n"
401 # some other non-gdr merge
402 # (gdr classification: VanillaMerge, DgitImportUnpatched, ?)
403 printdebug "branch_is_gdr $walk ?-2-merge NO\n";
407 # (gdr classification: ?)
408 printdebug "branch_is_gdr $walk ?-octopus NO\n";
412 printdebug "branch_is_gdr $walk origin\n";
415 if ($get_patches->($walk) ne $tip_patches) {
416 # Our parent added, removed, or edited patches, and wasn't
417 # a gdr make-patches commit. gdr make-patches probably
418 # won't do that well, then.
419 # (gdr classification of parent: AddPatches or ?)
420 printdebug "branch_is_gdr $walk ?-patches NO\n";
423 if ($tip_patches eq '' and
424 !defined git_cat_file "$walk~:debian" and
425 !quiltify_trees_differ "$walk~", $walk
427 # (gdr classification of parent: BreakwaterStart
428 printdebug "branch_is_gdr $walk unmarked BreakwaterStart YES\n";
431 # (gdr classification: Upstream Packaging Mixed Changelog)
432 printdebug "branch_is_gdr $walk plain\n"
438 #---------- remote protocol support, common ----------
440 # remote push initiator/responder protocol:
441 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
442 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
443 # < dgit-remote-push-ready <actual-proto-vsn>
450 # > supplementary-message NBYTES
455 # > file parsed-changelog
456 # [indicates that output of dpkg-parsechangelog follows]
457 # > data-block NBYTES
458 # > [NBYTES bytes of data (no newline)]
459 # [maybe some more blocks]
468 # > param head DGIT-VIEW-HEAD
469 # > param csuite SUITE
470 # > param tagformat new # $protovsn == 4
471 # > param maint-view MAINT-VIEW-HEAD
473 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
474 # > file buildinfo # for buildinfos to sign
476 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
477 # # goes into tag, for replay prevention
480 # [indicates that signed tag is wanted]
481 # < data-block NBYTES
482 # < [NBYTES bytes of data (no newline)]
483 # [maybe some more blocks]
487 # > want signed-dsc-changes
488 # < data-block NBYTES [transfer of signed dsc]
490 # < data-block NBYTES [transfer of signed changes]
492 # < data-block NBYTES [transfer of each signed buildinfo
493 # [etc] same number and order as "file buildinfo"]
501 sub i_child_report () {
502 # Sees if our child has died, and reap it if so. Returns a string
503 # describing how it died if it failed, or undef otherwise.
504 return undef unless $i_child_pid;
505 my $got = waitpid $i_child_pid, WNOHANG;
506 return undef if $got <= 0;
507 die unless $got == $i_child_pid;
508 $i_child_pid = undef;
509 return undef unless $?;
510 return f_ "build host child %s", waitstatusmsg();
515 fail f_ "connection lost: %s", $! if $fh->error;
516 fail f_ "protocol violation; %s not expected", $m;
519 sub badproto_badread ($$) {
521 fail f_ "connection lost: %s", $! if $!;
522 my $report = i_child_report();
523 fail $report if defined $report;
524 badproto $fh, f_ "eof (reading %s)", $wh;
527 sub protocol_expect (&$) {
528 my ($match, $fh) = @_;
531 defined && chomp or badproto_badread $fh, __ "protocol message";
539 badproto $fh, f_ "\`%s'", $_;
542 sub protocol_send_file ($$) {
543 my ($fh, $ourfn) = @_;
544 open PF, "<", $ourfn or die "$ourfn: $!";
547 my $got = read PF, $d, 65536;
548 die "$ourfn: $!" unless defined $got;
550 print $fh "data-block ".length($d)."\n" or confess "$!";
551 print $fh $d or confess "$!";
553 PF->error and die "$ourfn $!";
554 print $fh "data-end\n" or confess "$!";
558 sub protocol_read_bytes ($$) {
559 my ($fh, $nbytes) = @_;
560 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, __ "bad byte count";
562 my $got = read $fh, $d, $nbytes;
563 $got==$nbytes or badproto_badread $fh, __ "data block";
567 sub protocol_receive_file ($$) {
568 my ($fh, $ourfn) = @_;
569 printdebug "() $ourfn\n";
570 open PF, ">", $ourfn or die "$ourfn: $!";
572 my ($y,$l) = protocol_expect {
573 m/^data-block (.*)$/ ? (1,$1) :
574 m/^data-end$/ ? (0,) :
578 my $d = protocol_read_bytes $fh, $l;
579 print PF $d or confess "$!";
581 close PF or confess "$!";
584 #---------- remote protocol support, responder ----------
586 sub responder_send_command ($) {
588 return unless $we_are_responder;
589 # called even without $we_are_responder
590 printdebug ">> $command\n";
591 print PO $command, "\n" or confess "$!";
594 sub responder_send_file ($$) {
595 my ($keyword, $ourfn) = @_;
596 return unless $we_are_responder;
597 printdebug "]] $keyword $ourfn\n";
598 responder_send_command "file $keyword";
599 protocol_send_file \*PO, $ourfn;
602 sub responder_receive_files ($@) {
603 my ($keyword, @ourfns) = @_;
604 die unless $we_are_responder;
605 printdebug "[[ $keyword @ourfns\n";
606 responder_send_command "want $keyword";
607 foreach my $fn (@ourfns) {
608 protocol_receive_file \*PI, $fn;
611 protocol_expect { m/^files-end$/ } \*PI;
614 #---------- remote protocol support, initiator ----------
616 sub initiator_expect (&) {
618 protocol_expect { &$match } \*RO;
621 #---------- end remote code ----------
624 if ($we_are_responder) {
626 responder_send_command "progress ".length($m) or confess "$!";
627 print PO $m or confess "$!";
637 $ua = LWP::UserAgent->new();
641 progress "downloading $what...";
642 my $r = $ua->get(@_) or confess "$!";
643 return undef if $r->code == 404;
644 $r->is_success or fail f_ "failed to fetch %s: %s",
645 $what, $r->status_line;
646 return $r->decoded_content(charset => 'none');
649 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
651 sub act_local () { return $dryrun_level <= 1; }
652 sub act_scary () { return !$dryrun_level; }
655 if (!$dryrun_level) {
656 progress f_ "%s ok: %s", $us, "@_";
658 progress f_ "would be ok: %s (but dry run only)", "@_";
663 printcmd(\*STDERR,$debugprefix."#",@_);
666 sub runcmd_ordryrun {
674 sub runcmd_ordryrun_local {
682 our $helpmsg = i_ <<END;
684 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
685 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
686 dgit [dgit-opts] build [dpkg-buildpackage-opts]
687 dgit [dgit-opts] sbuild [sbuild-opts]
688 dgit [dgit-opts] pbuilder|cowbuilder [debbuildopts]
689 dgit [dgit-opts] push [dgit-opts] [suite]
690 dgit [dgit-opts] push-source [dgit-opts] [suite]
691 dgit [dgit-opts] rpush build-host:build-dir ...
692 important dgit options:
693 -k<keyid> sign tag and package with <keyid> instead of default
694 --dry-run -n do not change anything, but go through the motions
695 --damp-run -L like --dry-run but make local changes, without signing
696 --new -N allow introducing a new package
697 --debug -D increase debug level
698 -c<name>=<value> set git config option (used directly by dgit too)
701 our $later_warning_msg = i_ <<END;
702 Perhaps the upload is stuck in incoming. Using the version from git.
706 print STDERR f_ "%s: %s\n%s", $us, "@_", __ $helpmsg or confess "$!";
711 @ARGV or badusage __ "too few arguments";
712 return scalar shift @ARGV;
716 not_necessarily_a_tree();
719 print __ $helpmsg or confess "$!";
723 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
725 our %defcfg = ('dgit.default.distro' => 'debian',
726 'dgit.default.default-suite' => 'unstable',
727 'dgit.default.old-dsc-distro' => 'debian',
728 'dgit-suite.*-security.distro' => 'debian-security',
729 'dgit.default.username' => '',
730 'dgit.default.archive-query-default-component' => 'main',
731 'dgit.default.ssh' => 'ssh',
732 'dgit.default.archive-query' => 'madison:',
733 'dgit.default.sshpsql-dbname' => 'service=projectb',
734 'dgit.default.aptget-components' => 'main',
735 'dgit.default.source-only-uploads' => 'ok',
736 'dgit.dsc-url-proto-ok.http' => 'true',
737 'dgit.dsc-url-proto-ok.https' => 'true',
738 'dgit.dsc-url-proto-ok.git' => 'true',
739 'dgit.vcs-git.suites', => 'sid', # ;-separated
740 'dgit.default.dsc-url-proto-ok' => 'false',
741 # old means "repo server accepts pushes with old dgit tags"
742 # new means "repo server accepts pushes with new dgit tags"
743 # maint means "repo server accepts split brain pushes"
744 # hist means "repo server may have old pushes without new tag"
745 # ("hist" is implied by "old")
746 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
747 'dgit-distro.debian.git-check' => 'url',
748 'dgit-distro.debian.git-check-suffix' => '/info/refs',
749 'dgit-distro.debian.new-private-pushers' => 't',
750 'dgit-distro.debian.source-only-uploads' => 'not-wholly-new',
751 'dgit-distro.debian/push.git-url' => '',
752 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
753 'dgit-distro.debian/push.git-user-force' => 'dgit',
754 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
755 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
756 'dgit-distro.debian/push.git-create' => 'true',
757 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
758 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
759 # 'dgit-distro.debian.archive-query-tls-key',
760 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
761 # ^ this does not work because curl is broken nowadays
762 # Fixing #790093 properly will involve providing providing the key
763 # in some pacagke and maybe updating these paths.
765 # 'dgit-distro.debian.archive-query-tls-curl-args',
766 # '--ca-path=/etc/ssl/ca-debian',
767 # ^ this is a workaround but works (only) on DSA-administered machines
768 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
769 'dgit-distro.debian.git-url-suffix' => '',
770 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
771 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
772 'dgit-distro.debian-security.archive-query' => 'aptget:',
773 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
774 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
775 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
776 'dgit-distro.debian-security.nominal-distro' => 'debian',
777 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
778 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
779 'dgit-distro.ubuntu.git-check' => 'false',
780 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
781 'dgit-distro.test-dummy.ssh' => "$td/ssh",
782 'dgit-distro.test-dummy.username' => "alice",
783 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
784 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
785 'dgit-distro.test-dummy.git-url' => "$td/git",
786 'dgit-distro.test-dummy.git-host' => "git",
787 'dgit-distro.test-dummy.git-path' => "$td/git",
788 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
789 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
790 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
791 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
795 our @gitcfgsources = qw(cmdline local global system);
796 our $invoked_in_git_tree = 1;
798 sub git_slurp_config () {
799 # This algoritm is a bit subtle, but this is needed so that for
800 # options which we want to be single-valued, we allow the
801 # different config sources to override properly. See #835858.
802 foreach my $src (@gitcfgsources) {
803 next if $src eq 'cmdline';
804 # we do this ourselves since git doesn't handle it
806 $gitcfgs{$src} = git_slurp_config_src $src;
810 sub git_get_config ($) {
812 foreach my $src (@gitcfgsources) {
813 my $l = $gitcfgs{$src}{$c};
814 confess "internal error ($l $c)" if $l && !ref $l;
815 printdebug"C $c ".(defined $l ?
816 join " ", map { messagequote "'$_'" } @$l :
821 f_ "multiple values for %s (in %s git config)", $c, $src
823 $l->[0] =~ m/\n/ and badcfg f_
824 "value for config option %s (in %s git config) contains newline(s)!",
833 return undef if $c =~ /RETURN-UNDEF/;
834 printdebug "C? $c\n" if $debuglevel >= 5;
835 my $v = git_get_config($c);
836 return $v if defined $v;
837 my $dv = $defcfg{$c};
839 printdebug "CD $c $dv\n" if $debuglevel >= 4;
844 "need value for one of: %s\n".
845 "%s: distro or suite appears not to be (properly) supported",
849 sub not_necessarily_a_tree () {
850 # needs to be called from pre_*
851 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
852 $invoked_in_git_tree = 0;
855 sub access_basedistro__noalias () {
856 if (defined $idistro) {
859 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
860 return $def if defined $def;
861 foreach my $src (@gitcfgsources, 'internal') {
862 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
864 foreach my $k (keys %$kl) {
865 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
867 next unless match_glob $dpat, $isuite;
871 return cfg("dgit.default.distro");
875 sub access_basedistro () {
876 my $noalias = access_basedistro__noalias();
877 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
878 return $canon // $noalias;
881 sub access_nomdistro () {
882 my $base = access_basedistro();
883 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
884 $r =~ m/^$distro_re$/ or badcfg
885 f_ "bad syntax for (nominal) distro \`%s' (does not match %s)",
886 $r, "/^$distro_re$/";
890 sub access_quirk () {
891 # returns (quirk name, distro to use instead or undef, quirk-specific info)
892 my $basedistro = access_basedistro();
893 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
895 if (defined $backports_quirk) {
896 my $re = $backports_quirk;
897 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
899 $re =~ s/\%/([-0-9a-z_]+)/
900 or $re =~ m/[()]/ or badcfg __ "backports-quirk needs \% or ( )";
901 if ($isuite =~ m/^$re$/) {
902 return ('backports',"$basedistro-backports",$1);
905 return ('none',undef);
910 sub parse_cfg_bool ($$$) {
911 my ($what,$def,$v) = @_;
914 $v =~ m/^[ty1]/ ? 1 :
915 $v =~ m/^[fn0]/ ? 0 :
916 badcfg f_ "%s needs t (true, y, 1) or f (false, n, 0) not \`%s'",
920 sub access_forpush_config () {
921 my $d = access_basedistro();
925 parse_cfg_bool('new-private-pushers', 0,
926 cfg("dgit-distro.$d.new-private-pushers",
929 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
932 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
933 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
934 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
936 "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
939 sub access_forpush () {
940 $access_forpush //= access_forpush_config();
941 return $access_forpush;
944 sub default_from_access_cfg ($$$;$) {
945 my ($var, $keybase, $defval, $permit_re) = @_;
946 return if defined $$var;
948 $$var = access_cfg("$keybase-newer", 'RETURN-UNDEF');
949 $$var = undef if $$var && $$var !~ m/^$permit_re$/;
951 $$var //= access_cfg($keybase, 'RETURN-UNDEF');
954 badcfg f_ "unknown %s \`%s'", $keybase, $$var
955 if defined $permit_re and $$var !~ m/$permit_re/;
959 confess +(__ 'internal error').' '.Dumper($access_forpush)," ?" if
960 defined $access_forpush and !$access_forpush;
961 badcfg __ "pushing but distro is configured readonly"
962 if access_forpush_config() eq '0';
964 $supplementary_message = __ <<'END' unless $we_are_responder;
965 Push failed, before we got started.
966 You can retry the push, after fixing the problem, if you like.
968 parseopts_late_defaults();
972 parseopts_late_defaults();
975 sub determine_whether_split_brain () {
976 my ($format,) = get_source_format();
979 local $access_forpush;
980 default_from_access_cfg(\$splitview_mode, 'split-view', 'auto',
981 $splitview_modes_re);
982 $do_split_brain = 1 if $splitview_mode eq 'always';
985 printdebug "format $format, quilt mode $quilt_mode\n";
987 if (madformat_wantfixup($format) && quiltmode_splitting()) {
988 $splitview_mode ne 'never' or
989 fail f_ "dgit: quilt mode \`%s' (for format \`%s')".
990 " implies split view, but split-view set to \`%s'",
991 $quilt_mode, $format, $splitview_mode;
994 $do_split_brain //= 0;
999 sub supplementary_message ($) {
1001 if (!$we_are_responder) {
1002 $supplementary_message = $msg;
1005 responder_send_command "supplementary-message ".length($msg)
1007 print PO $msg or confess "$!";
1011 sub access_distros () {
1012 # Returns list of distros to try, in order
1015 # 0. `instead of' distro name(s) we have been pointed to
1016 # 1. the access_quirk distro, if any
1017 # 2a. the user's specified distro, or failing that } basedistro
1018 # 2b. the distro calculated from the suite }
1019 my @l = access_basedistro();
1021 my (undef,$quirkdistro) = access_quirk();
1022 unshift @l, $quirkdistro;
1023 unshift @l, $instead_distro;
1024 @l = grep { defined } @l;
1026 push @l, access_nomdistro();
1028 if (access_forpush()) {
1029 @l = map { ("$_/push", $_) } @l;
1034 sub access_cfg_cfgs (@) {
1037 # The nesting of these loops determines the search order. We put
1038 # the key loop on the outside so that we search all the distros
1039 # for each key, before going on to the next key. That means that
1040 # if access_cfg is called with a more specific, and then a less
1041 # specific, key, an earlier distro can override the less specific
1042 # without necessarily overriding any more specific keys. (If the
1043 # distro wants to override the more specific keys it can simply do
1044 # so; whereas if we did the loop the other way around, it would be
1045 # impossible to for an earlier distro to override a less specific
1046 # key but not the more specific ones without restating the unknown
1047 # values of the more specific keys.
1050 # We have to deal with RETURN-UNDEF specially, so that we don't
1051 # terminate the search prematurely.
1053 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
1056 foreach my $d (access_distros()) {
1057 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
1059 push @cfgs, map { "dgit.default.$_" } @realkeys;
1060 push @cfgs, @rundef;
1064 sub access_cfg (@) {
1066 my (@cfgs) = access_cfg_cfgs(@keys);
1067 my $value = cfg(@cfgs);
1071 sub access_cfg_bool ($$) {
1072 my ($def, @keys) = @_;
1073 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
1076 sub string_to_ssh ($) {
1078 if ($spec =~ m/\s/) {
1079 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
1085 sub access_cfg_ssh () {
1086 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
1087 if (!defined $gitssh) {
1090 return string_to_ssh $gitssh;
1094 sub access_runeinfo ($) {
1096 return ": dgit ".access_basedistro()." $info ;";
1099 sub access_someuserhost ($) {
1101 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
1102 defined($user) && length($user) or
1103 $user = access_cfg("$some-user",'username');
1104 my $host = access_cfg("$some-host");
1105 return length($user) ? "$user\@$host" : $host;
1108 sub access_gituserhost () {
1109 return access_someuserhost('git');
1112 sub access_giturl (;$) {
1113 my ($optional) = @_;
1114 my $url = access_cfg('git-url','RETURN-UNDEF');
1117 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
1118 return undef unless defined $proto;
1121 access_gituserhost().
1122 access_cfg('git-path');
1124 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
1127 return "$url/$package$suffix";
1130 sub commit_getclogp ($) {
1131 # Returns the parsed changelog hashref for a particular commit
1133 our %commit_getclogp_memo;
1134 my $memo = $commit_getclogp_memo{$objid};
1135 return $memo if $memo;
1137 my $mclog = dgit_privdir()."clog";
1138 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1139 "$objid:debian/changelog";
1140 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1143 sub parse_dscdata () {
1144 my $dscfh = new IO::File \$dscdata, '<' or confess "$!";
1145 printdebug Dumper($dscdata) if $debuglevel>1;
1146 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1147 printdebug Dumper($dsc) if $debuglevel>1;
1152 sub archive_query ($;@) {
1153 my ($method) = shift @_;
1154 fail __ "this operation does not support multiple comma-separated suites"
1156 my $query = access_cfg('archive-query','RETURN-UNDEF');
1157 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1160 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1163 sub archive_query_prepend_mirror {
1164 my $m = access_cfg('mirror');
1165 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1168 sub pool_dsc_subpath ($$) {
1169 my ($vsn,$component) = @_; # $package is implict arg
1170 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1171 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1174 sub cfg_apply_map ($$$) {
1175 my ($varref, $what, $mapspec) = @_;
1176 return unless $mapspec;
1178 printdebug "config $what EVAL{ $mapspec; }\n";
1180 eval "package Dgit::Config; $mapspec;";
1185 #---------- `ftpmasterapi' archive query method (nascent) ----------
1187 sub archive_api_query_cmd ($) {
1189 my @cmd = (@curl, qw(-sS));
1190 my $url = access_cfg('archive-query-url');
1191 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1193 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1194 foreach my $key (split /\:/, $keys) {
1195 $key =~ s/\%HOST\%/$host/g;
1197 fail "for $url: stat $key: $!" unless $!==ENOENT;
1200 fail f_ "config requested specific TLS key but do not know".
1201 " how to get curl to use exactly that EE key (%s)",
1203 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1204 # # Sadly the above line does not work because of changes
1205 # # to gnutls. The real fix for #790093 may involve
1206 # # new curl options.
1209 # Fixing #790093 properly will involve providing a value
1210 # for this on clients.
1211 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1212 push @cmd, split / /, $kargs if defined $kargs;
1214 push @cmd, $url.$subpath;
1218 sub api_query ($$;$) {
1220 my ($data, $subpath, $ok404) = @_;
1221 badcfg __ "ftpmasterapi archive query method takes no data part"
1223 my @cmd = archive_api_query_cmd($subpath);
1224 my $url = $cmd[$#cmd];
1225 push @cmd, qw(-w %{http_code});
1226 my $json = cmdoutput @cmd;
1227 unless ($json =~ s/\d+\d+\d$//) {
1228 failedcmd_report_cmd undef, @cmd;
1229 fail __ "curl failed to print 3-digit HTTP code";
1232 return undef if $code eq '404' && $ok404;
1233 fail f_ "fetch of %s gave HTTP code %s", $url, $code
1234 unless $url =~ m#^file://# or $code =~ m/^2/;
1235 return decode_json($json);
1238 sub canonicalise_suite_ftpmasterapi {
1239 my ($proto,$data) = @_;
1240 my $suites = api_query($data, 'suites');
1242 foreach my $entry (@$suites) {
1244 my $v = $entry->{$_};
1245 defined $v && $v eq $isuite;
1246 } qw(codename name);
1247 push @matched, $entry;
1249 fail f_ "unknown suite %s, maybe -d would help", $isuite
1253 @matched==1 or die f_ "multiple matches for suite %s\n", $isuite;
1254 $cn = "$matched[0]{codename}";
1255 defined $cn or die f_ "suite %s info has no codename\n", $isuite;
1256 $cn =~ m/^$suite_re$/
1257 or die f_ "suite %s maps to bad codename\n", $isuite;
1259 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper(\@matched)
1264 sub archive_query_ftpmasterapi {
1265 my ($proto,$data) = @_;
1266 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1268 my $digester = Digest::SHA->new(256);
1269 foreach my $entry (@$info) {
1271 my $vsn = "$entry->{version}";
1272 my ($ok,$msg) = version_check $vsn;
1273 die f_ "bad version: %s\n", $msg unless $ok;
1274 my $component = "$entry->{component}";
1275 $component =~ m/^$component_re$/ or die __ "bad component";
1276 my $filename = "$entry->{filename}";
1277 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1278 or die __ "bad filename";
1279 my $sha256sum = "$entry->{sha256sum}";
1280 $sha256sum =~ m/^[0-9a-f]+$/ or die __ "bad sha256sum";
1281 push @rows, [ $vsn, "/pool/$component/$filename",
1282 $digester, $sha256sum ];
1284 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper($entry)
1287 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1288 return archive_query_prepend_mirror @rows;
1291 sub file_in_archive_ftpmasterapi {
1292 my ($proto,$data,$filename) = @_;
1293 my $pat = $filename;
1296 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1297 my $info = api_query($data, "file_in_archive/$pat", 1);
1300 sub package_not_wholly_new_ftpmasterapi {
1301 my ($proto,$data,$pkg) = @_;
1302 my $info = api_query($data,"madison?package=${pkg}&f=json");
1306 #---------- `aptget' archive query method ----------
1309 our $aptget_releasefile;
1310 our $aptget_configpath;
1312 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1313 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1315 sub aptget_cache_clean {
1316 runcmd_ordryrun_local qw(sh -ec),
1317 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1321 sub aptget_lock_acquire () {
1322 my $lockfile = "$aptget_base/lock";
1323 open APTGET_LOCK, '>', $lockfile or confess "open $lockfile: $!";
1324 flock APTGET_LOCK, LOCK_EX or confess "lock $lockfile: $!";
1327 sub aptget_prep ($) {
1329 return if defined $aptget_base;
1331 badcfg __ "aptget archive query method takes no data part"
1334 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1337 ensuredir "$cache/dgit";
1339 access_cfg('aptget-cachekey','RETURN-UNDEF')
1340 // access_nomdistro();
1342 $aptget_base = "$cache/dgit/aptget";
1343 ensuredir $aptget_base;
1345 my $quoted_base = $aptget_base;
1346 confess "$quoted_base contains bad chars, cannot continue"
1347 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1349 ensuredir $aptget_base;
1351 aptget_lock_acquire();
1353 aptget_cache_clean();
1355 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1356 my $sourceslist = "source.list#$cachekey";
1358 my $aptsuites = $isuite;
1359 cfg_apply_map(\$aptsuites, 'suite map',
1360 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1362 open SRCS, ">", "$aptget_base/$sourceslist" or confess "$!";
1363 printf SRCS "deb-src %s %s %s\n",
1364 access_cfg('mirror'),
1366 access_cfg('aptget-components')
1369 ensuredir "$aptget_base/cache";
1370 ensuredir "$aptget_base/lists";
1372 open CONF, ">", $aptget_configpath or confess "$!";
1374 Debug::NoLocking "true";
1375 APT::Get::List-Cleanup "false";
1376 #clear APT::Update::Post-Invoke-Success;
1377 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1378 Dir::State::Lists "$quoted_base/lists";
1379 Dir::Etc::preferences "$quoted_base/preferences";
1380 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1381 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1384 foreach my $key (qw(
1387 Dir::Cache::Archives
1388 Dir::Etc::SourceParts
1389 Dir::Etc::preferencesparts
1391 ensuredir "$aptget_base/$key";
1392 print CONF "$key \"$quoted_base/$key\";\n" or confess "$!";
1395 my $oldatime = (time // confess "$!") - 1;
1396 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1397 next unless stat_exists $oldlist;
1398 my ($mtime) = (stat _)[9];
1399 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1402 runcmd_ordryrun_local aptget_aptget(), qw(update);
1405 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1406 next unless stat_exists $oldlist;
1407 my ($atime) = (stat _)[8];
1408 next if $atime == $oldatime;
1409 push @releasefiles, $oldlist;
1411 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1412 @releasefiles = @inreleasefiles if @inreleasefiles;
1413 if (!@releasefiles) {
1414 fail f_ <<END, $isuite, $cache;
1415 apt seemed to not to update dgit's cached Release files for %s.
1417 is on a filesystem mounted `noatime'; if so, please use `relatime'.)
1420 confess "apt updated too many Release files (@releasefiles), erk"
1421 unless @releasefiles == 1;
1423 ($aptget_releasefile) = @releasefiles;
1426 sub canonicalise_suite_aptget {
1427 my ($proto,$data) = @_;
1430 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1432 foreach my $name (qw(Codename Suite)) {
1433 my $val = $release->{$name};
1435 printdebug "release file $name: $val\n";
1436 $val =~ m/^$suite_re$/o or fail f_
1437 "Release file (%s) specifies intolerable %s",
1438 $aptget_releasefile, $name;
1439 cfg_apply_map(\$val, 'suite rmap',
1440 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1447 sub archive_query_aptget {
1448 my ($proto,$data) = @_;
1451 ensuredir "$aptget_base/source";
1452 foreach my $old (<$aptget_base/source/*.dsc>) {
1453 unlink $old or die "$old: $!";
1456 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1457 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1458 # avoids apt-get source failing with ambiguous error code
1460 runcmd_ordryrun_local
1461 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1462 aptget_aptget(), qw(--download-only --only-source source), $package;
1464 my @dscs = <$aptget_base/source/*.dsc>;
1465 fail __ "apt-get source did not produce a .dsc" unless @dscs;
1466 fail f_ "apt-get source produced several .dscs (%s)", "@dscs"
1469 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1472 my $uri = "file://". uri_escape $dscs[0];
1473 $uri =~ s{\%2f}{/}gi;
1474 return [ (getfield $pre_dsc, 'Version'), $uri ];
1477 sub file_in_archive_aptget () { return undef; }
1478 sub package_not_wholly_new_aptget () { return undef; }
1480 #---------- `dummyapicat' archive query method ----------
1481 # (untranslated, because this is for testing purposes etc.)
1483 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1484 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1486 sub dummycatapi_run_in_mirror ($@) {
1487 # runs $fn with FIA open onto rune
1488 my ($rune, $argl, $fn) = @_;
1490 my $mirror = access_cfg('mirror');
1491 $mirror =~ s#^file://#/# or die "$mirror ?";
1492 my @cmd = (qw(sh -ec), 'cd "$1"; shift'."\n".$rune,
1493 qw(x), $mirror, @$argl);
1494 debugcmd "-|", @cmd;
1495 open FIA, "-|", @cmd or confess "$!";
1497 close FIA or ($!==0 && $?==141) or die failedcmd @cmd;
1501 sub file_in_archive_dummycatapi ($$$) {
1502 my ($proto,$data,$filename) = @_;
1504 dummycatapi_run_in_mirror '
1505 find -name "$1" -print0 |
1507 ', [$filename], sub {
1510 printdebug "| $_\n";
1511 m/^(\w+) (\S+)$/ or die "$_ ?";
1512 push @out, { sha256sum => $1, filename => $2 };
1518 sub package_not_wholly_new_dummycatapi {
1519 my ($proto,$data,$pkg) = @_;
1520 dummycatapi_run_in_mirror "
1521 find -name ${pkg}_*.dsc
1528 #---------- `madison' archive query method ----------
1530 sub archive_query_madison {
1531 return archive_query_prepend_mirror
1532 map { [ @$_[0..1] ] } madison_get_parse(@_);
1535 sub madison_get_parse {
1536 my ($proto,$data) = @_;
1537 die unless $proto eq 'madison';
1538 if (!length $data) {
1539 $data= access_cfg('madison-distro','RETURN-UNDEF');
1540 $data //= access_basedistro();
1542 $rmad{$proto,$data,$package} ||= cmdoutput
1543 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1544 my $rmad = $rmad{$proto,$data,$package};
1547 foreach my $l (split /\n/, $rmad) {
1548 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1549 \s*( [^ \t|]+ )\s* \|
1550 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1551 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1552 $1 eq $package or die "$rmad $package ?";
1559 $component = access_cfg('archive-query-default-component');
1561 $5 eq 'source' or die "$rmad ?";
1562 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1564 return sort { -version_compare($a->[0],$b->[0]); } @out;
1567 sub canonicalise_suite_madison {
1568 # madison canonicalises for us
1569 my @r = madison_get_parse(@_);
1571 "unable to canonicalise suite using package %s".
1572 " which does not appear to exist in suite %s;".
1573 " --existing-package may help",
1578 sub file_in_archive_madison { return undef; }
1579 sub package_not_wholly_new_madison { return undef; }
1581 #---------- `sshpsql' archive query method ----------
1582 # (untranslated, because this is obsolete)
1585 my ($data,$runeinfo,$sql) = @_;
1586 if (!length $data) {
1587 $data= access_someuserhost('sshpsql').':'.
1588 access_cfg('sshpsql-dbname');
1590 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1591 my ($userhost,$dbname) = ($`,$'); #';
1593 my @cmd = (access_cfg_ssh, $userhost,
1594 access_runeinfo("ssh-psql $runeinfo").
1595 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1596 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1598 open P, "-|", @cmd or confess "$!";
1601 printdebug(">|$_|\n");
1604 $!=0; $?=0; close P or failedcmd @cmd;
1606 my $nrows = pop @rows;
1607 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1608 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1609 @rows = map { [ split /\|/, $_ ] } @rows;
1610 my $ncols = scalar @{ shift @rows };
1611 die if grep { scalar @$_ != $ncols } @rows;
1615 sub sql_injection_check {
1616 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1619 sub archive_query_sshpsql ($$) {
1620 my ($proto,$data) = @_;
1621 sql_injection_check $isuite, $package;
1622 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1623 SELECT source.version, component.name, files.filename, files.sha256sum
1625 JOIN src_associations ON source.id = src_associations.source
1626 JOIN suite ON suite.id = src_associations.suite
1627 JOIN dsc_files ON dsc_files.source = source.id
1628 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1629 JOIN component ON component.id = files_archive_map.component_id
1630 JOIN files ON files.id = dsc_files.file
1631 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1632 AND source.source='$package'
1633 AND files.filename LIKE '%.dsc';
1635 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1636 my $digester = Digest::SHA->new(256);
1638 my ($vsn,$component,$filename,$sha256sum) = @$_;
1639 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1641 return archive_query_prepend_mirror @rows;
1644 sub canonicalise_suite_sshpsql ($$) {
1645 my ($proto,$data) = @_;
1646 sql_injection_check $isuite;
1647 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1648 SELECT suite.codename
1649 FROM suite where suite_name='$isuite' or codename='$isuite';
1651 @rows = map { $_->[0] } @rows;
1652 fail "unknown suite $isuite" unless @rows;
1653 die "ambiguous $isuite: @rows ?" if @rows>1;
1657 sub file_in_archive_sshpsql ($$$) { return undef; }
1658 sub package_not_wholly_new_sshpsql ($$$) { return undef; }
1660 #---------- `dummycat' archive query method ----------
1661 # (untranslated, because this is for testing purposes etc.)
1663 sub canonicalise_suite_dummycat ($$) {
1664 my ($proto,$data) = @_;
1665 my $dpath = "$data/suite.$isuite";
1666 if (!open C, "<", $dpath) {
1667 $!==ENOENT or die "$dpath: $!";
1668 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1672 chomp or die "$dpath: $!";
1674 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1678 sub archive_query_dummycat ($$) {
1679 my ($proto,$data) = @_;
1680 canonicalise_suite();
1681 my $dpath = "$data/package.$csuite.$package";
1682 if (!open C, "<", $dpath) {
1683 $!==ENOENT or die "$dpath: $!";
1684 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1692 printdebug "dummycat query $csuite $package $dpath | $_\n";
1693 my @row = split /\s+/, $_;
1694 @row==2 or die "$dpath: $_ ?";
1697 C->error and die "$dpath: $!";
1699 return archive_query_prepend_mirror
1700 sort { -version_compare($a->[0],$b->[0]); } @rows;
1703 sub file_in_archive_dummycat () { return undef; }
1704 sub package_not_wholly_new_dummycat () { return undef; }
1706 #---------- archive query entrypoints and rest of program ----------
1708 sub canonicalise_suite () {
1709 return if defined $csuite;
1710 fail f_ "cannot operate on %s suite", $isuite if $isuite eq 'UNRELEASED';
1711 $csuite = archive_query('canonicalise_suite');
1712 if ($isuite ne $csuite) {
1713 progress f_ "canonical suite name for %s is %s", $isuite, $csuite;
1715 progress f_ "canonical suite name is %s", $csuite;
1719 sub get_archive_dsc () {
1720 canonicalise_suite();
1721 my @vsns = archive_query('archive_query');
1722 foreach my $vinfo (@vsns) {
1723 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1724 $dscurl = $vsn_dscurl;
1725 $dscdata = url_get($dscurl);
1727 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1732 $digester->add($dscdata);
1733 my $got = $digester->hexdigest();
1735 fail f_ "%s has hash %s but archive told us to expect %s",
1736 $dscurl, $got, $digest;
1739 my $fmt = getfield $dsc, 'Format';
1740 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1741 f_ "unsupported source format %s, sorry", $fmt;
1743 $dsc_checked = !!$digester;
1744 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1748 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1751 sub check_for_git ();
1752 sub check_for_git () {
1754 my $how = access_cfg('git-check');
1755 if ($how eq 'ssh-cmd') {
1757 (access_cfg_ssh, access_gituserhost(),
1758 access_runeinfo("git-check $package").
1759 " set -e; cd ".access_cfg('git-path').";".
1760 " if test -d $package.git; then echo 1; else echo 0; fi");
1761 my $r= cmdoutput @cmd;
1762 if (defined $r and $r =~ m/^divert (\w+)$/) {
1764 my ($usedistro,) = access_distros();
1765 # NB that if we are pushing, $usedistro will be $distro/push
1766 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1767 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1768 progress f_ "diverting to %s (using config for %s)",
1769 $divert, $instead_distro;
1770 return check_for_git();
1772 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1774 } elsif ($how eq 'url') {
1775 my $prefix = access_cfg('git-check-url','git-url');
1776 my $suffix = access_cfg('git-check-suffix','git-suffix',
1777 'RETURN-UNDEF') // '.git';
1778 my $url = "$prefix/$package$suffix";
1779 my @cmd = (@curl, qw(-sS -I), $url);
1780 my $result = cmdoutput @cmd;
1781 $result =~ s/^\S+ 200 .*\n\r?\n//;
1782 # curl -sS -I with https_proxy prints
1783 # HTTP/1.0 200 Connection established
1784 $result =~ m/^\S+ (404|200) /s or
1785 fail +(__ "unexpected results from git check query - ").
1786 Dumper($prefix, $result);
1788 if ($code eq '404') {
1790 } elsif ($code eq '200') {
1795 } elsif ($how eq 'true') {
1797 } elsif ($how eq 'false') {
1800 badcfg f_ "unknown git-check \`%s'", $how;
1804 sub create_remote_git_repo () {
1805 my $how = access_cfg('git-create');
1806 if ($how eq 'ssh-cmd') {
1808 (access_cfg_ssh, access_gituserhost(),
1809 access_runeinfo("git-create $package").
1810 "set -e; cd ".access_cfg('git-path').";".
1811 " cp -a _template $package.git");
1812 } elsif ($how eq 'true') {
1815 badcfg f_ "unknown git-create \`%s'", $how;
1819 our ($dsc_hash,$lastpush_mergeinput);
1820 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1824 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1825 $playground = fresh_playground 'dgit/unpack';
1828 sub mktree_in_ud_here () {
1829 playtree_setup $gitcfgs{local};
1832 sub git_write_tree () {
1833 my $tree = cmdoutput @git, qw(write-tree);
1834 $tree =~ m/^\w+$/ or die "$tree ?";
1838 sub git_add_write_tree () {
1839 runcmd @git, qw(add -Af .);
1840 return git_write_tree();
1843 sub remove_stray_gits ($) {
1845 my @gitscmd = qw(find -name .git -prune -print0);
1846 debugcmd "|",@gitscmd;
1847 open GITS, "-|", @gitscmd or confess "$!";
1852 print STDERR f_ "%s: warning: removing from %s: %s\n",
1853 $us, $what, (messagequote $_);
1857 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1860 sub mktree_in_ud_from_only_subdir ($;$) {
1861 my ($what,$raw) = @_;
1862 # changes into the subdir
1865 confess "expected one subdir but found @dirs ?" unless @dirs==1;
1866 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1870 remove_stray_gits($what);
1871 mktree_in_ud_here();
1873 my ($format, $fopts) = get_source_format();
1874 if (madformat($format)) {
1879 my $tree=git_add_write_tree();
1880 return ($tree,$dir);
1883 our @files_csum_info_fields =
1884 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1885 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1886 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1888 sub dsc_files_info () {
1889 foreach my $csumi (@files_csum_info_fields) {
1890 my ($fname, $module, $method) = @$csumi;
1891 my $field = $dsc->{$fname};
1892 next unless defined $field;
1893 eval "use $module; 1;" or die $@;
1895 foreach (split /\n/, $field) {
1897 m/^(\w+) (\d+) (\S+)$/ or
1898 fail f_ "could not parse .dsc %s line \`%s'", $fname, $_;
1899 my $digester = eval "$module"."->$method;" or die $@;
1904 Digester => $digester,
1909 fail f_ "missing any supported Checksums-* or Files field in %s",
1910 $dsc->get_option('name');
1914 map { $_->{Filename} } dsc_files_info();
1917 sub files_compare_inputs (@) {
1922 my $showinputs = sub {
1923 return join "; ", map { $_->get_option('name') } @$inputs;
1926 foreach my $in (@$inputs) {
1928 my $in_name = $in->get_option('name');
1930 printdebug "files_compare_inputs $in_name\n";
1932 foreach my $csumi (@files_csum_info_fields) {
1933 my ($fname) = @$csumi;
1934 printdebug "files_compare_inputs $in_name $fname\n";
1936 my $field = $in->{$fname};
1937 next unless defined $field;
1940 foreach (split /\n/, $field) {
1943 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1944 fail "could not parse $in_name $fname line \`$_'";
1946 printdebug "files_compare_inputs $in_name $fname $f\n";
1950 my $re = \ $record{$f}{$fname};
1952 $fchecked{$f}{$in_name} = 1;
1955 "hash or size of %s varies in %s fields (between: %s)",
1956 $f, $fname, $showinputs->();
1961 @files = sort @files;
1962 $expected_files //= \@files;
1963 "@$expected_files" eq "@files" or
1964 fail f_ "file list in %s varies between hash fields!",
1968 fail f_ "%s has no files list field(s)", $in_name;
1970 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1973 grep { keys %$_ == @$inputs-1 } values %fchecked
1974 or fail f_ "no file appears in all file lists (looked in: %s)",
1978 sub is_orig_file_in_dsc ($$) {
1979 my ($f, $dsc_files_info) = @_;
1980 return 0 if @$dsc_files_info <= 1;
1981 # One file means no origs, and the filename doesn't have a "what
1982 # part of dsc" component. (Consider versions ending `.orig'.)
1983 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1987 # This function determines whether a .changes file is source-only from
1988 # the point of view of dak. Thus, it permits *_source.buildinfo
1991 # It does not, however, permit any other buildinfo files. After a
1992 # source-only upload, the buildds will try to upload files like
1993 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
1994 # named like this in their (otherwise) source-only upload, the uploads
1995 # of the buildd can be rejected by dak. Fixing the resultant
1996 # situation can require manual intervention. So we block such
1997 # .buildinfo files when the user tells us to perform a source-only
1998 # upload (such as when using the push-source subcommand with the -C
1999 # option, which calls this function).
2001 # Note, though, that when dgit is told to prepare a source-only
2002 # upload, such as when subcommands like build-source and push-source
2003 # without -C are used, dgit has a more restrictive notion of
2004 # source-only .changes than dak: such uploads will never include
2005 # *_source.buildinfo files. This is because there is no use for such
2006 # files when using a tool like dgit to produce the source package, as
2007 # dgit ensures the source is identical to git HEAD.
2008 sub test_source_only_changes ($) {
2010 foreach my $l (split /\n/, getfield $changes, 'Files') {
2011 $l =~ m/\S+$/ or next;
2012 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
2013 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
2014 print f_ "purportedly source-only changes polluted by %s\n", $&;
2021 sub changes_update_origs_from_dsc ($$$$) {
2022 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
2024 printdebug "checking origs needed ($upstreamvsn)...\n";
2025 $_ = getfield $changes, 'Files';
2026 m/^\w+ \d+ (\S+ \S+) \S+$/m or
2027 fail __ "cannot find section/priority from .changes Files field";
2028 my $placementinfo = $1;
2030 printdebug "checking origs needed placement '$placementinfo'...\n";
2031 foreach my $l (split /\n/, getfield $dsc, 'Files') {
2032 $l =~ m/\S+$/ or next;
2034 printdebug "origs $file | $l\n";
2035 next unless is_orig_file_of_vsn $file, $upstreamvsn;
2036 printdebug "origs $file is_orig\n";
2037 my $have = archive_query('file_in_archive', $file);
2038 if (!defined $have) {
2039 print STDERR __ <<END;
2040 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
2046 printdebug "origs $file \$#\$have=$#$have\n";
2047 foreach my $h (@$have) {
2050 foreach my $csumi (@files_csum_info_fields) {
2051 my ($fname, $module, $method, $archivefield) = @$csumi;
2052 next unless defined $h->{$archivefield};
2053 $_ = $dsc->{$fname};
2054 next unless defined;
2055 m/^(\w+) .* \Q$file\E$/m or
2056 fail f_ ".dsc %s missing entry for %s", $fname, $file;
2057 if ($h->{$archivefield} eq $1) {
2061 "%s: %s (archive) != %s (local .dsc)",
2062 $archivefield, $h->{$archivefield}, $1;
2065 confess "$file ".Dumper($h)." ?!" if $same && @differ;
2069 f_ "archive %s: %s", $h->{filename}, join "; ", @differ
2072 printdebug "origs $file f.same=$found_same".
2073 " #f._differ=$#found_differ\n";
2074 if (@found_differ && !$found_same) {
2076 (f_ "archive contains %s with different checksum", $file),
2079 # Now we edit the changes file to add or remove it
2080 foreach my $csumi (@files_csum_info_fields) {
2081 my ($fname, $module, $method, $archivefield) = @$csumi;
2082 next unless defined $changes->{$fname};
2084 # in archive, delete from .changes if it's there
2085 $changed{$file} = "removed" if
2086 $changes->{$fname} =~ s/\n.* \Q$file\E$(?:)$//m;
2087 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)$/m) {
2088 # not in archive, but it's here in the .changes
2090 my $dsc_data = getfield $dsc, $fname;
2091 $dsc_data =~ m/^(.* \Q$file\E$)$/m or die "$dsc_data $file ?";
2093 $extra =~ s/ \d+ /$&$placementinfo /
2094 or confess "$fname $extra >$dsc_data< ?"
2095 if $fname eq 'Files';
2096 $changes->{$fname} .= "\n". $extra;
2097 $changed{$file} = "added";
2102 foreach my $file (keys %changed) {
2104 "edited .changes for archive .orig contents: %s %s",
2105 $changed{$file}, $file;
2107 my $chtmp = "$changesfile.tmp";
2108 $changes->save($chtmp);
2110 rename $chtmp,$changesfile or die "$changesfile $!";
2112 progress f_ "[new .changes left in %s]", $changesfile;
2115 progress f_ "%s already has appropriate .orig(s) (if any)",
2120 sub clogp_authline ($) {
2122 my $author = getfield $clogp, 'Maintainer';
2123 if ($author =~ m/^[^"\@]+\,/) {
2124 # single entry Maintainer field with unquoted comma
2125 $author = ($& =~ y/,//rd).$'; # strip the comma
2127 # git wants a single author; any remaining commas in $author
2128 # are by now preceded by @ (or "). It seems safer to punt on
2129 # "..." for now rather than attempting to dequote or something.
2130 $author =~ s#,.*##ms unless $author =~ m/"/;
2131 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2132 my $authline = "$author $date";
2133 $authline =~ m/$git_authline_re/o or
2134 fail f_ "unexpected commit author line format \`%s'".
2135 " (was generated from changelog Maintainer field)",
2137 return ($1,$2,$3) if wantarray;
2141 sub vendor_patches_distro ($$) {
2142 my ($checkdistro, $what) = @_;
2143 return unless defined $checkdistro;
2145 my $series = "debian/patches/\L$checkdistro\E.series";
2146 printdebug "checking for vendor-specific $series ($what)\n";
2148 if (!open SERIES, "<", $series) {
2149 confess "$series $!" unless $!==ENOENT;
2156 print STDERR __ <<END;
2158 Unfortunately, this source package uses a feature of dpkg-source where
2159 the same source package unpacks to different source code on different
2160 distros. dgit cannot safely operate on such packages on affected
2161 distros, because the meaning of source packages is not stable.
2163 Please ask the distro/maintainer to remove the distro-specific series
2164 files and use a different technique (if necessary, uploading actually
2165 different packages, if different distros are supposed to have
2169 fail f_ "Found active distro-specific series file for".
2170 " %s (%s): %s, cannot continue",
2171 $checkdistro, $what, $series;
2173 die "$series $!" if SERIES->error;
2177 sub check_for_vendor_patches () {
2178 # This dpkg-source feature doesn't seem to be documented anywhere!
2179 # But it can be found in the changelog (reformatted):
2181 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2182 # Author: Raphael Hertzog <hertzog@debian.org>
2183 # Date: Sun Oct 3 09:36:48 2010 +0200
2185 # dpkg-source: correctly create .pc/.quilt_series with alternate
2188 # If you have debian/patches/ubuntu.series and you were
2189 # unpacking the source package on ubuntu, quilt was still
2190 # directed to debian/patches/series instead of
2191 # debian/patches/ubuntu.series.
2193 # debian/changelog | 3 +++
2194 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2195 # 2 files changed, 6 insertions(+), 1 deletion(-)
2198 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2199 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2200 __ "Dpkg::Vendor \`current vendor'");
2201 vendor_patches_distro(access_basedistro(),
2202 __ "(base) distro being accessed");
2203 vendor_patches_distro(access_nomdistro(),
2204 __ "(nominal) distro being accessed");
2207 sub check_bpd_exists () {
2208 stat $buildproductsdir
2209 or fail f_ "build-products-dir %s is not accessible: %s\n",
2210 $buildproductsdir, $!;
2213 sub dotdot_bpd_transfer_origs ($$$) {
2214 my ($bpd_abs, $upstreamversion, $wanted) = @_;
2215 # checks is_orig_file_of_vsn and if
2216 # calls $wanted->{$leaf} and expects boolish
2218 return if $buildproductsdir eq '..';
2221 my $dotdot = $maindir;
2222 $dotdot =~ s{/[^/]+$}{};
2223 opendir DD, $dotdot or fail "opendir .. ($dotdot): $!";
2224 while ($!=0, defined(my $leaf = readdir DD)) {
2226 local ($debuglevel) = $debuglevel-1;
2227 printdebug "DD_BPD $leaf ?\n";
2229 next unless is_orig_file_of_vsn $leaf, $upstreamversion;
2230 next unless $wanted->($leaf);
2231 next if lstat "$bpd_abs/$leaf";
2234 "%s: found orig(s) in .. missing from build-products-dir, transferring:\n",
2237 $! == &ENOENT or fail f_
2238 "check orig file %s in bpd %s: %s", $leaf, $bpd_abs, $!;
2239 lstat "$dotdot/$leaf" or fail f_
2240 "check orig file %s in ..: %s", $leaf, $!;
2242 stat "$dotdot/$leaf" or fail f_
2243 "check target of orig symlink %s in ..: %s", $leaf, $!;
2244 my $ltarget = readlink "$dotdot/$leaf" or
2245 die "readlink $dotdot/$leaf: $!";
2246 if ($ltarget !~ m{^/}) {
2247 $ltarget = "$dotdot/$ltarget";
2249 symlink $ltarget, "$bpd_abs/$leaf"
2250 or die "$ltarget $bpd_abs $leaf: $!";
2252 "%s: cloned orig symlink from ..: %s\n",
2254 } elsif (link "$dotdot/$leaf", "$bpd_abs/$leaf") {
2256 "%s: hardlinked orig from ..: %s\n",
2258 } elsif ($! != EXDEV) {
2259 fail f_ "failed to make %s a hardlink to %s: %s",
2260 "$bpd_abs/$leaf", "$dotdot/$leaf", $!;
2262 symlink "$bpd_abs/$leaf", "$dotdot/$leaf"
2263 or die "$bpd_abs $dotdot $leaf $!";
2265 "%s: symmlinked orig from .. on other filesystem: %s\n",
2269 die "$dotdot; $!" if $!;
2273 sub generate_commits_from_dsc () {
2274 # See big comment in fetch_from_archive, below.
2275 # See also README.dsc-import.
2277 changedir $playground;
2279 my $bpd_abs = bpd_abs();
2280 my $upstreamv = upstreamversion $dsc->{version};
2281 my @dfi = dsc_files_info();
2283 dotdot_bpd_transfer_origs $bpd_abs, $upstreamv,
2284 sub { grep { $_->{Filename} eq $_[0] } @dfi };
2286 foreach my $fi (@dfi) {
2287 my $f = $fi->{Filename};
2288 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2289 my $upper_f = "$bpd_abs/$f";
2291 printdebug "considering reusing $f: ";
2293 if (link_ltarget "$upper_f,fetch", $f) {
2294 printdebug "linked (using ...,fetch).\n";
2295 } elsif ((printdebug "($!) "),
2297 fail f_ "accessing %s: %s", "$buildproductsdir/$f,fetch", $!;
2298 } elsif (link_ltarget $upper_f, $f) {
2299 printdebug "linked.\n";
2300 } elsif ((printdebug "($!) "),
2302 fail f_ "accessing %s: %s", "$buildproductsdir/$f", $!;
2304 printdebug "absent.\n";
2308 complete_file_from_dsc('.', $fi, \$refetched)
2311 printdebug "considering saving $f: ";
2313 if (rename_link_xf 1, $f, $upper_f) {
2314 printdebug "linked.\n";
2315 } elsif ((printdebug "($@) "),
2317 fail f_ "saving %s: %s", "$buildproductsdir/$f", $@;
2318 } elsif (!$refetched) {
2319 printdebug "no need.\n";
2320 } elsif (rename_link_xf 1, $f, "$upper_f,fetch") {
2321 printdebug "linked (using ...,fetch).\n";
2322 } elsif ((printdebug "($@) "),
2324 fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $@;
2326 printdebug "cannot.\n";
2330 # We unpack and record the orig tarballs first, so that we only
2331 # need disk space for one private copy of the unpacked source.
2332 # But we can't make them into commits until we have the metadata
2333 # from the debian/changelog, so we record the tree objects now and
2334 # make them into commits later.
2336 my $orig_f_base = srcfn $upstreamv, '';
2338 foreach my $fi (@dfi) {
2339 # We actually import, and record as a commit, every tarball
2340 # (unless there is only one file, in which case there seems
2343 my $f = $fi->{Filename};
2344 printdebug "import considering $f ";
2345 (printdebug "only one dfi\n"), next if @dfi == 1;
2346 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2347 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2351 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2353 printdebug "Y ", (join ' ', map { $_//"(none)" }
2354 $compr_ext, $orig_f_part
2357 my $input = new IO::File $f, '<' or die "$f $!";
2361 if (defined $compr_ext) {
2363 Dpkg::Compression::compression_guess_from_filename $f;
2364 fail "Dpkg::Compression cannot handle file $f in source package"
2365 if defined $compr_ext && !defined $cname;
2367 new Dpkg::Compression::Process compression => $cname;
2368 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2369 my $compr_fh = new IO::Handle;
2370 my $compr_pid = open $compr_fh, "-|" // confess "$!";
2372 open STDIN, "<&", $input or confess "$!";
2374 die "dgit (child): exec $compr_cmd[0]: $!\n";
2379 rmtree "_unpack-tar";
2380 mkdir "_unpack-tar" or confess "$!";
2381 my @tarcmd = qw(tar -x -f -
2382 --no-same-owner --no-same-permissions
2383 --no-acls --no-xattrs --no-selinux);
2384 my $tar_pid = fork // confess "$!";
2386 chdir "_unpack-tar" or confess "$!";
2387 open STDIN, "<&", $input or confess "$!";
2389 die f_ "dgit (child): exec %s: %s", $tarcmd[0], $!;
2391 $!=0; (waitpid $tar_pid, 0) == $tar_pid or confess "$!";
2392 !$? or failedcmd @tarcmd;
2395 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2397 # finally, we have the results in "tarball", but maybe
2398 # with the wrong permissions
2400 runcmd qw(chmod -R +rwX _unpack-tar);
2401 changedir "_unpack-tar";
2402 remove_stray_gits($f);
2403 mktree_in_ud_here();
2405 my ($tree) = git_add_write_tree();
2406 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2407 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2409 printdebug "one subtree $1\n";
2411 printdebug "multiple subtrees\n";
2414 rmtree "_unpack-tar";
2416 my $ent = [ $f, $tree ];
2418 Orig => !!$orig_f_part,
2419 Sort => (!$orig_f_part ? 2 :
2420 $orig_f_part =~ m/-/g ? 1 :
2428 # put any without "_" first (spec is not clear whether files
2429 # are always in the usual order). Tarballs without "_" are
2430 # the main orig or the debian tarball.
2431 $a->{Sort} <=> $b->{Sort} or
2435 my $any_orig = grep { $_->{Orig} } @tartrees;
2437 my $dscfn = "$package.dsc";
2439 my $treeimporthow = 'package';
2441 open D, ">", $dscfn or die "$dscfn: $!";
2442 print D $dscdata or die "$dscfn: $!";
2443 close D or die "$dscfn: $!";
2444 my @cmd = qw(dpkg-source);
2445 push @cmd, '--no-check' if $dsc_checked;
2446 if (madformat $dsc->{format}) {
2447 push @cmd, '--skip-patches';
2448 $treeimporthow = 'unpatched';
2450 push @cmd, qw(-x --), $dscfn;
2453 my ($tree,$dir) = mktree_in_ud_from_only_subdir(__ "source package");
2454 if (madformat $dsc->{format}) {
2455 check_for_vendor_patches();
2459 if (madformat $dsc->{format}) {
2460 my @pcmd = qw(dpkg-source --before-build .);
2461 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2463 $dappliedtree = git_add_write_tree();
2466 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2470 printdebug "import clog search...\n";
2471 parsechangelog_loop \@clogcmd, (__ "package changelog"), sub {
2472 my ($thisstanza, $desc) = @_;
2473 no warnings qw(exiting);
2475 $clogp //= $thisstanza;
2477 printdebug "import clog $thisstanza->{version} $desc...\n";
2479 last if !$any_orig; # we don't need $r1clogp
2481 # We look for the first (most recent) changelog entry whose
2482 # version number is lower than the upstream version of this
2483 # package. Then the last (least recent) previous changelog
2484 # entry is treated as the one which introduced this upstream
2485 # version and used for the synthetic commits for the upstream
2488 # One might think that a more sophisticated algorithm would be
2489 # necessary. But: we do not want to scan the whole changelog
2490 # file. Stopping when we see an earlier version, which
2491 # necessarily then is an earlier upstream version, is the only
2492 # realistic way to do that. Then, either the earliest
2493 # changelog entry we have seen so far is indeed the earliest
2494 # upload of this upstream version; or there are only changelog
2495 # entries relating to later upstream versions (which is not
2496 # possible unless the changelog and .dsc disagree about the
2497 # version). Then it remains to choose between the physically
2498 # last entry in the file, and the one with the lowest version
2499 # number. If these are not the same, we guess that the
2500 # versions were created in a non-monotonic order rather than
2501 # that the changelog entries have been misordered.
2503 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2505 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2506 $r1clogp = $thisstanza;
2508 printdebug "import clog $r1clogp->{version} becomes r1\n";
2511 $clogp or fail __ "package changelog has no entries!";
2513 my $authline = clogp_authline $clogp;
2514 my $changes = getfield $clogp, 'Changes';
2515 $changes =~ s/^\n//; # Changes: \n
2516 my $cversion = getfield $clogp, 'Version';
2519 $r1clogp //= $clogp; # maybe there's only one entry;
2520 my $r1authline = clogp_authline $r1clogp;
2521 # Strictly, r1authline might now be wrong if it's going to be
2522 # unused because !$any_orig. Whatever.
2524 printdebug "import tartrees authline $authline\n";
2525 printdebug "import tartrees r1authline $r1authline\n";
2527 foreach my $tt (@tartrees) {
2528 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2530 my $mbody = f_ "Import %s", $tt->{F};
2531 $tt->{Commit} = hash_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2534 committer $r1authline
2538 [dgit import orig $tt->{F}]
2546 [dgit import tarball $package $cversion $tt->{F}]
2551 printdebug "import main commit\n";
2553 open C, ">../commit.tmp" or confess "$!";
2554 print C <<END or confess "$!";
2557 print C <<END or confess "$!" foreach @tartrees;
2560 print C <<END or confess "$!";
2566 [dgit import $treeimporthow $package $cversion]
2569 close C or confess "$!";
2570 my $rawimport_hash = hash_commit qw(../commit.tmp);
2572 if (madformat $dsc->{format}) {
2573 printdebug "import apply patches...\n";
2575 # regularise the state of the working tree so that
2576 # the checkout of $rawimport_hash works nicely.
2577 my $dappliedcommit = hash_commit_text(<<END);
2584 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2586 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2588 # We need the answers to be reproducible
2589 my @authline = clogp_authline($clogp);
2590 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2591 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2592 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2593 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2594 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2595 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2597 my $path = $ENV{PATH} or die;
2599 # we use ../../gbp-pq-output, which (given that we are in
2600 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2603 foreach my $use_absurd (qw(0 1)) {
2604 runcmd @git, qw(checkout -q unpa);
2605 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2606 local $ENV{PATH} = $path;
2609 progress "warning: $@";
2610 $path = "$absurdity:$path";
2611 progress f_ "%s: trying slow absurd-git-apply...", $us;
2612 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2617 die "forbid absurd git-apply\n" if $use_absurd
2618 && forceing [qw(import-gitapply-no-absurd)];
2619 die "only absurd git-apply!\n" if !$use_absurd
2620 && forceing [qw(import-gitapply-absurd)];
2622 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2623 local $ENV{PATH} = $path if $use_absurd;
2625 my @showcmd = (gbp_pq, qw(import));
2626 my @realcmd = shell_cmd
2627 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2628 debugcmd "+",@realcmd;
2629 if (system @realcmd) {
2630 die f_ "%s failed: %s\n",
2631 +(shellquote @showcmd),
2632 failedcmd_waitstatus();
2635 my $gapplied = git_rev_parse('HEAD');
2636 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2637 $gappliedtree eq $dappliedtree or
2638 fail f_ <<END, $gapplied, $gappliedtree, $dappliedtree;
2639 gbp-pq import and dpkg-source disagree!
2640 gbp-pq import gave commit %s
2641 gbp-pq import gave tree %s
2642 dpkg-source --before-build gave tree %s
2644 $rawimport_hash = $gapplied;
2649 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2654 progress f_ "synthesised git commit from .dsc %s", $cversion;
2656 my $rawimport_mergeinput = {
2657 Commit => $rawimport_hash,
2658 Info => __ "Import of source package",
2660 my @output = ($rawimport_mergeinput);
2662 if ($lastpush_mergeinput) {
2663 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2664 my $oversion = getfield $oldclogp, 'Version';
2666 version_compare($oversion, $cversion);
2668 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2669 { ReverseParents => 1,
2670 Message => (f_ <<END, $package, $cversion, $csuite) });
2671 Record %s (%s) in archive suite %s
2673 } elsif ($vcmp > 0) {
2674 print STDERR f_ <<END, $cversion, $oversion,
2676 Version actually in archive: %s (older)
2677 Last version pushed with dgit: %s (newer or same)
2680 __ $later_warning_msg or confess "$!";
2681 @output = $lastpush_mergeinput;
2683 # Same version. Use what's in the server git branch,
2684 # discarding our own import. (This could happen if the
2685 # server automatically imports all packages into git.)
2686 @output = $lastpush_mergeinput;
2694 sub complete_file_from_dsc ($$;$) {
2695 our ($dstdir, $fi, $refetched) = @_;
2696 # Ensures that we have, in $dstdir, the file $fi, with the correct
2697 # contents. (Downloading it from alongside $dscurl if necessary.)
2698 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2699 # and will set $$refetched=1 if it did so (or tried to).
2701 my $f = $fi->{Filename};
2702 my $tf = "$dstdir/$f";
2706 my $checkhash = sub {
2707 open F, "<", "$tf" or die "$tf: $!";
2708 $fi->{Digester}->reset();
2709 $fi->{Digester}->addfile(*F);
2710 F->error and confess "$!";
2711 $got = $fi->{Digester}->hexdigest();
2712 return $got eq $fi->{Hash};
2715 if (stat_exists $tf) {
2716 if ($checkhash->()) {
2717 progress f_ "using existing %s", $f;
2721 fail f_ "file %s has hash %s but .dsc demands hash %s".
2722 " (perhaps you should delete this file?)",
2723 $f, $got, $fi->{Hash};
2725 progress f_ "need to fetch correct version of %s", $f;
2726 unlink $tf or die "$tf $!";
2729 printdebug "$tf does not exist, need to fetch\n";
2733 $furl =~ s{/[^/]+$}{};
2735 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2736 die "$f ?" if $f =~ m#/#;
2737 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2738 return 0 if !act_local();
2741 fail f_ "file %s has hash %s but .dsc demands hash %s".
2742 " (got wrong file from archive!)",
2743 $f, $got, $fi->{Hash};
2748 sub ensure_we_have_orig () {
2749 my @dfi = dsc_files_info();
2750 foreach my $fi (@dfi) {
2751 my $f = $fi->{Filename};
2752 next unless is_orig_file_in_dsc($f, \@dfi);
2753 complete_file_from_dsc($buildproductsdir, $fi)
2758 #---------- git fetch ----------
2760 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2761 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2763 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2764 # locally fetched refs because they have unhelpful names and clutter
2765 # up gitk etc. So we track whether we have "used up" head ref (ie,
2766 # whether we have made another local ref which refers to this object).
2768 # (If we deleted them unconditionally, then we might end up
2769 # re-fetching the same git objects each time dgit fetch was run.)
2771 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2772 # in git_fetch_us to fetch the refs in question, and possibly a call
2773 # to lrfetchref_used.
2775 our (%lrfetchrefs_f, %lrfetchrefs_d);
2776 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2778 sub lrfetchref_used ($) {
2779 my ($fullrefname) = @_;
2780 my $objid = $lrfetchrefs_f{$fullrefname};
2781 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2784 sub git_lrfetch_sane {
2785 my ($url, $supplementary, @specs) = @_;
2786 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2787 # at least as regards @specs. Also leave the results in
2788 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2789 # able to clean these up.
2791 # With $supplementary==1, @specs must not contain wildcards
2792 # and we add to our previous fetches (non-atomically).
2794 # This is rather miserable:
2795 # When git fetch --prune is passed a fetchspec ending with a *,
2796 # it does a plausible thing. If there is no * then:
2797 # - it matches subpaths too, even if the supplied refspec
2798 # starts refs, and behaves completely madly if the source
2799 # has refs/refs/something. (See, for example, Debian #NNNN.)
2800 # - if there is no matching remote ref, it bombs out the whole
2802 # We want to fetch a fixed ref, and we don't know in advance
2803 # if it exists, so this is not suitable.
2805 # Our workaround is to use git ls-remote. git ls-remote has its
2806 # own qairks. Notably, it has the absurd multi-tail-matching
2807 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2808 # refs/refs/foo etc.
2810 # Also, we want an idempotent snapshot, but we have to make two
2811 # calls to the remote: one to git ls-remote and to git fetch. The
2812 # solution is use git ls-remote to obtain a target state, and
2813 # git fetch to try to generate it. If we don't manage to generate
2814 # the target state, we try again.
2816 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2818 my $specre = join '|', map {
2821 my $wildcard = $x =~ s/\\\*$/.*/;
2822 die if $wildcard && $supplementary;
2825 printdebug "git_lrfetch_sane specre=$specre\n";
2826 my $wanted_rref = sub {
2828 return m/^(?:$specre)$/;
2831 my $fetch_iteration = 0;
2834 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2835 if (++$fetch_iteration > 10) {
2836 fail __ "too many iterations trying to get sane fetch!";
2839 my @look = map { "refs/$_" } @specs;
2840 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2844 open GITLS, "-|", @lcmd or confess "$!";
2846 printdebug "=> ", $_;
2847 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2848 my ($objid,$rrefname) = ($1,$2);
2849 if (!$wanted_rref->($rrefname)) {
2850 print STDERR f_ <<END, "@look", $rrefname;
2851 warning: git ls-remote %s reported %s; this is silly, ignoring it.
2855 $wantr{$rrefname} = $objid;
2858 close GITLS or failedcmd @lcmd;
2860 # OK, now %want is exactly what we want for refs in @specs
2862 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2863 "+refs/$_:".lrfetchrefs."/$_";
2866 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2868 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2869 runcmd_ordryrun_local @fcmd if @fspecs;
2871 if (!$supplementary) {
2872 %lrfetchrefs_f = ();
2876 git_for_each_ref(lrfetchrefs, sub {
2877 my ($objid,$objtype,$lrefname,$reftail) = @_;
2878 $lrfetchrefs_f{$lrefname} = $objid;
2879 $objgot{$objid} = 1;
2882 if ($supplementary) {
2886 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2887 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2888 if (!exists $wantr{$rrefname}) {
2889 if ($wanted_rref->($rrefname)) {
2891 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2894 print STDERR f_ <<END, "@fspecs", $lrefname
2895 warning: git fetch %s created %s; this is silly, deleting it.
2898 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2899 delete $lrfetchrefs_f{$lrefname};
2903 foreach my $rrefname (sort keys %wantr) {
2904 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2905 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2906 my $want = $wantr{$rrefname};
2907 next if $got eq $want;
2908 if (!defined $objgot{$want}) {
2909 fail __ <<END unless act_local();
2910 --dry-run specified but we actually wanted the results of git fetch,
2911 so this is not going to work. Try running dgit fetch first,
2912 or using --damp-run instead of --dry-run.
2914 print STDERR f_ <<END, $lrefname, $want;
2915 warning: git ls-remote suggests we want %s
2916 warning: and it should refer to %s
2917 warning: but git fetch didn't fetch that object to any relevant ref.
2918 warning: This may be due to a race with someone updating the server.
2919 warning: Will try again...
2921 next FETCH_ITERATION;
2924 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2926 runcmd_ordryrun_local @git, qw(update-ref -m),
2927 "dgit fetch git fetch fixup", $lrefname, $want;
2928 $lrfetchrefs_f{$lrefname} = $want;
2933 if (defined $csuite) {
2934 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2935 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2936 my ($objid,$objtype,$lrefname,$reftail) = @_;
2937 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2938 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2942 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2943 Dumper(\%lrfetchrefs_f);
2946 sub git_fetch_us () {
2947 # Want to fetch only what we are going to use, unless
2948 # deliberately-not-ff, in which case we must fetch everything.
2950 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2951 map { "tags/$_" } debiantags('*',access_nomdistro);
2952 push @specs, server_branch($csuite);
2953 push @specs, $rewritemap;
2954 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2956 my $url = access_giturl();
2957 git_lrfetch_sane $url, 0, @specs;
2960 my @tagpats = debiantags('*',access_nomdistro);
2962 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2963 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2964 printdebug "currently $fullrefname=$objid\n";
2965 $here{$fullrefname} = $objid;
2967 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2968 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2969 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2970 printdebug "offered $lref=$objid\n";
2971 if (!defined $here{$lref}) {
2972 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2973 runcmd_ordryrun_local @upd;
2974 lrfetchref_used $fullrefname;
2975 } elsif ($here{$lref} eq $objid) {
2976 lrfetchref_used $fullrefname;
2978 print STDERR f_ "Not updating %s from %s to %s.\n",
2979 $lref, $here{$lref}, $objid;
2984 #---------- dsc and archive handling ----------
2986 sub mergeinfo_getclogp ($) {
2987 # Ensures thit $mi->{Clogp} exists and returns it
2989 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2992 sub mergeinfo_version ($) {
2993 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2996 sub fetch_from_archive_record_1 ($) {
2998 runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
2999 cmdoutput @git, qw(log -n2), $hash;
3000 # ... gives git a chance to complain if our commit is malformed
3003 sub fetch_from_archive_record_2 ($) {
3005 my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
3009 dryrun_report @upd_cmd;
3013 sub parse_dsc_field_def_dsc_distro () {
3014 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
3015 dgit.default.distro);
3018 sub parse_dsc_field ($$) {
3019 my ($dsc, $what) = @_;
3021 foreach my $field (@ourdscfield) {
3022 $f = $dsc->{$field};
3027 progress f_ "%s: NO git hash", $what;
3028 parse_dsc_field_def_dsc_distro();
3029 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
3030 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
3031 progress f_ "%s: specified git info (%s)", $what, $dsc_distro;
3032 $dsc_hint_tag = [ $dsc_hint_tag ];
3033 } elsif ($f =~ m/^\w+\s*$/) {
3035 parse_dsc_field_def_dsc_distro();
3036 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
3038 progress f_ "%s: specified git hash", $what;
3040 fail f_ "%s: invalid Dgit info", $what;
3044 sub resolve_dsc_field_commit ($$) {
3045 my ($already_distro, $already_mapref) = @_;
3047 return unless defined $dsc_hash;
3050 defined $already_mapref &&
3051 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
3052 ? $already_mapref : undef;
3056 my ($what, @fetch) = @_;
3058 local $idistro = $dsc_distro;
3059 my $lrf = lrfetchrefs;
3061 if (!$chase_dsc_distro) {
3062 progress f_ "not chasing .dsc distro %s: not fetching %s",
3067 progress f_ ".dsc names distro %s: fetching %s", $dsc_distro, $what;
3069 my $url = access_giturl();
3070 if (!defined $url) {
3071 defined $dsc_hint_url or fail f_ <<END, $dsc_distro;
3072 .dsc Dgit metadata is in context of distro %s
3073 for which we have no configured url and .dsc provides no hint
3076 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
3077 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
3078 parse_cfg_bool "dsc-url-proto-ok", 'false',
3079 cfg("dgit.dsc-url-proto-ok.$proto",
3080 "dgit.default.dsc-url-proto-ok")
3081 or fail f_ <<END, $dsc_distro, $proto;
3082 .dsc Dgit metadata is in context of distro %s
3083 for which we have no configured url;
3084 .dsc provides hinted url with protocol %s which is unsafe.
3085 (can be overridden by config - consult documentation)
3087 $url = $dsc_hint_url;
3090 git_lrfetch_sane $url, 1, @fetch;
3095 my $rewrite_enable = do {
3096 local $idistro = $dsc_distro;
3097 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
3100 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
3101 if (!defined $mapref) {
3102 my $lrf = $do_fetch->((__ "rewrite map"), $rewritemap) or return;
3103 $mapref = $lrf.'/'.$rewritemap;
3105 my $rewritemapdata = git_cat_file $mapref.':map';
3106 if (defined $rewritemapdata
3107 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
3109 "server's git history rewrite map contains a relevant entry!";
3112 if (defined $dsc_hash) {
3113 progress __ "using rewritten git hash in place of .dsc value";
3115 progress __ "server data says .dsc hash is to be disregarded";
3120 if (!defined git_cat_file $dsc_hash) {
3121 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
3122 my $lrf = $do_fetch->((__ "additional commits"), @tags) &&
3123 defined git_cat_file $dsc_hash
3124 or fail f_ <<END, $dsc_hash;
3125 .dsc Dgit metadata requires commit %s
3126 but we could not obtain that object anywhere.
3128 foreach my $t (@tags) {
3129 my $fullrefname = $lrf.'/'.$t;
3130 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
3131 next unless $lrfetchrefs_f{$fullrefname};
3132 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
3133 lrfetchref_used $fullrefname;
3138 sub fetch_from_archive () {
3140 ensure_setup_existing_tree();
3142 # Ensures that lrref() is what is actually in the archive, one way
3143 # or another, according to us - ie this client's
3144 # appropritaely-updated archive view. Also returns the commit id.
3145 # If there is nothing in the archive, leaves lrref alone and
3146 # returns undef. git_fetch_us must have already been called.
3150 parse_dsc_field($dsc, __ 'last upload to archive');
3151 resolve_dsc_field_commit access_basedistro,
3152 lrfetchrefs."/".$rewritemap
3154 progress __ "no version available from the archive";
3157 # If the archive's .dsc has a Dgit field, there are three
3158 # relevant git commitids we need to choose between and/or merge
3160 # 1. $dsc_hash: the Dgit field from the archive
3161 # 2. $lastpush_hash: the suite branch on the dgit git server
3162 # 3. $lastfetch_hash: our local tracking brach for the suite
3164 # These may all be distinct and need not be in any fast forward
3167 # If the dsc was pushed to this suite, then the server suite
3168 # branch will have been updated; but it might have been pushed to
3169 # a different suite and copied by the archive. Conversely a more
3170 # recent version may have been pushed with dgit but not appeared
3171 # in the archive (yet).
3173 # $lastfetch_hash may be awkward because archive imports
3174 # (particularly, imports of Dgit-less .dscs) are performed only as
3175 # needed on individual clients, so different clients may perform a
3176 # different subset of them - and these imports are only made
3177 # public during push. So $lastfetch_hash may represent a set of
3178 # imports different to a subsequent upload by a different dgit
3181 # Our approach is as follows:
3183 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3184 # descendant of $dsc_hash, then it was pushed by a dgit user who
3185 # had based their work on $dsc_hash, so we should prefer it.
3186 # Otherwise, $dsc_hash was installed into this suite in the
3187 # archive other than by a dgit push, and (necessarily) after the
3188 # last dgit push into that suite (since a dgit push would have
3189 # been descended from the dgit server git branch); thus, in that
3190 # case, we prefer the archive's version (and produce a
3191 # pseudo-merge to overwrite the dgit server git branch).
3193 # (If there is no Dgit field in the archive's .dsc then
3194 # generate_commit_from_dsc uses the version numbers to decide
3195 # whether the suite branch or the archive is newer. If the suite
3196 # branch is newer it ignores the archive's .dsc; otherwise it
3197 # generates an import of the .dsc, and produces a pseudo-merge to
3198 # overwrite the suite branch with the archive contents.)
3200 # The outcome of that part of the algorithm is the `public view',
3201 # and is same for all dgit clients: it does not depend on any
3202 # unpublished history in the local tracking branch.
3204 # As between the public view and the local tracking branch: The
3205 # local tracking branch is only updated by dgit fetch, and
3206 # whenever dgit fetch runs it includes the public view in the
3207 # local tracking branch. Therefore if the public view is not
3208 # descended from the local tracking branch, the local tracking
3209 # branch must contain history which was imported from the archive
3210 # but never pushed; and, its tip is now out of date. So, we make
3211 # a pseudo-merge to overwrite the old imports and stitch the old
3214 # Finally: we do not necessarily reify the public view (as
3215 # described above). This is so that we do not end up stacking two
3216 # pseudo-merges. So what we actually do is figure out the inputs
3217 # to any public view pseudo-merge and put them in @mergeinputs.
3220 # $mergeinputs[]{Commit}
3221 # $mergeinputs[]{Info}
3222 # $mergeinputs[0] is the one whose tree we use
3223 # @mergeinputs is in the order we use in the actual commit)
3226 # $mergeinputs[]{Message} is a commit message to use
3227 # $mergeinputs[]{ReverseParents} if def specifies that parent
3228 # list should be in opposite order
3229 # Such an entry has no Commit or Info. It applies only when found
3230 # in the last entry. (This ugliness is to support making
3231 # identical imports to previous dgit versions.)
3233 my $lastpush_hash = git_get_ref(lrfetchref());
3234 printdebug "previous reference hash=$lastpush_hash\n";
3235 $lastpush_mergeinput = $lastpush_hash && {
3236 Commit => $lastpush_hash,
3237 Info => (__ "dgit suite branch on dgit git server"),
3240 my $lastfetch_hash = git_get_ref(lrref());
3241 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3242 my $lastfetch_mergeinput = $lastfetch_hash && {
3243 Commit => $lastfetch_hash,
3244 Info => (__ "dgit client's archive history view"),
3247 my $dsc_mergeinput = $dsc_hash && {
3248 Commit => $dsc_hash,
3249 Info => (__ "Dgit field in .dsc from archive"),
3253 my $del_lrfetchrefs = sub {
3256 printdebug "del_lrfetchrefs...\n";
3257 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3258 my $objid = $lrfetchrefs_d{$fullrefname};
3259 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3261 $gur ||= new IO::Handle;
3262 open $gur, "|-", qw(git update-ref --stdin) or confess "$!";
3264 printf $gur "delete %s %s\n", $fullrefname, $objid;
3267 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3271 if (defined $dsc_hash) {
3272 ensure_we_have_orig();
3273 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3274 @mergeinputs = $dsc_mergeinput
3275 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3276 print STDERR f_ <<END, $dsc_hash, $lastpush_hash,
3278 Git commit in archive is behind the last version allegedly pushed/uploaded.
3279 Commit referred to by archive: %s
3280 Last version pushed with dgit: %s
3283 __ $later_warning_msg or confess "$!";
3284 @mergeinputs = ($lastpush_mergeinput);
3286 # Archive has .dsc which is not a descendant of the last dgit
3287 # push. This can happen if the archive moves .dscs about.
3288 # Just follow its lead.
3289 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3290 progress __ "archive .dsc names newer git commit";
3291 @mergeinputs = ($dsc_mergeinput);
3293 progress __ "archive .dsc names other git commit, fixing up";
3294 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3298 @mergeinputs = generate_commits_from_dsc();
3299 # We have just done an import. Now, our import algorithm might
3300 # have been improved. But even so we do not want to generate
3301 # a new different import of the same package. So if the
3302 # version numbers are the same, just use our existing version.
3303 # If the version numbers are different, the archive has changed
3304 # (perhaps, rewound).
3305 if ($lastfetch_mergeinput &&
3306 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3307 (mergeinfo_version $mergeinputs[0]) )) {
3308 @mergeinputs = ($lastfetch_mergeinput);
3310 } elsif ($lastpush_hash) {
3311 # only in git, not in the archive yet
3312 @mergeinputs = ($lastpush_mergeinput);
3313 print STDERR f_ <<END,
3315 Package not found in the archive, but has allegedly been pushed using dgit.
3318 __ $later_warning_msg or confess "$!";
3320 printdebug "nothing found!\n";
3321 if (defined $skew_warning_vsn) {
3322 print STDERR f_ <<END, $skew_warning_vsn or confess "$!";
3324 Warning: relevant archive skew detected.
3325 Archive allegedly contains %s
3326 But we were not able to obtain any version from the archive or git.
3330 unshift @end, $del_lrfetchrefs;
3334 if ($lastfetch_hash &&
3336 my $h = $_->{Commit};
3337 $h and is_fast_fwd($lastfetch_hash, $h);
3338 # If true, one of the existing parents of this commit
3339 # is a descendant of the $lastfetch_hash, so we'll
3340 # be ff from that automatically.
3344 push @mergeinputs, $lastfetch_mergeinput;
3347 printdebug "fetch mergeinfos:\n";
3348 foreach my $mi (@mergeinputs) {
3350 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3352 printdebug sprintf " ReverseParents=%d Message=%s",
3353 $mi->{ReverseParents}, $mi->{Message};
3357 my $compat_info= pop @mergeinputs
3358 if $mergeinputs[$#mergeinputs]{Message};
3360 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3363 if (@mergeinputs > 1) {
3365 my $tree_commit = $mergeinputs[0]{Commit};
3367 my $tree = get_tree_of_commit $tree_commit;;
3369 # We use the changelog author of the package in question the
3370 # author of this pseudo-merge. This is (roughly) correct if
3371 # this commit is simply representing aa non-dgit upload.
3372 # (Roughly because it does not record sponsorship - but we
3373 # don't have sponsorship info because that's in the .changes,
3374 # which isn't in the archivw.)
3376 # But, it might be that we are representing archive history
3377 # updates (including in-archive copies). These are not really
3378 # the responsibility of the person who created the .dsc, but
3379 # there is no-one whose name we should better use. (The
3380 # author of the .dsc-named commit is clearly worse.)
3382 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3383 my $author = clogp_authline $useclogp;
3384 my $cversion = getfield $useclogp, 'Version';
3386 my $mcf = dgit_privdir()."/mergecommit";
3387 open MC, ">", $mcf or die "$mcf $!";
3388 print MC <<END or confess "$!";
3392 my @parents = grep { $_->{Commit} } @mergeinputs;
3393 @parents = reverse @parents if $compat_info->{ReverseParents};
3394 print MC <<END or confess "$!" foreach @parents;
3398 print MC <<END or confess "$!";
3404 if (defined $compat_info->{Message}) {
3405 print MC $compat_info->{Message} or confess "$!";
3407 print MC f_ <<END, $package, $cversion, $csuite or confess "$!";
3408 Record %s (%s) in archive suite %s
3412 my $message_add_info = sub {
3414 my $mversion = mergeinfo_version $mi;
3415 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3419 $message_add_info->($mergeinputs[0]);
3420 print MC __ <<END or confess "$!";
3421 should be treated as descended from
3423 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3426 close MC or confess "$!";
3427 $hash = hash_commit $mcf;
3429 $hash = $mergeinputs[0]{Commit};
3431 printdebug "fetch hash=$hash\n";
3434 my ($lasth, $what) = @_;
3435 return unless $lasth;
3436 confess "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3439 $chkff->($lastpush_hash, __ 'dgit repo server tip (last push)')
3441 $chkff->($lastfetch_hash, __ 'local tracking tip (last fetch)');
3443 fetch_from_archive_record_1($hash);
3445 if (defined $skew_warning_vsn) {
3446 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3447 my $gotclogp = commit_getclogp($hash);
3448 my $got_vsn = getfield $gotclogp, 'Version';
3449 printdebug "SKEW CHECK GOT $got_vsn\n";
3450 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3451 print STDERR f_ <<END, $skew_warning_vsn, $got_vsn or confess "$!";
3453 Warning: archive skew detected. Using the available version:
3454 Archive allegedly contains %s
3455 We were able to obtain only %s
3461 if ($lastfetch_hash ne $hash) {
3462 fetch_from_archive_record_2($hash);
3465 lrfetchref_used lrfetchref();
3467 check_gitattrs($hash, __ "fetched source tree");
3469 unshift @end, $del_lrfetchrefs;
3473 sub set_local_git_config ($$) {
3475 runcmd @git, qw(config), $k, $v;
3478 sub setup_mergechangelogs (;$) {
3480 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3482 my $driver = 'dpkg-mergechangelogs';
3483 my $cb = "merge.$driver";
3484 confess unless defined $maindir;
3485 my $attrs = "$maindir_gitcommon/info/attributes";
3486 ensuredir "$maindir_gitcommon/info";
3488 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3489 if (!open ATTRS, "<", $attrs) {
3490 $!==ENOENT or die "$attrs: $!";
3494 next if m{^debian/changelog\s};
3495 print NATTRS $_, "\n" or confess "$!";
3497 ATTRS->error and confess "$!";
3500 print NATTRS "debian/changelog merge=$driver\n" or confess "$!";
3503 set_local_git_config "$cb.name", __ 'debian/changelog merge driver';
3504 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3506 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3509 sub setup_useremail (;$) {
3511 return unless $always || access_cfg_bool(1, 'setup-useremail');
3514 my ($k, $envvar) = @_;
3515 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3516 return unless defined $v;
3517 set_local_git_config "user.$k", $v;
3520 $setup->('email', 'DEBEMAIL');
3521 $setup->('name', 'DEBFULLNAME');
3524 sub ensure_setup_existing_tree () {
3525 my $k = "remote.$remotename.skipdefaultupdate";
3526 my $c = git_get_config $k;
3527 return if defined $c;
3528 set_local_git_config $k, 'true';
3531 sub open_main_gitattrs () {
3532 confess 'internal error no maindir' unless defined $maindir;
3533 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3535 or die "open $maindir_gitcommon/info/attributes: $!";
3539 our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
3541 sub is_gitattrs_setup () {
3544 # 1: gitattributes set up and should be left alone
3546 # 0: there is a dgit-defuse-attrs but it needs fixing
3547 # undef: there is none
3548 my $gai = open_main_gitattrs();
3549 return 0 unless $gai;
3551 next unless m{$gitattrs_ourmacro_re};
3552 return 1 if m{\s-working-tree-encoding\s};
3553 printdebug "is_gitattrs_setup: found old macro\n";
3556 $gai->error and confess "$!";
3557 printdebug "is_gitattrs_setup: found nothing\n";
3561 sub setup_gitattrs (;$) {
3563 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3565 my $already = is_gitattrs_setup();
3568 [attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
3569 not doing further gitattributes setup
3573 my $new = "[attr]dgit-defuse-attrs $negate_harmful_gitattrs";
3574 my $af = "$maindir_gitcommon/info/attributes";
3575 ensuredir "$maindir_gitcommon/info";
3577 open GAO, "> $af.new" or confess "$!";
3578 print GAO <<END, __ <<ENDT or confess "$!" unless defined $already;
3582 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3584 my $gai = open_main_gitattrs();
3587 if (m{$gitattrs_ourmacro_re}) {
3588 die unless defined $already;
3592 print GAO $_, "\n" or confess "$!";
3594 $gai->error and confess "$!";
3596 close GAO or confess "$!";
3597 rename "$af.new", "$af" or fail f_ "install %s: %s", $af, $!;
3600 sub setup_new_tree () {
3601 setup_mergechangelogs();
3606 sub check_gitattrs ($$) {
3607 my ($treeish, $what) = @_;
3609 return if is_gitattrs_setup;
3612 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3614 my $gafl = new IO::File;
3615 open $gafl, "-|", @cmd or confess "$!";
3618 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3620 next unless m{(?:^|/)\.gitattributes$};
3622 # oh dear, found one
3623 print STDERR f_ <<END, $what;
3624 dgit: warning: %s contains .gitattributes
3625 dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree.
3630 # tree contains no .gitattributes files
3631 $?=0; $!=0; close $gafl or failedcmd @cmd;
3635 sub multisuite_suite_child ($$$) {
3636 my ($tsuite, $mergeinputs, $fn) = @_;
3637 # in child, sets things up, calls $fn->(), and returns undef
3638 # in parent, returns canonical suite name for $tsuite
3639 my $canonsuitefh = IO::File::new_tmpfile;
3640 my $pid = fork // confess "$!";
3644 $us .= " [$isuite]";
3645 $debugprefix .= " ";
3646 progress f_ "fetching %s...", $tsuite;
3647 canonicalise_suite();
3648 print $canonsuitefh $csuite, "\n" or confess "$!";
3649 close $canonsuitefh or confess "$!";
3653 waitpid $pid,0 == $pid or confess "$!";
3654 fail f_ "failed to obtain %s: %s", $tsuite, waitstatusmsg()
3656 seek $canonsuitefh,0,0 or confess "$!";
3657 local $csuite = <$canonsuitefh>;
3658 confess "$!" unless defined $csuite && chomp $csuite;
3660 printdebug "multisuite $tsuite missing\n";
3663 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3664 push @$mergeinputs, {
3671 sub fork_for_multisuite ($) {
3672 my ($before_fetch_merge) = @_;
3673 # if nothing unusual, just returns ''
3676 # returns 0 to caller in child, to do first of the specified suites
3677 # in child, $csuite is not yet set
3679 # returns 1 to caller in parent, to finish up anything needed after
3680 # in parent, $csuite is set to canonicalised portmanteau
3682 my $org_isuite = $isuite;
3683 my @suites = split /\,/, $isuite;
3684 return '' unless @suites > 1;
3685 printdebug "fork_for_multisuite: @suites\n";
3689 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3691 return 0 unless defined $cbasesuite;
3693 fail f_ "package %s missing in (base suite) %s", $package, $cbasesuite
3694 unless @mergeinputs;
3696 my @csuites = ($cbasesuite);
3698 $before_fetch_merge->();
3700 foreach my $tsuite (@suites[1..$#suites]) {
3701 $tsuite =~ s/^-/$cbasesuite-/;
3702 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3709 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3710 push @csuites, $csubsuite;
3713 foreach my $mi (@mergeinputs) {
3714 my $ref = git_get_ref $mi->{Ref};
3715 die "$mi->{Ref} ?" unless length $ref;
3716 $mi->{Commit} = $ref;
3719 $csuite = join ",", @csuites;
3721 my $previous = git_get_ref lrref;
3723 unshift @mergeinputs, {
3724 Commit => $previous,
3725 Info => (__ "local combined tracking branch"),
3727 "archive seems to have rewound: local tracking branch is ahead!"),
3731 foreach my $ix (0..$#mergeinputs) {
3732 $mergeinputs[$ix]{Index} = $ix;
3735 @mergeinputs = sort {
3736 -version_compare(mergeinfo_version $a,
3737 mergeinfo_version $b) # highest version first
3739 $a->{Index} <=> $b->{Index}; # earliest in spec first
3745 foreach my $mi (@mergeinputs) {
3746 printdebug "multisuite merge check $mi->{Info}\n";
3747 foreach my $previous (@needed) {
3748 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3749 printdebug "multisuite merge un-needed $previous->{Info}\n";
3753 printdebug "multisuite merge this-needed\n";
3754 $mi->{Character} = '+';
3757 $needed[0]{Character} = '*';
3759 my $output = $needed[0]{Commit};
3762 printdebug "multisuite merge nontrivial\n";
3763 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3765 my $commit = "tree $tree\n";
3766 my $msg = f_ "Combine archive branches %s [dgit]\n\n".
3767 "Input branches:\n",
3770 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3771 printdebug "multisuite merge include $mi->{Info}\n";
3772 $mi->{Character} //= ' ';
3773 $commit .= "parent $mi->{Commit}\n";
3774 $msg .= sprintf " %s %-25s %s\n",
3776 (mergeinfo_version $mi),
3779 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3780 $msg .= __ "\nKey\n".
3781 " * marks the highest version branch, which choose to use\n".
3782 " + marks each branch which was not already an ancestor\n\n";
3784 "[dgit multi-suite $csuite]\n";
3786 "author $authline\n".
3787 "committer $authline\n\n";
3788 $output = hash_commit_text $commit.$msg;
3789 printdebug "multisuite merge generated $output\n";
3792 fetch_from_archive_record_1($output);
3793 fetch_from_archive_record_2($output);
3795 progress f_ "calculated combined tracking suite %s", $csuite;
3800 sub clone_set_head () {
3801 open H, "> .git/HEAD" or confess "$!";
3802 print H "ref: ".lref()."\n" or confess "$!";
3803 close H or confess "$!";
3805 sub clone_finish ($) {
3807 runcmd @git, qw(reset --hard), lrref();
3808 runcmd qw(bash -ec), <<'END';
3810 git ls-tree -r --name-only -z HEAD | \
3811 xargs -0r touch -h -r . --
3813 printdone f_ "ready for work in %s", $dstdir;
3817 # in multisuite, returns twice!
3818 # once in parent after first suite fetched,
3819 # and then again in child after everything is finished
3821 badusage __ "dry run makes no sense with clone" unless act_local();
3823 my $multi_fetched = fork_for_multisuite(sub {
3824 printdebug "multi clone before fetch merge\n";
3828 if ($multi_fetched) {
3829 printdebug "multi clone after fetch merge\n";
3831 clone_finish($dstdir);
3834 printdebug "clone main body\n";
3836 mkdir $dstdir or fail f_ "create \`%s': %s", $dstdir, $!;
3840 canonicalise_suite();
3841 my $hasgit = check_for_git();
3843 runcmd @git, qw(init -q);
3847 my $giturl = access_giturl(1);
3848 if (defined $giturl) {
3849 runcmd @git, qw(remote add), 'origin', $giturl;
3852 progress __ "fetching existing git history";
3854 runcmd_ordryrun_local @git, qw(fetch origin);
3856 progress __ "starting new git history";
3858 fetch_from_archive() or no_such_package;
3859 my $vcsgiturl = $dsc->{'Vcs-Git'};
3860 if (length $vcsgiturl) {
3861 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3862 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3864 clone_finish($dstdir);
3868 canonicalise_suite();
3869 if (check_for_git()) {
3872 fetch_from_archive() or no_such_package();
3874 my $vcsgiturl = $dsc && $dsc->{'Vcs-Git'};
3875 if (length $vcsgiturl and
3876 (grep { $csuite eq $_ }
3878 cfg 'dgit.vcs-git.suites')) {
3879 my $current = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
3880 if (defined $current && $current ne $vcsgiturl) {
3881 print STDERR f_ <<END, $csuite;
3882 FYI: Vcs-Git in %s has different url to your vcs-git remote.
3883 Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?
3887 printdone f_ "fetched into %s", lrref();
3891 my $multi_fetched = fork_for_multisuite(sub { });
3892 fetch_one() unless $multi_fetched; # parent
3893 finish 0 if $multi_fetched eq '0'; # child
3898 runcmd_ordryrun_local @git, qw(merge -m),
3899 (f_ "Merge from %s [dgit]", $csuite),
3901 printdone f_ "fetched to %s and merged into HEAD", lrref();
3904 sub check_not_dirty () {
3905 my @forbid = qw(local-options local-patch-header);
3906 @forbid = map { "debian/source/$_" } @forbid;
3907 foreach my $f (@forbid) {
3908 if (stat_exists $f) {
3909 fail f_ "git tree contains %s", $f;
3913 my @cmd = (@git, qw(status -uall --ignored --porcelain));
3914 push @cmd, qw(debian/source/format debian/source/options);
3917 my $bad = cmdoutput @cmd;
3920 "you have uncommitted changes to critical files, cannot continue:\n").
3924 return if $includedirty;
3926 git_check_unmodified();
3929 sub commit_admin ($) {
3932 runcmd_ordryrun_local @git, qw(commit -m), $m;
3935 sub quiltify_nofix_bail ($$) {
3936 my ($headinfo, $xinfo) = @_;
3937 if ($quilt_mode eq 'nofix') {
3939 "quilt fixup required but quilt mode is \`nofix'\n".
3940 "HEAD commit%s differs from tree implied by debian/patches%s",
3945 sub commit_quilty_patch () {
3946 my $output = cmdoutput @git, qw(status --ignored --porcelain);
3948 foreach my $l (split /\n/, $output) {
3949 next unless $l =~ m/\S/;
3950 if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
3954 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3956 progress __ "nothing quilty to commit, ok.";
3959 quiltify_nofix_bail "", __ " (wanted to commit patch update)";
3960 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3961 runcmd_ordryrun_local @git, qw(add -f), @adds;
3962 commit_admin +(__ <<ENDT).<<END
3963 Commit Debian 3.0 (quilt) metadata
3966 [dgit ($our_version) quilt-fixup]
3970 sub get_source_format () {
3972 if (open F, "debian/source/options") {
3976 s/\s+$//; # ignore missing final newline
3978 my ($k, $v) = ($`, $'); #');
3979 $v =~ s/^"(.*)"$/$1/;
3985 F->error and confess "$!";
3988 confess "$!" unless $!==&ENOENT;
3991 if (!open F, "debian/source/format") {
3992 confess "$!" unless $!==&ENOENT;
3996 F->error and confess "$!";
3998 return ($_, \%options);
4001 sub madformat_wantfixup ($) {
4003 return 0 unless $format eq '3.0 (quilt)';
4004 our $quilt_mode_warned;
4005 if ($quilt_mode eq 'nocheck') {
4006 progress f_ "Not doing any fixup of \`%s'".
4007 " due to ----no-quilt-fixup or --quilt=nocheck", $format
4008 unless $quilt_mode_warned++;
4011 progress f_ "Format \`%s', need to check/update patch stack", $format
4012 unless $quilt_mode_warned++;
4016 sub maybe_split_brain_save ($$$) {
4017 my ($headref, $dgitview, $msg) = @_;
4018 # => message fragment "$saved" describing disposition of $dgitview
4019 # (used inside parens, in the English texts)
4020 my $save = $internal_object_save{'dgit-view'};
4021 return f_ "commit id %s", $dgitview unless defined $save;
4022 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
4024 "dgit --dgit-view-save $msg HEAD=$headref",
4027 return f_ "and left in %s", $save;
4030 # An "infopair" is a tuple [ $thing, $what ]
4031 # (often $thing is a commit hash; $what is a description)
4033 sub infopair_cond_equal ($$) {
4035 $x->[0] eq $y->[0] or fail <<END;
4036 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
4040 sub infopair_lrf_tag_lookup ($$) {
4041 my ($tagnames, $what) = @_;
4042 # $tagname may be an array ref
4043 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
4044 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
4045 foreach my $tagname (@tagnames) {
4046 my $lrefname = lrfetchrefs."/tags/$tagname";
4047 my $tagobj = $lrfetchrefs_f{$lrefname};
4048 next unless defined $tagobj;
4049 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
4050 return [ git_rev_parse($tagobj), $what ];
4052 fail @tagnames==1 ? (f_ <<END, $what, "@tagnames")
4053 Wanted tag %s (%s) on dgit server, but not found
4055 : (f_ <<END, $what, "@tagnames");
4056 Wanted tag %s (one of: %s) on dgit server, but not found
4060 sub infopair_cond_ff ($$) {
4061 my ($anc,$desc) = @_;
4062 is_fast_fwd($anc->[0], $desc->[0]) or
4063 fail f_ <<END, $anc->[1], $anc->[0], $desc->[1], $desc->[0];
4064 %s (%s) .. %s (%s) is not fast forward
4068 sub pseudomerge_version_check ($$) {
4069 my ($clogp, $archive_hash) = @_;
4071 my $arch_clogp = commit_getclogp $archive_hash;
4072 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
4073 __ 'version currently in archive' ];
4074 if (defined $overwrite_version) {
4075 if (length $overwrite_version) {
4076 infopair_cond_equal([ $overwrite_version,
4077 '--overwrite= version' ],
4080 my $v = $i_arch_v->[0];
4082 "Checking package changelog for archive version %s ...", $v;
4085 my @xa = ("-f$v", "-t$v");
4086 my $vclogp = parsechangelog @xa;
4089 [ (getfield $vclogp, $fn),
4090 (f_ "%s field from dpkg-parsechangelog %s",
4093 my $cv = $gf->('Version');
4094 infopair_cond_equal($i_arch_v, $cv);
4095 $cd = $gf->('Distribution');
4099 $@ =~ s/^dgit: //gm;
4101 f_ "Perhaps debian/changelog does not mention %s ?", $v;
4103 fail f_ <<END, $cd->[1], $cd->[0], $v
4105 Your tree seems to based on earlier (not uploaded) %s.
4107 if $cd->[0] =~ m/UNRELEASED/;
4111 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
4115 sub pseudomerge_hash_commit ($$$$ $$) {
4116 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
4117 $msg_cmd, $msg_msg) = @_;
4118 progress f_ "Declaring that HEAD includes all changes in %s...",
4121 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
4122 my $authline = clogp_authline $clogp;
4126 !defined $overwrite_version ? ""
4127 : !length $overwrite_version ? " --overwrite"
4128 : " --overwrite=".$overwrite_version;
4130 # Contributing parent is the first parent - that makes
4131 # git rev-list --first-parent DTRT.
4132 my $pmf = dgit_privdir()."/pseudomerge";
4133 open MC, ">", $pmf or die "$pmf $!";
4134 print MC <<END or confess "$!";
4137 parent $archive_hash
4145 close MC or confess "$!";
4147 return hash_commit($pmf);
4150 sub splitbrain_pseudomerge ($$$$) {
4151 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
4152 # => $merged_dgitview
4153 printdebug "splitbrain_pseudomerge...\n";
4155 # We: debian/PREVIOUS HEAD($maintview)
4156 # expect: o ----------------- o
4159 # a/d/PREVIOUS $dgitview
4162 # we do: `------------------ o
4166 return $dgitview unless defined $archive_hash;
4167 return $dgitview if deliberately_not_fast_forward();
4169 printdebug "splitbrain_pseudomerge...\n";
4171 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4173 if (!defined $overwrite_version) {
4174 progress __ "Checking that HEAD includes all changes in archive...";
4177 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
4179 if (defined $overwrite_version) {
4181 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
4182 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14,
4183 __ "maintainer view tag");
4184 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
4185 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, __ "dgit view tag");
4186 my $i_archive = [ $archive_hash, __ "current archive contents" ];
4188 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
4190 infopair_cond_equal($i_dgit, $i_archive);
4191 infopair_cond_ff($i_dep14, $i_dgit);
4192 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
4195 $@ =~ s/^\n//; chomp $@;
4196 print STDERR <<END.(__ <<ENDT);
4199 | Not fast forward; maybe --overwrite is needed ? Please see dgit(1).
4204 my $arch_v = $i_arch_v->[0];
4205 my $r = pseudomerge_hash_commit
4206 $clogp, $dgitview, $archive_hash, $i_arch_v,
4207 "dgit --quilt=$quilt_mode",
4208 (defined $overwrite_version
4209 ? f_ "Declare fast forward from %s\n", $arch_v
4210 : f_ "Make fast forward from %s\n", $arch_v);
4212 maybe_split_brain_save $maintview, $r, "pseudomerge";
4214 progress f_ "Made pseudo-merge of %s into dgit view.", $arch_v;
4218 sub plain_overwrite_pseudomerge ($$$) {
4219 my ($clogp, $head, $archive_hash) = @_;
4221 printdebug "plain_overwrite_pseudomerge...";
4223 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4225 return $head if is_fast_fwd $archive_hash, $head;
4227 my $m = f_ "Declare fast forward from %s", $i_arch_v->[0];
4229 my $r = pseudomerge_hash_commit
4230 $clogp, $head, $archive_hash, $i_arch_v,
4233 runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
4235 progress f_ "Make pseudo-merge of %s into your HEAD.", $i_arch_v->[0];
4239 sub push_parse_changelog ($) {
4242 my $clogp = Dpkg::Control::Hash->new();
4243 $clogp->load($clogpfn) or die;
4245 my $clogpackage = getfield $clogp, 'Source';
4246 $package //= $clogpackage;
4247 fail f_ "-p specified %s but changelog specified %s",
4248 $package, $clogpackage
4249 unless $package eq $clogpackage;
4250 my $cversion = getfield $clogp, 'Version';
4252 if (!$we_are_initiator) {
4253 # rpush initiator can't do this because it doesn't have $isuite yet
4254 my $tag = debiantag_new($cversion, access_nomdistro);
4255 runcmd @git, qw(check-ref-format), $tag;
4258 my $dscfn = dscfn($cversion);
4260 return ($clogp, $cversion, $dscfn);
4263 sub push_parse_dsc ($$$) {
4264 my ($dscfn,$dscfnwhat, $cversion) = @_;
4265 $dsc = parsecontrol($dscfn,$dscfnwhat);
4266 my $dversion = getfield $dsc, 'Version';
4267 my $dscpackage = getfield $dsc, 'Source';
4268 ($dscpackage eq $package && $dversion eq $cversion) or
4269 fail f_ "%s is for %s %s but debian/changelog is for %s %s",
4270 $dscfn, $dscpackage, $dversion,
4271 $package, $cversion;
4274 sub push_tagwants ($$$$) {
4275 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4278 TagFn => \&debiantag_new,
4283 if (defined $maintviewhead) {
4285 TagFn => \&debiantag_maintview,
4286 Objid => $maintviewhead,
4287 TfSuffix => '-maintview',
4290 } elsif ($dodep14tag ne 'no') {
4292 TagFn => \&debiantag_maintview,
4294 TfSuffix => '-dgit',
4298 foreach my $tw (@tagwants) {
4299 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4300 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4302 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4306 sub push_mktags ($$ $$ $) {
4308 $changesfile,$changesfilewhat,
4311 die unless $tagwants->[0]{View} eq 'dgit';
4313 my $declaredistro = access_nomdistro();
4314 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4315 $dsc->{$ourdscfield[0]} = join " ",
4316 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4318 $dsc->save("$dscfn.tmp") or confess "$!";
4320 my $changes = parsecontrol($changesfile,$changesfilewhat);
4321 foreach my $field (qw(Source Distribution Version)) {
4322 $changes->{$field} eq $clogp->{$field} or
4323 fail f_ "changes field %s \`%s' does not match changelog \`%s'",
4324 $field, $changes->{$field}, $clogp->{$field};
4327 my $cversion = getfield $clogp, 'Version';
4328 my $clogsuite = getfield $clogp, 'Distribution';
4330 # We make the git tag by hand because (a) that makes it easier
4331 # to control the "tagger" (b) we can do remote signing
4332 my $authline = clogp_authline $clogp;
4333 my $delibs = join(" ", "",@deliberatelies);
4337 my $tfn = $tw->{Tfn};
4338 my $head = $tw->{Objid};
4339 my $tag = $tw->{Tag};
4341 open TO, '>', $tfn->('.tmp') or confess "$!";
4342 print TO <<END or confess "$!";
4349 if ($tw->{View} eq 'dgit') {
4350 print TO f_ <<ENDT, $package, $cversion, $clogsuite, $csuite
4351 %s release %s for %s (%s) [dgit]
4354 print TO <<END or confess "$!";
4355 [dgit distro=$declaredistro$delibs]
4357 foreach my $ref (sort keys %previously) {
4358 print TO <<END or confess "$!";
4359 [dgit previously:$ref=$previously{$ref}]
4362 } elsif ($tw->{View} eq 'maint') {
4363 print TO f_ <<END, $package, $cversion, $clogsuite, $csuite,
4364 %s release %s for %s (%s)
4365 (maintainer view tag generated by dgit --quilt=%s)
4370 confess Dumper($tw)."?";
4373 close TO or confess "$!";
4375 my $tagobjfn = $tfn->('.tmp');
4377 if (!defined $keyid) {
4378 $keyid = access_cfg('keyid','RETURN-UNDEF');
4380 if (!defined $keyid) {
4381 $keyid = getfield $clogp, 'Maintainer';
4383 unlink $tfn->('.tmp.asc') or $!==&ENOENT or confess "$!";
4384 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4385 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4386 push @sign_cmd, $tfn->('.tmp');
4387 runcmd_ordryrun @sign_cmd;
4389 $tagobjfn = $tfn->('.signed.tmp');
4390 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4391 $tfn->('.tmp'), $tfn->('.tmp.asc');
4397 my @r = map { $mktag->($_); } @$tagwants;
4401 sub sign_changes ($) {
4402 my ($changesfile) = @_;
4404 my @debsign_cmd = @debsign;
4405 push @debsign_cmd, "-k$keyid" if defined $keyid;
4406 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4407 push @debsign_cmd, $changesfile;
4408 runcmd_ordryrun @debsign_cmd;
4413 printdebug "actually entering push\n";
4415 supplementary_message(__ <<'END');
4416 Push failed, while checking state of the archive.
4417 You can retry the push, after fixing the problem, if you like.
4419 if (check_for_git()) {
4422 my $archive_hash = fetch_from_archive();
4423 if (!$archive_hash) {
4425 fail __ "package appears to be new in this suite;".
4426 " if this is intentional, use --new";
4429 supplementary_message(__ <<'END');
4430 Push failed, while preparing your push.
4431 You can retry the push, after fixing the problem, if you like.
4436 access_giturl(); # check that success is vaguely likely
4437 rpush_handle_protovsn_bothends() if $we_are_initiator;
4439 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4440 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4442 responder_send_file('parsed-changelog', $clogpfn);
4444 my ($clogp, $cversion, $dscfn) =
4445 push_parse_changelog("$clogpfn");
4447 my $dscpath = "$buildproductsdir/$dscfn";
4448 stat_exists $dscpath or
4449 fail f_ "looked for .dsc %s, but %s; maybe you forgot to build",
4452 responder_send_file('dsc', $dscpath);
4454 push_parse_dsc($dscpath, $dscfn, $cversion);
4456 my $format = getfield $dsc, 'Format';
4458 my $symref = git_get_symref();
4459 my $actualhead = git_rev_parse('HEAD');
4461 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4462 if (quiltmode_splitting()) {
4463 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $actualhead);
4464 fail f_ <<END, $ffq_prev, $quilt_mode;
4465 Branch is managed by git-debrebase (%s
4466 exists), but quilt mode (%s) implies a split view.
4467 Pass the right --quilt option or adjust your git config.
4468 Or, maybe, run git-debrebase forget-was-ever-debrebase.
4471 runcmd_ordryrun_local @git_debrebase, 'stitch';
4472 $actualhead = git_rev_parse('HEAD');
4475 my $dgithead = $actualhead;
4476 my $maintviewhead = undef;
4478 my $upstreamversion = upstreamversion $clogp->{Version};
4480 if (madformat_wantfixup($format)) {
4481 # user might have not used dgit build, so maybe do this now:
4482 if (do_split_brain()) {
4483 changedir $playground;
4485 ($dgithead, $cachekey) =
4486 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4487 $dgithead or fail f_
4488 "--quilt=%s but no cached dgit view:
4489 perhaps HEAD changed since dgit build[-source] ?",
4492 if (!do_split_brain()) {
4493 # In split brain mode, do not attempt to incorporate dirty
4494 # stuff from the user's working tree. That would be mad.
4495 commit_quilty_patch();
4498 if (do_split_brain()) {
4499 $made_split_brain = 1;
4500 $dgithead = splitbrain_pseudomerge($clogp,
4501 $actualhead, $dgithead,
4503 $maintviewhead = $actualhead;
4505 prep_ud(); # so _only_subdir() works, below
4508 if (defined $overwrite_version && !defined $maintviewhead
4510 $dgithead = plain_overwrite_pseudomerge($clogp,
4518 if ($archive_hash) {
4519 if (is_fast_fwd($archive_hash, $dgithead)) {
4521 } elsif (deliberately_not_fast_forward) {
4524 fail __ "dgit push: HEAD is not a descendant".
4525 " of the archive's version.\n".
4526 "To overwrite the archive's contents,".
4527 " pass --overwrite[=VERSION].\n".
4528 "To rewind history, if permitted by the archive,".
4529 " use --deliberately-not-fast-forward.";
4533 confess unless !!$made_split_brain == do_split_brain();
4535 changedir $playground;
4536 progress f_ "checking that %s corresponds to HEAD", $dscfn;
4537 runcmd qw(dpkg-source -x --),
4538 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4539 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4540 check_for_vendor_patches() if madformat($dsc->{format});
4542 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4543 debugcmd "+",@diffcmd;
4545 my $r = system @diffcmd;
4548 my $referent = $made_split_brain ? $dgithead : 'HEAD';
4549 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4552 my $raw = cmdoutput @git,
4553 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4555 foreach (split /\0/, $raw) {
4556 if (defined $changed) {
4557 push @mode_changes, "$changed: $_\n" if $changed;
4560 } elsif (m/^:0+ 0+ /) {
4562 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4563 $changed = "Mode change from $1 to $2"
4568 if (@mode_changes) {
4569 fail +(f_ <<ENDT, $dscfn).<<END
4570 HEAD specifies a different tree to %s:
4574 .(join '', @mode_changes)
4575 .(f_ <<ENDT, $tree, $referent);
4576 There is a problem with your source tree (see dgit(7) for some hints).
4577 To see a full diff, run git diff %s %s
4581 fail +(f_ <<ENDT, $dscfn).<<END.(f_ <<ENDT, $tree, $referent);
4582 HEAD specifies a different tree to %s:
4586 Perhaps you forgot to build. Or perhaps there is a problem with your
4587 source tree (see dgit(7) for some hints). To see a full diff, run
4594 if (!$changesfile) {
4595 my $pat = changespat $cversion;
4596 my @cs = glob "$buildproductsdir/$pat";
4597 fail f_ "failed to find unique changes file".
4598 " (looked for %s in %s);".
4599 " perhaps you need to use dgit -C",
4600 $pat, $buildproductsdir
4602 ($changesfile) = @cs;
4604 $changesfile = "$buildproductsdir/$changesfile";
4607 # Check that changes and .dsc agree enough
4608 $changesfile =~ m{[^/]*$};
4609 my $changes = parsecontrol($changesfile,$&);
4610 files_compare_inputs($dsc, $changes)
4611 unless forceing [qw(dsc-changes-mismatch)];
4613 # Check whether this is a source only upload
4614 my $hasdebs = $changes->{Files} =~ m{\.deb$}m;
4615 my $sourceonlypolicy = access_cfg 'source-only-uploads';
4616 if ($sourceonlypolicy eq 'ok') {
4617 } elsif ($sourceonlypolicy eq 'always') {
4618 forceable_fail [qw(uploading-binaries)],
4619 __ "uploading binaries, although distro policy is source only"
4621 } elsif ($sourceonlypolicy eq 'never') {
4622 forceable_fail [qw(uploading-source-only)],
4623 __ "source-only upload, although distro policy requires .debs"
4625 } elsif ($sourceonlypolicy eq 'not-wholly-new') {
4626 forceable_fail [qw(uploading-source-only)],
4627 f_ "source-only upload, even though package is entirely NEW\n".
4628 "(this is contrary to policy in %s)",
4632 && !(archive_query('package_not_wholly_new', $package) // 1);
4634 badcfg f_ "unknown source-only-uploads policy \`%s'",
4638 # Perhaps adjust .dsc to contain right set of origs
4639 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4641 unless forceing [qw(changes-origs-exactly)];
4643 # Checks complete, we're going to try and go ahead:
4645 responder_send_file('changes',$changesfile);
4646 responder_send_command("param head $dgithead");
4647 responder_send_command("param csuite $csuite");
4648 responder_send_command("param isuite $isuite");
4649 responder_send_command("param tagformat new"); # needed in $protovsn==4
4650 if (defined $maintviewhead) {
4651 responder_send_command("param maint-view $maintviewhead");
4654 # Perhaps send buildinfo(s) for signing
4655 my $changes_files = getfield $changes, 'Files';
4656 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4657 foreach my $bi (@buildinfos) {
4658 responder_send_command("param buildinfo-filename $bi");
4659 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4662 if (deliberately_not_fast_forward) {
4663 git_for_each_ref(lrfetchrefs, sub {
4664 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4665 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4666 responder_send_command("previously $rrefname=$objid");
4667 $previously{$rrefname} = $objid;
4671 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4672 dgit_privdir()."/tag");
4675 supplementary_message(__ <<'END');
4676 Push failed, while signing the tag.
4677 You can retry the push, after fixing the problem, if you like.
4679 # If we manage to sign but fail to record it anywhere, it's fine.
4680 if ($we_are_responder) {
4681 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4682 responder_receive_files('signed-tag', @tagobjfns);
4684 @tagobjfns = push_mktags($clogp,$dscpath,
4685 $changesfile,$changesfile,
4688 supplementary_message(__ <<'END');
4689 Push failed, *after* signing the tag.
4690 If you want to try again, you should use a new version number.
4693 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4695 foreach my $tw (@tagwants) {
4696 my $tag = $tw->{Tag};
4697 my $tagobjfn = $tw->{TagObjFn};
4699 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4700 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4701 runcmd_ordryrun_local
4702 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4705 supplementary_message(__ <<'END');
4706 Push failed, while updating the remote git repository - see messages above.
4707 If you want to try again, you should use a new version number.
4709 if (!check_for_git()) {
4710 create_remote_git_repo();
4713 my @pushrefs = $forceflag.$dgithead.":".rrref();
4714 foreach my $tw (@tagwants) {
4715 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4718 runcmd_ordryrun @git,
4719 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4720 runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
4722 supplementary_message(__ <<'END');
4723 Push failed, while obtaining signatures on the .changes and .dsc.
4724 If it was just that the signature failed, you may try again by using
4725 debsign by hand to sign the changes file (see the command dgit tried,
4726 above), and then dput that changes file to complete the upload.
4727 If you need to change the package, you must use a new version number.
4729 if ($we_are_responder) {
4730 my $dryrunsuffix = act_local() ? "" : ".tmp";
4731 my @rfiles = ($dscpath, $changesfile);
4732 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4733 responder_receive_files('signed-dsc-changes',
4734 map { "$_$dryrunsuffix" } @rfiles);
4737 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4739 progress f_ "[new .dsc left in %s.tmp]", $dscpath;
4741 sign_changes $changesfile;
4744 supplementary_message(f_ <<END, $changesfile);
4745 Push failed, while uploading package(s) to the archive server.
4746 You can retry the upload of exactly these same files with dput of:
4748 If that .changes file is broken, you will need to use a new version
4749 number for your next attempt at the upload.
4751 my $host = access_cfg('upload-host','RETURN-UNDEF');
4752 my @hostarg = defined($host) ? ($host,) : ();
4753 runcmd_ordryrun @dput, @hostarg, $changesfile;
4754 printdone f_ "pushed and uploaded %s", $cversion;
4756 supplementary_message('');
4757 responder_send_command("complete");
4761 not_necessarily_a_tree();
4766 badusage __ "-p is not allowed with clone; specify as argument instead"
4767 if defined $package;
4770 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4771 ($package,$isuite) = @ARGV;
4772 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4773 ($package,$dstdir) = @ARGV;
4774 } elsif (@ARGV==3) {
4775 ($package,$isuite,$dstdir) = @ARGV;
4777 badusage __ "incorrect arguments to dgit clone";
4781 $dstdir ||= "$package";
4782 if (stat_exists $dstdir) {
4783 fail f_ "%s already exists", $dstdir;
4787 if ($rmonerror && !$dryrun_level) {
4788 $cwd_remove= getcwd();
4790 return unless defined $cwd_remove;
4791 if (!chdir "$cwd_remove") {
4792 return if $!==&ENOENT;
4793 confess "chdir $cwd_remove: $!";
4795 printdebug "clone rmonerror removing $dstdir\n";
4797 rmtree($dstdir) or fail f_ "remove %s: %s\n", $dstdir, $!;
4798 } elsif (grep { $! == $_ }
4799 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4801 print STDERR f_ "check whether to remove %s: %s\n",
4808 $cwd_remove = undef;
4811 sub branchsuite () {
4812 my $branch = git_get_symref();
4813 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4820 sub package_from_d_control () {
4821 if (!defined $package) {
4822 my $sourcep = parsecontrol('debian/control','debian/control');
4823 $package = getfield $sourcep, 'Source';
4827 sub fetchpullargs () {
4828 package_from_d_control();
4830 $isuite = branchsuite();
4832 my $clogp = parsechangelog();
4833 my $clogsuite = getfield $clogp, 'Distribution';
4834 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4836 } elsif (@ARGV==1) {
4839 badusage __ "incorrect arguments to dgit fetch or dgit pull";
4853 determine_whether_split_brain();
4854 if (do_split_brain()) {
4855 my ($format, $fopts) = get_source_format();
4856 madformat($format) and fail f_ <<END, $quilt_mode
4857 dgit pull not yet supported in split view mode (including with view-splitting quilt modes)
4865 package_from_d_control();
4866 @ARGV==1 or badusage __ "dgit checkout needs a suite argument";
4870 foreach my $canon (qw(0 1)) {
4875 canonicalise_suite();
4877 if (length git_get_ref lref()) {
4878 # local branch already exists, yay
4881 if (!length git_get_ref lrref()) {
4889 runcmd (@git, qw(update-ref), lref(), lrref(), '');
4892 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
4893 "dgit checkout $isuite";
4894 runcmd (@git, qw(checkout), lbranch());
4897 sub cmd_update_vcs_git () {
4899 if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
4900 ($specsuite,) = split /\;/, cfg 'dgit.vcs-git.suites';
4902 ($specsuite) = (@ARGV);
4907 if ($ARGV[0] eq '-') {
4909 } elsif ($ARGV[0] eq '-') {
4914 package_from_d_control();
4916 if ($specsuite eq '.') {
4917 $ctrl = parsecontrol 'debian/control', 'debian/control';
4919 $isuite = $specsuite;
4923 my $url = getfield $ctrl, 'Vcs-Git';
4926 my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
4927 if (!defined $orgurl) {
4928 print STDERR f_ "setting up vcs-git: %s\n", $url;
4929 @cmd = (@git, qw(remote add vcs-git), $url);
4930 } elsif ($orgurl eq $url) {
4931 print STDERR f_ "vcs git already configured: %s\n", $url;
4933 print STDERR f_ "changing vcs-git url to: %s\n", $url;
4934 @cmd = (@git, qw(remote set-url vcs-git), $url);
4936 runcmd_ordryrun_local @cmd;
4938 print f_ "fetching (%s)\n", "@ARGV";
4939 runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
4945 build_or_push_prep_early();
4947 build_or_push_prep_modes();
4951 } elsif (@ARGV==1) {
4952 ($specsuite) = (@ARGV);
4954 badusage f_ "incorrect arguments to dgit %s", $subcommand;
4957 local ($package) = $existing_package; # this is a hack
4958 canonicalise_suite();
4960 canonicalise_suite();
4962 if (defined $specsuite &&
4963 $specsuite ne $isuite &&
4964 $specsuite ne $csuite) {
4965 fail f_ "dgit %s: changelog specifies %s (%s)".
4966 " but command line specifies %s",
4967 $subcommand, $isuite, $csuite, $specsuite;
4976 #---------- remote commands' implementation ----------
4978 sub pre_remote_push_build_host {
4979 my ($nrargs) = shift @ARGV;
4980 my (@rargs) = @ARGV[0..$nrargs-1];
4981 @ARGV = @ARGV[$nrargs..$#ARGV];
4983 my ($dir,$vsnwant) = @rargs;
4984 # vsnwant is a comma-separated list; we report which we have
4985 # chosen in our ready response (so other end can tell if they
4988 $we_are_responder = 1;
4989 $us .= " (build host)";
4991 open PI, "<&STDIN" or confess "$!";
4992 open STDIN, "/dev/null" or confess "$!";
4993 open PO, ">&STDOUT" or confess "$!";
4995 open STDOUT, ">&STDERR" or confess "$!";
4999 ($protovsn) = grep {
5000 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
5001 } @rpushprotovsn_support;
5003 fail f_ "build host has dgit rpush protocol versions %s".
5004 " but invocation host has %s",
5005 (join ",", @rpushprotovsn_support), $vsnwant
5006 unless defined $protovsn;
5010 sub cmd_remote_push_build_host {
5011 responder_send_command("dgit-remote-push-ready $protovsn");
5015 sub pre_remote_push_responder { pre_remote_push_build_host(); }
5016 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
5017 # ... for compatibility with proto vsn.1 dgit (just so that user gets
5018 # a good error message)
5020 sub rpush_handle_protovsn_bothends () {
5027 my $report = i_child_report();
5028 if (defined $report) {
5029 printdebug "($report)\n";
5030 } elsif ($i_child_pid) {
5031 printdebug "(killing build host child $i_child_pid)\n";
5032 kill 15, $i_child_pid;
5034 if (defined $i_tmp && !defined $initiator_tempdir) {
5036 eval { rmtree $i_tmp; };
5041 return unless forkcheck_mainprocess();
5046 my ($base,$selector,@args) = @_;
5047 $selector =~ s/\-/_/g;
5048 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
5052 not_necessarily_a_tree();
5057 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
5065 push @rargs, join ",", @rpushprotovsn_support;
5068 push @rdgit, @ropts;
5069 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
5071 my @cmd = (@ssh, $host, shellquote @rdgit);
5074 $we_are_initiator=1;
5076 if (defined $initiator_tempdir) {
5077 rmtree $initiator_tempdir;
5078 mkdir $initiator_tempdir, 0700
5079 or fail f_ "create %s: %s", $initiator_tempdir, $!;
5080 $i_tmp = $initiator_tempdir;
5084 $i_child_pid = open2(\*RO, \*RI, @cmd);
5086 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
5087 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
5090 my ($icmd,$iargs) = initiator_expect {
5091 m/^(\S+)(?: (.*))?$/;
5094 i_method "i_resp", $icmd, $iargs;
5098 sub i_resp_progress ($) {
5100 my $msg = protocol_read_bytes \*RO, $rhs;
5104 sub i_resp_supplementary_message ($) {
5106 $supplementary_message = protocol_read_bytes \*RO, $rhs;
5109 sub i_resp_complete {
5110 my $pid = $i_child_pid;
5111 $i_child_pid = undef; # prevents killing some other process with same pid
5112 printdebug "waiting for build host child $pid...\n";
5113 my $got = waitpid $pid, 0;
5114 confess "$!" unless $got == $pid;
5115 fail f_ "build host child failed: %s", waitstatusmsg() if $?;
5118 printdebug __ "all done\n";
5122 sub i_resp_file ($) {
5124 my $localname = i_method "i_localname", $keyword;
5125 my $localpath = "$i_tmp/$localname";
5126 stat_exists $localpath and
5127 badproto \*RO, f_ "file %s (%s) twice", $keyword, $localpath;
5128 protocol_receive_file \*RO, $localpath;
5129 i_method "i_file", $keyword;
5134 sub i_resp_param ($) {
5135 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, __ "bad param spec";
5139 sub i_resp_previously ($) {
5140 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
5141 or badproto \*RO, __ "bad previously spec";
5142 my $r = system qw(git check-ref-format), $1;
5143 confess "bad previously ref spec ($r)" if $r;
5144 $previously{$1} = $2;
5149 sub i_resp_want ($) {
5151 die "$keyword ?" if $i_wanted{$keyword}++;
5153 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
5154 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
5155 die unless $isuite =~ m/^$suite_re$/;
5158 rpush_handle_protovsn_bothends();
5160 my @localpaths = i_method "i_want", $keyword;
5161 printdebug "[[ $keyword @localpaths\n";
5162 foreach my $localpath (@localpaths) {
5163 protocol_send_file \*RI, $localpath;
5165 print RI "files-end\n" or confess "$!";
5168 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
5170 sub i_localname_parsed_changelog {
5171 return "remote-changelog.822";
5173 sub i_file_parsed_changelog {
5174 ($i_clogp, $i_version, $i_dscfn) =
5175 push_parse_changelog "$i_tmp/remote-changelog.822";
5176 die if $i_dscfn =~ m#/|^\W#;
5179 sub i_localname_dsc {
5180 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5185 sub i_localname_buildinfo ($) {
5186 my $bi = $i_param{'buildinfo-filename'};
5187 defined $bi or badproto \*RO, "buildinfo before filename";
5188 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
5189 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
5190 or badproto \*RO, "improper buildinfo filename";
5193 sub i_file_buildinfo {
5194 my $bi = $i_param{'buildinfo-filename'};
5195 my $bd = parsecontrol "$i_tmp/$bi", $bi;
5196 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
5197 if (!forceing [qw(buildinfo-changes-mismatch)]) {
5198 files_compare_inputs($bd, $ch);
5199 (getfield $bd, $_) eq (getfield $ch, $_) or
5200 fail f_ "buildinfo mismatch in field %s", $_
5201 foreach qw(Source Version);
5202 !defined $bd->{$_} or
5203 fail f_ "buildinfo contains forbidden field %s", $_
5204 foreach qw(Changes Changed-by Distribution);
5206 push @i_buildinfos, $bi;
5207 delete $i_param{'buildinfo-filename'};
5210 sub i_localname_changes {
5211 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5212 $i_changesfn = $i_dscfn;
5213 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
5214 return $i_changesfn;
5216 sub i_file_changes { }
5218 sub i_want_signed_tag {
5219 printdebug Dumper(\%i_param, $i_dscfn);
5220 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
5221 && defined $i_param{'csuite'}
5222 or badproto \*RO, "premature desire for signed-tag";
5223 my $head = $i_param{'head'};
5224 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
5226 my $maintview = $i_param{'maint-view'};
5227 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
5229 if ($protovsn == 4) {
5230 my $p = $i_param{'tagformat'} // '<undef>';
5232 or badproto \*RO, "tag format mismatch: $p vs. new";
5235 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
5237 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
5239 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
5242 push_mktags $i_clogp, $i_dscfn,
5243 $i_changesfn, (__ 'remote changes file'),
5247 sub i_want_signed_dsc_changes {
5248 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
5249 sign_changes $i_changesfn;
5250 return ($i_dscfn, $i_changesfn, @i_buildinfos);
5253 #---------- building etc. ----------
5259 #----- `3.0 (quilt)' handling -----
5261 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
5263 sub quiltify_dpkg_commit ($$$;$) {
5264 my ($patchname,$author,$msg, $xinfo) = @_;
5267 mkpath '.git/dgit'; # we are in playtree
5268 my $descfn = ".git/dgit/quilt-description.tmp";
5269 open O, '>', $descfn or confess "$descfn: $!";
5270 $msg =~ s/\n+/\n\n/;
5271 print O <<END or confess "$!";
5273 ${xinfo}Subject: $msg
5277 close O or confess "$!";
5280 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
5281 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
5282 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
5283 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
5287 sub quiltify_trees_differ ($$;$$$) {
5288 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
5289 # returns true iff the two tree objects differ other than in debian/
5290 # with $finegrained,
5291 # returns bitmask 01 - differ in upstream files except .gitignore
5292 # 02 - differ in .gitignore
5293 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
5294 # is set for each modified .gitignore filename $fn
5295 # if $unrepres is defined, array ref to which is appeneded
5296 # a list of unrepresentable changes (removals of upstream files
5299 my @cmd = (@git, qw(diff-tree -z --no-renames));
5300 push @cmd, qw(--name-only) unless $unrepres;
5301 push @cmd, qw(-r) if $finegrained || $unrepres;
5303 my $diffs= cmdoutput @cmd;
5306 foreach my $f (split /\0/, $diffs) {
5307 if ($unrepres && !@lmodes) {
5308 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
5311 my ($oldmode,$newmode) = @lmodes;
5314 next if $f =~ m#^debian(?:/.*)?$#s;
5318 die __ "not a plain file or symlink\n"
5319 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5320 $oldmode =~ m/^(?:10|12)\d{4}$/;
5321 if ($oldmode =~ m/[^0]/ &&
5322 $newmode =~ m/[^0]/) {
5323 # both old and new files exist
5324 die __ "mode or type changed\n" if $oldmode ne $newmode;
5325 die __ "modified symlink\n" unless $newmode =~ m/^10/;
5326 } elsif ($oldmode =~ m/[^0]/) {
5328 die __ "deletion of symlink\n"
5329 unless $oldmode =~ m/^10/;
5332 die __ "creation with non-default mode\n"
5333 unless $newmode =~ m/^100644$/ or
5334 $newmode =~ m/^120000$/;
5338 local $/="\n"; chomp $@;
5339 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5343 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5344 $r |= $isignore ? 02 : 01;
5345 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5347 printdebug "quiltify_trees_differ $x $y => $r\n";
5351 sub quiltify_tree_sentinelfiles ($) {
5352 # lists the `sentinel' files present in the tree
5354 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5355 qw(-- debian/rules debian/control);
5360 sub quiltify_splitting ($$$$$$$) {
5361 my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
5362 $editedignores, $cachekey) = @_;
5363 my $gitignore_special = 1;
5364 if ($quilt_mode !~ m/gbp|dpm|baredebian/) {
5365 # treat .gitignore just like any other upstream file
5366 $diffbits = { %$diffbits };
5367 $_ = !!$_ foreach values %$diffbits;
5368 $gitignore_special = 0;
5370 # We would like any commits we generate to be reproducible
5371 my @authline = clogp_authline($clogp);
5372 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5373 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5374 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5375 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5376 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5377 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5379 confess unless do_split_brain();
5381 my $fulldiffhint = sub {
5383 my $cmd = "git diff $x $y -- :/ ':!debian'";
5384 $cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special;
5385 return f_ "\nFor full diff showing the problem(s), type:\n %s\n",
5389 if ($quilt_mode =~ m/gbp|unapplied|baredebian/ &&
5390 ($diffbits->{O2H} & 01)) {
5392 "--quilt=%s specified, implying patches-unapplied git tree\n".
5393 " but git tree differs from orig in upstream files.",
5395 $msg .= $fulldiffhint->($unapplied, 'HEAD');
5396 if (!stat_exists "debian/patches" and $quilt_mode !~ m/baredebian/) {
5398 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5402 if ($quilt_mode =~ m/dpm/ &&
5403 ($diffbits->{H2A} & 01)) {
5404 fail +(f_ <<END, $quilt_mode). $fulldiffhint->($oldtiptree,'HEAD');
5405 --quilt=%s specified, implying patches-applied git tree
5406 but git tree differs from result of applying debian/patches to upstream
5409 if ($quilt_mode =~ m/baredebian/) {
5410 # We need to construct a merge which has upstream files from
5411 # upstream and debian/ files from HEAD.
5413 read_tree_upstream $quilt_upstream_commitish, 1, $headref;
5414 my $version = getfield $clogp, 'Version';
5415 my $upsversion = upstreamversion $version;
5416 my $merge = make_commit
5417 [ $headref, $quilt_upstream_commitish ],
5418 [ +(f_ <<ENDT, $upsversion), $quilt_upstream_commitish_message, <<ENDU ];
5419 Combine debian/ with upstream source for %s
5421 [dgit ($our_version) baredebian-merge $version $quilt_upstream_commitish_used]
5423 runcmd @git, qw(reset -q --hard), $merge;
5425 if ($quilt_mode =~ m/gbp|unapplied|baredebian/ &&
5426 ($diffbits->{O2A} & 01)) { # some patches
5427 progress __ "dgit view: creating patches-applied version using gbp pq";
5428 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5429 # gbp pq import creates a fresh branch; push back to dgit-view
5430 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5431 runcmd @git, qw(checkout -q dgit-view);
5433 if ($quilt_mode =~ m/gbp|dpm/ &&
5434 ($diffbits->{O2A} & 02)) {
5435 fail f_ <<END, $quilt_mode;
5436 --quilt=%s specified, implying that HEAD is for use with a
5437 tool which does not create patches for changes to upstream
5438 .gitignores: but, such patches exist in debian/patches.
5441 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5442 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5444 "dgit view: creating patch to represent .gitignore changes";
5445 ensuredir "debian/patches";
5446 my $gipatch = "debian/patches/auto-gitignore";
5447 open GIPATCH, ">>", "$gipatch" or confess "$gipatch: $!";
5448 stat GIPATCH or confess "$gipatch: $!";
5449 fail f_ "%s already exists; but want to create it".
5450 " to record .gitignore changes",
5453 print GIPATCH +(__ <<END).<<ENDU or die "$gipatch: $!";
5454 Subject: Update .gitignore from Debian packaging branch
5456 The Debian packaging git branch contains these updates to the upstream
5457 .gitignore file(s). This patch is autogenerated, to provide these
5458 updates to users of the official Debian archive view of the package.
5461 [dgit ($our_version) update-gitignore]
5464 close GIPATCH or die "$gipatch: $!";
5465 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5466 $unapplied, $headref, "--", sort keys %$editedignores;
5467 open SERIES, "+>>", "debian/patches/series" or confess "$!";
5468 defined seek SERIES, -1, 2 or $!==EINVAL or confess "$!";
5470 defined read SERIES, $newline, 1 or confess "$!";
5471 print SERIES "\n" or confess "$!" unless $newline eq "\n";
5472 print SERIES "auto-gitignore\n" or confess "$!";
5473 close SERIES or die $!;
5474 runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
5475 commit_admin +(__ <<END).<<ENDU
5476 Commit patch to update .gitignore
5479 [dgit ($our_version) update-gitignore-quilt-fixup]
5484 sub quiltify ($$$$) {
5485 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5487 # Quilt patchification algorithm
5489 # We search backwards through the history of the main tree's HEAD
5490 # (T) looking for a start commit S whose tree object is identical
5491 # to to the patch tip tree (ie the tree corresponding to the
5492 # current dpkg-committed patch series). For these purposes
5493 # `identical' disregards anything in debian/ - this wrinkle is
5494 # necessary because dpkg-source treates debian/ specially.
5496 # We can only traverse edges where at most one of the ancestors'
5497 # trees differs (in changes outside in debian/). And we cannot
5498 # handle edges which change .pc/ or debian/patches. To avoid
5499 # going down a rathole we avoid traversing edges which introduce
5500 # debian/rules or debian/control. And we set a limit on the
5501 # number of edges we are willing to look at.
5503 # If we succeed, we walk forwards again. For each traversed edge
5504 # PC (with P parent, C child) (starting with P=S and ending with
5505 # C=T) to we do this:
5507 # - dpkg-source --commit with a patch name and message derived from C
5508 # After traversing PT, we git commit the changes which
5509 # should be contained within debian/patches.
5511 # The search for the path S..T is breadth-first. We maintain a
5512 # todo list containing search nodes. A search node identifies a
5513 # commit, and looks something like this:
5515 # Commit => $git_commit_id,
5516 # Child => $c, # or undef if P=T
5517 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5518 # Nontrivial => true iff $p..$c has relevant changes
5525 my %considered; # saves being exponential on some weird graphs
5527 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5530 my ($search,$whynot) = @_;
5531 printdebug " search NOT $search->{Commit} $whynot\n";
5532 $search->{Whynot} = $whynot;
5533 push @nots, $search;
5534 no warnings qw(exiting);
5543 my $c = shift @todo;
5544 next if $considered{$c->{Commit}}++;
5546 $not->($c, __ "maximum search space exceeded") if --$max_work <= 0;
5548 printdebug "quiltify investigate $c->{Commit}\n";
5551 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5552 printdebug " search finished hooray!\n";
5557 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5558 if ($quilt_mode eq 'smash') {
5559 printdebug " search quitting smash\n";
5563 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5564 $not->($c, f_ "has %s not %s", $c_sentinels, $t_sentinels)
5565 if $c_sentinels ne $t_sentinels;
5567 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5568 $commitdata =~ m/\n\n/;
5570 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5571 @parents = map { { Commit => $_, Child => $c } } @parents;
5573 $not->($c, __ "root commit") if !@parents;
5575 foreach my $p (@parents) {
5576 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5578 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5579 $not->($c, f_ "merge (%s nontrivial parents)", $ndiffers)
5582 foreach my $p (@parents) {
5583 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5585 my @cmd= (@git, qw(diff-tree -r --name-only),
5586 $p->{Commit},$c->{Commit},
5587 qw(-- debian/patches .pc debian/source/format));
5588 my $patchstackchange = cmdoutput @cmd;
5589 if (length $patchstackchange) {
5590 $patchstackchange =~ s/\n/,/g;
5591 $not->($p, f_ "changed %s", $patchstackchange);
5594 printdebug " search queue P=$p->{Commit} ",
5595 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5601 printdebug "quiltify want to smash\n";
5604 my $x = $_[0]{Commit};
5605 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5608 if ($quilt_mode eq 'linear') {
5610 "\n%s: error: quilt fixup cannot be linear. Stopped at:\n",
5612 my $all_gdr = !!@nots;
5613 foreach my $notp (@nots) {
5614 my $c = $notp->{Child};
5615 my $cprange = $abbrev->($notp);
5616 $cprange .= "..".$abbrev->($c) if $c;
5617 print STDERR f_ "%s: %s: %s\n",
5618 $us, $cprange, $notp->{Whynot};
5619 $all_gdr &&= $notp->{Child} &&
5620 (git_cat_file $notp->{Child}{Commit}, 'commit')
5621 =~ m{^\[git-debrebase(?! split[: ]).*\]$}m;
5625 [ grep { $_->[0] ne 'quilt-mode' } @$failsuggestion ]
5627 print STDERR "$us: $_->[1]\n" foreach @$failsuggestion;
5629 "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n";
5630 } elsif ($quilt_mode eq 'smash') {
5631 } elsif ($quilt_mode eq 'auto') {
5632 progress __ "quilt fixup cannot be linear, smashing...";
5634 confess "$quilt_mode ?";
5637 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5638 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5640 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5642 quiltify_dpkg_commit "auto-$version-$target-$time",
5643 (getfield $clogp, 'Maintainer'),
5644 (f_ "Automatically generated patch (%s)\n".
5645 "Last (up to) %s git changes, FYI:\n\n",
5646 $clogp->{Version}, $ncommits).
5651 progress __ "quiltify linearisation planning successful, executing...";
5653 for (my $p = $sref_S;
5654 my $c = $p->{Child};
5656 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5657 next unless $p->{Nontrivial};
5659 my $cc = $c->{Commit};
5661 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5662 $commitdata =~ m/\n\n/ or die "$c ?";
5665 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5668 my $commitdate = cmdoutput
5669 @git, qw(log -n1 --pretty=format:%aD), $cc;
5671 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5673 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5680 my $gbp_check_suitable = sub {
5685 die __ "contains unexpected slashes\n" if m{//} || m{/$};
5686 die __ "contains leading punctuation\n" if m{^\W} || m{/\W};
5687 die __ "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5688 die __ "is series file\n" if m{$series_filename_re}o;
5689 die __ "too long\n" if length > 200;
5691 return $_ unless $@;
5693 "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s",
5698 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5700 (\S+) \s* \n //ixm) {
5701 $patchname = $gbp_check_suitable->($1, 'Name');
5703 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5705 (\S+) \s* \n //ixm) {
5706 $patchdir = $gbp_check_suitable->($1, 'Topic');
5711 if (!defined $patchname) {
5712 $patchname = $title;
5713 $patchname =~ s/[.:]$//;
5716 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5717 my $translitname = $converter->convert($patchname);
5718 die unless defined $translitname;
5719 $patchname = $translitname;
5722 +(f_ "dgit: patch title transliteration error: %s", $@)
5724 $patchname =~ y/ A-Z/-a-z/;
5725 $patchname =~ y/-a-z0-9_.+=~//cd;
5726 $patchname =~ s/^\W/x-$&/;
5727 $patchname = substr($patchname,0,40);
5728 $patchname .= ".patch";
5730 if (!defined $patchdir) {
5733 if (length $patchdir) {
5734 $patchname = "$patchdir/$patchname";
5736 if ($patchname =~ m{^(.*)/}) {
5737 mkpath "debian/patches/$1";
5742 stat "debian/patches/$patchname$index";
5744 $!==ENOENT or confess "$patchname$index $!";
5746 runcmd @git, qw(checkout -q), $cc;
5748 # We use the tip's changelog so that dpkg-source doesn't
5749 # produce complaining messages from dpkg-parsechangelog. None
5750 # of the information dpkg-source gets from the changelog is
5751 # actually relevant - it gets put into the original message
5752 # which dpkg-source provides our stunt editor, and then
5754 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5756 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5757 "Date: $commitdate\n".
5758 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5760 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5764 sub build_maybe_quilt_fixup () {
5765 my ($format,$fopts) = get_source_format;
5766 return unless madformat_wantfixup $format;
5769 check_for_vendor_patches();
5771 my $clogp = parsechangelog();
5772 my $headref = git_rev_parse('HEAD');
5773 my $symref = git_get_symref();
5774 my $upstreamversion = upstreamversion $version;
5777 changedir $playground;
5779 my $splitbrain_cachekey;
5781 if (do_split_brain()) {
5783 ($cachehit, $splitbrain_cachekey) =
5784 quilt_check_splitbrain_cache($headref, $upstreamversion);
5791 unpack_playtree_need_cd_work($headref);
5792 if (do_split_brain()) {
5793 runcmd @git, qw(checkout -q -b dgit-view);
5794 # so long as work is not deleted, its current branch will
5795 # remain dgit-view, rather than master, so subsequent calls to
5796 # unpack_playtree_need_cd_work
5797 # will DTRT, resetting dgit-view.
5798 confess if $made_split_brain;
5799 $made_split_brain = 1;
5803 if ($fopts->{'single-debian-patch'}) {
5805 "quilt mode %s does not make sense (or is not supported) with single-debian-patch",
5807 if quiltmode_splitting();
5808 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5810 quilt_fixup_multipatch($clogp, $headref, $upstreamversion,
5811 $splitbrain_cachekey);
5814 if (do_split_brain()) {
5815 my $dgitview = git_rev_parse 'HEAD';
5818 reflog_cache_insert "refs/$splitbraincache",
5819 $splitbrain_cachekey, $dgitview;
5821 changedir "$playground/work";
5823 my $saved = maybe_split_brain_save $headref, $dgitview, __ "converted";
5824 progress f_ "dgit view: created (%s)", $saved;
5828 runcmd_ordryrun_local
5829 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5832 sub build_check_quilt_splitbrain () {
5833 build_maybe_quilt_fixup();
5836 sub unpack_playtree_need_cd_work ($) {
5839 # prep_ud() must have been called already.
5840 if (!chdir "work") {
5841 # Check in the filesystem because sometimes we run prep_ud
5842 # in between multiple calls to unpack_playtree_need_cd_work.
5843 confess "$!" unless $!==ENOENT;
5844 mkdir "work" or confess "$!";
5846 mktree_in_ud_here();
5848 runcmd @git, qw(reset -q --hard), $headref;
5851 sub unpack_playtree_linkorigs ($$) {
5852 my ($upstreamversion, $fn) = @_;
5853 # calls $fn->($leafname);
5855 my $bpd_abs = bpd_abs();
5857 dotdot_bpd_transfer_origs $bpd_abs, $upstreamversion, sub { 1 };
5859 opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!";
5860 while ($!=0, defined(my $leaf = readdir QFD)) {
5861 my $f = bpd_abs()."/".$leaf;
5863 local ($debuglevel) = $debuglevel-1;
5864 printdebug "QF linkorigs bpd $leaf, $f ?\n";
5866 next unless is_orig_file_of_vsn $leaf, $upstreamversion;
5867 printdebug "QF linkorigs $leaf, $f Y\n";
5868 link_ltarget $f, $leaf or die "$leaf $!";
5871 die "$buildproductsdir: $!" if $!;
5875 sub quilt_fixup_delete_pc () {
5876 runcmd @git, qw(rm -rqf .pc);
5877 commit_admin +(__ <<END).<<ENDU
5878 Commit removal of .pc (quilt series tracking data)
5881 [dgit ($our_version) upgrade quilt-remove-pc]
5885 sub quilt_fixup_singlepatch ($$$) {
5886 my ($clogp, $headref, $upstreamversion) = @_;
5888 progress __ "starting quiltify (single-debian-patch)";
5890 # dpkg-source --commit generates new patches even if
5891 # single-debian-patch is in debian/source/options. In order to
5892 # get it to generate debian/patches/debian-changes, it is
5893 # necessary to build the source package.
5895 unpack_playtree_linkorigs($upstreamversion, sub { });
5896 unpack_playtree_need_cd_work($headref);
5898 rmtree("debian/patches");
5900 runcmd @dpkgsource, qw(-b .);
5902 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5903 rename srcfn("$upstreamversion", "/debian/patches"),
5904 "work/debian/patches"
5906 or confess "install d/patches: $!";
5909 commit_quilty_patch();
5912 sub quilt_need_fake_dsc ($) {
5913 # cwd should be playground
5914 my ($upstreamversion) = @_;
5916 return if stat_exists "fake.dsc";
5917 # ^ OK to test this as a sentinel because if we created it
5918 # we must either have done the rest too, or crashed.
5920 my $fakeversion="$upstreamversion-~~DGITFAKE";
5922 my $fakedsc=new IO::File 'fake.dsc', '>' or confess "$!";
5923 print $fakedsc <<END or confess "$!";
5926 Version: $fakeversion
5930 my $dscaddfile=sub {
5933 my $md = new Digest::MD5;
5935 my $fh = new IO::File $leaf, '<' or die "$leaf $!";
5936 stat $fh or confess "$!";
5940 print $fakedsc " ".$md->hexdigest." $size $leaf\n" or confess "$!";
5943 unpack_playtree_linkorigs($upstreamversion, $dscaddfile);
5945 my @files=qw(debian/source/format debian/rules
5946 debian/control debian/changelog);
5947 foreach my $maybe (qw(debian/patches debian/source/options
5948 debian/tests/control)) {
5949 next unless stat_exists "$maindir/$maybe";
5950 push @files, $maybe;
5953 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5954 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5956 $dscaddfile->($debtar);
5957 close $fakedsc or confess "$!";
5960 sub quilt_fakedsc2unapplied ($$) {
5961 my ($headref, $upstreamversion) = @_;
5962 # must be run in the playground
5963 # quilt_need_fake_dsc must have been called
5965 quilt_need_fake_dsc($upstreamversion);
5967 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5969 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5970 rename $fakexdir, "fake" or die "$fakexdir $!";
5974 remove_stray_gits(__ "source package");
5975 mktree_in_ud_here();
5979 rmtree 'debian'; # git checkout commitish paths does not delete!
5980 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5981 my $unapplied=git_add_write_tree();
5982 printdebug "fake orig tree object $unapplied\n";
5986 sub quilt_check_splitbrain_cache ($$) {
5987 my ($headref, $upstreamversion) = @_;
5988 # Called only if we are in (potentially) split brain mode.
5989 # Called in playground.
5990 # Computes the cache key and looks in the cache.
5991 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5993 quilt_need_fake_dsc($upstreamversion);
5995 my $splitbrain_cachekey;
5998 "dgit: split brain (separate dgit view) may be needed (--quilt=%s).",
6000 # we look in the reflog of dgit-intern/quilt-cache
6001 # we look for an entry whose message is the key for the cache lookup
6002 my @cachekey = (qw(dgit), $our_version);
6003 push @cachekey, $upstreamversion;
6004 push @cachekey, $quilt_mode;
6005 push @cachekey, $headref;
6006 push @cachekey, $quilt_upstream_commitish // '-';
6008 push @cachekey, hashfile('fake.dsc');
6010 my $srcshash = Digest::SHA->new(256);
6011 my %sfs = ( %INC, '$0(dgit)' => $0 );
6012 foreach my $sfk (sort keys %sfs) {
6013 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
6014 $srcshash->add($sfk," ");
6015 $srcshash->add(hashfile($sfs{$sfk}));
6016 $srcshash->add("\n");
6018 push @cachekey, $srcshash->hexdigest();
6019 $splitbrain_cachekey = "@cachekey";
6021 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
6023 my $cachehit = reflog_cache_lookup
6024 "refs/$splitbraincache", $splitbrain_cachekey;
6027 unpack_playtree_need_cd_work($headref);
6028 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
6029 if ($cachehit ne $headref) {
6030 progress f_ "dgit view: found cached (%s)", $saved;
6031 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
6032 $made_split_brain = 1;
6033 return ($cachehit, $splitbrain_cachekey);
6035 progress __ "dgit view: found cached, no changes required";
6036 return ($headref, $splitbrain_cachekey);
6039 printdebug "splitbrain cache miss\n";
6040 return (undef, $splitbrain_cachekey);
6043 sub quilt_fixup_multipatch ($$$) {
6044 my ($clogp, $headref, $upstreamversion, $splitbrain_cachekey) = @_;
6046 progress f_ "examining quilt state (multiple patches, %s mode)",
6050 # - honour any existing .pc in case it has any strangeness
6051 # - determine the git commit corresponding to the tip of
6052 # the patch stack (if there is one)
6053 # - if there is such a git commit, convert each subsequent
6054 # git commit into a quilt patch with dpkg-source --commit
6055 # - otherwise convert all the differences in the tree into
6056 # a single git commit
6060 # Our git tree doesn't necessarily contain .pc. (Some versions of
6061 # dgit would include the .pc in the git tree.) If there isn't
6062 # one, we need to generate one by unpacking the patches that we
6065 # We first look for a .pc in the git tree. If there is one, we
6066 # will use it. (This is not the normal case.)
6068 # Otherwise need to regenerate .pc so that dpkg-source --commit
6069 # can work. We do this as follows:
6070 # 1. Collect all relevant .orig from parent directory
6071 # 2. Generate a debian.tar.gz out of
6072 # debian/{patches,rules,source/format,source/options}
6073 # 3. Generate a fake .dsc containing just these fields:
6074 # Format Source Version Files
6075 # 4. Extract the fake .dsc
6076 # Now the fake .dsc has a .pc directory.
6077 # (In fact we do this in every case, because in future we will
6078 # want to search for a good base commit for generating patches.)
6080 # Then we can actually do the dpkg-source --commit
6081 # 1. Make a new working tree with the same object
6082 # store as our main tree and check out the main
6084 # 2. Copy .pc from the fake's extraction, if necessary
6085 # 3. Run dpkg-source --commit
6086 # 4. If the result has changes to debian/, then
6087 # - git add them them
6088 # - git add .pc if we had a .pc in-tree
6090 # 5. If we had a .pc in-tree, delete it, and git commit
6091 # 6. Back in the main tree, fast forward to the new HEAD
6093 # Another situation we may have to cope with is gbp-style
6094 # patches-unapplied trees.
6096 # We would want to detect these, so we know to escape into
6097 # quilt_fixup_gbp. However, this is in general not possible.
6098 # Consider a package with a one patch which the dgit user reverts
6099 # (with git revert or the moral equivalent).
6101 # That is indistinguishable in contents from a patches-unapplied
6102 # tree. And looking at the history to distinguish them is not
6103 # useful because the user might have made a confusing-looking git
6104 # history structure (which ought to produce an error if dgit can't
6105 # cope, not a silent reintroduction of an unwanted patch).
6107 # So gbp users will have to pass an option. But we can usually
6108 # detect their failure to do so: if the tree is not a clean
6109 # patches-applied tree, quilt linearisation fails, but the tree
6110 # _is_ a clean patches-unapplied tree, we can suggest that maybe
6111 # they want --quilt=unapplied.
6113 # To help detect this, when we are extracting the fake dsc, we
6114 # first extract it with --skip-patches, and then apply the patches
6115 # afterwards with dpkg-source --before-build. That lets us save a
6116 # tree object corresponding to .origs.
6118 if ($quilt_mode eq 'linear'
6119 && branch_is_gdr($headref)) {
6120 # This is much faster. It also makes patches that gdr
6121 # likes better for future updates without laundering.
6123 # However, it can fail in some casses where we would
6124 # succeed: if there are existing patches, which correspond
6125 # to a prefix of the branch, but are not in gbp/gdr
6126 # format, gdr will fail (exiting status 7), but we might
6127 # be able to figure out where to start linearising. That
6128 # will be slower so hopefully there's not much to do.
6130 unpack_playtree_need_cd_work $headref;
6132 my @cmd = (@git_debrebase,
6133 qw(--noop-ok -funclean-mixed -funclean-ordering
6134 make-patches --quiet-would-amend));
6135 # We tolerate soe snags that gdr wouldn't, by default.
6141 and not ($? == 7*256 or
6142 $? == -1 && $!==ENOENT);
6146 $headref = git_rev_parse('HEAD');
6151 my $unapplied=quilt_fakedsc2unapplied($headref, $upstreamversion);
6155 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
6157 if (system @bbcmd) {
6158 failedcmd @bbcmd if $? < 0;
6160 failed to apply your git tree's patch stack (from debian/patches/) to
6161 the corresponding upstream tarball(s). Your source tree and .orig
6162 are probably too inconsistent. dgit can only fix up certain kinds of
6163 anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).
6169 unpack_playtree_need_cd_work($headref);
6172 if (stat_exists ".pc") {
6174 progress __ "Tree already contains .pc - will use it then delete it.";
6177 rename '../fake/.pc','.pc' or confess "$!";
6180 changedir '../fake';
6182 my $oldtiptree=git_add_write_tree();
6183 printdebug "fake o+d/p tree object $unapplied\n";
6184 changedir '../work';
6187 # We calculate some guesswork now about what kind of tree this might
6188 # be. This is mostly for error reporting.
6190 my $tentries = cmdoutput @git, qw(ls-tree --name-only -z), $headref;
6191 my $onlydebian = $tentries eq "debian\0";
6193 my $uheadref = $headref;
6194 my $uhead_whatshort = 'HEAD';
6196 if ($quilt_mode =~ m/baredebian/) {
6197 $uheadref = $quilt_upstream_commitish;
6198 # TRANSLATORS: this translation must fit in the ASCII art
6199 # quilt differences display. The untranslated display
6200 # says %9.9s, so with that display it must be at most 9
6202 $uhead_whatshort = __ 'upstream';
6209 # O = orig, without patches applied
6210 # A = "applied", ie orig with H's debian/patches applied
6211 O2H => quiltify_trees_differ($unapplied,$uheadref, 1,
6212 \%editedignores, \@unrepres),
6213 H2A => quiltify_trees_differ($uheadref, $oldtiptree,1),
6214 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
6218 foreach my $bits (qw(01 02)) {
6219 foreach my $v (qw(O2H O2A H2A)) {
6220 push @dl, ($diffbits->{$v} & $bits) ? '##' : '==';
6223 printdebug "differences \@dl @dl.\n";
6226 "%s: base trees orig=%.20s o+d/p=%.20s",
6227 $us, $unapplied, $oldtiptree;
6228 # TRANSLATORS: Try to keep this ascii-art layout right. The 0s in
6229 # %9.00009s will be ignored and are there to make the format the
6230 # same length (9 characters) as the output it generates. If you
6231 # change the value 9, your translation of "upstream" must fit into
6232 # the new length, and you should change the number of 0s. Do
6233 # not reduce it below 4 as HEAD has to fit too.
6235 "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
6236 "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p",
6237 $us, $dl[0], $dl[1], $dl[3], $dl[4],
6238 $us, $uhead_whatshort, $dl[2], $uhead_whatshort, $dl[5];
6240 if (@unrepres && $quilt_mode !~ m/baredebian/) {
6241 # With baredebian, even if the upstream commitish has this
6242 # problem, we don't want to print this message, as nothing
6243 # is going to try to make a patch out of it anyway.
6244 print STDERR f_ "dgit: cannot represent change: %s: %s\n",
6247 forceable_fail [qw(unrepresentable)], __ <<END;
6248 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
6254 push @failsuggestion, [ 'onlydebian', __
6255 "This has only a debian/ directory; you probably want --quilt=bare debian." ]
6256 unless $quilt_mode =~ m/baredebian/;
6257 } elsif (!($diffbits->{O2H} & $diffbits->{O2A})) {
6258 push @failsuggestion, [ 'unapplied', __
6259 "This might be a patches-unapplied branch." ];
6260 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
6261 push @failsuggestion, [ 'applied', __
6262 "This might be a patches-applied branch." ];
6264 push @failsuggestion, [ 'quilt-mode', __
6265 "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" ];
6267 push @failsuggestion, [ 'gitattrs', __
6268 "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." ]
6269 if stat_exists '.gitattributes';
6271 push @failsuggestion, [ 'origs', __
6272 "Maybe orig tarball(s) are not identical to git representation?" ]
6273 unless $onlydebian && $quilt_mode !~ m/baredebian/;
6274 # ^ in that case, we didn't really look properly
6276 if (quiltmode_splitting()) {
6277 quiltify_splitting($clogp, $unapplied, $headref, $oldtiptree,
6278 $diffbits, \%editedignores,
6279 $splitbrain_cachekey);
6283 progress f_ "starting quiltify (multiple patches, %s mode)", $quilt_mode;
6284 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
6285 runcmd @git, qw(checkout -q), (qw(master dgit-view)[do_split_brain()]);
6287 if (!open P, '>>', ".pc/applied-patches") {
6288 $!==&ENOENT or confess "$!";
6293 commit_quilty_patch();
6295 if ($mustdeletepc) {
6296 quilt_fixup_delete_pc();
6300 sub quilt_fixup_editor () {
6301 my $descfn = $ENV{$fakeeditorenv};
6302 my $editing = $ARGV[$#ARGV];
6303 open I1, '<', $descfn or confess "$descfn: $!";
6304 open I2, '<', $editing or confess "$editing: $!";
6305 unlink $editing or confess "$editing: $!";
6306 open O, '>', $editing or confess "$editing: $!";
6307 while (<I1>) { print O or confess "$!"; } I1->error and confess "$!";
6310 $copying ||= m/^\-\-\- /;
6311 next unless $copying;
6312 print O or confess "$!";
6314 I2->error and confess "$!";
6319 sub maybe_apply_patches_dirtily () {
6320 return unless $quilt_mode =~ m/gbp|unapplied|baredebian/;
6321 print STDERR __ <<END or confess "$!";
6323 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
6324 dgit: Have to apply the patches - making the tree dirty.
6325 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
6328 $patches_applied_dirtily = 01;
6329 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
6330 runcmd qw(dpkg-source --before-build .);
6333 sub maybe_unapply_patches_again () {
6334 progress __ "dgit: Unapplying patches again to tidy up the tree."
6335 if $patches_applied_dirtily;
6336 runcmd qw(dpkg-source --after-build .)
6337 if $patches_applied_dirtily & 01;
6339 if $patches_applied_dirtily & 02;
6340 $patches_applied_dirtily = 0;
6343 #----- other building -----
6345 sub clean_tree_check_git ($$$) {
6346 my ($honour_ignores, $message, $ignmessage) = @_;
6347 my @cmd = (@git, qw(clean -dn));
6348 push @cmd, qw(-x) unless $honour_ignores;
6349 my $leftovers = cmdoutput @cmd;
6350 if (length $leftovers) {
6351 print STDERR $leftovers, "\n" or confess "$!";
6352 $message .= $ignmessage if $honour_ignores;
6357 sub clean_tree_check_git_wd ($) {
6359 return if $cleanmode =~ m{no-check};
6360 return if $patches_applied_dirtily; # yuk
6361 clean_tree_check_git +($cleanmode !~ m{all-check}),
6362 $message, "\n".__ <<END;
6363 If this is just missing .gitignore entries, use a different clean
6364 mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them
6365 or --clean=git (-wg/-wgf) to use \`git clean' instead.
6369 sub clean_tree_check () {
6370 # This function needs to not care about modified but tracked files.
6371 # That was done by check_not_dirty, and by now we may have run
6372 # the rules clean target which might modify tracked files (!)
6373 if ($cleanmode =~ m{^check}) {
6374 clean_tree_check_git +($cleanmode =~ m{ignores}), __
6375 "tree contains uncommitted files and --clean=check specified", '';
6376 } elsif ($cleanmode =~ m{^dpkg-source}) {
6377 clean_tree_check_git_wd __
6378 "tree contains uncommitted files (NB dgit didn't run rules clean)";
6379 } elsif ($cleanmode =~ m{^git}) {
6380 clean_tree_check_git 1, __
6381 "tree contains uncommited, untracked, unignored files\n".
6382 "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.", '';
6383 } elsif ($cleanmode eq 'none') {
6385 confess "$cleanmode ?";
6390 # We always clean the tree ourselves, rather than leave it to the
6391 # builder (dpkg-source, or soemthing which calls dpkg-source).
6392 if ($quilt_mode =~ m/baredebian/ and $cleanmode =~ m/git/) {
6393 fail f_ <<END, $quilt_mode, $cleanmode;
6394 quilt mode %s (generally needs untracked upstream files)
6395 contradicts clean mode %s (which would delete them)
6397 # This is not 100% true: dgit build-source and push-source
6398 # (for example) could operate just fine with no upstream
6399 # source in the working tree. But it doesn't seem likely that
6400 # the user wants dgit to proactively delete such things.
6401 # -wn, for example, would produce identical output without
6402 # deleting anything from the working tree.
6404 if ($cleanmode =~ m{^dpkg-source}) {
6405 my @cmd = @dpkgbuildpackage;
6406 push @cmd, qw(-d) if $cleanmode =~ m{^dpkg-source-d};
6407 push @cmd, qw(-T clean);
6408 maybe_apply_patches_dirtily();
6409 runcmd_ordryrun_local @cmd;
6410 clean_tree_check_git_wd __
6411 "tree contains uncommitted files (after running rules clean)";
6412 } elsif ($cleanmode =~ m{^git(?!-)}) {
6413 runcmd_ordryrun_local @git, qw(clean -xdf);
6414 } elsif ($cleanmode =~ m{^git-ff}) {
6415 runcmd_ordryrun_local @git, qw(clean -xdff);
6416 } elsif ($cleanmode =~ m{^check}) {
6418 } elsif ($cleanmode eq 'none') {
6420 confess "$cleanmode ?";
6425 badusage __ "clean takes no additional arguments" if @ARGV;
6428 maybe_unapply_patches_again();
6431 # return values from massage_dbp_args are one or both of these flags
6432 sub WANTSRC_SOURCE () { 01; } # caller should build source (separately)
6433 sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
6435 sub build_or_push_prep_early () {
6436 our $build_or_push_prep_early_done //= 0;
6437 return if $build_or_push_prep_early_done++;
6438 badusage f_ "-p is not allowed with dgit %s", $subcommand
6439 if defined $package;
6440 my $clogp = parsechangelog();
6441 $isuite = getfield $clogp, 'Distribution';
6442 $package = getfield $clogp, 'Source';
6443 $version = getfield $clogp, 'Version';
6444 $dscfn = dscfn($version);
6447 sub build_or_push_prep_modes () {
6448 my ($format,) = determine_whether_split_brain();
6450 fail __ "dgit: --include-dirty is not supported with split view".
6451 " (including with view-splitting quilt modes)"
6452 if do_split_brain() && $includedirty;
6454 if (madformat_wantfixup $format and $quilt_mode =~ m/baredebian$/) {
6455 ($quilt_upstream_commitish, $quilt_upstream_commitish_used,
6456 $quilt_upstream_commitish_message)
6457 = resolve_upstream_version
6458 $quilt_upstream_commitish, upstreamversion $version;
6459 progress f_ "dgit: --quilt=%s, %s", $quilt_mode,
6460 $quilt_upstream_commitish_message;
6461 } elsif (defined $quilt_upstream_commitish) {
6463 "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
6467 sub build_prep_early () {
6468 build_or_push_prep_early();
6470 build_or_push_prep_modes();
6474 sub build_prep ($) {
6478 if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)
6479 # Clean the tree because we're going to use the contents of
6480 # $maindir. (We trying to include dirty changes in the source
6481 # package, or we are running the builder in $maindir.)
6482 || $cleanmode =~ m{always}) {
6483 # Or because the user asked us to.
6486 # We don't actually need to do anything in $maindir, but we
6487 # should do some kind of cleanliness check because (i) the
6488 # user may have forgotten a `git add', and (ii) if the user
6489 # said -wc we should still do the check.
6492 build_check_quilt_splitbrain();
6494 my $pat = changespat $version;
6495 foreach my $f (glob "$buildproductsdir/$pat") {
6498 fail f_ "remove old changes file %s: %s", $f, $!;
6500 progress f_ "would remove %s", $f;
6506 sub changesopts_initial () {
6507 my @opts =@changesopts[1..$#changesopts];
6510 sub changesopts_version () {
6511 if (!defined $changes_since_version) {
6514 @vsns = archive_query('archive_query');
6515 my @quirk = access_quirk();
6516 if ($quirk[0] eq 'backports') {
6517 local $isuite = $quirk[2];
6519 canonicalise_suite();
6520 push @vsns, archive_query('archive_query');
6526 "archive query failed (queried because --since-version not specified)";
6529 @vsns = map { $_->[0] } @vsns;
6530 @vsns = sort { -version_compare($a, $b) } @vsns;
6531 $changes_since_version = $vsns[0];
6532 progress f_ "changelog will contain changes since %s", $vsns[0];
6534 $changes_since_version = '_';
6535 progress __ "package seems new, not specifying -v<version>";
6538 if ($changes_since_version ne '_') {
6539 return ("-v$changes_since_version");
6545 sub changesopts () {
6546 return (changesopts_initial(), changesopts_version());
6549 sub massage_dbp_args ($;$) {
6550 my ($cmd,$xargs) = @_;
6551 # Since we split the source build out so we can do strange things
6552 # to it, massage the arguments to dpkg-buildpackage so that the
6553 # main build doessn't build source (or add an argument to stop it
6554 # building source by default).
6555 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6556 # -nc has the side effect of specifying -b if nothing else specified
6557 # and some combinations of -S, -b, et al, are errors, rather than
6558 # later simply overriding earlie. So we need to:
6559 # - search the command line for these options
6560 # - pick the last one
6561 # - perhaps add our own as a default
6562 # - perhaps adjust it to the corresponding non-source-building version
6564 foreach my $l ($cmd, $xargs) {
6566 @$l = grep { !(m/^-[SgGFABb]$|^--build=/s and $dmode=$_) } @$l;
6569 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6570 my $r = WANTSRC_BUILDER;
6571 printdebug "massage split $dmode.\n";
6572 if ($dmode =~ s/^--build=//) {
6574 my @d = split /,/, $dmode;
6575 $r |= WANTSRC_SOURCE if grep { s/^full$/binary/ } @d;
6576 $r |= WANTSRC_SOURCE if grep { s/^source$// } @d;
6577 $r |= WANTSRC_BUILDER if grep { m/./ } @d;
6578 fail __ "Wanted to build nothing!" unless $r;
6579 $dmode = '--build='. join ',', grep m/./, @d;
6582 $dmode =~ m/[S]/ ? WANTSRC_SOURCE :
6583 $dmode =~ y/gGF/ABb/ ? WANTSRC_SOURCE | WANTSRC_BUILDER :
6584 $dmode =~ m/[ABb]/ ? WANTSRC_BUILDER :
6587 printdebug "massage done $r $dmode.\n";
6589 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6595 my $wasdir = must_getcwd();
6596 changedir $buildproductsdir;
6601 # this sub must run with CWD=$buildproductsdir (eg in in_bpd)
6602 sub postbuild_mergechanges ($) {
6603 my ($msg_if_onlyone) = @_;
6604 # If there is only one .changes file, fail with $msg_if_onlyone,
6605 # or if that is undef, be a no-op.
6606 # Returns the changes file to report to the user.
6607 my $pat = changespat $version;
6608 my @changesfiles = grep { !m/_multi\.changes/ } glob $pat;
6609 @changesfiles = sort {
6610 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6614 if (@changesfiles==1) {
6615 fail +(f_ <<END, "@changesfiles").$msg_if_onlyone
6616 only one changes file from build (%s)
6618 if defined $msg_if_onlyone;
6619 $result = $changesfiles[0];
6620 } elsif (@changesfiles==2) {
6621 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6622 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6623 fail f_ "%s found in binaries changes file %s", $l, $binchanges
6626 runcmd_ordryrun_local @mergechanges, @changesfiles;
6627 my $multichanges = changespat $version,'multi';
6629 stat_exists $multichanges or fail f_
6630 "%s unexpectedly not created by build", $multichanges;
6631 foreach my $cf (glob $pat) {
6632 next if $cf eq $multichanges;
6633 rename "$cf", "$cf.inmulti" or fail f_
6634 "install new changes %s\{,.inmulti}: %s", $cf, $!;
6637 $result = $multichanges;
6639 fail f_ "wrong number of different changes files (%s)",
6642 printdone f_ "build successful, results in %s\n", $result
6646 sub midbuild_checkchanges () {
6647 my $pat = changespat $version;
6648 return if $rmchanges;
6649 my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
6651 $_ ne changespat $version,'source' and
6652 $_ ne changespat $version,'multi'
6654 fail +(f_ <<END, $pat, "@unwanted")
6655 changes files other than source matching %s already present; building would result in ambiguity about the intended results.
6656 Suggest you delete %s.
6661 sub midbuild_checkchanges_vanilla ($) {
6663 midbuild_checkchanges() if $wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER);
6666 sub postbuild_mergechanges_vanilla ($) {
6668 if ($wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER)) {
6670 postbuild_mergechanges(undef);
6673 printdone __ "build successful\n";
6679 $buildproductsdir eq '..' or print STDERR +(f_ <<END, $us, $us);
6680 %s: warning: build-products-dir set, but not supported by dpkg-buildpackage
6681 %s: warning: build-products-dir will be ignored; files will go to ..
6683 $buildproductsdir = '..';
6684 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6685 my $wantsrc = massage_dbp_args \@dbp;
6686 build_prep($wantsrc);
6687 if ($wantsrc & WANTSRC_SOURCE) {
6689 midbuild_checkchanges_vanilla $wantsrc;
6691 if ($wantsrc & WANTSRC_BUILDER) {
6692 push @dbp, changesopts_version();
6693 maybe_apply_patches_dirtily();
6694 runcmd_ordryrun_local @dbp;
6696 maybe_unapply_patches_again();
6697 postbuild_mergechanges_vanilla $wantsrc;
6701 $quilt_mode //= 'gbp';
6707 # gbp can make .origs out of thin air. In my tests it does this
6708 # even for a 1.0 format package, with no origs present. So I
6709 # guess it keys off just the version number. We don't know
6710 # exactly what .origs ought to exist, but let's assume that we
6711 # should run gbp if: the version has an upstream part and the main
6713 my $upstreamversion = upstreamversion $version;
6714 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6715 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "$bpd_glob/$origfnpat");
6717 if ($gbp_make_orig) {
6719 $cleanmode = 'none'; # don't do it again
6722 my @dbp = @dpkgbuildpackage;
6724 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6726 if (!length $gbp_build[0]) {
6727 if (length executable_on_path('git-buildpackage')) {
6728 $gbp_build[0] = qw(git-buildpackage);
6730 $gbp_build[0] = 'gbp buildpackage';
6733 my @cmd = opts_opt_multi_cmd [], @gbp_build;
6735 push @cmd, (qw(-us -uc --git-no-sign-tags),
6736 "--git-builder=".(shellquote @dbp));
6738 if ($gbp_make_orig) {
6739 my $priv = dgit_privdir();
6740 my $ok = "$priv/origs-gen-ok";
6741 unlink $ok or $!==&ENOENT or confess "$!";
6742 my @origs_cmd = @cmd;
6743 push @origs_cmd, qw(--git-cleaner=true);
6744 push @origs_cmd, "--git-prebuild=".
6745 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6746 push @origs_cmd, @ARGV;
6748 debugcmd @origs_cmd;
6750 do { local $!; stat_exists $ok; }
6751 or failedcmd @origs_cmd;
6753 dryrun_report @origs_cmd;
6757 build_prep($wantsrc);
6758 if ($wantsrc & WANTSRC_SOURCE) {
6760 midbuild_checkchanges_vanilla $wantsrc;
6762 push @cmd, '--git-cleaner=true';
6764 maybe_unapply_patches_again();
6765 if ($wantsrc & WANTSRC_BUILDER) {
6766 push @cmd, changesopts();
6767 runcmd_ordryrun_local @cmd, @ARGV;
6769 postbuild_mergechanges_vanilla $wantsrc;
6771 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6773 sub building_source_in_playtree {
6774 # If $includedirty, we have to build the source package from the
6775 # working tree, not a playtree, so that uncommitted changes are
6776 # included (copying or hardlinking them into the playtree could
6779 # Note that if we are building a source package in split brain
6780 # mode we do not support including uncommitted changes, because
6781 # that makes quilt fixup too hard. I.e. ($made_split_brain && (dgit is
6782 # building a source package)) => !$includedirty
6783 return !$includedirty;
6787 $sourcechanges = changespat $version,'source';
6789 unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
6790 or fail f_ "remove %s: %s", $sourcechanges, $!;
6792 # confess unless !!$made_split_brain == do_split_brain();
6794 my @cmd = (@dpkgsource, qw(-b --));
6796 if (building_source_in_playtree()) {
6798 my $headref = git_rev_parse('HEAD');
6799 # If we are in split brain, there is already a playtree with
6800 # the thing we should package into a .dsc (thanks to quilt
6801 # fixup). If not, make a playtree
6802 prep_ud() unless $made_split_brain;
6803 changedir $playground;
6804 unless ($made_split_brain) {
6805 my $upstreamversion = upstreamversion $version;
6806 unpack_playtree_linkorigs($upstreamversion, sub { });
6807 unpack_playtree_need_cd_work($headref);
6811 $leafdir = basename $maindir;
6813 if ($buildproductsdir ne '..') {
6814 # Well, we are going to run dpkg-source -b which consumes
6815 # origs from .. and generates output there. To make this
6816 # work when the bpd is not .. , we would have to (i) link
6817 # origs from bpd to .. , (ii) check for files that
6818 # dpkg-source -b would/might overwrite, and afterwards
6819 # (iii) move all the outputs back to the bpd (iv) except
6820 # for the origs which should be deleted from .. if they
6821 # weren't there beforehand. And if there is an error and
6822 # we don't run to completion we would necessarily leave a
6823 # mess. This is too much. The real way to fix this
6824 # is for dpkg-source to have bpd support.
6825 confess unless $includedirty;
6827 "--include-dirty not supported with --build-products-dir, sorry";
6832 runcmd_ordryrun_local @cmd, $leafdir;
6835 runcmd_ordryrun_local qw(sh -ec),
6836 'exec >../$1; shift; exec "$@"','x', $sourcechanges,
6837 @dpkggenchanges, qw(-S), changesopts();
6840 printdebug "moving $dscfn, $sourcechanges, etc. to ".bpd_abs()."\n";
6841 $dsc = parsecontrol($dscfn, "source package");
6845 printdebug " renaming ($why) $l\n";
6846 rename_link_xf 0, "$l", bpd_abs()."/$l"
6847 or fail f_ "put in place new built file (%s): %s", $l, $@;
6849 foreach my $l (split /\n/, getfield $dsc, 'Files') {
6850 $l =~ m/\S+$/ or next;
6853 $mv->('dsc', $dscfn);
6854 $mv->('changes', $sourcechanges);
6859 sub cmd_build_source {
6860 badusage __ "build-source takes no additional arguments" if @ARGV;
6861 build_prep(WANTSRC_SOURCE);
6863 maybe_unapply_patches_again();
6864 printdone f_ "source built, results in %s and %s",
6865 $dscfn, $sourcechanges;
6868 sub cmd_push_source {
6871 "dgit push-source: --include-dirty/--ignore-dirty does not make".
6872 "sense with push-source!"
6874 build_check_quilt_splitbrain();
6876 my $changes = parsecontrol("$buildproductsdir/$changesfile",
6877 __ "source changes file");
6878 unless (test_source_only_changes($changes)) {
6879 fail __ "user-specified changes file is not source-only";
6882 # Building a source package is very fast, so just do it
6884 confess "er, patches are applied dirtily but shouldn't be.."
6885 if $patches_applied_dirtily;
6886 $changesfile = $sourcechanges;
6891 sub binary_builder {
6892 my ($bbuilder, $pbmc_msg, @args) = @_;
6893 build_prep(WANTSRC_SOURCE);
6895 midbuild_checkchanges();
6898 stat_exists $dscfn or fail f_
6899 "%s (in build products dir): %s", $dscfn, $!;
6900 stat_exists $sourcechanges or fail f_
6901 "%s (in build products dir): %s", $sourcechanges, $!;
6903 runcmd_ordryrun_local @$bbuilder, @args;
6905 maybe_unapply_patches_again();
6907 postbuild_mergechanges($pbmc_msg);
6913 binary_builder(\@sbuild, (__ <<END), qw(-d), $isuite, @ARGV, $dscfn);
6914 perhaps you need to pass -A ? (sbuild's default is to build only
6915 arch-specific binaries; dgit 1.4 used to override that.)
6920 my ($pbuilder) = @_;
6922 # @ARGV is allowed to contain only things that should be passed to
6923 # pbuilder under debbuildopts; just massage those
6924 my $wantsrc = massage_dbp_args \@ARGV;
6926 "you asked for a builder but your debbuildopts didn't ask for".
6927 " any binaries -- is this really what you meant?"
6928 unless $wantsrc & WANTSRC_BUILDER;
6930 "we must build a .dsc to pass to the builder but your debbuiltopts".
6931 " forbids the building of a source package; cannot continue"
6932 unless $wantsrc & WANTSRC_SOURCE;
6933 # We do not want to include the verb "build" in @pbuilder because
6934 # the user can customise @pbuilder and they shouldn't be required
6935 # to include "build" in their customised value. However, if the
6936 # user passes any additional args to pbuilder using the dgit
6937 # option --pbuilder:foo, such args need to come after the "build"
6938 # verb. opts_opt_multi_cmd does all of that.
6939 binary_builder([opts_opt_multi_cmd ["build"], @$pbuilder], undef,
6940 qw(--debbuildopts), "@ARGV", qw(--distribution), $isuite,
6945 pbuilder(\@pbuilder);
6948 sub cmd_cowbuilder {
6949 pbuilder(\@cowbuilder);
6952 sub cmd_quilt_fixup {
6953 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6956 build_maybe_quilt_fixup();
6959 sub cmd_print_unapplied_treeish {
6960 badusage __ "incorrect arguments to dgit print-unapplied-treeish"
6962 my $headref = git_rev_parse('HEAD');
6963 my $clogp = commit_getclogp $headref;
6964 $package = getfield $clogp, 'Source';
6965 $version = getfield $clogp, 'Version';
6966 $isuite = getfield $clogp, 'Distribution';
6967 $csuite = $isuite; # we want this to be offline!
6971 changedir $playground;
6972 my $uv = upstreamversion $version;
6973 my $u = quilt_fakedsc2unapplied($headref, $uv);
6974 print $u, "\n" or confess "$!";
6977 sub import_dsc_result {
6978 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6979 my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
6981 check_gitattrs($newhash, __ "source tree");
6983 progress f_ "dgit: import-dsc: %s", $what_msg;
6986 sub cmd_import_dsc {
6990 last unless $ARGV[0] =~ m/^-/;
6993 if (m/^--require-valid-signature$/) {
6996 badusage f_ "unknown dgit import-dsc sub-option \`%s'", $_;
7000 badusage __ "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
7002 my ($dscfn, $dstbranch) = @ARGV;
7004 badusage __ "dry run makes no sense with import-dsc"
7007 my $force = $dstbranch =~ s/^\+// ? +1 :
7008 $dstbranch =~ s/^\.\.// ? -1 :
7010 my $info = $force ? " $&" : '';
7011 $info = "$dscfn$info";
7013 my $specbranch = $dstbranch;
7014 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
7015 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
7017 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
7018 my $chead = cmdoutput_errok @symcmd;
7019 defined $chead or $?==256 or failedcmd @symcmd;
7021 fail f_ "%s is checked out - will not update it", $dstbranch
7022 if defined $chead and $chead eq $dstbranch;
7024 my $oldhash = git_get_ref $dstbranch;
7026 open D, "<", $dscfn or fail f_ "open import .dsc (%s): %s", $dscfn, $!;
7027 $dscdata = do { local $/ = undef; <D>; };
7028 D->error and fail f_ "read %s: %s", $dscfn, $!;
7031 # we don't normally need this so import it here
7032 use Dpkg::Source::Package;
7033 my $dp = new Dpkg::Source::Package filename => $dscfn,
7034 require_valid_signature => $needsig;
7036 local $SIG{__WARN__} = sub {
7038 return unless $needsig;
7039 fail __ "import-dsc signature check failed";
7041 if (!$dp->is_signed()) {
7042 warn f_ "%s: warning: importing unsigned .dsc\n", $us;
7044 my $r = $dp->check_signature();
7045 confess "->check_signature => $r" if $needsig && $r;
7051 $package = getfield $dsc, 'Source';
7053 parse_dsc_field($dsc, __ "Dgit metadata in .dsc")
7054 unless forceing [qw(import-dsc-with-dgit-field)];
7055 parse_dsc_field_def_dsc_distro();
7057 $isuite = 'DGIT-IMPORT-DSC';
7058 $idistro //= $dsc_distro;
7062 if (defined $dsc_hash) {
7064 "dgit: import-dsc of .dsc with Dgit field, using git hash";
7065 resolve_dsc_field_commit undef, undef;
7067 if (defined $dsc_hash) {
7068 my @cmd = (qw(sh -ec),
7069 "echo $dsc_hash | git cat-file --batch-check");
7070 my $objgot = cmdoutput @cmd;
7071 if ($objgot =~ m#^\w+ missing\b#) {
7072 fail f_ <<END, $dsc_hash
7073 .dsc contains Dgit field referring to object %s
7074 Your git tree does not have that object. Try `git fetch' from a
7075 plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.
7078 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
7080 progress __ "Not fast forward, forced update.";
7082 fail f_ "Not fast forward to %s", $dsc_hash;
7085 import_dsc_result $dstbranch, $dsc_hash,
7086 "dgit import-dsc (Dgit): $info",
7087 f_ "updated git ref %s", $dstbranch;
7091 fail f_ <<END, $dstbranch, $specbranch, $specbranch
7092 Branch %s already exists
7093 Specify ..%s for a pseudo-merge, binding in existing history
7094 Specify +%s to overwrite, discarding existing history
7096 if $oldhash && !$force;
7098 my @dfi = dsc_files_info();
7099 foreach my $fi (@dfi) {
7100 my $f = $fi->{Filename};
7101 # We transfer all the pieces of the dsc to the bpd, not just
7102 # origs. This is by analogy with dgit fetch, which wants to
7103 # keep them somewhere to avoid downloading them again.
7104 # We make symlinks, though. If the user wants copies, then
7105 # they can copy the parts of the dsc to the bpd using dcmd,
7107 my $here = "$buildproductsdir/$f";
7112 fail f_ "lstat %s works but stat gives %s !", $here, $!;
7114 fail f_ "stat %s: %s", $here, $! unless $! == ENOENT;
7115 printdebug "not in bpd, $f ...\n";
7116 # $f does not exist in bpd, we need to transfer it
7118 $there =~ s{[^/]+$}{$f} or confess "$there ?";
7119 # $there is file we want, relative to user's cwd, or abs
7120 printdebug "not in bpd, $f, test $there ...\n";
7121 stat $there or fail f_
7122 "import %s requires %s, but: %s", $dscfn, $there, $!;
7123 if ($there =~ m#^(?:\./+)?\.\./+#) {
7124 # $there is relative to user's cwd
7125 my $there_from_parent = $';
7126 if ($buildproductsdir !~ m{^/}) {
7127 # abs2rel, despite its name, can take two relative paths
7128 $there = File::Spec->abs2rel($there,$buildproductsdir);
7129 # now $there is relative to bpd, great
7130 printdebug "not in bpd, $f, abs2rel, $there ...\n";
7132 $there = (dirname $maindir)."/$there_from_parent";
7133 # now $there is absoute
7134 printdebug "not in bpd, $f, rel2rel, $there ...\n";
7136 } elsif ($there =~ m#^/#) {
7137 # $there is absolute already
7138 printdebug "not in bpd, $f, abs, $there ...\n";
7141 "cannot import %s which seems to be inside working tree!",
7144 symlink $there, $here or fail f_
7145 "symlink %s to %s: %s", $there, $here, $!;
7146 progress f_ "made symlink %s -> %s", $here, $there;
7147 # print STDERR Dumper($fi);
7149 my @mergeinputs = generate_commits_from_dsc();
7150 die unless @mergeinputs == 1;
7152 my $newhash = $mergeinputs[0]{Commit};
7157 "Import, forced update - synthetic orphan git history.";
7158 } elsif ($force < 0) {
7159 progress __ "Import, merging.";
7160 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
7161 my $version = getfield $dsc, 'Version';
7162 my $clogp = commit_getclogp $newhash;
7163 my $authline = clogp_authline $clogp;
7164 $newhash = hash_commit_text <<ENDU
7172 .(f_ <<END, $package, $version, $dstbranch);
7173 Merge %s (%s) import into %s
7176 die; # caught earlier
7180 import_dsc_result $dstbranch, $newhash,
7181 "dgit import-dsc: $info",
7182 f_ "results are in git ref %s", $dstbranch;
7185 sub pre_archive_api_query () {
7186 not_necessarily_a_tree();
7188 sub cmd_archive_api_query {
7189 badusage __ "need only 1 subpath argument" unless @ARGV==1;
7190 my ($subpath) = @ARGV;
7191 local $isuite = 'DGIT-API-QUERY-CMD';
7192 my @cmd = archive_api_query_cmd($subpath);
7195 exec @cmd or fail f_ "exec curl: %s\n", $!;
7198 sub repos_server_url () {
7199 $package = '_dgit-repos-server';
7200 local $access_forpush = 1;
7201 local $isuite = 'DGIT-REPOS-SERVER';
7202 my $url = access_giturl();
7205 sub pre_clone_dgit_repos_server () {
7206 not_necessarily_a_tree();
7208 sub cmd_clone_dgit_repos_server {
7209 badusage __ "need destination argument" unless @ARGV==1;
7210 my ($destdir) = @ARGV;
7211 my $url = repos_server_url();
7212 my @cmd = (@git, qw(clone), $url, $destdir);
7214 exec @cmd or fail f_ "exec git clone: %s\n", $!;
7217 sub pre_print_dgit_repos_server_source_url () {
7218 not_necessarily_a_tree();
7220 sub cmd_print_dgit_repos_server_source_url {
7222 "no arguments allowed to dgit print-dgit-repos-server-source-url"
7224 my $url = repos_server_url();
7225 print $url, "\n" or confess "$!";
7228 sub pre_print_dpkg_source_ignores {
7229 not_necessarily_a_tree();
7231 sub cmd_print_dpkg_source_ignores {
7233 "no arguments allowed to dgit print-dpkg-source-ignores"
7235 print "@dpkg_source_ignores\n" or confess "$!";
7238 sub cmd_setup_mergechangelogs {
7239 badusage __ "no arguments allowed to dgit setup-mergechangelogs"
7241 local $isuite = 'DGIT-SETUP-TREE';
7242 setup_mergechangelogs(1);
7245 sub cmd_setup_useremail {
7246 badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
7247 local $isuite = 'DGIT-SETUP-TREE';
7251 sub cmd_setup_gitattributes {
7252 badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
7253 local $isuite = 'DGIT-SETUP-TREE';
7257 sub cmd_setup_new_tree {
7258 badusage __ "no arguments allowed to dgit setup-tree" if @ARGV;
7259 local $isuite = 'DGIT-SETUP-TREE';
7263 #---------- argument parsing and main program ----------
7266 print "dgit version $our_version\n" or confess "$!";
7270 our (%valopts_long, %valopts_short);
7271 our (%funcopts_long);
7273 our (@modeopt_cfgs);
7275 sub defvalopt ($$$$) {
7276 my ($long,$short,$val_re,$how) = @_;
7277 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
7278 $valopts_long{$long} = $oi;
7279 $valopts_short{$short} = $oi;
7280 # $how subref should:
7281 # do whatever assignemnt or thing it likes with $_[0]
7282 # if the option should not be passed on to remote, @rvalopts=()
7283 # or $how can be a scalar ref, meaning simply assign the value
7286 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
7287 defvalopt '--distro', '-d', '.+', \$idistro;
7288 defvalopt '', '-k', '.+', \$keyid;
7289 defvalopt '--existing-package','', '.*', \$existing_package;
7290 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
7291 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
7292 defvalopt '--package', '-p', $package_re, \$package;
7293 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
7295 defvalopt '', '-C', '.+', sub {
7296 ($changesfile) = (@_);
7297 if ($changesfile =~ s#^(.*)/##) {
7298 $buildproductsdir = $1;
7302 defvalopt '--initiator-tempdir','','.*', sub {
7303 ($initiator_tempdir) = (@_);
7304 $initiator_tempdir =~ m#^/# or
7305 badusage __ "--initiator-tempdir must be used specify an".
7306 " absolute, not relative, directory."
7309 sub defoptmodes ($@) {
7310 my ($varref, $cfgkey, $default, %optmap) = @_;
7312 while (my ($opt,$val) = each %optmap) {
7313 $funcopts_long{$opt} = sub { $$varref = $val; };
7314 $permit{$val} = $val;
7316 push @modeopt_cfgs, {
7319 Default => $default,
7324 defoptmodes \$dodep14tag, qw( dep14tag want
7327 --always-dep14tag always );
7332 if (defined $ENV{'DGIT_SSH'}) {
7333 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
7334 } elsif (defined $ENV{'GIT_SSH'}) {
7335 @ssh = ($ENV{'GIT_SSH'});
7343 if (!defined $val) {
7344 badusage f_ "%s needs a value", $what unless @ARGV;
7346 push @rvalopts, $val;
7348 badusage f_ "bad value \`%s' for %s", $val, $what unless
7349 $val =~ m/^$oi->{Re}$(?!\n)/s;
7350 my $how = $oi->{How};
7351 if (ref($how) eq 'SCALAR') {
7356 push @ropts, @rvalopts;
7360 last unless $ARGV[0] =~ m/^-/;
7364 if (m/^--dry-run$/) {
7367 } elsif (m/^--damp-run$/) {
7370 } elsif (m/^--no-sign$/) {
7373 } elsif (m/^--help$/) {
7375 } elsif (m/^--version$/) {
7377 } elsif (m/^--new$/) {
7380 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
7381 ($om = $opts_opt_map{$1}) &&
7385 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
7386 !$opts_opt_cmdonly{$1} &&
7387 ($om = $opts_opt_map{$1})) {
7390 } elsif (m/^--([-0-9a-z]+)\!:(.*)/s &&
7391 !$opts_opt_cmdonly{$1} &&
7392 ($om = $opts_opt_map{$1})) {
7394 my $cmd = shift @$om;
7395 @$om = ($cmd, grep { $_ ne $2 } @$om);
7396 } elsif (m/^--(gbp|dpm|baredebian)$/s) {
7397 push @ropts, "--quilt=$1";
7399 } elsif (m/^--(?:ignore|include)-dirty$/s) {
7402 } elsif (m/^--no-quilt-fixup$/s) {
7404 $quilt_mode = 'nocheck';
7405 } elsif (m/^--no-rm-on-error$/s) {
7408 } elsif (m/^--no-chase-dsc-distro$/s) {
7410 $chase_dsc_distro = 0;
7411 } elsif (m/^--overwrite$/s) {
7413 $overwrite_version = '';
7414 } elsif (m/^--split-(?:view|brain)$/s) {
7416 $splitview_mode = 'always';
7417 } elsif (m/^--split-(?:view|brain)=($splitview_modes_re)$/s) {
7419 $splitview_mode = $1;
7420 } elsif (m/^--overwrite=(.+)$/s) {
7422 $overwrite_version = $1;
7423 } elsif (m/^--delayed=(\d+)$/s) {
7426 } elsif (m/^--upstream-commitish=(.+)$/s) {
7428 $quilt_upstream_commitish = $1;
7429 } elsif (m/^--save-(dgit-view)=(.+)$/s ||
7430 m/^--(dgit-view)-save=(.+)$/s
7432 my ($k,$v) = ($1,$2);
7434 $v =~ s#^(?!refs/)#refs/heads/#;
7435 $internal_object_save{$k} = $v;
7436 } elsif (m/^--(no-)?rm-old-changes$/s) {
7439 } elsif (m/^--deliberately-($deliberately_re)$/s) {
7441 push @deliberatelies, $&;
7442 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
7446 } elsif (m/^--force-/) {
7448 f_ "%s: warning: ignoring unknown force option %s\n",
7451 } elsif (m/^--config-lookup-explode=(.+)$/s) {
7452 # undocumented, for testing
7454 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
7455 # ^ it's supposed to be an array ref
7456 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
7457 $val = $2 ? $' : undef; #';
7458 $valopt->($oi->{Long});
7459 } elsif ($funcopts_long{$_}) {
7461 $funcopts_long{$_}();
7463 badusage f_ "unknown long option \`%s'", $_;
7470 } elsif (s/^-L/-/) {
7473 } elsif (s/^-h/-/) {
7475 } elsif (s/^-D/-/) {
7479 } elsif (s/^-N/-/) {
7484 push @changesopts, $_;
7486 } elsif (s/^-wn$//s) {
7488 $cleanmode = 'none';
7489 } elsif (s/^-wg(f?)(a?)$//s) {
7492 $cleanmode .= '-ff' if $1;
7493 $cleanmode .= ',always' if $2;
7494 } elsif (s/^-wd(d?)([na]?)$//s) {
7496 $cleanmode = 'dpkg-source';
7497 $cleanmode .= '-d' if $1;
7498 $cleanmode .= ',no-check' if $2 eq 'n';
7499 $cleanmode .= ',all-check' if $2 eq 'a';
7500 } elsif (s/^-wc$//s) {
7502 $cleanmode = 'check';
7503 } elsif (s/^-wci$//s) {
7505 $cleanmode = 'check,ignores';
7506 } elsif (s/^-c([^=]*)\=(.*)$//s) {
7507 push @git, '-c', $&;
7508 $gitcfgs{cmdline}{$1} = [ $2 ];
7509 } elsif (s/^-c([^=]+)$//s) {
7510 push @git, '-c', $&;
7511 $gitcfgs{cmdline}{$1} = [ 'true' ];
7512 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
7514 $val = undef unless length $val;
7515 $valopt->($oi->{Short});
7518 badusage f_ "unknown short option \`%s'", $_;
7525 sub check_env_sanity () {
7526 my $blocked = new POSIX::SigSet;
7527 sigprocmask SIG_UNBLOCK, $blocked, $blocked or confess "$!";
7530 foreach my $name (qw(PIPE CHLD)) {
7531 my $signame = "SIG$name";
7532 my $signum = eval "POSIX::$signame" // die;
7533 die f_ "%s is set to something other than SIG_DFL\n",
7535 if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT';
7536 $blocked->ismember($signum) and
7537 die f_ "%s is blocked\n", $signame;
7543 On entry to dgit, %s
7544 This is a bug produced by something in your execution environment.
7550 sub parseopts_late_defaults () {
7551 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
7552 if defined $idistro;
7553 $isuite //= cfg('dgit.default.default-suite');
7555 foreach my $k (keys %opts_opt_map) {
7556 my $om = $opts_opt_map{$k};
7558 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
7560 badcfg f_ "cannot set command for %s", $k
7561 unless length $om->[0];
7565 foreach my $c (access_cfg_cfgs("opts-$k")) {
7567 map { $_ ? @$_ : () }
7568 map { $gitcfgs{$_}{$c} }
7569 reverse @gitcfgsources;
7570 printdebug "CL $c ", (join " ", map { shellquote } @vl),
7571 "\n" if $debuglevel >= 4;
7573 badcfg f_ "cannot configure options for %s", $k
7574 if $opts_opt_cmdonly{$k};
7575 my $insertpos = $opts_cfg_insertpos{$k};
7576 @$om = ( @$om[0..$insertpos-1],
7578 @$om[$insertpos..$#$om] );
7582 if (!defined $rmchanges) {
7583 local $access_forpush;
7584 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
7587 if (!defined $quilt_mode) {
7588 local $access_forpush;
7589 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
7590 // access_cfg('quilt-mode', 'RETURN-UNDEF')
7592 $quilt_mode =~ m/^($quilt_modes_re)$/
7593 or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
7597 foreach my $moc (@modeopt_cfgs) {
7598 local $access_forpush;
7599 my $vr = $moc->{Var};
7600 next if defined $$vr;
7601 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
7602 my $v = $moc->{Vals}{$$vr};
7603 badcfg f_ "unknown %s setting \`%s'", $moc->{Key}, $$vr
7609 local $access_forpush;
7610 default_from_access_cfg(\$cleanmode, 'clean-mode', 'dpkg-source',
7614 $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
7615 $buildproductsdir //= '..';
7616 $bpd_glob = $buildproductsdir;
7617 $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
7620 setlocale(LC_MESSAGES, "");
7623 if ($ENV{$fakeeditorenv}) {
7625 quilt_fixup_editor();
7631 print STDERR __ "DRY RUN ONLY\n" if $dryrun_level > 1;
7632 print STDERR __ "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
7633 if $dryrun_level == 1;
7635 print STDERR __ $helpmsg or confess "$!";
7638 $cmd = $subcommand = shift @ARGV;
7641 my $pre_fn = ${*::}{"pre_$cmd"};
7642 $pre_fn->() if $pre_fn;
7644 if ($invoked_in_git_tree) {
7645 changedir_git_toplevel();
7650 my $fn = ${*::}{"cmd_$cmd"};
7651 $fn or badusage f_ "unknown operation %s", $cmd;