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_options_re = 'gbp|dpm|baredebian(?:\+tarball)?';
86 our $quilt_modes_re = "linear|smash|auto|nofix|nocheck|unapplied|$quilt_options_re";
88 our $splitview_modes_re = qr{auto|always|never};
90 our %internal_object_save;
91 our $we_are_responder;
92 our $we_are_initiator;
93 our $initiator_tempdir;
94 our $patches_applied_dirtily = 00;
95 our $chase_dsc_distro=1;
97 our %forceopts = map { $_=>0 }
98 qw(unrepresentable unsupported-source-format
99 dsc-changes-mismatch changes-origs-exactly
100 uploading-binaries uploading-source-only
101 import-gitapply-absurd
102 import-gitapply-no-absurd
103 import-dsc-with-dgit-field);
105 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
107 our $suite_re = '[-+.0-9a-z]+';
108 our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
109 | (?: git | git-ff ) (?: ,always )?
110 | check (?: ,ignores )?
114 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
115 our $splitbraincache = 'dgit-intern/quilt-cache';
116 our $rewritemap = 'dgit-rewrite/map';
118 our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
120 our (@git) = qw(git);
121 our (@dget) = qw(dget);
122 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
123 our (@dput) = qw(dput);
124 our (@debsign) = qw(debsign);
125 our (@gpg) = qw(gpg);
126 our (@sbuild) = (qw(sbuild --no-source));
128 our (@dgit) = qw(dgit);
129 our (@git_debrebase) = qw(git-debrebase);
130 our (@aptget) = qw(apt-get);
131 our (@aptcache) = qw(apt-cache);
132 our (@dpkgbuildpackage) = (qw(dpkg-buildpackage), @dpkg_source_ignores);
133 our (@dpkgsource) = (qw(dpkg-source), @dpkg_source_ignores);
134 our (@dpkggenchanges) = qw(dpkg-genchanges);
135 our (@mergechanges) = qw(mergechanges -f);
136 our (@gbp_build) = ('');
137 our (@gbp_pq) = ('gbp pq');
138 our (@changesopts) = ('');
139 our (@pbuilder) = ("sudo -E pbuilder","--no-source-only-changes");
140 our (@cowbuilder) = ("sudo -E cowbuilder","--no-source-only-changes");
142 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
145 'debsign' => \@debsign,
147 'sbuild' => \@sbuild,
151 'git-debrebase' => \@git_debrebase,
152 'apt-get' => \@aptget,
153 'apt-cache' => \@aptcache,
154 'dpkg-source' => \@dpkgsource,
155 'dpkg-buildpackage' => \@dpkgbuildpackage,
156 'dpkg-genchanges' => \@dpkggenchanges,
157 'gbp-build' => \@gbp_build,
158 'gbp-pq' => \@gbp_pq,
159 'ch' => \@changesopts,
160 'mergechanges' => \@mergechanges,
161 'pbuilder' => \@pbuilder,
162 'cowbuilder' => \@cowbuilder);
164 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
165 our %opts_cfg_insertpos = map {
167 scalar @{ $opts_opt_map{$_} }
168 } keys %opts_opt_map;
170 sub parseopts_late_defaults();
171 sub quiltify_trees_differ ($$;$$$);
172 sub setup_gitattrs(;$);
173 sub check_gitattrs($$);
180 our $supplementary_message = '';
181 our $made_split_brain = 0;
184 # Interactions between quilt mode and split brain
185 # (currently, split brain only implemented iff
186 # madformat_wantfixup && quiltmode_splitting)
188 # source format sane `3.0 (quilt)'
189 # madformat_wantfixup()
191 # quilt mode normal quiltmode
192 # (eg linear) _splitbrain
194 # ------------ ------------------------------------------------
196 # no split no q cache no q cache forbidden,
197 # brain PM on master q fixup on master prevented
198 # !do_split_brain() PM on master
200 # split brain no q cache q fixup cached, to dgit view
201 # PM in dgit view PM in dgit view
203 # PM = pseudomerge to make ff, due to overwrite (or split view)
204 # "no q cache" = do not record in cache on build, do not check cache
205 # `3.0 (quilt)' with --quilt=nocheck is treated as sane format
209 return unless forkcheck_mainprocess();
210 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
213 our $remotename = 'dgit';
214 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
218 if (!defined $absurdity) {
220 $absurdity =~ s{/[^/]+$}{/absurd} or die;
223 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
225 sub lbranch () { return "$branchprefix/$csuite"; }
226 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
227 sub lref () { return "refs/heads/".lbranch(); }
228 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
229 sub rrref () { return server_ref($csuite); }
232 my ($vsn, $sfx) = @_;
233 return &source_file_leafname($package, $vsn, $sfx);
235 sub is_orig_file_of_vsn ($$) {
236 my ($f, $upstreamvsn) = @_;
237 return is_orig_file_of_p_v($f, $package, $upstreamvsn);
242 return srcfn($vsn,".dsc");
245 sub changespat ($;$) {
246 my ($vsn, $arch) = @_;
247 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
256 return unless forkcheck_mainprocess();
257 foreach my $f (@end) {
259 print STDERR "$us: cleanup: $@" if length $@;
264 print STDERR f_ "%s: invalid configuration: %s\n", $us, "@_";
268 sub forceable_fail ($$) {
269 my ($forceoptsl, $msg) = @_;
270 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
271 print STDERR +(__ "warning: overriding problem due to --force:\n"). $msg;
275 my ($forceoptsl) = @_;
276 my @got = grep { $forceopts{$_} } @$forceoptsl;
277 return 0 unless @got;
279 "warning: skipping checks or functionality due to --force-%s\n",
283 sub no_such_package () {
284 print STDERR f_ "%s: source package %s does not exist in suite %s\n",
285 $us, $package, $isuite;
289 sub deliberately ($) {
291 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
294 sub deliberately_not_fast_forward () {
295 foreach (qw(not-fast-forward fresh-repo)) {
296 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
300 sub quiltmode_splitting () {
301 $quilt_mode =~ m/gbp|dpm|unapplied|baredebian/;
304 sub do_split_brain () { !!($do_split_brain // confess) }
306 sub opts_opt_multi_cmd {
309 push @cmd, split /\s+/, shift @_;
316 return opts_opt_multi_cmd [], @gbp_pq;
319 sub dgit_privdir () {
320 our $dgit_privdir_made //= ensure_a_playground 'dgit';
324 my $r = $buildproductsdir;
325 $r = "$maindir/$r" unless $r =~ m{^/};
329 sub get_tree_of_commit ($) {
330 my ($commitish) = @_;
331 my $cdata = cmdoutput @git, qw(cat-file commit), $commitish;
332 $cdata =~ m/\n\n/; $cdata = $`;
333 $cdata =~ m/^tree (\w+)$/m or confess "cdata $cdata ?";
337 sub branch_gdr_info ($$) {
338 my ($symref, $head) = @_;
339 my ($status, $msg, $current, $ffq_prev, $gdrlast) =
340 gdr_ffq_prev_branchinfo($symref);
341 return () unless $status eq 'branch';
342 $ffq_prev = git_get_ref $ffq_prev;
343 $gdrlast = git_get_ref $gdrlast;
344 $gdrlast &&= is_fast_fwd $gdrlast, $head;
345 return ($ffq_prev, $gdrlast);
348 sub branch_is_gdr_unstitched_ff ($$$) {
349 my ($symref, $head, $ancestor) = @_;
350 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
351 return 0 unless $ffq_prev;
352 return 0 unless !defined $ancestor or is_fast_fwd $ancestor, $ffq_prev;
356 sub branch_is_gdr ($) {
358 # This is quite like git-debrebase's keycommits.
359 # We have our own implementation because:
360 # - our algorighm can do fewer tests so is faster
361 # - it saves testing to see if gdr is installed
363 # NB we use this jsut for deciding whether to run gdr make-patches
364 # Before reusing this algorithm for somthing else, its
365 # suitability should be reconsidered.
368 local $Debian::Dgit::debugcmd_when_debuglevel = 3;
369 printdebug "branch_is_gdr $head...\n";
370 my $get_patches = sub {
371 my $t = git_cat_file "$_[0]:debian/patches", [qw(missing tree)];
374 my $tip_patches = $get_patches->($head);
377 my $cdata = git_cat_file $walk, 'commit';
378 my ($hdrs,$msg) = $cdata =~ m{\n\n} ? ($`,$') : ($cdata,'');
379 if ($msg =~ m{^\[git-debrebase\ (
380 anchor | changelog | make-patches |
381 merged-breakwater | pseudomerge
383 # no need to analyse this - it's sufficient
384 # (gdr classifications: Anchor, MergedBreakwaters)
385 # (made by gdr: Pseudomerge, Changelog)
386 printdebug "branch_is_gdr $walk gdr $1 YES\n";
389 my @parents = ($hdrs =~ m/^parent (\w+)$/gm);
391 my $walk_tree = get_tree_of_commit $walk;
392 foreach my $p (@parents) {
393 my $p_tree = get_tree_of_commit $p;
394 if ($p_tree eq $walk_tree) { # pseudomerge contriburor
395 # (gdr classification: Pseudomerge; not made by gdr)
396 printdebug "branch_is_gdr $walk unmarked pseudomerge\n"
402 # some other non-gdr merge
403 # (gdr classification: VanillaMerge, DgitImportUnpatched, ?)
404 printdebug "branch_is_gdr $walk ?-2-merge NO\n";
408 # (gdr classification: ?)
409 printdebug "branch_is_gdr $walk ?-octopus NO\n";
413 printdebug "branch_is_gdr $walk origin\n";
416 if ($get_patches->($walk) ne $tip_patches) {
417 # Our parent added, removed, or edited patches, and wasn't
418 # a gdr make-patches commit. gdr make-patches probably
419 # won't do that well, then.
420 # (gdr classification of parent: AddPatches or ?)
421 printdebug "branch_is_gdr $walk ?-patches NO\n";
424 if ($tip_patches eq '' and
425 !defined git_cat_file "$walk~:debian" and
426 !quiltify_trees_differ "$walk~", $walk
428 # (gdr classification of parent: BreakwaterStart
429 printdebug "branch_is_gdr $walk unmarked BreakwaterStart YES\n";
432 # (gdr classification: Upstream Packaging Mixed Changelog)
433 printdebug "branch_is_gdr $walk plain\n"
439 #---------- remote protocol support, common ----------
441 # remote push initiator/responder protocol:
442 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
443 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
444 # < dgit-remote-push-ready <actual-proto-vsn>
451 # > supplementary-message NBYTES
456 # > file parsed-changelog
457 # [indicates that output of dpkg-parsechangelog follows]
458 # > data-block NBYTES
459 # > [NBYTES bytes of data (no newline)]
460 # [maybe some more blocks]
469 # > param head DGIT-VIEW-HEAD
470 # > param csuite SUITE
471 # > param tagformat new # $protovsn == 4
472 # > param maint-view MAINT-VIEW-HEAD
474 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
475 # > file buildinfo # for buildinfos to sign
477 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
478 # # goes into tag, for replay prevention
481 # [indicates that signed tag is wanted]
482 # < data-block NBYTES
483 # < [NBYTES bytes of data (no newline)]
484 # [maybe some more blocks]
488 # > want signed-dsc-changes
489 # < data-block NBYTES [transfer of signed dsc]
491 # < data-block NBYTES [transfer of signed changes]
493 # < data-block NBYTES [transfer of each signed buildinfo
494 # [etc] same number and order as "file buildinfo"]
502 sub i_child_report () {
503 # Sees if our child has died, and reap it if so. Returns a string
504 # describing how it died if it failed, or undef otherwise.
505 return undef unless $i_child_pid;
506 my $got = waitpid $i_child_pid, WNOHANG;
507 return undef if $got <= 0;
508 die unless $got == $i_child_pid;
509 $i_child_pid = undef;
510 return undef unless $?;
511 return f_ "build host child %s", waitstatusmsg();
516 fail f_ "connection lost: %s", $! if $fh->error;
517 fail f_ "protocol violation; %s not expected", $m;
520 sub badproto_badread ($$) {
522 fail f_ "connection lost: %s", $! if $!;
523 my $report = i_child_report();
524 fail $report if defined $report;
525 badproto $fh, f_ "eof (reading %s)", $wh;
528 sub protocol_expect (&$) {
529 my ($match, $fh) = @_;
532 defined && chomp or badproto_badread $fh, __ "protocol message";
540 badproto $fh, f_ "\`%s'", $_;
543 sub protocol_send_file ($$) {
544 my ($fh, $ourfn) = @_;
545 open PF, "<", $ourfn or die "$ourfn: $!";
548 my $got = read PF, $d, 65536;
549 die "$ourfn: $!" unless defined $got;
551 print $fh "data-block ".length($d)."\n" or confess "$!";
552 print $fh $d or confess "$!";
554 PF->error and die "$ourfn $!";
555 print $fh "data-end\n" or confess "$!";
559 sub protocol_read_bytes ($$) {
560 my ($fh, $nbytes) = @_;
561 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, __ "bad byte count";
563 my $got = read $fh, $d, $nbytes;
564 $got==$nbytes or badproto_badread $fh, __ "data block";
568 sub protocol_receive_file ($$) {
569 my ($fh, $ourfn) = @_;
570 printdebug "() $ourfn\n";
571 open PF, ">", $ourfn or die "$ourfn: $!";
573 my ($y,$l) = protocol_expect {
574 m/^data-block (.*)$/ ? (1,$1) :
575 m/^data-end$/ ? (0,) :
579 my $d = protocol_read_bytes $fh, $l;
580 print PF $d or confess "$!";
582 close PF or confess "$!";
585 #---------- remote protocol support, responder ----------
587 sub responder_send_command ($) {
589 return unless $we_are_responder;
590 # called even without $we_are_responder
591 printdebug ">> $command\n";
592 print PO $command, "\n" or confess "$!";
595 sub responder_send_file ($$) {
596 my ($keyword, $ourfn) = @_;
597 return unless $we_are_responder;
598 printdebug "]] $keyword $ourfn\n";
599 responder_send_command "file $keyword";
600 protocol_send_file \*PO, $ourfn;
603 sub responder_receive_files ($@) {
604 my ($keyword, @ourfns) = @_;
605 die unless $we_are_responder;
606 printdebug "[[ $keyword @ourfns\n";
607 responder_send_command "want $keyword";
608 foreach my $fn (@ourfns) {
609 protocol_receive_file \*PI, $fn;
612 protocol_expect { m/^files-end$/ } \*PI;
615 #---------- remote protocol support, initiator ----------
617 sub initiator_expect (&) {
619 protocol_expect { &$match } \*RO;
622 #---------- end remote code ----------
625 if ($we_are_responder) {
627 responder_send_command "progress ".length($m) or confess "$!";
628 print PO $m or confess "$!";
638 $ua = LWP::UserAgent->new();
642 progress "downloading $what...";
643 my $r = $ua->get(@_) or confess "$!";
644 return undef if $r->code == 404;
645 $r->is_success or fail f_ "failed to fetch %s: %s",
646 $what, $r->status_line;
647 return $r->decoded_content(charset => 'none');
650 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
652 sub act_local () { return $dryrun_level <= 1; }
653 sub act_scary () { return !$dryrun_level; }
656 if (!$dryrun_level) {
657 progress f_ "%s ok: %s", $us, "@_";
659 progress f_ "would be ok: %s (but dry run only)", "@_";
664 printcmd(\*STDERR,$debugprefix."#",@_);
667 sub runcmd_ordryrun {
675 sub runcmd_ordryrun_local {
683 our $helpmsg = i_ <<END;
685 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
686 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
687 dgit [dgit-opts] build [dpkg-buildpackage-opts]
688 dgit [dgit-opts] sbuild [sbuild-opts]
689 dgit [dgit-opts] pbuilder|cowbuilder [debbuildopts]
690 dgit [dgit-opts] push [dgit-opts] [suite]
691 dgit [dgit-opts] push-source [dgit-opts] [suite]
692 dgit [dgit-opts] rpush build-host:build-dir ...
693 important dgit options:
694 -k<keyid> sign tag and package with <keyid> instead of default
695 --dry-run -n do not change anything, but go through the motions
696 --damp-run -L like --dry-run but make local changes, without signing
697 --new -N allow introducing a new package
698 --debug -D increase debug level
699 -c<name>=<value> set git config option (used directly by dgit too)
702 our $later_warning_msg = i_ <<END;
703 Perhaps the upload is stuck in incoming. Using the version from git.
707 print STDERR f_ "%s: %s\n%s", $us, "@_", __ $helpmsg or confess "$!";
712 @ARGV or badusage __ "too few arguments";
713 return scalar shift @ARGV;
717 not_necessarily_a_tree();
720 print __ $helpmsg or confess "$!";
724 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
726 our %defcfg = ('dgit.default.distro' => 'debian',
727 'dgit.default.default-suite' => 'unstable',
728 'dgit.default.old-dsc-distro' => 'debian',
729 'dgit-suite.*-security.distro' => 'debian-security',
730 'dgit.default.username' => '',
731 'dgit.default.archive-query-default-component' => 'main',
732 'dgit.default.ssh' => 'ssh',
733 'dgit.default.archive-query' => 'madison:',
734 'dgit.default.sshpsql-dbname' => 'service=projectb',
735 'dgit.default.aptget-components' => 'main',
736 'dgit.default.source-only-uploads' => 'ok',
737 'dgit.dsc-url-proto-ok.http' => 'true',
738 'dgit.dsc-url-proto-ok.https' => 'true',
739 'dgit.dsc-url-proto-ok.git' => 'true',
740 'dgit.vcs-git.suites', => 'sid', # ;-separated
741 'dgit.default.dsc-url-proto-ok' => 'false',
742 # old means "repo server accepts pushes with old dgit tags"
743 # new means "repo server accepts pushes with new dgit tags"
744 # maint means "repo server accepts split brain pushes"
745 # hist means "repo server may have old pushes without new tag"
746 # ("hist" is implied by "old")
747 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
748 'dgit-distro.debian.git-check' => 'url',
749 'dgit-distro.debian.git-check-suffix' => '/info/refs',
750 'dgit-distro.debian.new-private-pushers' => 't',
751 'dgit-distro.debian.source-only-uploads' => 'not-wholly-new',
752 'dgit-distro.debian/push.git-url' => '',
753 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
754 'dgit-distro.debian/push.git-user-force' => 'dgit',
755 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
756 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
757 'dgit-distro.debian/push.git-create' => 'true',
758 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
759 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
760 # 'dgit-distro.debian.archive-query-tls-key',
761 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
762 # ^ this does not work because curl is broken nowadays
763 # Fixing #790093 properly will involve providing providing the key
764 # in some pacagke and maybe updating these paths.
766 # 'dgit-distro.debian.archive-query-tls-curl-args',
767 # '--ca-path=/etc/ssl/ca-debian',
768 # ^ this is a workaround but works (only) on DSA-administered machines
769 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
770 'dgit-distro.debian.git-url-suffix' => '',
771 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
772 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
773 'dgit-distro.debian-security.archive-query' => 'aptget:',
774 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
775 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
776 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
777 'dgit-distro.debian-security.nominal-distro' => 'debian',
778 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
779 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
780 'dgit-distro.ubuntu.git-check' => 'false',
781 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
782 'dgit-distro.test-dummy.ssh' => "$td/ssh",
783 'dgit-distro.test-dummy.username' => "alice",
784 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
785 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
786 'dgit-distro.test-dummy.git-url' => "$td/git",
787 'dgit-distro.test-dummy.git-host' => "git",
788 'dgit-distro.test-dummy.git-path' => "$td/git",
789 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
790 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
791 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
792 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
796 our @gitcfgsources = qw(cmdline local global system);
797 our $invoked_in_git_tree = 1;
799 sub git_slurp_config () {
800 # This algoritm is a bit subtle, but this is needed so that for
801 # options which we want to be single-valued, we allow the
802 # different config sources to override properly. See #835858.
803 foreach my $src (@gitcfgsources) {
804 next if $src eq 'cmdline';
805 # we do this ourselves since git doesn't handle it
807 $gitcfgs{$src} = git_slurp_config_src $src;
811 sub git_get_config ($) {
813 foreach my $src (@gitcfgsources) {
814 my $l = $gitcfgs{$src}{$c};
815 confess "internal error ($l $c)" if $l && !ref $l;
816 printdebug"C $c ".(defined $l ?
817 join " ", map { messagequote "'$_'" } @$l :
822 f_ "multiple values for %s (in %s git config)", $c, $src
824 $l->[0] =~ m/\n/ and badcfg f_
825 "value for config option %s (in %s git config) contains newline(s)!",
834 return undef if $c =~ /RETURN-UNDEF/;
835 printdebug "C? $c\n" if $debuglevel >= 5;
836 my $v = git_get_config($c);
837 return $v if defined $v;
838 my $dv = $defcfg{$c};
840 printdebug "CD $c $dv\n" if $debuglevel >= 4;
845 "need value for one of: %s\n".
846 "%s: distro or suite appears not to be (properly) supported",
850 sub not_necessarily_a_tree () {
851 # needs to be called from pre_*
852 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
853 $invoked_in_git_tree = 0;
856 sub access_basedistro__noalias () {
857 if (defined $idistro) {
860 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
861 return $def if defined $def;
862 foreach my $src (@gitcfgsources, 'internal') {
863 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
865 foreach my $k (keys %$kl) {
866 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
868 next unless match_glob $dpat, $isuite;
872 return cfg("dgit.default.distro");
876 sub access_basedistro () {
877 my $noalias = access_basedistro__noalias();
878 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
879 return $canon // $noalias;
882 sub access_nomdistro () {
883 my $base = access_basedistro();
884 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
885 $r =~ m/^$distro_re$/ or badcfg
886 f_ "bad syntax for (nominal) distro \`%s' (does not match %s)",
887 $r, "/^$distro_re$/";
891 sub access_quirk () {
892 # returns (quirk name, distro to use instead or undef, quirk-specific info)
893 my $basedistro = access_basedistro();
894 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
896 if (defined $backports_quirk) {
897 my $re = $backports_quirk;
898 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
900 $re =~ s/\%/([-0-9a-z_]+)/
901 or $re =~ m/[()]/ or badcfg __ "backports-quirk needs \% or ( )";
902 if ($isuite =~ m/^$re$/) {
903 return ('backports',"$basedistro-backports",$1);
906 return ('none',undef);
911 sub parse_cfg_bool ($$$) {
912 my ($what,$def,$v) = @_;
915 $v =~ m/^[ty1]/ ? 1 :
916 $v =~ m/^[fn0]/ ? 0 :
917 badcfg f_ "%s needs t (true, y, 1) or f (false, n, 0) not \`%s'",
921 sub access_forpush_config () {
922 my $d = access_basedistro();
926 parse_cfg_bool('new-private-pushers', 0,
927 cfg("dgit-distro.$d.new-private-pushers",
930 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
933 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
934 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
935 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
937 "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
940 sub access_forpush () {
941 $access_forpush //= access_forpush_config();
942 return $access_forpush;
945 sub default_from_access_cfg ($$$;$) {
946 my ($var, $keybase, $defval, $permit_re) = @_;
947 return if defined $$var;
949 $$var = access_cfg("$keybase-newer", 'RETURN-UNDEF');
950 $$var = undef if $$var && $$var !~ m/^$permit_re$/;
952 $$var //= access_cfg($keybase, 'RETURN-UNDEF');
955 badcfg f_ "unknown %s \`%s'", $keybase, $$var
956 if defined $permit_re and $$var !~ m/$permit_re/;
960 confess +(__ 'internal error').' '.Dumper($access_forpush)," ?" if
961 defined $access_forpush and !$access_forpush;
962 badcfg __ "pushing but distro is configured readonly"
963 if access_forpush_config() eq '0';
965 $supplementary_message = __ <<'END' unless $we_are_responder;
966 Push failed, before we got started.
967 You can retry the push, after fixing the problem, if you like.
969 parseopts_late_defaults();
973 parseopts_late_defaults();
976 sub determine_whether_split_brain () {
977 my ($format,) = get_source_format();
980 local $access_forpush;
981 default_from_access_cfg(\$splitview_mode, 'split-view', 'auto',
982 $splitview_modes_re);
983 $do_split_brain = 1 if $splitview_mode eq 'always';
986 printdebug "format $format, quilt mode $quilt_mode\n";
988 if (madformat_wantfixup($format) && quiltmode_splitting()) {
989 $splitview_mode ne 'never' or
990 fail f_ "dgit: quilt mode \`%s' (for format \`%s')".
991 " implies split view, but split-view set to \`%s'",
992 $quilt_mode, $format, $splitview_mode;
995 $do_split_brain //= 0;
1000 sub supplementary_message ($) {
1002 if (!$we_are_responder) {
1003 $supplementary_message = $msg;
1006 responder_send_command "supplementary-message ".length($msg)
1008 print PO $msg or confess "$!";
1012 sub access_distros () {
1013 # Returns list of distros to try, in order
1016 # 0. `instead of' distro name(s) we have been pointed to
1017 # 1. the access_quirk distro, if any
1018 # 2a. the user's specified distro, or failing that } basedistro
1019 # 2b. the distro calculated from the suite }
1020 my @l = access_basedistro();
1022 my (undef,$quirkdistro) = access_quirk();
1023 unshift @l, $quirkdistro;
1024 unshift @l, $instead_distro;
1025 @l = grep { defined } @l;
1027 push @l, access_nomdistro();
1029 if (access_forpush()) {
1030 @l = map { ("$_/push", $_) } @l;
1035 sub access_cfg_cfgs (@) {
1038 # The nesting of these loops determines the search order. We put
1039 # the key loop on the outside so that we search all the distros
1040 # for each key, before going on to the next key. That means that
1041 # if access_cfg is called with a more specific, and then a less
1042 # specific, key, an earlier distro can override the less specific
1043 # without necessarily overriding any more specific keys. (If the
1044 # distro wants to override the more specific keys it can simply do
1045 # so; whereas if we did the loop the other way around, it would be
1046 # impossible to for an earlier distro to override a less specific
1047 # key but not the more specific ones without restating the unknown
1048 # values of the more specific keys.
1051 # We have to deal with RETURN-UNDEF specially, so that we don't
1052 # terminate the search prematurely.
1054 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
1057 foreach my $d (access_distros()) {
1058 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
1060 push @cfgs, map { "dgit.default.$_" } @realkeys;
1061 push @cfgs, @rundef;
1065 sub access_cfg (@) {
1067 my (@cfgs) = access_cfg_cfgs(@keys);
1068 my $value = cfg(@cfgs);
1072 sub access_cfg_bool ($$) {
1073 my ($def, @keys) = @_;
1074 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
1077 sub string_to_ssh ($) {
1079 if ($spec =~ m/\s/) {
1080 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
1086 sub access_cfg_ssh () {
1087 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
1088 if (!defined $gitssh) {
1091 return string_to_ssh $gitssh;
1095 sub access_runeinfo ($) {
1097 return ": dgit ".access_basedistro()." $info ;";
1100 sub access_someuserhost ($) {
1102 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
1103 defined($user) && length($user) or
1104 $user = access_cfg("$some-user",'username');
1105 my $host = access_cfg("$some-host");
1106 return length($user) ? "$user\@$host" : $host;
1109 sub access_gituserhost () {
1110 return access_someuserhost('git');
1113 sub access_giturl (;$) {
1114 my ($optional) = @_;
1115 my $url = access_cfg('git-url','RETURN-UNDEF');
1118 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
1119 return undef unless defined $proto;
1122 access_gituserhost().
1123 access_cfg('git-path');
1125 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
1128 return "$url/$package$suffix";
1131 sub commit_getclogp ($) {
1132 # Returns the parsed changelog hashref for a particular commit
1134 our %commit_getclogp_memo;
1135 my $memo = $commit_getclogp_memo{$objid};
1136 return $memo if $memo;
1138 my $mclog = dgit_privdir()."clog";
1139 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1140 "$objid:debian/changelog";
1141 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1144 sub parse_dscdata () {
1145 my $dscfh = new IO::File \$dscdata, '<' or confess "$!";
1146 printdebug Dumper($dscdata) if $debuglevel>1;
1147 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1148 printdebug Dumper($dsc) if $debuglevel>1;
1153 sub archive_query ($;@) {
1154 my ($method) = shift @_;
1155 fail __ "this operation does not support multiple comma-separated suites"
1157 my $query = access_cfg('archive-query','RETURN-UNDEF');
1158 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1161 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1164 sub archive_query_prepend_mirror {
1165 my $m = access_cfg('mirror');
1166 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1169 sub pool_dsc_subpath ($$) {
1170 my ($vsn,$component) = @_; # $package is implict arg
1171 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1172 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1175 sub cfg_apply_map ($$$) {
1176 my ($varref, $what, $mapspec) = @_;
1177 return unless $mapspec;
1179 printdebug "config $what EVAL{ $mapspec; }\n";
1181 eval "package Dgit::Config; $mapspec;";
1186 #---------- `ftpmasterapi' archive query method (nascent) ----------
1188 sub archive_api_query_cmd ($) {
1190 my @cmd = (@curl, qw(-sS));
1191 my $url = access_cfg('archive-query-url');
1192 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1194 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1195 foreach my $key (split /\:/, $keys) {
1196 $key =~ s/\%HOST\%/$host/g;
1198 fail "for $url: stat $key: $!" unless $!==ENOENT;
1201 fail f_ "config requested specific TLS key but do not know".
1202 " how to get curl to use exactly that EE key (%s)",
1204 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1205 # # Sadly the above line does not work because of changes
1206 # # to gnutls. The real fix for #790093 may involve
1207 # # new curl options.
1210 # Fixing #790093 properly will involve providing a value
1211 # for this on clients.
1212 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1213 push @cmd, split / /, $kargs if defined $kargs;
1215 push @cmd, $url.$subpath;
1219 sub api_query ($$;$) {
1221 my ($data, $subpath, $ok404) = @_;
1222 badcfg __ "ftpmasterapi archive query method takes no data part"
1224 my @cmd = archive_api_query_cmd($subpath);
1225 my $url = $cmd[$#cmd];
1226 push @cmd, qw(-w %{http_code});
1227 my $json = cmdoutput @cmd;
1228 unless ($json =~ s/\d+\d+\d$//) {
1229 failedcmd_report_cmd undef, @cmd;
1230 fail __ "curl failed to print 3-digit HTTP code";
1233 return undef if $code eq '404' && $ok404;
1234 fail f_ "fetch of %s gave HTTP code %s", $url, $code
1235 unless $url =~ m#^file://# or $code =~ m/^2/;
1236 return decode_json($json);
1239 sub canonicalise_suite_ftpmasterapi {
1240 my ($proto,$data) = @_;
1241 my $suites = api_query($data, 'suites');
1243 foreach my $entry (@$suites) {
1245 my $v = $entry->{$_};
1246 defined $v && $v eq $isuite;
1247 } qw(codename name);
1248 push @matched, $entry;
1250 fail f_ "unknown suite %s, maybe -d would help", $isuite
1254 @matched==1 or die f_ "multiple matches for suite %s\n", $isuite;
1255 $cn = "$matched[0]{codename}";
1256 defined $cn or die f_ "suite %s info has no codename\n", $isuite;
1257 $cn =~ m/^$suite_re$/
1258 or die f_ "suite %s maps to bad codename\n", $isuite;
1260 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper(\@matched)
1265 sub archive_query_ftpmasterapi {
1266 my ($proto,$data) = @_;
1267 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1269 my $digester = Digest::SHA->new(256);
1270 foreach my $entry (@$info) {
1272 my $vsn = "$entry->{version}";
1273 my ($ok,$msg) = version_check $vsn;
1274 die f_ "bad version: %s\n", $msg unless $ok;
1275 my $component = "$entry->{component}";
1276 $component =~ m/^$component_re$/ or die __ "bad component";
1277 my $filename = "$entry->{filename}";
1278 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1279 or die __ "bad filename";
1280 my $sha256sum = "$entry->{sha256sum}";
1281 $sha256sum =~ m/^[0-9a-f]+$/ or die __ "bad sha256sum";
1282 push @rows, [ $vsn, "/pool/$component/$filename",
1283 $digester, $sha256sum ];
1285 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper($entry)
1288 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1289 return archive_query_prepend_mirror @rows;
1292 sub file_in_archive_ftpmasterapi {
1293 my ($proto,$data,$filename) = @_;
1294 my $pat = $filename;
1297 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1298 my $info = api_query($data, "file_in_archive/$pat", 1);
1301 sub package_not_wholly_new_ftpmasterapi {
1302 my ($proto,$data,$pkg) = @_;
1303 my $info = api_query($data,"madison?package=${pkg}&f=json");
1307 #---------- `aptget' archive query method ----------
1310 our $aptget_releasefile;
1311 our $aptget_configpath;
1313 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1314 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1316 sub aptget_cache_clean {
1317 runcmd_ordryrun_local qw(sh -ec),
1318 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1322 sub aptget_lock_acquire () {
1323 my $lockfile = "$aptget_base/lock";
1324 open APTGET_LOCK, '>', $lockfile or confess "open $lockfile: $!";
1325 flock APTGET_LOCK, LOCK_EX or confess "lock $lockfile: $!";
1328 sub aptget_prep ($) {
1330 return if defined $aptget_base;
1332 badcfg __ "aptget archive query method takes no data part"
1335 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1338 ensuredir "$cache/dgit";
1340 access_cfg('aptget-cachekey','RETURN-UNDEF')
1341 // access_nomdistro();
1343 $aptget_base = "$cache/dgit/aptget";
1344 ensuredir $aptget_base;
1346 my $quoted_base = $aptget_base;
1347 confess "$quoted_base contains bad chars, cannot continue"
1348 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1350 ensuredir $aptget_base;
1352 aptget_lock_acquire();
1354 aptget_cache_clean();
1356 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1357 my $sourceslist = "source.list#$cachekey";
1359 my $aptsuites = $isuite;
1360 cfg_apply_map(\$aptsuites, 'suite map',
1361 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1363 open SRCS, ">", "$aptget_base/$sourceslist" or confess "$!";
1364 printf SRCS "deb-src %s %s %s\n",
1365 access_cfg('mirror'),
1367 access_cfg('aptget-components')
1370 ensuredir "$aptget_base/cache";
1371 ensuredir "$aptget_base/lists";
1373 open CONF, ">", $aptget_configpath or confess "$!";
1375 Debug::NoLocking "true";
1376 APT::Get::List-Cleanup "false";
1377 #clear APT::Update::Post-Invoke-Success;
1378 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1379 Dir::State::Lists "$quoted_base/lists";
1380 Dir::Etc::preferences "$quoted_base/preferences";
1381 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1382 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1385 foreach my $key (qw(
1388 Dir::Cache::Archives
1389 Dir::Etc::SourceParts
1390 Dir::Etc::preferencesparts
1392 ensuredir "$aptget_base/$key";
1393 print CONF "$key \"$quoted_base/$key\";\n" or confess "$!";
1396 my $oldatime = (time // confess "$!") - 1;
1397 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1398 next unless stat_exists $oldlist;
1399 my ($mtime) = (stat _)[9];
1400 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1403 runcmd_ordryrun_local aptget_aptget(), qw(update);
1406 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1407 next unless stat_exists $oldlist;
1408 my ($atime) = (stat _)[8];
1409 next if $atime == $oldatime;
1410 push @releasefiles, $oldlist;
1412 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1413 @releasefiles = @inreleasefiles if @inreleasefiles;
1414 if (!@releasefiles) {
1415 fail f_ <<END, $isuite, $cache;
1416 apt seemed to not to update dgit's cached Release files for %s.
1418 is on a filesystem mounted `noatime'; if so, please use `relatime'.)
1421 confess "apt updated too many Release files (@releasefiles), erk"
1422 unless @releasefiles == 1;
1424 ($aptget_releasefile) = @releasefiles;
1427 sub canonicalise_suite_aptget {
1428 my ($proto,$data) = @_;
1431 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1433 foreach my $name (qw(Codename Suite)) {
1434 my $val = $release->{$name};
1436 printdebug "release file $name: $val\n";
1437 $val =~ m/^$suite_re$/o or fail f_
1438 "Release file (%s) specifies intolerable %s",
1439 $aptget_releasefile, $name;
1440 cfg_apply_map(\$val, 'suite rmap',
1441 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1448 sub archive_query_aptget {
1449 my ($proto,$data) = @_;
1452 ensuredir "$aptget_base/source";
1453 foreach my $old (<$aptget_base/source/*.dsc>) {
1454 unlink $old or die "$old: $!";
1457 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1458 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1459 # avoids apt-get source failing with ambiguous error code
1461 runcmd_ordryrun_local
1462 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1463 aptget_aptget(), qw(--download-only --only-source source), $package;
1465 my @dscs = <$aptget_base/source/*.dsc>;
1466 fail __ "apt-get source did not produce a .dsc" unless @dscs;
1467 fail f_ "apt-get source produced several .dscs (%s)", "@dscs"
1470 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1473 my $uri = "file://". uri_escape $dscs[0];
1474 $uri =~ s{\%2f}{/}gi;
1475 return [ (getfield $pre_dsc, 'Version'), $uri ];
1478 sub file_in_archive_aptget () { return undef; }
1479 sub package_not_wholly_new_aptget () { return undef; }
1481 #---------- `dummyapicat' archive query method ----------
1482 # (untranslated, because this is for testing purposes etc.)
1484 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1485 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1487 sub dummycatapi_run_in_mirror ($@) {
1488 # runs $fn with FIA open onto rune
1489 my ($rune, $argl, $fn) = @_;
1491 my $mirror = access_cfg('mirror');
1492 $mirror =~ s#^file://#/# or die "$mirror ?";
1493 my @cmd = (qw(sh -ec), 'cd "$1"; shift'."\n".$rune,
1494 qw(x), $mirror, @$argl);
1495 debugcmd "-|", @cmd;
1496 open FIA, "-|", @cmd or confess "$!";
1498 close FIA or ($!==0 && $?==141) or die failedcmd @cmd;
1502 sub file_in_archive_dummycatapi ($$$) {
1503 my ($proto,$data,$filename) = @_;
1505 dummycatapi_run_in_mirror '
1506 find -name "$1" -print0 |
1508 ', [$filename], sub {
1511 printdebug "| $_\n";
1512 m/^(\w+) (\S+)$/ or die "$_ ?";
1513 push @out, { sha256sum => $1, filename => $2 };
1519 sub package_not_wholly_new_dummycatapi {
1520 my ($proto,$data,$pkg) = @_;
1521 dummycatapi_run_in_mirror "
1522 find -name ${pkg}_*.dsc
1529 #---------- `madison' archive query method ----------
1531 sub archive_query_madison {
1532 return archive_query_prepend_mirror
1533 map { [ @$_[0..1] ] } madison_get_parse(@_);
1536 sub madison_get_parse {
1537 my ($proto,$data) = @_;
1538 die unless $proto eq 'madison';
1539 if (!length $data) {
1540 $data= access_cfg('madison-distro','RETURN-UNDEF');
1541 $data //= access_basedistro();
1543 $rmad{$proto,$data,$package} ||= cmdoutput
1544 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1545 my $rmad = $rmad{$proto,$data,$package};
1548 foreach my $l (split /\n/, $rmad) {
1549 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1550 \s*( [^ \t|]+ )\s* \|
1551 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1552 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1553 $1 eq $package or die "$rmad $package ?";
1560 $component = access_cfg('archive-query-default-component');
1562 $5 eq 'source' or die "$rmad ?";
1563 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1565 return sort { -version_compare($a->[0],$b->[0]); } @out;
1568 sub canonicalise_suite_madison {
1569 # madison canonicalises for us
1570 my @r = madison_get_parse(@_);
1572 "unable to canonicalise suite using package %s".
1573 " which does not appear to exist in suite %s;".
1574 " --existing-package may help",
1579 sub file_in_archive_madison { return undef; }
1580 sub package_not_wholly_new_madison { return undef; }
1582 #---------- `sshpsql' archive query method ----------
1583 # (untranslated, because this is obsolete)
1586 my ($data,$runeinfo,$sql) = @_;
1587 if (!length $data) {
1588 $data= access_someuserhost('sshpsql').':'.
1589 access_cfg('sshpsql-dbname');
1591 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1592 my ($userhost,$dbname) = ($`,$'); #';
1594 my @cmd = (access_cfg_ssh, $userhost,
1595 access_runeinfo("ssh-psql $runeinfo").
1596 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1597 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1599 open P, "-|", @cmd or confess "$!";
1602 printdebug(">|$_|\n");
1605 $!=0; $?=0; close P or failedcmd @cmd;
1607 my $nrows = pop @rows;
1608 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1609 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1610 @rows = map { [ split /\|/, $_ ] } @rows;
1611 my $ncols = scalar @{ shift @rows };
1612 die if grep { scalar @$_ != $ncols } @rows;
1616 sub sql_injection_check {
1617 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1620 sub archive_query_sshpsql ($$) {
1621 my ($proto,$data) = @_;
1622 sql_injection_check $isuite, $package;
1623 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1624 SELECT source.version, component.name, files.filename, files.sha256sum
1626 JOIN src_associations ON source.id = src_associations.source
1627 JOIN suite ON suite.id = src_associations.suite
1628 JOIN dsc_files ON dsc_files.source = source.id
1629 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1630 JOIN component ON component.id = files_archive_map.component_id
1631 JOIN files ON files.id = dsc_files.file
1632 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1633 AND source.source='$package'
1634 AND files.filename LIKE '%.dsc';
1636 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1637 my $digester = Digest::SHA->new(256);
1639 my ($vsn,$component,$filename,$sha256sum) = @$_;
1640 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1642 return archive_query_prepend_mirror @rows;
1645 sub canonicalise_suite_sshpsql ($$) {
1646 my ($proto,$data) = @_;
1647 sql_injection_check $isuite;
1648 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1649 SELECT suite.codename
1650 FROM suite where suite_name='$isuite' or codename='$isuite';
1652 @rows = map { $_->[0] } @rows;
1653 fail "unknown suite $isuite" unless @rows;
1654 die "ambiguous $isuite: @rows ?" if @rows>1;
1658 sub file_in_archive_sshpsql ($$$) { return undef; }
1659 sub package_not_wholly_new_sshpsql ($$$) { return undef; }
1661 #---------- `dummycat' archive query method ----------
1662 # (untranslated, because this is for testing purposes etc.)
1664 sub canonicalise_suite_dummycat ($$) {
1665 my ($proto,$data) = @_;
1666 my $dpath = "$data/suite.$isuite";
1667 if (!open C, "<", $dpath) {
1668 $!==ENOENT or die "$dpath: $!";
1669 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1673 chomp or die "$dpath: $!";
1675 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1679 sub archive_query_dummycat ($$) {
1680 my ($proto,$data) = @_;
1681 canonicalise_suite();
1682 my $dpath = "$data/package.$csuite.$package";
1683 if (!open C, "<", $dpath) {
1684 $!==ENOENT or die "$dpath: $!";
1685 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1693 printdebug "dummycat query $csuite $package $dpath | $_\n";
1694 my @row = split /\s+/, $_;
1695 @row==2 or die "$dpath: $_ ?";
1698 C->error and die "$dpath: $!";
1700 return archive_query_prepend_mirror
1701 sort { -version_compare($a->[0],$b->[0]); } @rows;
1704 sub file_in_archive_dummycat () { return undef; }
1705 sub package_not_wholly_new_dummycat () { return undef; }
1707 #---------- archive query entrypoints and rest of program ----------
1709 sub canonicalise_suite () {
1710 return if defined $csuite;
1711 fail f_ "cannot operate on %s suite", $isuite if $isuite eq 'UNRELEASED';
1712 $csuite = archive_query('canonicalise_suite');
1713 if ($isuite ne $csuite) {
1714 progress f_ "canonical suite name for %s is %s", $isuite, $csuite;
1716 progress f_ "canonical suite name is %s", $csuite;
1720 sub get_archive_dsc () {
1721 canonicalise_suite();
1722 my @vsns = archive_query('archive_query');
1723 foreach my $vinfo (@vsns) {
1724 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1725 $dscurl = $vsn_dscurl;
1726 $dscdata = url_get($dscurl);
1728 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1733 $digester->add($dscdata);
1734 my $got = $digester->hexdigest();
1736 fail f_ "%s has hash %s but archive told us to expect %s",
1737 $dscurl, $got, $digest;
1740 my $fmt = getfield $dsc, 'Format';
1741 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1742 f_ "unsupported source format %s, sorry", $fmt;
1744 $dsc_checked = !!$digester;
1745 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1749 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1752 sub check_for_git ();
1753 sub check_for_git () {
1755 my $how = access_cfg('git-check');
1756 if ($how eq 'ssh-cmd') {
1758 (access_cfg_ssh, access_gituserhost(),
1759 access_runeinfo("git-check $package").
1760 " set -e; cd ".access_cfg('git-path').";".
1761 " if test -d $package.git; then echo 1; else echo 0; fi");
1762 my $r= cmdoutput @cmd;
1763 if (defined $r and $r =~ m/^divert (\w+)$/) {
1765 my ($usedistro,) = access_distros();
1766 # NB that if we are pushing, $usedistro will be $distro/push
1767 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1768 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1769 progress f_ "diverting to %s (using config for %s)",
1770 $divert, $instead_distro;
1771 return check_for_git();
1773 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1775 } elsif ($how eq 'url') {
1776 my $prefix = access_cfg('git-check-url','git-url');
1777 my $suffix = access_cfg('git-check-suffix','git-suffix',
1778 'RETURN-UNDEF') // '.git';
1779 my $url = "$prefix/$package$suffix";
1780 my @cmd = (@curl, qw(-sS -I), $url);
1781 my $result = cmdoutput @cmd;
1782 $result =~ s/^\S+ 200 .*\n\r?\n//;
1783 # curl -sS -I with https_proxy prints
1784 # HTTP/1.0 200 Connection established
1785 $result =~ m/^\S+ (404|200) /s or
1786 fail +(__ "unexpected results from git check query - ").
1787 Dumper($prefix, $result);
1789 if ($code eq '404') {
1791 } elsif ($code eq '200') {
1796 } elsif ($how eq 'true') {
1798 } elsif ($how eq 'false') {
1801 badcfg f_ "unknown git-check \`%s'", $how;
1805 sub create_remote_git_repo () {
1806 my $how = access_cfg('git-create');
1807 if ($how eq 'ssh-cmd') {
1809 (access_cfg_ssh, access_gituserhost(),
1810 access_runeinfo("git-create $package").
1811 "set -e; cd ".access_cfg('git-path').";".
1812 " cp -a _template $package.git");
1813 } elsif ($how eq 'true') {
1816 badcfg f_ "unknown git-create \`%s'", $how;
1820 our ($dsc_hash,$lastpush_mergeinput);
1821 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1825 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1826 $playground = fresh_playground 'dgit/unpack';
1829 sub mktree_in_ud_here () {
1830 playtree_setup $gitcfgs{local};
1833 sub git_write_tree () {
1834 my $tree = cmdoutput @git, qw(write-tree);
1835 $tree =~ m/^\w+$/ or die "$tree ?";
1839 sub git_add_write_tree () {
1840 runcmd @git, qw(add -Af .);
1841 return git_write_tree();
1844 sub remove_stray_gits ($) {
1846 my @gitscmd = qw(find -name .git -prune -print0);
1847 debugcmd "|",@gitscmd;
1848 open GITS, "-|", @gitscmd or confess "$!";
1853 print STDERR f_ "%s: warning: removing from %s: %s\n",
1854 $us, $what, (messagequote $_);
1858 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1861 sub mktree_in_ud_from_only_subdir ($;$) {
1862 my ($what,$raw) = @_;
1863 # changes into the subdir
1866 confess "expected one subdir but found @dirs ?" unless @dirs==1;
1867 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1871 remove_stray_gits($what);
1872 mktree_in_ud_here();
1874 my ($format, $fopts) = get_source_format();
1875 if (madformat($format)) {
1880 my $tree=git_add_write_tree();
1881 return ($tree,$dir);
1884 our @files_csum_info_fields =
1885 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1886 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1887 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1889 sub dsc_files_info () {
1890 foreach my $csumi (@files_csum_info_fields) {
1891 my ($fname, $module, $method) = @$csumi;
1892 my $field = $dsc->{$fname};
1893 next unless defined $field;
1894 eval "use $module; 1;" or die $@;
1896 foreach (split /\n/, $field) {
1898 m/^(\w+) (\d+) (\S+)$/ or
1899 fail f_ "could not parse .dsc %s line \`%s'", $fname, $_;
1900 my $digester = eval "$module"."->$method;" or die $@;
1905 Digester => $digester,
1910 fail f_ "missing any supported Checksums-* or Files field in %s",
1911 $dsc->get_option('name');
1915 map { $_->{Filename} } dsc_files_info();
1918 sub files_compare_inputs (@) {
1923 my $showinputs = sub {
1924 return join "; ", map { $_->get_option('name') } @$inputs;
1927 foreach my $in (@$inputs) {
1929 my $in_name = $in->get_option('name');
1931 printdebug "files_compare_inputs $in_name\n";
1933 foreach my $csumi (@files_csum_info_fields) {
1934 my ($fname) = @$csumi;
1935 printdebug "files_compare_inputs $in_name $fname\n";
1937 my $field = $in->{$fname};
1938 next unless defined $field;
1941 foreach (split /\n/, $field) {
1944 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1945 fail "could not parse $in_name $fname line \`$_'";
1947 printdebug "files_compare_inputs $in_name $fname $f\n";
1951 my $re = \ $record{$f}{$fname};
1953 $fchecked{$f}{$in_name} = 1;
1956 "hash or size of %s varies in %s fields (between: %s)",
1957 $f, $fname, $showinputs->();
1962 @files = sort @files;
1963 $expected_files //= \@files;
1964 "@$expected_files" eq "@files" or
1965 fail f_ "file list in %s varies between hash fields!",
1969 fail f_ "%s has no files list field(s)", $in_name;
1971 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1974 grep { keys %$_ == @$inputs-1 } values %fchecked
1975 or fail f_ "no file appears in all file lists (looked in: %s)",
1979 sub is_orig_file_in_dsc ($$) {
1980 my ($f, $dsc_files_info) = @_;
1981 return 0 if @$dsc_files_info <= 1;
1982 # One file means no origs, and the filename doesn't have a "what
1983 # part of dsc" component. (Consider versions ending `.orig'.)
1984 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1988 # This function determines whether a .changes file is source-only from
1989 # the point of view of dak. Thus, it permits *_source.buildinfo
1992 # It does not, however, permit any other buildinfo files. After a
1993 # source-only upload, the buildds will try to upload files like
1994 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
1995 # named like this in their (otherwise) source-only upload, the uploads
1996 # of the buildd can be rejected by dak. Fixing the resultant
1997 # situation can require manual intervention. So we block such
1998 # .buildinfo files when the user tells us to perform a source-only
1999 # upload (such as when using the push-source subcommand with the -C
2000 # option, which calls this function).
2002 # Note, though, that when dgit is told to prepare a source-only
2003 # upload, such as when subcommands like build-source and push-source
2004 # without -C are used, dgit has a more restrictive notion of
2005 # source-only .changes than dak: such uploads will never include
2006 # *_source.buildinfo files. This is because there is no use for such
2007 # files when using a tool like dgit to produce the source package, as
2008 # dgit ensures the source is identical to git HEAD.
2009 sub test_source_only_changes ($) {
2011 foreach my $l (split /\n/, getfield $changes, 'Files') {
2012 $l =~ m/\S+$/ or next;
2013 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
2014 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
2015 print f_ "purportedly source-only changes polluted by %s\n", $&;
2022 sub changes_update_origs_from_dsc ($$$$) {
2023 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
2025 printdebug "checking origs needed ($upstreamvsn)...\n";
2026 $_ = getfield $changes, 'Files';
2027 m/^\w+ \d+ (\S+ \S+) \S+$/m or
2028 fail __ "cannot find section/priority from .changes Files field";
2029 my $placementinfo = $1;
2031 printdebug "checking origs needed placement '$placementinfo'...\n";
2032 foreach my $l (split /\n/, getfield $dsc, 'Files') {
2033 $l =~ m/\S+$/ or next;
2035 printdebug "origs $file | $l\n";
2036 next unless is_orig_file_of_vsn $file, $upstreamvsn;
2037 printdebug "origs $file is_orig\n";
2038 my $have = archive_query('file_in_archive', $file);
2039 if (!defined $have) {
2040 print STDERR __ <<END;
2041 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
2047 printdebug "origs $file \$#\$have=$#$have\n";
2048 foreach my $h (@$have) {
2051 foreach my $csumi (@files_csum_info_fields) {
2052 my ($fname, $module, $method, $archivefield) = @$csumi;
2053 next unless defined $h->{$archivefield};
2054 $_ = $dsc->{$fname};
2055 next unless defined;
2056 m/^(\w+) .* \Q$file\E$/m or
2057 fail f_ ".dsc %s missing entry for %s", $fname, $file;
2058 if ($h->{$archivefield} eq $1) {
2062 "%s: %s (archive) != %s (local .dsc)",
2063 $archivefield, $h->{$archivefield}, $1;
2066 confess "$file ".Dumper($h)." ?!" if $same && @differ;
2070 f_ "archive %s: %s", $h->{filename}, join "; ", @differ
2073 printdebug "origs $file f.same=$found_same".
2074 " #f._differ=$#found_differ\n";
2075 if (@found_differ && !$found_same) {
2077 (f_ "archive contains %s with different checksum", $file),
2080 # Now we edit the changes file to add or remove it
2081 foreach my $csumi (@files_csum_info_fields) {
2082 my ($fname, $module, $method, $archivefield) = @$csumi;
2083 next unless defined $changes->{$fname};
2085 # in archive, delete from .changes if it's there
2086 $changed{$file} = "removed" if
2087 $changes->{$fname} =~ s/\n.* \Q$file\E$(?:)$//m;
2088 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)$/m) {
2089 # not in archive, but it's here in the .changes
2091 my $dsc_data = getfield $dsc, $fname;
2092 $dsc_data =~ m/^(.* \Q$file\E$)$/m or die "$dsc_data $file ?";
2094 $extra =~ s/ \d+ /$&$placementinfo /
2095 or confess "$fname $extra >$dsc_data< ?"
2096 if $fname eq 'Files';
2097 $changes->{$fname} .= "\n". $extra;
2098 $changed{$file} = "added";
2103 foreach my $file (keys %changed) {
2105 "edited .changes for archive .orig contents: %s %s",
2106 $changed{$file}, $file;
2108 my $chtmp = "$changesfile.tmp";
2109 $changes->save($chtmp);
2111 rename $chtmp,$changesfile or die "$changesfile $!";
2113 progress f_ "[new .changes left in %s]", $changesfile;
2116 progress f_ "%s already has appropriate .orig(s) (if any)",
2121 sub clogp_authline ($) {
2123 my $author = getfield $clogp, 'Maintainer';
2124 if ($author =~ m/^[^"\@]+\,/) {
2125 # single entry Maintainer field with unquoted comma
2126 $author = ($& =~ y/,//rd).$'; # strip the comma
2128 # git wants a single author; any remaining commas in $author
2129 # are by now preceded by @ (or "). It seems safer to punt on
2130 # "..." for now rather than attempting to dequote or something.
2131 $author =~ s#,.*##ms unless $author =~ m/"/;
2132 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2133 my $authline = "$author $date";
2134 $authline =~ m/$git_authline_re/o or
2135 fail f_ "unexpected commit author line format \`%s'".
2136 " (was generated from changelog Maintainer field)",
2138 return ($1,$2,$3) if wantarray;
2142 sub vendor_patches_distro ($$) {
2143 my ($checkdistro, $what) = @_;
2144 return unless defined $checkdistro;
2146 my $series = "debian/patches/\L$checkdistro\E.series";
2147 printdebug "checking for vendor-specific $series ($what)\n";
2149 if (!open SERIES, "<", $series) {
2150 confess "$series $!" unless $!==ENOENT;
2157 print STDERR __ <<END;
2159 Unfortunately, this source package uses a feature of dpkg-source where
2160 the same source package unpacks to different source code on different
2161 distros. dgit cannot safely operate on such packages on affected
2162 distros, because the meaning of source packages is not stable.
2164 Please ask the distro/maintainer to remove the distro-specific series
2165 files and use a different technique (if necessary, uploading actually
2166 different packages, if different distros are supposed to have
2170 fail f_ "Found active distro-specific series file for".
2171 " %s (%s): %s, cannot continue",
2172 $checkdistro, $what, $series;
2174 die "$series $!" if SERIES->error;
2178 sub check_for_vendor_patches () {
2179 # This dpkg-source feature doesn't seem to be documented anywhere!
2180 # But it can be found in the changelog (reformatted):
2182 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2183 # Author: Raphael Hertzog <hertzog@debian.org>
2184 # Date: Sun Oct 3 09:36:48 2010 +0200
2186 # dpkg-source: correctly create .pc/.quilt_series with alternate
2189 # If you have debian/patches/ubuntu.series and you were
2190 # unpacking the source package on ubuntu, quilt was still
2191 # directed to debian/patches/series instead of
2192 # debian/patches/ubuntu.series.
2194 # debian/changelog | 3 +++
2195 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2196 # 2 files changed, 6 insertions(+), 1 deletion(-)
2199 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2200 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2201 __ "Dpkg::Vendor \`current vendor'");
2202 vendor_patches_distro(access_basedistro(),
2203 __ "(base) distro being accessed");
2204 vendor_patches_distro(access_nomdistro(),
2205 __ "(nominal) distro being accessed");
2208 sub check_bpd_exists () {
2209 stat $buildproductsdir
2210 or fail f_ "build-products-dir %s is not accessible: %s\n",
2211 $buildproductsdir, $!;
2214 sub dotdot_bpd_transfer_origs ($$$) {
2215 my ($bpd_abs, $upstreamversion, $wanted) = @_;
2216 # checks is_orig_file_of_vsn and if
2217 # calls $wanted->{$leaf} and expects boolish
2219 return if $buildproductsdir eq '..';
2222 my $dotdot = $maindir;
2223 $dotdot =~ s{/[^/]+$}{};
2224 opendir DD, $dotdot or fail "opendir .. ($dotdot): $!";
2225 while ($!=0, defined(my $leaf = readdir DD)) {
2227 local ($debuglevel) = $debuglevel-1;
2228 printdebug "DD_BPD $leaf ?\n";
2230 next unless is_orig_file_of_vsn $leaf, $upstreamversion;
2231 next unless $wanted->($leaf);
2232 next if lstat "$bpd_abs/$leaf";
2235 "%s: found orig(s) in .. missing from build-products-dir, transferring:\n",
2238 $! == &ENOENT or fail f_
2239 "check orig file %s in bpd %s: %s", $leaf, $bpd_abs, $!;
2240 lstat "$dotdot/$leaf" or fail f_
2241 "check orig file %s in ..: %s", $leaf, $!;
2243 stat "$dotdot/$leaf" or fail f_
2244 "check target of orig symlink %s in ..: %s", $leaf, $!;
2245 my $ltarget = readlink "$dotdot/$leaf" or
2246 die "readlink $dotdot/$leaf: $!";
2247 if ($ltarget !~ m{^/}) {
2248 $ltarget = "$dotdot/$ltarget";
2250 symlink $ltarget, "$bpd_abs/$leaf"
2251 or die "$ltarget $bpd_abs $leaf: $!";
2253 "%s: cloned orig symlink from ..: %s\n",
2255 } elsif (link "$dotdot/$leaf", "$bpd_abs/$leaf") {
2257 "%s: hardlinked orig from ..: %s\n",
2259 } elsif ($! != EXDEV) {
2260 fail f_ "failed to make %s a hardlink to %s: %s",
2261 "$bpd_abs/$leaf", "$dotdot/$leaf", $!;
2263 symlink "$bpd_abs/$leaf", "$dotdot/$leaf"
2264 or die "$bpd_abs $dotdot $leaf $!";
2266 "%s: symmlinked orig from .. on other filesystem: %s\n",
2270 die "$dotdot; $!" if $!;
2274 sub import_tarball_tartrees ($$) {
2275 my ($upstreamv, $dfi) = @_;
2276 # cwd should be the playground
2278 # We unpack and record the orig tarballs first, so that we only
2279 # need disk space for one private copy of the unpacked source.
2280 # But we can't make them into commits until we have the metadata
2281 # from the debian/changelog, so we record the tree objects now and
2282 # make them into commits later.
2284 my $orig_f_base = srcfn $upstreamv, '';
2286 foreach my $fi (@$dfi) {
2287 # We actually import, and record as a commit, every tarball
2288 # (unless there is only one file, in which case there seems
2291 my $f = $fi->{Filename};
2292 printdebug "import considering $f ";
2293 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2294 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2298 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2300 printdebug "Y ", (join ' ', map { $_//"(none)" }
2301 $compr_ext, $orig_f_part
2304 my $path = $fi->{Path} // $f;
2305 my $input = new IO::File $f, '<' or die "$f $!";
2309 if (defined $compr_ext) {
2311 Dpkg::Compression::compression_guess_from_filename $f;
2312 fail "Dpkg::Compression cannot handle file $f in source package"
2313 if defined $compr_ext && !defined $cname;
2315 new Dpkg::Compression::Process compression => $cname;
2316 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2317 my $compr_fh = new IO::Handle;
2318 my $compr_pid = open $compr_fh, "-|" // confess "$!";
2320 open STDIN, "<&", $input or confess "$!";
2322 die "dgit (child): exec $compr_cmd[0]: $!\n";
2327 rmtree "_unpack-tar";
2328 mkdir "_unpack-tar" or confess "$!";
2329 my @tarcmd = qw(tar -x -f -
2330 --no-same-owner --no-same-permissions
2331 --no-acls --no-xattrs --no-selinux);
2332 my $tar_pid = fork // confess "$!";
2334 chdir "_unpack-tar" or confess "$!";
2335 open STDIN, "<&", $input or confess "$!";
2337 die f_ "dgit (child): exec %s: %s", $tarcmd[0], $!;
2339 $!=0; (waitpid $tar_pid, 0) == $tar_pid or confess "$!";
2340 !$? or failedcmd @tarcmd;
2343 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2345 # finally, we have the results in "tarball", but maybe
2346 # with the wrong permissions
2348 runcmd qw(chmod -R +rwX _unpack-tar);
2349 changedir "_unpack-tar";
2350 remove_stray_gits($f);
2351 mktree_in_ud_here();
2353 my ($tree) = git_add_write_tree();
2354 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2355 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2357 printdebug "one subtree $1\n";
2359 printdebug "multiple subtrees\n";
2362 rmtree "_unpack-tar";
2364 my $ent = [ $f, $tree ];
2366 Orig => !!$orig_f_part,
2367 Sort => (!$orig_f_part ? 2 :
2368 $orig_f_part =~ m/-/g ? 1 :
2370 OrigPart => $orig_f_part, # 'orig', 'orig-XXX', or undef
2377 # put any without "_" first (spec is not clear whether files
2378 # are always in the usual order). Tarballs without "_" are
2379 # the main orig or the debian tarball.
2380 $a->{Sort} <=> $b->{Sort} or
2387 sub import_tarball_commits ($$) {
2388 my ($tartrees, $upstreamv) = @_;
2389 # cwd should be a playtree which has a relevant debian/changelog
2390 # fills in $tt->{Commit} for each one
2392 my $any_orig = grep { $_->{Orig} } @$tartrees;
2394 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2398 printdebug "import clog search...\n";
2399 parsechangelog_loop \@clogcmd, (__ "package changelog"), sub {
2400 my ($thisstanza, $desc) = @_;
2401 no warnings qw(exiting);
2403 $clogp //= $thisstanza;
2405 printdebug "import clog $thisstanza->{version} $desc...\n";
2407 last if !$any_orig; # we don't need $r1clogp
2409 # We look for the first (most recent) changelog entry whose
2410 # version number is lower than the upstream version of this
2411 # package. Then the last (least recent) previous changelog
2412 # entry is treated as the one which introduced this upstream
2413 # version and used for the synthetic commits for the upstream
2416 # One might think that a more sophisticated algorithm would be
2417 # necessary. But: we do not want to scan the whole changelog
2418 # file. Stopping when we see an earlier version, which
2419 # necessarily then is an earlier upstream version, is the only
2420 # realistic way to do that. Then, either the earliest
2421 # changelog entry we have seen so far is indeed the earliest
2422 # upload of this upstream version; or there are only changelog
2423 # entries relating to later upstream versions (which is not
2424 # possible unless the changelog and .dsc disagree about the
2425 # version). Then it remains to choose between the physically
2426 # last entry in the file, and the one with the lowest version
2427 # number. If these are not the same, we guess that the
2428 # versions were created in a non-monotonic order rather than
2429 # that the changelog entries have been misordered.
2431 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2433 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2434 $r1clogp = $thisstanza;
2436 printdebug "import clog $r1clogp->{version} becomes r1\n";
2439 $clogp or fail __ "package changelog has no entries!";
2441 my $authline = clogp_authline $clogp;
2442 my $changes = getfield $clogp, 'Changes';
2443 $changes =~ s/^\n//; # Changes: \n
2444 my $cversion = getfield $clogp, 'Version';
2448 $r1clogp //= $clogp; # maybe there's only one entry;
2449 $r1authline = clogp_authline $r1clogp;
2450 # Strictly, r1authline might now be wrong if it's going to be
2451 # unused because !$any_orig. Whatever.
2453 printdebug "import tartrees authline $authline\n";
2454 printdebug "import tartrees r1authline $r1authline\n";
2456 foreach my $tt (@$tartrees) {
2457 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2459 my $mbody = f_ "Import %s", $tt->{F};
2460 $tt->{Commit} = hash_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2463 committer $r1authline
2467 [dgit import orig $tt->{F}]
2475 [dgit import tarball $package $cversion $tt->{F}]
2480 return ($authline, $r1authline, $clogp, $changes);
2483 sub generate_commits_from_dsc () {
2484 # See big comment in fetch_from_archive, below.
2485 # See also README.dsc-import.
2487 changedir $playground;
2489 my $bpd_abs = bpd_abs();
2490 my $upstreamv = upstreamversion $dsc->{version};
2491 my @dfi = dsc_files_info();
2493 dotdot_bpd_transfer_origs $bpd_abs, $upstreamv,
2494 sub { grep { $_->{Filename} eq $_[0] } @dfi };
2496 foreach my $fi (@dfi) {
2497 my $f = $fi->{Filename};
2498 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2499 my $upper_f = "$bpd_abs/$f";
2501 printdebug "considering reusing $f: ";
2503 if (link_ltarget "$upper_f,fetch", $f) {
2504 printdebug "linked (using ...,fetch).\n";
2505 } elsif ((printdebug "($!) "),
2507 fail f_ "accessing %s: %s", "$buildproductsdir/$f,fetch", $!;
2508 } elsif (link_ltarget $upper_f, $f) {
2509 printdebug "linked.\n";
2510 } elsif ((printdebug "($!) "),
2512 fail f_ "accessing %s: %s", "$buildproductsdir/$f", $!;
2514 printdebug "absent.\n";
2518 complete_file_from_dsc('.', $fi, \$refetched)
2521 printdebug "considering saving $f: ";
2523 if (rename_link_xf 1, $f, $upper_f) {
2524 printdebug "linked.\n";
2525 } elsif ((printdebug "($@) "),
2527 fail f_ "saving %s: %s", "$buildproductsdir/$f", $@;
2528 } elsif (!$refetched) {
2529 printdebug "no need.\n";
2530 } elsif (rename_link_xf 1, $f, "$upper_f,fetch") {
2531 printdebug "linked (using ...,fetch).\n";
2532 } elsif ((printdebug "($@) "),
2534 fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $@;
2536 printdebug "cannot.\n";
2541 @tartrees = import_tarball_tartrees($upstreamv, \@dfi)
2542 unless @dfi == 1; # only one file in .dsc
2544 my $dscfn = "$package.dsc";
2546 my $treeimporthow = 'package';
2548 open D, ">", $dscfn or die "$dscfn: $!";
2549 print D $dscdata or die "$dscfn: $!";
2550 close D or die "$dscfn: $!";
2551 my @cmd = qw(dpkg-source);
2552 push @cmd, '--no-check' if $dsc_checked;
2553 if (madformat $dsc->{format}) {
2554 push @cmd, '--skip-patches';
2555 $treeimporthow = 'unpatched';
2557 push @cmd, qw(-x --), $dscfn;
2560 my ($tree,$dir) = mktree_in_ud_from_only_subdir(__ "source package");
2561 if (madformat $dsc->{format}) {
2562 check_for_vendor_patches();
2566 if (madformat $dsc->{format}) {
2567 my @pcmd = qw(dpkg-source --before-build .);
2568 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2570 $dappliedtree = git_add_write_tree();
2573 my ($authline, $r1authline, $clogp, $changes) =
2574 import_tarball_commits(\@tartrees, $upstreamv);
2576 my $cversion = getfield $clogp, 'Version';
2578 printdebug "import main commit\n";
2580 open C, ">../commit.tmp" or confess "$!";
2581 print C <<END or confess "$!";
2584 print C <<END or confess "$!" foreach @tartrees;
2587 print C <<END or confess "$!";
2593 [dgit import $treeimporthow $package $cversion]
2596 close C or confess "$!";
2597 my $rawimport_hash = hash_commit qw(../commit.tmp);
2599 if (madformat $dsc->{format}) {
2600 printdebug "import apply patches...\n";
2602 # regularise the state of the working tree so that
2603 # the checkout of $rawimport_hash works nicely.
2604 my $dappliedcommit = hash_commit_text(<<END);
2611 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2613 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2615 # We need the answers to be reproducible
2616 my @authline = clogp_authline($clogp);
2617 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2618 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2619 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2620 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2621 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2622 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2624 my $path = $ENV{PATH} or die;
2626 # we use ../../gbp-pq-output, which (given that we are in
2627 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2630 foreach my $use_absurd (qw(0 1)) {
2631 runcmd @git, qw(checkout -q unpa);
2632 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2633 local $ENV{PATH} = $path;
2636 progress "warning: $@";
2637 $path = "$absurdity:$path";
2638 progress f_ "%s: trying slow absurd-git-apply...", $us;
2639 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2644 die "forbid absurd git-apply\n" if $use_absurd
2645 && forceing [qw(import-gitapply-no-absurd)];
2646 die "only absurd git-apply!\n" if !$use_absurd
2647 && forceing [qw(import-gitapply-absurd)];
2649 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2650 local $ENV{PATH} = $path if $use_absurd;
2652 my @showcmd = (gbp_pq, qw(import));
2653 my @realcmd = shell_cmd
2654 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2655 debugcmd "+",@realcmd;
2656 if (system @realcmd) {
2657 die f_ "%s failed: %s\n",
2658 +(shellquote @showcmd),
2659 failedcmd_waitstatus();
2662 my $gapplied = git_rev_parse('HEAD');
2663 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2664 $gappliedtree eq $dappliedtree or
2665 fail f_ <<END, $gapplied, $gappliedtree, $dappliedtree;
2666 gbp-pq import and dpkg-source disagree!
2667 gbp-pq import gave commit %s
2668 gbp-pq import gave tree %s
2669 dpkg-source --before-build gave tree %s
2671 $rawimport_hash = $gapplied;
2676 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2681 progress f_ "synthesised git commit from .dsc %s", $cversion;
2683 my $rawimport_mergeinput = {
2684 Commit => $rawimport_hash,
2685 Info => __ "Import of source package",
2687 my @output = ($rawimport_mergeinput);
2689 if ($lastpush_mergeinput) {
2690 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2691 my $oversion = getfield $oldclogp, 'Version';
2693 version_compare($oversion, $cversion);
2695 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2696 { ReverseParents => 1,
2697 Message => (f_ <<END, $package, $cversion, $csuite) });
2698 Record %s (%s) in archive suite %s
2700 } elsif ($vcmp > 0) {
2701 print STDERR f_ <<END, $cversion, $oversion,
2703 Version actually in archive: %s (older)
2704 Last version pushed with dgit: %s (newer or same)
2707 __ $later_warning_msg or confess "$!";
2708 @output = $lastpush_mergeinput;
2710 # Same version. Use what's in the server git branch,
2711 # discarding our own import. (This could happen if the
2712 # server automatically imports all packages into git.)
2713 @output = $lastpush_mergeinput;
2721 sub complete_file_from_dsc ($$;$) {
2722 our ($dstdir, $fi, $refetched) = @_;
2723 # Ensures that we have, in $dstdir, the file $fi, with the correct
2724 # contents. (Downloading it from alongside $dscurl if necessary.)
2725 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2726 # and will set $$refetched=1 if it did so (or tried to).
2728 my $f = $fi->{Filename};
2729 my $tf = "$dstdir/$f";
2733 my $checkhash = sub {
2734 open F, "<", "$tf" or die "$tf: $!";
2735 $fi->{Digester}->reset();
2736 $fi->{Digester}->addfile(*F);
2737 F->error and confess "$!";
2738 $got = $fi->{Digester}->hexdigest();
2739 return $got eq $fi->{Hash};
2742 if (stat_exists $tf) {
2743 if ($checkhash->()) {
2744 progress f_ "using existing %s", $f;
2748 fail f_ "file %s has hash %s but .dsc demands hash %s".
2749 " (perhaps you should delete this file?)",
2750 $f, $got, $fi->{Hash};
2752 progress f_ "need to fetch correct version of %s", $f;
2753 unlink $tf or die "$tf $!";
2756 printdebug "$tf does not exist, need to fetch\n";
2760 $furl =~ s{/[^/]+$}{};
2762 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2763 die "$f ?" if $f =~ m#/#;
2764 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2765 return 0 if !act_local();
2768 fail f_ "file %s has hash %s but .dsc demands hash %s".
2769 " (got wrong file from archive!)",
2770 $f, $got, $fi->{Hash};
2775 sub ensure_we_have_orig () {
2776 my @dfi = dsc_files_info();
2777 foreach my $fi (@dfi) {
2778 my $f = $fi->{Filename};
2779 next unless is_orig_file_in_dsc($f, \@dfi);
2780 complete_file_from_dsc($buildproductsdir, $fi)
2785 #---------- git fetch ----------
2787 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2788 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2790 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2791 # locally fetched refs because they have unhelpful names and clutter
2792 # up gitk etc. So we track whether we have "used up" head ref (ie,
2793 # whether we have made another local ref which refers to this object).
2795 # (If we deleted them unconditionally, then we might end up
2796 # re-fetching the same git objects each time dgit fetch was run.)
2798 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2799 # in git_fetch_us to fetch the refs in question, and possibly a call
2800 # to lrfetchref_used.
2802 our (%lrfetchrefs_f, %lrfetchrefs_d);
2803 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2805 sub lrfetchref_used ($) {
2806 my ($fullrefname) = @_;
2807 my $objid = $lrfetchrefs_f{$fullrefname};
2808 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2811 sub git_lrfetch_sane {
2812 my ($url, $supplementary, @specs) = @_;
2813 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2814 # at least as regards @specs. Also leave the results in
2815 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2816 # able to clean these up.
2818 # With $supplementary==1, @specs must not contain wildcards
2819 # and we add to our previous fetches (non-atomically).
2821 # This is rather miserable:
2822 # When git fetch --prune is passed a fetchspec ending with a *,
2823 # it does a plausible thing. If there is no * then:
2824 # - it matches subpaths too, even if the supplied refspec
2825 # starts refs, and behaves completely madly if the source
2826 # has refs/refs/something. (See, for example, Debian #NNNN.)
2827 # - if there is no matching remote ref, it bombs out the whole
2829 # We want to fetch a fixed ref, and we don't know in advance
2830 # if it exists, so this is not suitable.
2832 # Our workaround is to use git ls-remote. git ls-remote has its
2833 # own qairks. Notably, it has the absurd multi-tail-matching
2834 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2835 # refs/refs/foo etc.
2837 # Also, we want an idempotent snapshot, but we have to make two
2838 # calls to the remote: one to git ls-remote and to git fetch. The
2839 # solution is use git ls-remote to obtain a target state, and
2840 # git fetch to try to generate it. If we don't manage to generate
2841 # the target state, we try again.
2843 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2845 my $specre = join '|', map {
2848 my $wildcard = $x =~ s/\\\*$/.*/;
2849 die if $wildcard && $supplementary;
2852 printdebug "git_lrfetch_sane specre=$specre\n";
2853 my $wanted_rref = sub {
2855 return m/^(?:$specre)$/;
2858 my $fetch_iteration = 0;
2861 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2862 if (++$fetch_iteration > 10) {
2863 fail __ "too many iterations trying to get sane fetch!";
2866 my @look = map { "refs/$_" } @specs;
2867 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2871 open GITLS, "-|", @lcmd or confess "$!";
2873 printdebug "=> ", $_;
2874 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2875 my ($objid,$rrefname) = ($1,$2);
2876 if (!$wanted_rref->($rrefname)) {
2877 print STDERR f_ <<END, "@look", $rrefname;
2878 warning: git ls-remote %s reported %s; this is silly, ignoring it.
2882 $wantr{$rrefname} = $objid;
2885 close GITLS or failedcmd @lcmd;
2887 # OK, now %want is exactly what we want for refs in @specs
2889 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2890 "+refs/$_:".lrfetchrefs."/$_";
2893 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2895 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2896 runcmd_ordryrun_local @fcmd if @fspecs;
2898 if (!$supplementary) {
2899 %lrfetchrefs_f = ();
2903 git_for_each_ref(lrfetchrefs, sub {
2904 my ($objid,$objtype,$lrefname,$reftail) = @_;
2905 $lrfetchrefs_f{$lrefname} = $objid;
2906 $objgot{$objid} = 1;
2909 if ($supplementary) {
2913 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2914 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2915 if (!exists $wantr{$rrefname}) {
2916 if ($wanted_rref->($rrefname)) {
2918 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2921 print STDERR f_ <<END, "@fspecs", $lrefname
2922 warning: git fetch %s created %s; this is silly, deleting it.
2925 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2926 delete $lrfetchrefs_f{$lrefname};
2930 foreach my $rrefname (sort keys %wantr) {
2931 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2932 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2933 my $want = $wantr{$rrefname};
2934 next if $got eq $want;
2935 if (!defined $objgot{$want}) {
2936 fail __ <<END unless act_local();
2937 --dry-run specified but we actually wanted the results of git fetch,
2938 so this is not going to work. Try running dgit fetch first,
2939 or using --damp-run instead of --dry-run.
2941 print STDERR f_ <<END, $lrefname, $want;
2942 warning: git ls-remote suggests we want %s
2943 warning: and it should refer to %s
2944 warning: but git fetch didn't fetch that object to any relevant ref.
2945 warning: This may be due to a race with someone updating the server.
2946 warning: Will try again...
2948 next FETCH_ITERATION;
2951 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2953 runcmd_ordryrun_local @git, qw(update-ref -m),
2954 "dgit fetch git fetch fixup", $lrefname, $want;
2955 $lrfetchrefs_f{$lrefname} = $want;
2960 if (defined $csuite) {
2961 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2962 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2963 my ($objid,$objtype,$lrefname,$reftail) = @_;
2964 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2965 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2969 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2970 Dumper(\%lrfetchrefs_f);
2973 sub git_fetch_us () {
2974 # Want to fetch only what we are going to use, unless
2975 # deliberately-not-ff, in which case we must fetch everything.
2977 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2978 map { "tags/$_" } debiantags('*',access_nomdistro);
2979 push @specs, server_branch($csuite);
2980 push @specs, $rewritemap;
2981 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2983 my $url = access_giturl();
2984 git_lrfetch_sane $url, 0, @specs;
2987 my @tagpats = debiantags('*',access_nomdistro);
2989 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2990 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2991 printdebug "currently $fullrefname=$objid\n";
2992 $here{$fullrefname} = $objid;
2994 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2995 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2996 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2997 printdebug "offered $lref=$objid\n";
2998 if (!defined $here{$lref}) {
2999 my @upd = (@git, qw(update-ref), $lref, $objid, '');
3000 runcmd_ordryrun_local @upd;
3001 lrfetchref_used $fullrefname;
3002 } elsif ($here{$lref} eq $objid) {
3003 lrfetchref_used $fullrefname;
3005 print STDERR f_ "Not updating %s from %s to %s.\n",
3006 $lref, $here{$lref}, $objid;
3011 #---------- dsc and archive handling ----------
3013 sub mergeinfo_getclogp ($) {
3014 # Ensures thit $mi->{Clogp} exists and returns it
3016 $mi->{Clogp} = commit_getclogp($mi->{Commit});
3019 sub mergeinfo_version ($) {
3020 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
3023 sub fetch_from_archive_record_1 ($) {
3025 runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
3026 cmdoutput @git, qw(log -n2), $hash;
3027 # ... gives git a chance to complain if our commit is malformed
3030 sub fetch_from_archive_record_2 ($) {
3032 my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
3036 dryrun_report @upd_cmd;
3040 sub parse_dsc_field_def_dsc_distro () {
3041 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
3042 dgit.default.distro);
3045 sub parse_dsc_field ($$) {
3046 my ($dsc, $what) = @_;
3048 foreach my $field (@ourdscfield) {
3049 $f = $dsc->{$field};
3054 progress f_ "%s: NO git hash", $what;
3055 parse_dsc_field_def_dsc_distro();
3056 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
3057 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
3058 progress f_ "%s: specified git info (%s)", $what, $dsc_distro;
3059 $dsc_hint_tag = [ $dsc_hint_tag ];
3060 } elsif ($f =~ m/^\w+\s*$/) {
3062 parse_dsc_field_def_dsc_distro();
3063 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
3065 progress f_ "%s: specified git hash", $what;
3067 fail f_ "%s: invalid Dgit info", $what;
3071 sub resolve_dsc_field_commit ($$) {
3072 my ($already_distro, $already_mapref) = @_;
3074 return unless defined $dsc_hash;
3077 defined $already_mapref &&
3078 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
3079 ? $already_mapref : undef;
3083 my ($what, @fetch) = @_;
3085 local $idistro = $dsc_distro;
3086 my $lrf = lrfetchrefs;
3088 if (!$chase_dsc_distro) {
3089 progress f_ "not chasing .dsc distro %s: not fetching %s",
3094 progress f_ ".dsc names distro %s: fetching %s", $dsc_distro, $what;
3096 my $url = access_giturl();
3097 if (!defined $url) {
3098 defined $dsc_hint_url or fail f_ <<END, $dsc_distro;
3099 .dsc Dgit metadata is in context of distro %s
3100 for which we have no configured url and .dsc provides no hint
3103 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
3104 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
3105 parse_cfg_bool "dsc-url-proto-ok", 'false',
3106 cfg("dgit.dsc-url-proto-ok.$proto",
3107 "dgit.default.dsc-url-proto-ok")
3108 or fail f_ <<END, $dsc_distro, $proto;
3109 .dsc Dgit metadata is in context of distro %s
3110 for which we have no configured url;
3111 .dsc provides hinted url with protocol %s which is unsafe.
3112 (can be overridden by config - consult documentation)
3114 $url = $dsc_hint_url;
3117 git_lrfetch_sane $url, 1, @fetch;
3122 my $rewrite_enable = do {
3123 local $idistro = $dsc_distro;
3124 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
3127 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
3128 if (!defined $mapref) {
3129 my $lrf = $do_fetch->((__ "rewrite map"), $rewritemap) or return;
3130 $mapref = $lrf.'/'.$rewritemap;
3132 my $rewritemapdata = git_cat_file $mapref.':map';
3133 if (defined $rewritemapdata
3134 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
3136 "server's git history rewrite map contains a relevant entry!";
3139 if (defined $dsc_hash) {
3140 progress __ "using rewritten git hash in place of .dsc value";
3142 progress __ "server data says .dsc hash is to be disregarded";
3147 if (!defined git_cat_file $dsc_hash) {
3148 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
3149 my $lrf = $do_fetch->((__ "additional commits"), @tags) &&
3150 defined git_cat_file $dsc_hash
3151 or fail f_ <<END, $dsc_hash;
3152 .dsc Dgit metadata requires commit %s
3153 but we could not obtain that object anywhere.
3155 foreach my $t (@tags) {
3156 my $fullrefname = $lrf.'/'.$t;
3157 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
3158 next unless $lrfetchrefs_f{$fullrefname};
3159 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
3160 lrfetchref_used $fullrefname;
3165 sub fetch_from_archive () {
3167 ensure_setup_existing_tree();
3169 # Ensures that lrref() is what is actually in the archive, one way
3170 # or another, according to us - ie this client's
3171 # appropritaely-updated archive view. Also returns the commit id.
3172 # If there is nothing in the archive, leaves lrref alone and
3173 # returns undef. git_fetch_us must have already been called.
3177 parse_dsc_field($dsc, __ 'last upload to archive');
3178 resolve_dsc_field_commit access_basedistro,
3179 lrfetchrefs."/".$rewritemap
3181 progress __ "no version available from the archive";
3184 # If the archive's .dsc has a Dgit field, there are three
3185 # relevant git commitids we need to choose between and/or merge
3187 # 1. $dsc_hash: the Dgit field from the archive
3188 # 2. $lastpush_hash: the suite branch on the dgit git server
3189 # 3. $lastfetch_hash: our local tracking brach for the suite
3191 # These may all be distinct and need not be in any fast forward
3194 # If the dsc was pushed to this suite, then the server suite
3195 # branch will have been updated; but it might have been pushed to
3196 # a different suite and copied by the archive. Conversely a more
3197 # recent version may have been pushed with dgit but not appeared
3198 # in the archive (yet).
3200 # $lastfetch_hash may be awkward because archive imports
3201 # (particularly, imports of Dgit-less .dscs) are performed only as
3202 # needed on individual clients, so different clients may perform a
3203 # different subset of them - and these imports are only made
3204 # public during push. So $lastfetch_hash may represent a set of
3205 # imports different to a subsequent upload by a different dgit
3208 # Our approach is as follows:
3210 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3211 # descendant of $dsc_hash, then it was pushed by a dgit user who
3212 # had based their work on $dsc_hash, so we should prefer it.
3213 # Otherwise, $dsc_hash was installed into this suite in the
3214 # archive other than by a dgit push, and (necessarily) after the
3215 # last dgit push into that suite (since a dgit push would have
3216 # been descended from the dgit server git branch); thus, in that
3217 # case, we prefer the archive's version (and produce a
3218 # pseudo-merge to overwrite the dgit server git branch).
3220 # (If there is no Dgit field in the archive's .dsc then
3221 # generate_commit_from_dsc uses the version numbers to decide
3222 # whether the suite branch or the archive is newer. If the suite
3223 # branch is newer it ignores the archive's .dsc; otherwise it
3224 # generates an import of the .dsc, and produces a pseudo-merge to
3225 # overwrite the suite branch with the archive contents.)
3227 # The outcome of that part of the algorithm is the `public view',
3228 # and is same for all dgit clients: it does not depend on any
3229 # unpublished history in the local tracking branch.
3231 # As between the public view and the local tracking branch: The
3232 # local tracking branch is only updated by dgit fetch, and
3233 # whenever dgit fetch runs it includes the public view in the
3234 # local tracking branch. Therefore if the public view is not
3235 # descended from the local tracking branch, the local tracking
3236 # branch must contain history which was imported from the archive
3237 # but never pushed; and, its tip is now out of date. So, we make
3238 # a pseudo-merge to overwrite the old imports and stitch the old
3241 # Finally: we do not necessarily reify the public view (as
3242 # described above). This is so that we do not end up stacking two
3243 # pseudo-merges. So what we actually do is figure out the inputs
3244 # to any public view pseudo-merge and put them in @mergeinputs.
3247 # $mergeinputs[]{Commit}
3248 # $mergeinputs[]{Info}
3249 # $mergeinputs[0] is the one whose tree we use
3250 # @mergeinputs is in the order we use in the actual commit)
3253 # $mergeinputs[]{Message} is a commit message to use
3254 # $mergeinputs[]{ReverseParents} if def specifies that parent
3255 # list should be in opposite order
3256 # Such an entry has no Commit or Info. It applies only when found
3257 # in the last entry. (This ugliness is to support making
3258 # identical imports to previous dgit versions.)
3260 my $lastpush_hash = git_get_ref(lrfetchref());
3261 printdebug "previous reference hash=$lastpush_hash\n";
3262 $lastpush_mergeinput = $lastpush_hash && {
3263 Commit => $lastpush_hash,
3264 Info => (__ "dgit suite branch on dgit git server"),
3267 my $lastfetch_hash = git_get_ref(lrref());
3268 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3269 my $lastfetch_mergeinput = $lastfetch_hash && {
3270 Commit => $lastfetch_hash,
3271 Info => (__ "dgit client's archive history view"),
3274 my $dsc_mergeinput = $dsc_hash && {
3275 Commit => $dsc_hash,
3276 Info => (__ "Dgit field in .dsc from archive"),
3280 my $del_lrfetchrefs = sub {
3283 printdebug "del_lrfetchrefs...\n";
3284 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3285 my $objid = $lrfetchrefs_d{$fullrefname};
3286 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3288 $gur ||= new IO::Handle;
3289 open $gur, "|-", qw(git update-ref --stdin) or confess "$!";
3291 printf $gur "delete %s %s\n", $fullrefname, $objid;
3294 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3298 if (defined $dsc_hash) {
3299 ensure_we_have_orig();
3300 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3301 @mergeinputs = $dsc_mergeinput
3302 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3303 print STDERR f_ <<END, $dsc_hash, $lastpush_hash,
3305 Git commit in archive is behind the last version allegedly pushed/uploaded.
3306 Commit referred to by archive: %s
3307 Last version pushed with dgit: %s
3310 __ $later_warning_msg or confess "$!";
3311 @mergeinputs = ($lastpush_mergeinput);
3313 # Archive has .dsc which is not a descendant of the last dgit
3314 # push. This can happen if the archive moves .dscs about.
3315 # Just follow its lead.
3316 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3317 progress __ "archive .dsc names newer git commit";
3318 @mergeinputs = ($dsc_mergeinput);
3320 progress __ "archive .dsc names other git commit, fixing up";
3321 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3325 @mergeinputs = generate_commits_from_dsc();
3326 # We have just done an import. Now, our import algorithm might
3327 # have been improved. But even so we do not want to generate
3328 # a new different import of the same package. So if the
3329 # version numbers are the same, just use our existing version.
3330 # If the version numbers are different, the archive has changed
3331 # (perhaps, rewound).
3332 if ($lastfetch_mergeinput &&
3333 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3334 (mergeinfo_version $mergeinputs[0]) )) {
3335 @mergeinputs = ($lastfetch_mergeinput);
3337 } elsif ($lastpush_hash) {
3338 # only in git, not in the archive yet
3339 @mergeinputs = ($lastpush_mergeinput);
3340 print STDERR f_ <<END,
3342 Package not found in the archive, but has allegedly been pushed using dgit.
3345 __ $later_warning_msg or confess "$!";
3347 printdebug "nothing found!\n";
3348 if (defined $skew_warning_vsn) {
3349 print STDERR f_ <<END, $skew_warning_vsn or confess "$!";
3351 Warning: relevant archive skew detected.
3352 Archive allegedly contains %s
3353 But we were not able to obtain any version from the archive or git.
3357 unshift @end, $del_lrfetchrefs;
3361 if ($lastfetch_hash &&
3363 my $h = $_->{Commit};
3364 $h and is_fast_fwd($lastfetch_hash, $h);
3365 # If true, one of the existing parents of this commit
3366 # is a descendant of the $lastfetch_hash, so we'll
3367 # be ff from that automatically.
3371 push @mergeinputs, $lastfetch_mergeinput;
3374 printdebug "fetch mergeinfos:\n";
3375 foreach my $mi (@mergeinputs) {
3377 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3379 printdebug sprintf " ReverseParents=%d Message=%s",
3380 $mi->{ReverseParents}, $mi->{Message};
3384 my $compat_info= pop @mergeinputs
3385 if $mergeinputs[$#mergeinputs]{Message};
3387 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3390 if (@mergeinputs > 1) {
3392 my $tree_commit = $mergeinputs[0]{Commit};
3394 my $tree = get_tree_of_commit $tree_commit;;
3396 # We use the changelog author of the package in question the
3397 # author of this pseudo-merge. This is (roughly) correct if
3398 # this commit is simply representing aa non-dgit upload.
3399 # (Roughly because it does not record sponsorship - but we
3400 # don't have sponsorship info because that's in the .changes,
3401 # which isn't in the archivw.)
3403 # But, it might be that we are representing archive history
3404 # updates (including in-archive copies). These are not really
3405 # the responsibility of the person who created the .dsc, but
3406 # there is no-one whose name we should better use. (The
3407 # author of the .dsc-named commit is clearly worse.)
3409 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3410 my $author = clogp_authline $useclogp;
3411 my $cversion = getfield $useclogp, 'Version';
3413 my $mcf = dgit_privdir()."/mergecommit";
3414 open MC, ">", $mcf or die "$mcf $!";
3415 print MC <<END or confess "$!";
3419 my @parents = grep { $_->{Commit} } @mergeinputs;
3420 @parents = reverse @parents if $compat_info->{ReverseParents};
3421 print MC <<END or confess "$!" foreach @parents;
3425 print MC <<END or confess "$!";
3431 if (defined $compat_info->{Message}) {
3432 print MC $compat_info->{Message} or confess "$!";
3434 print MC f_ <<END, $package, $cversion, $csuite or confess "$!";
3435 Record %s (%s) in archive suite %s
3439 my $message_add_info = sub {
3441 my $mversion = mergeinfo_version $mi;
3442 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3446 $message_add_info->($mergeinputs[0]);
3447 print MC __ <<END or confess "$!";
3448 should be treated as descended from
3450 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3453 close MC or confess "$!";
3454 $hash = hash_commit $mcf;
3456 $hash = $mergeinputs[0]{Commit};
3458 printdebug "fetch hash=$hash\n";
3461 my ($lasth, $what) = @_;
3462 return unless $lasth;
3463 confess "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3466 $chkff->($lastpush_hash, __ 'dgit repo server tip (last push)')
3468 $chkff->($lastfetch_hash, __ 'local tracking tip (last fetch)');
3470 fetch_from_archive_record_1($hash);
3472 if (defined $skew_warning_vsn) {
3473 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3474 my $gotclogp = commit_getclogp($hash);
3475 my $got_vsn = getfield $gotclogp, 'Version';
3476 printdebug "SKEW CHECK GOT $got_vsn\n";
3477 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3478 print STDERR f_ <<END, $skew_warning_vsn, $got_vsn or confess "$!";
3480 Warning: archive skew detected. Using the available version:
3481 Archive allegedly contains %s
3482 We were able to obtain only %s
3488 if ($lastfetch_hash ne $hash) {
3489 fetch_from_archive_record_2($hash);
3492 lrfetchref_used lrfetchref();
3494 check_gitattrs($hash, __ "fetched source tree");
3496 unshift @end, $del_lrfetchrefs;
3500 sub set_local_git_config ($$) {
3502 runcmd @git, qw(config), $k, $v;
3505 sub setup_mergechangelogs (;$) {
3507 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3509 my $driver = 'dpkg-mergechangelogs';
3510 my $cb = "merge.$driver";
3511 confess unless defined $maindir;
3512 my $attrs = "$maindir_gitcommon/info/attributes";
3513 ensuredir "$maindir_gitcommon/info";
3515 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3516 if (!open ATTRS, "<", $attrs) {
3517 $!==ENOENT or die "$attrs: $!";
3521 next if m{^debian/changelog\s};
3522 print NATTRS $_, "\n" or confess "$!";
3524 ATTRS->error and confess "$!";
3527 print NATTRS "debian/changelog merge=$driver\n" or confess "$!";
3530 set_local_git_config "$cb.name", __ 'debian/changelog merge driver';
3531 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3533 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3536 sub setup_useremail (;$) {
3538 return unless $always || access_cfg_bool(1, 'setup-useremail');
3541 my ($k, $envvar) = @_;
3542 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3543 return unless defined $v;
3544 set_local_git_config "user.$k", $v;
3547 $setup->('email', 'DEBEMAIL');
3548 $setup->('name', 'DEBFULLNAME');
3551 sub ensure_setup_existing_tree () {
3552 my $k = "remote.$remotename.skipdefaultupdate";
3553 my $c = git_get_config $k;
3554 return if defined $c;
3555 set_local_git_config $k, 'true';
3558 sub open_main_gitattrs () {
3559 confess 'internal error no maindir' unless defined $maindir;
3560 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3562 or die "open $maindir_gitcommon/info/attributes: $!";
3566 our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
3568 sub is_gitattrs_setup () {
3571 # 1: gitattributes set up and should be left alone
3573 # 0: there is a dgit-defuse-attrs but it needs fixing
3574 # undef: there is none
3575 my $gai = open_main_gitattrs();
3576 return 0 unless $gai;
3578 next unless m{$gitattrs_ourmacro_re};
3579 return 1 if m{\s-working-tree-encoding\s};
3580 printdebug "is_gitattrs_setup: found old macro\n";
3583 $gai->error and confess "$!";
3584 printdebug "is_gitattrs_setup: found nothing\n";
3588 sub setup_gitattrs (;$) {
3590 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3592 my $already = is_gitattrs_setup();
3595 [attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
3596 not doing further gitattributes setup
3600 my $new = "[attr]dgit-defuse-attrs $negate_harmful_gitattrs";
3601 my $af = "$maindir_gitcommon/info/attributes";
3602 ensuredir "$maindir_gitcommon/info";
3604 open GAO, "> $af.new" or confess "$!";
3605 print GAO <<END, __ <<ENDT or confess "$!" unless defined $already;
3609 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3611 my $gai = open_main_gitattrs();
3614 if (m{$gitattrs_ourmacro_re}) {
3615 die unless defined $already;
3619 print GAO $_, "\n" or confess "$!";
3621 $gai->error and confess "$!";
3623 close GAO or confess "$!";
3624 rename "$af.new", "$af" or fail f_ "install %s: %s", $af, $!;
3627 sub setup_new_tree () {
3628 setup_mergechangelogs();
3633 sub check_gitattrs ($$) {
3634 my ($treeish, $what) = @_;
3636 return if is_gitattrs_setup;
3639 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3641 my $gafl = new IO::File;
3642 open $gafl, "-|", @cmd or confess "$!";
3645 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3647 next unless m{(?:^|/)\.gitattributes$};
3649 # oh dear, found one
3650 print STDERR f_ <<END, $what;
3651 dgit: warning: %s contains .gitattributes
3652 dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree.
3657 # tree contains no .gitattributes files
3658 $?=0; $!=0; close $gafl or failedcmd @cmd;
3662 sub multisuite_suite_child ($$$) {
3663 my ($tsuite, $mergeinputs, $fn) = @_;
3664 # in child, sets things up, calls $fn->(), and returns undef
3665 # in parent, returns canonical suite name for $tsuite
3666 my $canonsuitefh = IO::File::new_tmpfile;
3667 my $pid = fork // confess "$!";
3671 $us .= " [$isuite]";
3672 $debugprefix .= " ";
3673 progress f_ "fetching %s...", $tsuite;
3674 canonicalise_suite();
3675 print $canonsuitefh $csuite, "\n" or confess "$!";
3676 close $canonsuitefh or confess "$!";
3680 waitpid $pid,0 == $pid or confess "$!";
3681 fail f_ "failed to obtain %s: %s", $tsuite, waitstatusmsg()
3683 seek $canonsuitefh,0,0 or confess "$!";
3684 local $csuite = <$canonsuitefh>;
3685 confess "$!" unless defined $csuite && chomp $csuite;
3687 printdebug "multisuite $tsuite missing\n";
3690 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3691 push @$mergeinputs, {
3698 sub fork_for_multisuite ($) {
3699 my ($before_fetch_merge) = @_;
3700 # if nothing unusual, just returns ''
3703 # returns 0 to caller in child, to do first of the specified suites
3704 # in child, $csuite is not yet set
3706 # returns 1 to caller in parent, to finish up anything needed after
3707 # in parent, $csuite is set to canonicalised portmanteau
3709 my $org_isuite = $isuite;
3710 my @suites = split /\,/, $isuite;
3711 return '' unless @suites > 1;
3712 printdebug "fork_for_multisuite: @suites\n";
3716 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3718 return 0 unless defined $cbasesuite;
3720 fail f_ "package %s missing in (base suite) %s", $package, $cbasesuite
3721 unless @mergeinputs;
3723 my @csuites = ($cbasesuite);
3725 $before_fetch_merge->();
3727 foreach my $tsuite (@suites[1..$#suites]) {
3728 $tsuite =~ s/^-/$cbasesuite-/;
3729 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3736 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3737 push @csuites, $csubsuite;
3740 foreach my $mi (@mergeinputs) {
3741 my $ref = git_get_ref $mi->{Ref};
3742 die "$mi->{Ref} ?" unless length $ref;
3743 $mi->{Commit} = $ref;
3746 $csuite = join ",", @csuites;
3748 my $previous = git_get_ref lrref;
3750 unshift @mergeinputs, {
3751 Commit => $previous,
3752 Info => (__ "local combined tracking branch"),
3754 "archive seems to have rewound: local tracking branch is ahead!"),
3758 foreach my $ix (0..$#mergeinputs) {
3759 $mergeinputs[$ix]{Index} = $ix;
3762 @mergeinputs = sort {
3763 -version_compare(mergeinfo_version $a,
3764 mergeinfo_version $b) # highest version first
3766 $a->{Index} <=> $b->{Index}; # earliest in spec first
3772 foreach my $mi (@mergeinputs) {
3773 printdebug "multisuite merge check $mi->{Info}\n";
3774 foreach my $previous (@needed) {
3775 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3776 printdebug "multisuite merge un-needed $previous->{Info}\n";
3780 printdebug "multisuite merge this-needed\n";
3781 $mi->{Character} = '+';
3784 $needed[0]{Character} = '*';
3786 my $output = $needed[0]{Commit};
3789 printdebug "multisuite merge nontrivial\n";
3790 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3792 my $commit = "tree $tree\n";
3793 my $msg = f_ "Combine archive branches %s [dgit]\n\n".
3794 "Input branches:\n",
3797 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3798 printdebug "multisuite merge include $mi->{Info}\n";
3799 $mi->{Character} //= ' ';
3800 $commit .= "parent $mi->{Commit}\n";
3801 $msg .= sprintf " %s %-25s %s\n",
3803 (mergeinfo_version $mi),
3806 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3807 $msg .= __ "\nKey\n".
3808 " * marks the highest version branch, which choose to use\n".
3809 " + marks each branch which was not already an ancestor\n\n";
3811 "[dgit multi-suite $csuite]\n";
3813 "author $authline\n".
3814 "committer $authline\n\n";
3815 $output = hash_commit_text $commit.$msg;
3816 printdebug "multisuite merge generated $output\n";
3819 fetch_from_archive_record_1($output);
3820 fetch_from_archive_record_2($output);
3822 progress f_ "calculated combined tracking suite %s", $csuite;
3827 sub clone_set_head () {
3828 open H, "> .git/HEAD" or confess "$!";
3829 print H "ref: ".lref()."\n" or confess "$!";
3830 close H or confess "$!";
3832 sub clone_finish ($) {
3834 runcmd @git, qw(reset --hard), lrref();
3835 runcmd qw(bash -ec), <<'END';
3837 git ls-tree -r --name-only -z HEAD | \
3838 xargs -0r touch -h -r . --
3840 printdone f_ "ready for work in %s", $dstdir;
3844 # in multisuite, returns twice!
3845 # once in parent after first suite fetched,
3846 # and then again in child after everything is finished
3848 badusage __ "dry run makes no sense with clone" unless act_local();
3850 my $multi_fetched = fork_for_multisuite(sub {
3851 printdebug "multi clone before fetch merge\n";
3855 if ($multi_fetched) {
3856 printdebug "multi clone after fetch merge\n";
3858 clone_finish($dstdir);
3861 printdebug "clone main body\n";
3863 mkdir $dstdir or fail f_ "create \`%s': %s", $dstdir, $!;
3867 canonicalise_suite();
3868 my $hasgit = check_for_git();
3870 runcmd @git, qw(init -q);
3874 my $giturl = access_giturl(1);
3875 if (defined $giturl) {
3876 runcmd @git, qw(remote add), 'origin', $giturl;
3879 progress __ "fetching existing git history";
3881 runcmd_ordryrun_local @git, qw(fetch origin);
3883 progress __ "starting new git history";
3885 fetch_from_archive() or no_such_package;
3886 my $vcsgiturl = $dsc->{'Vcs-Git'};
3887 if (length $vcsgiturl) {
3888 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3889 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3891 clone_finish($dstdir);
3895 canonicalise_suite();
3896 if (check_for_git()) {
3899 fetch_from_archive() or no_such_package();
3901 my $vcsgiturl = $dsc && $dsc->{'Vcs-Git'};
3902 if (length $vcsgiturl and
3903 (grep { $csuite eq $_ }
3905 cfg 'dgit.vcs-git.suites')) {
3906 my $current = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
3907 if (defined $current && $current ne $vcsgiturl) {
3908 print STDERR f_ <<END, $csuite;
3909 FYI: Vcs-Git in %s has different url to your vcs-git remote.
3910 Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?
3914 printdone f_ "fetched into %s", lrref();
3918 my $multi_fetched = fork_for_multisuite(sub { });
3919 fetch_one() unless $multi_fetched; # parent
3920 finish 0 if $multi_fetched eq '0'; # child
3925 runcmd_ordryrun_local @git, qw(merge -m),
3926 (f_ "Merge from %s [dgit]", $csuite),
3928 printdone f_ "fetched to %s and merged into HEAD", lrref();
3931 sub check_not_dirty () {
3932 my @forbid = qw(local-options local-patch-header);
3933 @forbid = map { "debian/source/$_" } @forbid;
3934 foreach my $f (@forbid) {
3935 if (stat_exists $f) {
3936 fail f_ "git tree contains %s", $f;
3940 my @cmd = (@git, qw(status -uall --ignored --porcelain));
3941 push @cmd, qw(debian/source/format debian/source/options);
3944 my $bad = cmdoutput @cmd;
3947 "you have uncommitted changes to critical files, cannot continue:\n").
3951 return if $includedirty;
3953 git_check_unmodified();
3956 sub commit_admin ($) {
3959 runcmd_ordryrun_local @git, qw(commit -m), $m;
3962 sub quiltify_nofix_bail ($$) {
3963 my ($headinfo, $xinfo) = @_;
3964 if ($quilt_mode eq 'nofix') {
3966 "quilt fixup required but quilt mode is \`nofix'\n".
3967 "HEAD commit%s differs from tree implied by debian/patches%s",
3972 sub commit_quilty_patch () {
3973 my $output = cmdoutput @git, qw(status --ignored --porcelain);
3975 foreach my $l (split /\n/, $output) {
3976 next unless $l =~ m/\S/;
3977 if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
3981 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3983 progress __ "nothing quilty to commit, ok.";
3986 quiltify_nofix_bail "", __ " (wanted to commit patch update)";
3987 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3988 runcmd_ordryrun_local @git, qw(add -f), @adds;
3989 commit_admin +(__ <<ENDT).<<END
3990 Commit Debian 3.0 (quilt) metadata
3993 [dgit ($our_version) quilt-fixup]
3997 sub get_source_format () {
3999 if (open F, "debian/source/options") {
4003 s/\s+$//; # ignore missing final newline
4005 my ($k, $v) = ($`, $'); #');
4006 $v =~ s/^"(.*)"$/$1/;
4012 F->error and confess "$!";
4015 confess "$!" unless $!==&ENOENT;
4018 if (!open F, "debian/source/format") {
4019 confess "$!" unless $!==&ENOENT;
4023 F->error and confess "$!";
4025 return ($_, \%options);
4028 sub madformat_wantfixup ($) {
4030 return 0 unless $format eq '3.0 (quilt)';
4031 our $quilt_mode_warned;
4032 if ($quilt_mode eq 'nocheck') {
4033 progress f_ "Not doing any fixup of \`%s'".
4034 " due to ----no-quilt-fixup or --quilt=nocheck", $format
4035 unless $quilt_mode_warned++;
4038 progress f_ "Format \`%s', need to check/update patch stack", $format
4039 unless $quilt_mode_warned++;
4043 sub maybe_split_brain_save ($$$) {
4044 my ($headref, $dgitview, $msg) = @_;
4045 # => message fragment "$saved" describing disposition of $dgitview
4046 # (used inside parens, in the English texts)
4047 my $save = $internal_object_save{'dgit-view'};
4048 return f_ "commit id %s", $dgitview unless defined $save;
4049 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
4051 "dgit --dgit-view-save $msg HEAD=$headref",
4054 return f_ "and left in %s", $save;
4057 # An "infopair" is a tuple [ $thing, $what ]
4058 # (often $thing is a commit hash; $what is a description)
4060 sub infopair_cond_equal ($$) {
4062 $x->[0] eq $y->[0] or fail <<END;
4063 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
4067 sub infopair_lrf_tag_lookup ($$) {
4068 my ($tagnames, $what) = @_;
4069 # $tagname may be an array ref
4070 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
4071 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
4072 foreach my $tagname (@tagnames) {
4073 my $lrefname = lrfetchrefs."/tags/$tagname";
4074 my $tagobj = $lrfetchrefs_f{$lrefname};
4075 next unless defined $tagobj;
4076 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
4077 return [ git_rev_parse($tagobj), $what ];
4079 fail @tagnames==1 ? (f_ <<END, $what, "@tagnames")
4080 Wanted tag %s (%s) on dgit server, but not found
4082 : (f_ <<END, $what, "@tagnames");
4083 Wanted tag %s (one of: %s) on dgit server, but not found
4087 sub infopair_cond_ff ($$) {
4088 my ($anc,$desc) = @_;
4089 is_fast_fwd($anc->[0], $desc->[0]) or
4090 fail f_ <<END, $anc->[1], $anc->[0], $desc->[1], $desc->[0];
4091 %s (%s) .. %s (%s) is not fast forward
4095 sub pseudomerge_version_check ($$) {
4096 my ($clogp, $archive_hash) = @_;
4098 my $arch_clogp = commit_getclogp $archive_hash;
4099 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
4100 __ 'version currently in archive' ];
4101 if (defined $overwrite_version) {
4102 if (length $overwrite_version) {
4103 infopair_cond_equal([ $overwrite_version,
4104 '--overwrite= version' ],
4107 my $v = $i_arch_v->[0];
4109 "Checking package changelog for archive version %s ...", $v;
4112 my @xa = ("-f$v", "-t$v");
4113 my $vclogp = parsechangelog @xa;
4116 [ (getfield $vclogp, $fn),
4117 (f_ "%s field from dpkg-parsechangelog %s",
4120 my $cv = $gf->('Version');
4121 infopair_cond_equal($i_arch_v, $cv);
4122 $cd = $gf->('Distribution');
4126 $@ =~ s/^dgit: //gm;
4128 f_ "Perhaps debian/changelog does not mention %s ?", $v;
4130 fail f_ <<END, $cd->[1], $cd->[0], $v
4132 Your tree seems to based on earlier (not uploaded) %s.
4134 if $cd->[0] =~ m/UNRELEASED/;
4138 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
4142 sub pseudomerge_hash_commit ($$$$ $$) {
4143 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
4144 $msg_cmd, $msg_msg) = @_;
4145 progress f_ "Declaring that HEAD includes all changes in %s...",
4148 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
4149 my $authline = clogp_authline $clogp;
4153 !defined $overwrite_version ? ""
4154 : !length $overwrite_version ? " --overwrite"
4155 : " --overwrite=".$overwrite_version;
4157 # Contributing parent is the first parent - that makes
4158 # git rev-list --first-parent DTRT.
4159 my $pmf = dgit_privdir()."/pseudomerge";
4160 open MC, ">", $pmf or die "$pmf $!";
4161 print MC <<END or confess "$!";
4164 parent $archive_hash
4172 close MC or confess "$!";
4174 return hash_commit($pmf);
4177 sub splitbrain_pseudomerge ($$$$) {
4178 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
4179 # => $merged_dgitview
4180 printdebug "splitbrain_pseudomerge...\n";
4182 # We: debian/PREVIOUS HEAD($maintview)
4183 # expect: o ----------------- o
4186 # a/d/PREVIOUS $dgitview
4189 # we do: `------------------ o
4193 return $dgitview unless defined $archive_hash;
4194 return $dgitview if deliberately_not_fast_forward();
4196 printdebug "splitbrain_pseudomerge...\n";
4198 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4200 if (!defined $overwrite_version) {
4201 progress __ "Checking that HEAD includes all changes in archive...";
4204 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
4206 if (defined $overwrite_version) {
4208 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
4209 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14,
4210 __ "maintainer view tag");
4211 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
4212 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, __ "dgit view tag");
4213 my $i_archive = [ $archive_hash, __ "current archive contents" ];
4215 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
4217 infopair_cond_equal($i_dgit, $i_archive);
4218 infopair_cond_ff($i_dep14, $i_dgit);
4219 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
4222 $@ =~ s/^\n//; chomp $@;
4223 print STDERR <<END.(__ <<ENDT);
4226 | Not fast forward; maybe --overwrite is needed ? Please see dgit(1).
4231 my $arch_v = $i_arch_v->[0];
4232 my $r = pseudomerge_hash_commit
4233 $clogp, $dgitview, $archive_hash, $i_arch_v,
4234 "dgit --quilt=$quilt_mode",
4235 (defined $overwrite_version
4236 ? f_ "Declare fast forward from %s\n", $arch_v
4237 : f_ "Make fast forward from %s\n", $arch_v);
4239 maybe_split_brain_save $maintview, $r, "pseudomerge";
4241 progress f_ "Made pseudo-merge of %s into dgit view.", $arch_v;
4245 sub plain_overwrite_pseudomerge ($$$) {
4246 my ($clogp, $head, $archive_hash) = @_;
4248 printdebug "plain_overwrite_pseudomerge...";
4250 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4252 return $head if is_fast_fwd $archive_hash, $head;
4254 my $m = f_ "Declare fast forward from %s", $i_arch_v->[0];
4256 my $r = pseudomerge_hash_commit
4257 $clogp, $head, $archive_hash, $i_arch_v,
4260 runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
4262 progress f_ "Make pseudo-merge of %s into your HEAD.", $i_arch_v->[0];
4266 sub push_parse_changelog ($) {
4269 my $clogp = Dpkg::Control::Hash->new();
4270 $clogp->load($clogpfn) or die;
4272 my $clogpackage = getfield $clogp, 'Source';
4273 $package //= $clogpackage;
4274 fail f_ "-p specified %s but changelog specified %s",
4275 $package, $clogpackage
4276 unless $package eq $clogpackage;
4277 my $cversion = getfield $clogp, 'Version';
4279 if (!$we_are_initiator) {
4280 # rpush initiator can't do this because it doesn't have $isuite yet
4281 my $tag = debiantag_new($cversion, access_nomdistro);
4282 runcmd @git, qw(check-ref-format), $tag;
4285 my $dscfn = dscfn($cversion);
4287 return ($clogp, $cversion, $dscfn);
4290 sub push_parse_dsc ($$$) {
4291 my ($dscfn,$dscfnwhat, $cversion) = @_;
4292 $dsc = parsecontrol($dscfn,$dscfnwhat);
4293 my $dversion = getfield $dsc, 'Version';
4294 my $dscpackage = getfield $dsc, 'Source';
4295 ($dscpackage eq $package && $dversion eq $cversion) or
4296 fail f_ "%s is for %s %s but debian/changelog is for %s %s",
4297 $dscfn, $dscpackage, $dversion,
4298 $package, $cversion;
4301 sub push_tagwants ($$$$) {
4302 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4305 TagFn => \&debiantag_new,
4310 if (defined $maintviewhead) {
4312 TagFn => \&debiantag_maintview,
4313 Objid => $maintviewhead,
4314 TfSuffix => '-maintview',
4317 } elsif ($dodep14tag ne 'no') {
4319 TagFn => \&debiantag_maintview,
4321 TfSuffix => '-dgit',
4325 foreach my $tw (@tagwants) {
4326 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4327 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4329 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4333 sub push_mktags ($$ $$ $) {
4335 $changesfile,$changesfilewhat,
4338 die unless $tagwants->[0]{View} eq 'dgit';
4340 my $declaredistro = access_nomdistro();
4341 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4342 $dsc->{$ourdscfield[0]} = join " ",
4343 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4345 $dsc->save("$dscfn.tmp") or confess "$!";
4347 my $changes = parsecontrol($changesfile,$changesfilewhat);
4348 foreach my $field (qw(Source Distribution Version)) {
4349 $changes->{$field} eq $clogp->{$field} or
4350 fail f_ "changes field %s \`%s' does not match changelog \`%s'",
4351 $field, $changes->{$field}, $clogp->{$field};
4354 my $cversion = getfield $clogp, 'Version';
4355 my $clogsuite = getfield $clogp, 'Distribution';
4357 # We make the git tag by hand because (a) that makes it easier
4358 # to control the "tagger" (b) we can do remote signing
4359 my $authline = clogp_authline $clogp;
4360 my $delibs = join(" ", "",@deliberatelies);
4364 my $tfn = $tw->{Tfn};
4365 my $head = $tw->{Objid};
4366 my $tag = $tw->{Tag};
4368 open TO, '>', $tfn->('.tmp') or confess "$!";
4369 print TO <<END or confess "$!";
4376 if ($tw->{View} eq 'dgit') {
4377 print TO f_ <<ENDT, $package, $cversion, $clogsuite, $csuite
4378 %s release %s for %s (%s) [dgit]
4381 print TO <<END or confess "$!";
4382 [dgit distro=$declaredistro$delibs]
4384 foreach my $ref (sort keys %previously) {
4385 print TO <<END or confess "$!";
4386 [dgit previously:$ref=$previously{$ref}]
4389 } elsif ($tw->{View} eq 'maint') {
4390 print TO f_ <<END, $package, $cversion, $clogsuite, $csuite,
4391 %s release %s for %s (%s)
4392 (maintainer view tag generated by dgit --quilt=%s)
4397 confess Dumper($tw)."?";
4400 close TO or confess "$!";
4402 my $tagobjfn = $tfn->('.tmp');
4404 if (!defined $keyid) {
4405 $keyid = access_cfg('keyid','RETURN-UNDEF');
4407 if (!defined $keyid) {
4408 $keyid = getfield $clogp, 'Maintainer';
4410 unlink $tfn->('.tmp.asc') or $!==&ENOENT or confess "$!";
4411 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4412 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4413 push @sign_cmd, $tfn->('.tmp');
4414 runcmd_ordryrun @sign_cmd;
4416 $tagobjfn = $tfn->('.signed.tmp');
4417 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4418 $tfn->('.tmp'), $tfn->('.tmp.asc');
4424 my @r = map { $mktag->($_); } @$tagwants;
4428 sub sign_changes ($) {
4429 my ($changesfile) = @_;
4431 my @debsign_cmd = @debsign;
4432 push @debsign_cmd, "-k$keyid" if defined $keyid;
4433 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4434 push @debsign_cmd, $changesfile;
4435 runcmd_ordryrun @debsign_cmd;
4440 printdebug "actually entering push\n";
4442 supplementary_message(__ <<'END');
4443 Push failed, while checking state of the archive.
4444 You can retry the push, after fixing the problem, if you like.
4446 if (check_for_git()) {
4449 my $archive_hash = fetch_from_archive();
4450 if (!$archive_hash) {
4452 fail __ "package appears to be new in this suite;".
4453 " if this is intentional, use --new";
4456 supplementary_message(__ <<'END');
4457 Push failed, while preparing your push.
4458 You can retry the push, after fixing the problem, if you like.
4463 access_giturl(); # check that success is vaguely likely
4464 rpush_handle_protovsn_bothends() if $we_are_initiator;
4466 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4467 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4469 responder_send_file('parsed-changelog', $clogpfn);
4471 my ($clogp, $cversion, $dscfn) =
4472 push_parse_changelog("$clogpfn");
4474 my $dscpath = "$buildproductsdir/$dscfn";
4475 stat_exists $dscpath or
4476 fail f_ "looked for .dsc %s, but %s; maybe you forgot to build",
4479 responder_send_file('dsc', $dscpath);
4481 push_parse_dsc($dscpath, $dscfn, $cversion);
4483 my $format = getfield $dsc, 'Format';
4485 my $symref = git_get_symref();
4486 my $actualhead = git_rev_parse('HEAD');
4488 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4489 if (quiltmode_splitting()) {
4490 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $actualhead);
4491 fail f_ <<END, $ffq_prev, $quilt_mode;
4492 Branch is managed by git-debrebase (%s
4493 exists), but quilt mode (%s) implies a split view.
4494 Pass the right --quilt option or adjust your git config.
4495 Or, maybe, run git-debrebase forget-was-ever-debrebase.
4498 runcmd_ordryrun_local @git_debrebase, 'stitch';
4499 $actualhead = git_rev_parse('HEAD');
4502 my $dgithead = $actualhead;
4503 my $maintviewhead = undef;
4505 my $upstreamversion = upstreamversion $clogp->{Version};
4507 if (madformat_wantfixup($format)) {
4508 # user might have not used dgit build, so maybe do this now:
4509 if (do_split_brain()) {
4510 changedir $playground;
4512 ($dgithead, $cachekey) =
4513 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4514 $dgithead or fail f_
4515 "--quilt=%s but no cached dgit view:
4516 perhaps HEAD changed since dgit build[-source] ?",
4519 if (!do_split_brain()) {
4520 # In split brain mode, do not attempt to incorporate dirty
4521 # stuff from the user's working tree. That would be mad.
4522 commit_quilty_patch();
4525 if (do_split_brain()) {
4526 $made_split_brain = 1;
4527 $dgithead = splitbrain_pseudomerge($clogp,
4528 $actualhead, $dgithead,
4530 $maintviewhead = $actualhead;
4532 prep_ud(); # so _only_subdir() works, below
4535 if (defined $overwrite_version && !defined $maintviewhead
4537 $dgithead = plain_overwrite_pseudomerge($clogp,
4545 if ($archive_hash) {
4546 if (is_fast_fwd($archive_hash, $dgithead)) {
4548 } elsif (deliberately_not_fast_forward) {
4551 fail __ "dgit push: HEAD is not a descendant".
4552 " of the archive's version.\n".
4553 "To overwrite the archive's contents,".
4554 " pass --overwrite[=VERSION].\n".
4555 "To rewind history, if permitted by the archive,".
4556 " use --deliberately-not-fast-forward.";
4560 confess unless !!$made_split_brain == do_split_brain();
4562 changedir $playground;
4563 progress f_ "checking that %s corresponds to HEAD", $dscfn;
4564 runcmd qw(dpkg-source -x --),
4565 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4566 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4567 check_for_vendor_patches() if madformat($dsc->{format});
4569 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4570 debugcmd "+",@diffcmd;
4572 my $r = system @diffcmd;
4575 my $referent = $made_split_brain ? $dgithead : 'HEAD';
4576 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4579 my $raw = cmdoutput @git,
4580 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4582 foreach (split /\0/, $raw) {
4583 if (defined $changed) {
4584 push @mode_changes, "$changed: $_\n" if $changed;
4587 } elsif (m/^:0+ 0+ /) {
4589 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4590 $changed = "Mode change from $1 to $2"
4595 if (@mode_changes) {
4596 fail +(f_ <<ENDT, $dscfn).<<END
4597 HEAD specifies a different tree to %s:
4601 .(join '', @mode_changes)
4602 .(f_ <<ENDT, $tree, $referent);
4603 There is a problem with your source tree (see dgit(7) for some hints).
4604 To see a full diff, run git diff %s %s
4608 fail +(f_ <<ENDT, $dscfn).<<END.(f_ <<ENDT, $tree, $referent);
4609 HEAD specifies a different tree to %s:
4613 Perhaps you forgot to build. Or perhaps there is a problem with your
4614 source tree (see dgit(7) for some hints). To see a full diff, run
4621 if (!$changesfile) {
4622 my $pat = changespat $cversion;
4623 my @cs = glob "$buildproductsdir/$pat";
4624 fail f_ "failed to find unique changes file".
4625 " (looked for %s in %s);".
4626 " perhaps you need to use dgit -C",
4627 $pat, $buildproductsdir
4629 ($changesfile) = @cs;
4631 $changesfile = "$buildproductsdir/$changesfile";
4634 # Check that changes and .dsc agree enough
4635 $changesfile =~ m{[^/]*$};
4636 my $changes = parsecontrol($changesfile,$&);
4637 files_compare_inputs($dsc, $changes)
4638 unless forceing [qw(dsc-changes-mismatch)];
4640 # Check whether this is a source only upload
4641 my $hasdebs = $changes->{Files} =~ m{\.deb$}m;
4642 my $sourceonlypolicy = access_cfg 'source-only-uploads';
4643 if ($sourceonlypolicy eq 'ok') {
4644 } elsif ($sourceonlypolicy eq 'always') {
4645 forceable_fail [qw(uploading-binaries)],
4646 __ "uploading binaries, although distro policy is source only"
4648 } elsif ($sourceonlypolicy eq 'never') {
4649 forceable_fail [qw(uploading-source-only)],
4650 __ "source-only upload, although distro policy requires .debs"
4652 } elsif ($sourceonlypolicy eq 'not-wholly-new') {
4653 forceable_fail [qw(uploading-source-only)],
4654 f_ "source-only upload, even though package is entirely NEW\n".
4655 "(this is contrary to policy in %s)",
4659 && !(archive_query('package_not_wholly_new', $package) // 1);
4661 badcfg f_ "unknown source-only-uploads policy \`%s'",
4665 # Perhaps adjust .dsc to contain right set of origs
4666 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4668 unless forceing [qw(changes-origs-exactly)];
4670 # Checks complete, we're going to try and go ahead:
4672 responder_send_file('changes',$changesfile);
4673 responder_send_command("param head $dgithead");
4674 responder_send_command("param csuite $csuite");
4675 responder_send_command("param isuite $isuite");
4676 responder_send_command("param tagformat new"); # needed in $protovsn==4
4677 if (defined $maintviewhead) {
4678 responder_send_command("param maint-view $maintviewhead");
4681 # Perhaps send buildinfo(s) for signing
4682 my $changes_files = getfield $changes, 'Files';
4683 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4684 foreach my $bi (@buildinfos) {
4685 responder_send_command("param buildinfo-filename $bi");
4686 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4689 if (deliberately_not_fast_forward) {
4690 git_for_each_ref(lrfetchrefs, sub {
4691 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4692 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4693 responder_send_command("previously $rrefname=$objid");
4694 $previously{$rrefname} = $objid;
4698 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4699 dgit_privdir()."/tag");
4702 supplementary_message(__ <<'END');
4703 Push failed, while signing the tag.
4704 You can retry the push, after fixing the problem, if you like.
4706 # If we manage to sign but fail to record it anywhere, it's fine.
4707 if ($we_are_responder) {
4708 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4709 responder_receive_files('signed-tag', @tagobjfns);
4711 @tagobjfns = push_mktags($clogp,$dscpath,
4712 $changesfile,$changesfile,
4715 supplementary_message(__ <<'END');
4716 Push failed, *after* signing the tag.
4717 If you want to try again, you should use a new version number.
4720 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4722 foreach my $tw (@tagwants) {
4723 my $tag = $tw->{Tag};
4724 my $tagobjfn = $tw->{TagObjFn};
4726 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4727 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4728 runcmd_ordryrun_local
4729 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4732 supplementary_message(__ <<'END');
4733 Push failed, while updating the remote git repository - see messages above.
4734 If you want to try again, you should use a new version number.
4736 if (!check_for_git()) {
4737 create_remote_git_repo();
4740 my @pushrefs = $forceflag.$dgithead.":".rrref();
4741 foreach my $tw (@tagwants) {
4742 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4745 runcmd_ordryrun @git,
4746 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4747 runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
4749 supplementary_message(__ <<'END');
4750 Push failed, while obtaining signatures on the .changes and .dsc.
4751 If it was just that the signature failed, you may try again by using
4752 debsign by hand to sign the changes file (see the command dgit tried,
4753 above), and then dput that changes file to complete the upload.
4754 If you need to change the package, you must use a new version number.
4756 if ($we_are_responder) {
4757 my $dryrunsuffix = act_local() ? "" : ".tmp";
4758 my @rfiles = ($dscpath, $changesfile);
4759 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4760 responder_receive_files('signed-dsc-changes',
4761 map { "$_$dryrunsuffix" } @rfiles);
4764 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4766 progress f_ "[new .dsc left in %s.tmp]", $dscpath;
4768 sign_changes $changesfile;
4771 supplementary_message(f_ <<END, $changesfile);
4772 Push failed, while uploading package(s) to the archive server.
4773 You can retry the upload of exactly these same files with dput of:
4775 If that .changes file is broken, you will need to use a new version
4776 number for your next attempt at the upload.
4778 my $host = access_cfg('upload-host','RETURN-UNDEF');
4779 my @hostarg = defined($host) ? ($host,) : ();
4780 runcmd_ordryrun @dput, @hostarg, $changesfile;
4781 printdone f_ "pushed and uploaded %s", $cversion;
4783 supplementary_message('');
4784 responder_send_command("complete");
4788 not_necessarily_a_tree();
4793 badusage __ "-p is not allowed with clone; specify as argument instead"
4794 if defined $package;
4797 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4798 ($package,$isuite) = @ARGV;
4799 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4800 ($package,$dstdir) = @ARGV;
4801 } elsif (@ARGV==3) {
4802 ($package,$isuite,$dstdir) = @ARGV;
4804 badusage __ "incorrect arguments to dgit clone";
4808 $dstdir ||= "$package";
4809 if (stat_exists $dstdir) {
4810 fail f_ "%s already exists", $dstdir;
4814 if ($rmonerror && !$dryrun_level) {
4815 $cwd_remove= getcwd();
4817 return unless defined $cwd_remove;
4818 if (!chdir "$cwd_remove") {
4819 return if $!==&ENOENT;
4820 confess "chdir $cwd_remove: $!";
4822 printdebug "clone rmonerror removing $dstdir\n";
4824 rmtree($dstdir) or fail f_ "remove %s: %s\n", $dstdir, $!;
4825 } elsif (grep { $! == $_ }
4826 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4828 print STDERR f_ "check whether to remove %s: %s\n",
4835 $cwd_remove = undef;
4838 sub branchsuite () {
4839 my $branch = git_get_symref();
4840 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4847 sub package_from_d_control () {
4848 if (!defined $package) {
4849 my $sourcep = parsecontrol('debian/control','debian/control');
4850 $package = getfield $sourcep, 'Source';
4854 sub fetchpullargs () {
4855 package_from_d_control();
4857 $isuite = branchsuite();
4859 my $clogp = parsechangelog();
4860 my $clogsuite = getfield $clogp, 'Distribution';
4861 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4863 } elsif (@ARGV==1) {
4866 badusage __ "incorrect arguments to dgit fetch or dgit pull";
4880 determine_whether_split_brain();
4881 if (do_split_brain()) {
4882 my ($format, $fopts) = get_source_format();
4883 madformat($format) and fail f_ <<END, $quilt_mode
4884 dgit pull not yet supported in split view mode (including with view-splitting quilt modes)
4892 package_from_d_control();
4893 @ARGV==1 or badusage __ "dgit checkout needs a suite argument";
4897 foreach my $canon (qw(0 1)) {
4902 canonicalise_suite();
4904 if (length git_get_ref lref()) {
4905 # local branch already exists, yay
4908 if (!length git_get_ref lrref()) {
4916 runcmd (@git, qw(update-ref), lref(), lrref(), '');
4919 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
4920 "dgit checkout $isuite";
4921 runcmd (@git, qw(checkout), lbranch());
4924 sub cmd_update_vcs_git () {
4926 if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
4927 ($specsuite,) = split /\;/, cfg 'dgit.vcs-git.suites';
4929 ($specsuite) = (@ARGV);
4934 if ($ARGV[0] eq '-') {
4936 } elsif ($ARGV[0] eq '-') {
4941 package_from_d_control();
4943 if ($specsuite eq '.') {
4944 $ctrl = parsecontrol 'debian/control', 'debian/control';
4946 $isuite = $specsuite;
4950 my $url = getfield $ctrl, 'Vcs-Git';
4953 my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
4954 if (!defined $orgurl) {
4955 print STDERR f_ "setting up vcs-git: %s\n", $url;
4956 @cmd = (@git, qw(remote add vcs-git), $url);
4957 } elsif ($orgurl eq $url) {
4958 print STDERR f_ "vcs git already configured: %s\n", $url;
4960 print STDERR f_ "changing vcs-git url to: %s\n", $url;
4961 @cmd = (@git, qw(remote set-url vcs-git), $url);
4963 runcmd_ordryrun_local @cmd;
4965 print f_ "fetching (%s)\n", "@ARGV";
4966 runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
4972 build_or_push_prep_early();
4974 build_or_push_prep_modes();
4978 } elsif (@ARGV==1) {
4979 ($specsuite) = (@ARGV);
4981 badusage f_ "incorrect arguments to dgit %s", $subcommand;
4984 local ($package) = $existing_package; # this is a hack
4985 canonicalise_suite();
4987 canonicalise_suite();
4989 if (defined $specsuite &&
4990 $specsuite ne $isuite &&
4991 $specsuite ne $csuite) {
4992 fail f_ "dgit %s: changelog specifies %s (%s)".
4993 " but command line specifies %s",
4994 $subcommand, $isuite, $csuite, $specsuite;
5003 #---------- remote commands' implementation ----------
5005 sub pre_remote_push_build_host {
5006 my ($nrargs) = shift @ARGV;
5007 my (@rargs) = @ARGV[0..$nrargs-1];
5008 @ARGV = @ARGV[$nrargs..$#ARGV];
5010 my ($dir,$vsnwant) = @rargs;
5011 # vsnwant is a comma-separated list; we report which we have
5012 # chosen in our ready response (so other end can tell if they
5015 $we_are_responder = 1;
5016 $us .= " (build host)";
5018 open PI, "<&STDIN" or confess "$!";
5019 open STDIN, "/dev/null" or confess "$!";
5020 open PO, ">&STDOUT" or confess "$!";
5022 open STDOUT, ">&STDERR" or confess "$!";
5026 ($protovsn) = grep {
5027 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
5028 } @rpushprotovsn_support;
5030 fail f_ "build host has dgit rpush protocol versions %s".
5031 " but invocation host has %s",
5032 (join ",", @rpushprotovsn_support), $vsnwant
5033 unless defined $protovsn;
5037 sub cmd_remote_push_build_host {
5038 responder_send_command("dgit-remote-push-ready $protovsn");
5042 sub pre_remote_push_responder { pre_remote_push_build_host(); }
5043 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
5044 # ... for compatibility with proto vsn.1 dgit (just so that user gets
5045 # a good error message)
5047 sub rpush_handle_protovsn_bothends () {
5054 my $report = i_child_report();
5055 if (defined $report) {
5056 printdebug "($report)\n";
5057 } elsif ($i_child_pid) {
5058 printdebug "(killing build host child $i_child_pid)\n";
5059 kill 15, $i_child_pid;
5061 if (defined $i_tmp && !defined $initiator_tempdir) {
5063 eval { rmtree $i_tmp; };
5068 return unless forkcheck_mainprocess();
5073 my ($base,$selector,@args) = @_;
5074 $selector =~ s/\-/_/g;
5075 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
5079 not_necessarily_a_tree();
5084 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
5092 push @rargs, join ",", @rpushprotovsn_support;
5095 push @rdgit, @ropts;
5096 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
5098 my @cmd = (@ssh, $host, shellquote @rdgit);
5101 $we_are_initiator=1;
5103 if (defined $initiator_tempdir) {
5104 rmtree $initiator_tempdir;
5105 mkdir $initiator_tempdir, 0700
5106 or fail f_ "create %s: %s", $initiator_tempdir, $!;
5107 $i_tmp = $initiator_tempdir;
5111 $i_child_pid = open2(\*RO, \*RI, @cmd);
5113 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
5114 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
5117 my ($icmd,$iargs) = initiator_expect {
5118 m/^(\S+)(?: (.*))?$/;
5121 i_method "i_resp", $icmd, $iargs;
5125 sub i_resp_progress ($) {
5127 my $msg = protocol_read_bytes \*RO, $rhs;
5131 sub i_resp_supplementary_message ($) {
5133 $supplementary_message = protocol_read_bytes \*RO, $rhs;
5136 sub i_resp_complete {
5137 my $pid = $i_child_pid;
5138 $i_child_pid = undef; # prevents killing some other process with same pid
5139 printdebug "waiting for build host child $pid...\n";
5140 my $got = waitpid $pid, 0;
5141 confess "$!" unless $got == $pid;
5142 fail f_ "build host child failed: %s", waitstatusmsg() if $?;
5145 printdebug __ "all done\n";
5149 sub i_resp_file ($) {
5151 my $localname = i_method "i_localname", $keyword;
5152 my $localpath = "$i_tmp/$localname";
5153 stat_exists $localpath and
5154 badproto \*RO, f_ "file %s (%s) twice", $keyword, $localpath;
5155 protocol_receive_file \*RO, $localpath;
5156 i_method "i_file", $keyword;
5161 sub i_resp_param ($) {
5162 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, __ "bad param spec";
5166 sub i_resp_previously ($) {
5167 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
5168 or badproto \*RO, __ "bad previously spec";
5169 my $r = system qw(git check-ref-format), $1;
5170 confess "bad previously ref spec ($r)" if $r;
5171 $previously{$1} = $2;
5176 sub i_resp_want ($) {
5178 die "$keyword ?" if $i_wanted{$keyword}++;
5180 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
5181 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
5182 die unless $isuite =~ m/^$suite_re$/;
5185 rpush_handle_protovsn_bothends();
5187 my @localpaths = i_method "i_want", $keyword;
5188 printdebug "[[ $keyword @localpaths\n";
5189 foreach my $localpath (@localpaths) {
5190 protocol_send_file \*RI, $localpath;
5192 print RI "files-end\n" or confess "$!";
5195 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
5197 sub i_localname_parsed_changelog {
5198 return "remote-changelog.822";
5200 sub i_file_parsed_changelog {
5201 ($i_clogp, $i_version, $i_dscfn) =
5202 push_parse_changelog "$i_tmp/remote-changelog.822";
5203 die if $i_dscfn =~ m#/|^\W#;
5206 sub i_localname_dsc {
5207 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5212 sub i_localname_buildinfo ($) {
5213 my $bi = $i_param{'buildinfo-filename'};
5214 defined $bi or badproto \*RO, "buildinfo before filename";
5215 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
5216 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
5217 or badproto \*RO, "improper buildinfo filename";
5220 sub i_file_buildinfo {
5221 my $bi = $i_param{'buildinfo-filename'};
5222 my $bd = parsecontrol "$i_tmp/$bi", $bi;
5223 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
5224 if (!forceing [qw(buildinfo-changes-mismatch)]) {
5225 files_compare_inputs($bd, $ch);
5226 (getfield $bd, $_) eq (getfield $ch, $_) or
5227 fail f_ "buildinfo mismatch in field %s", $_
5228 foreach qw(Source Version);
5229 !defined $bd->{$_} or
5230 fail f_ "buildinfo contains forbidden field %s", $_
5231 foreach qw(Changes Changed-by Distribution);
5233 push @i_buildinfos, $bi;
5234 delete $i_param{'buildinfo-filename'};
5237 sub i_localname_changes {
5238 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5239 $i_changesfn = $i_dscfn;
5240 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
5241 return $i_changesfn;
5243 sub i_file_changes { }
5245 sub i_want_signed_tag {
5246 printdebug Dumper(\%i_param, $i_dscfn);
5247 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
5248 && defined $i_param{'csuite'}
5249 or badproto \*RO, "premature desire for signed-tag";
5250 my $head = $i_param{'head'};
5251 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
5253 my $maintview = $i_param{'maint-view'};
5254 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
5256 if ($protovsn == 4) {
5257 my $p = $i_param{'tagformat'} // '<undef>';
5259 or badproto \*RO, "tag format mismatch: $p vs. new";
5262 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
5264 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
5266 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
5269 push_mktags $i_clogp, $i_dscfn,
5270 $i_changesfn, (__ 'remote changes file'),
5274 sub i_want_signed_dsc_changes {
5275 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
5276 sign_changes $i_changesfn;
5277 return ($i_dscfn, $i_changesfn, @i_buildinfos);
5280 #---------- building etc. ----------
5286 #----- `3.0 (quilt)' handling -----
5288 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
5290 sub quiltify_dpkg_commit ($$$;$) {
5291 my ($patchname,$author,$msg, $xinfo) = @_;
5294 mkpath '.git/dgit'; # we are in playtree
5295 my $descfn = ".git/dgit/quilt-description.tmp";
5296 open O, '>', $descfn or confess "$descfn: $!";
5297 $msg =~ s/\n+/\n\n/;
5298 print O <<END or confess "$!";
5300 ${xinfo}Subject: $msg
5304 close O or confess "$!";
5307 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
5308 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
5309 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
5310 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
5314 sub quiltify_trees_differ ($$;$$$) {
5315 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
5316 # returns true iff the two tree objects differ other than in debian/
5317 # with $finegrained,
5318 # returns bitmask 01 - differ in upstream files except .gitignore
5319 # 02 - differ in .gitignore
5320 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
5321 # is set for each modified .gitignore filename $fn
5322 # if $unrepres is defined, array ref to which is appeneded
5323 # a list of unrepresentable changes (removals of upstream files
5326 my @cmd = (@git, qw(diff-tree -z --no-renames));
5327 push @cmd, qw(--name-only) unless $unrepres;
5328 push @cmd, qw(-r) if $finegrained || $unrepres;
5330 my $diffs= cmdoutput @cmd;
5333 foreach my $f (split /\0/, $diffs) {
5334 if ($unrepres && !@lmodes) {
5335 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
5338 my ($oldmode,$newmode) = @lmodes;
5341 next if $f =~ m#^debian(?:/.*)?$#s;
5345 die __ "not a plain file or symlink\n"
5346 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5347 $oldmode =~ m/^(?:10|12)\d{4}$/;
5348 if ($oldmode =~ m/[^0]/ &&
5349 $newmode =~ m/[^0]/) {
5350 # both old and new files exist
5351 die __ "mode or type changed\n" if $oldmode ne $newmode;
5352 die __ "modified symlink\n" unless $newmode =~ m/^10/;
5353 } elsif ($oldmode =~ m/[^0]/) {
5355 die __ "deletion of symlink\n"
5356 unless $oldmode =~ m/^10/;
5359 die __ "creation with non-default mode\n"
5360 unless $newmode =~ m/^100644$/ or
5361 $newmode =~ m/^120000$/;
5365 local $/="\n"; chomp $@;
5366 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5370 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5371 $r |= $isignore ? 02 : 01;
5372 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5374 printdebug "quiltify_trees_differ $x $y => $r\n";
5378 sub quiltify_tree_sentinelfiles ($) {
5379 # lists the `sentinel' files present in the tree
5381 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5382 qw(-- debian/rules debian/control);
5387 sub quiltify_splitting ($$$$$$$) {
5388 my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
5389 $editedignores, $cachekey) = @_;
5390 my $gitignore_special = 1;
5391 if ($quilt_mode !~ m/gbp|dpm|baredebian/) {
5392 # treat .gitignore just like any other upstream file
5393 $diffbits = { %$diffbits };
5394 $_ = !!$_ foreach values %$diffbits;
5395 $gitignore_special = 0;
5397 # We would like any commits we generate to be reproducible
5398 my @authline = clogp_authline($clogp);
5399 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5400 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5401 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5402 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5403 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5404 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5406 confess unless do_split_brain();
5408 my $fulldiffhint = sub {
5410 my $cmd = "git diff $x $y -- :/ ':!debian'";
5411 $cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special;
5412 return f_ "\nFor full diff showing the problem(s), type:\n %s\n",
5416 if ($quilt_mode =~ m/gbp|unapplied|baredebian/ &&
5417 ($diffbits->{O2H} & 01)) {
5419 "--quilt=%s specified, implying patches-unapplied git tree\n".
5420 " but git tree differs from orig in upstream files.",
5422 $msg .= $fulldiffhint->($unapplied, 'HEAD');
5423 if (!stat_exists "debian/patches" and $quilt_mode !~ m/baredebian/) {
5425 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5429 if ($quilt_mode =~ m/dpm/ &&
5430 ($diffbits->{H2A} & 01)) {
5431 fail +(f_ <<END, $quilt_mode). $fulldiffhint->($oldtiptree,'HEAD');
5432 --quilt=%s specified, implying patches-applied git tree
5433 but git tree differs from result of applying debian/patches to upstream
5436 if ($quilt_mode =~ m/baredebian/) {
5437 # We need to construct a merge which has upstream files from
5438 # upstream and debian/ files from HEAD.
5440 read_tree_upstream $quilt_upstream_commitish, 1, $headref;
5441 my $version = getfield $clogp, 'Version';
5442 my $upsversion = upstreamversion $version;
5443 my $merge = make_commit
5444 [ $headref, $quilt_upstream_commitish ],
5445 [ +(f_ <<ENDT, $upsversion), $quilt_upstream_commitish_message, <<ENDU ];
5446 Combine debian/ with upstream source for %s
5448 [dgit ($our_version) baredebian-merge $version $quilt_upstream_commitish_used]
5450 runcmd @git, qw(reset -q --hard), $merge;
5452 if ($quilt_mode =~ m/gbp|unapplied|baredebian/ &&
5453 ($diffbits->{O2A} & 01)) { # some patches
5454 progress __ "dgit view: creating patches-applied version using gbp pq";
5455 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5456 # gbp pq import creates a fresh branch; push back to dgit-view
5457 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5458 runcmd @git, qw(checkout -q dgit-view);
5460 if ($quilt_mode =~ m/gbp|dpm/ &&
5461 ($diffbits->{O2A} & 02)) {
5462 fail f_ <<END, $quilt_mode;
5463 --quilt=%s specified, implying that HEAD is for use with a
5464 tool which does not create patches for changes to upstream
5465 .gitignores: but, such patches exist in debian/patches.
5468 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5469 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5471 "dgit view: creating patch to represent .gitignore changes";
5472 ensuredir "debian/patches";
5473 my $gipatch = "debian/patches/auto-gitignore";
5474 open GIPATCH, ">>", "$gipatch" or confess "$gipatch: $!";
5475 stat GIPATCH or confess "$gipatch: $!";
5476 fail f_ "%s already exists; but want to create it".
5477 " to record .gitignore changes",
5480 print GIPATCH +(__ <<END).<<ENDU or die "$gipatch: $!";
5481 Subject: Update .gitignore from Debian packaging branch
5483 The Debian packaging git branch contains these updates to the upstream
5484 .gitignore file(s). This patch is autogenerated, to provide these
5485 updates to users of the official Debian archive view of the package.
5488 [dgit ($our_version) update-gitignore]
5491 close GIPATCH or die "$gipatch: $!";
5492 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5493 $unapplied, $headref, "--", sort keys %$editedignores;
5494 open SERIES, "+>>", "debian/patches/series" or confess "$!";
5495 defined seek SERIES, -1, 2 or $!==EINVAL or confess "$!";
5497 defined read SERIES, $newline, 1 or confess "$!";
5498 print SERIES "\n" or confess "$!" unless $newline eq "\n";
5499 print SERIES "auto-gitignore\n" or confess "$!";
5500 close SERIES or die $!;
5501 runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
5502 commit_admin +(__ <<END).<<ENDU
5503 Commit patch to update .gitignore
5506 [dgit ($our_version) update-gitignore-quilt-fixup]
5511 sub quiltify ($$$$) {
5512 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5514 # Quilt patchification algorithm
5516 # We search backwards through the history of the main tree's HEAD
5517 # (T) looking for a start commit S whose tree object is identical
5518 # to to the patch tip tree (ie the tree corresponding to the
5519 # current dpkg-committed patch series). For these purposes
5520 # `identical' disregards anything in debian/ - this wrinkle is
5521 # necessary because dpkg-source treates debian/ specially.
5523 # We can only traverse edges where at most one of the ancestors'
5524 # trees differs (in changes outside in debian/). And we cannot
5525 # handle edges which change .pc/ or debian/patches. To avoid
5526 # going down a rathole we avoid traversing edges which introduce
5527 # debian/rules or debian/control. And we set a limit on the
5528 # number of edges we are willing to look at.
5530 # If we succeed, we walk forwards again. For each traversed edge
5531 # PC (with P parent, C child) (starting with P=S and ending with
5532 # C=T) to we do this:
5534 # - dpkg-source --commit with a patch name and message derived from C
5535 # After traversing PT, we git commit the changes which
5536 # should be contained within debian/patches.
5538 # The search for the path S..T is breadth-first. We maintain a
5539 # todo list containing search nodes. A search node identifies a
5540 # commit, and looks something like this:
5542 # Commit => $git_commit_id,
5543 # Child => $c, # or undef if P=T
5544 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5545 # Nontrivial => true iff $p..$c has relevant changes
5552 my %considered; # saves being exponential on some weird graphs
5554 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5557 my ($search,$whynot) = @_;
5558 printdebug " search NOT $search->{Commit} $whynot\n";
5559 $search->{Whynot} = $whynot;
5560 push @nots, $search;
5561 no warnings qw(exiting);
5570 my $c = shift @todo;
5571 next if $considered{$c->{Commit}}++;
5573 $not->($c, __ "maximum search space exceeded") if --$max_work <= 0;
5575 printdebug "quiltify investigate $c->{Commit}\n";
5578 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5579 printdebug " search finished hooray!\n";
5584 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5585 if ($quilt_mode eq 'smash') {
5586 printdebug " search quitting smash\n";
5590 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5591 $not->($c, f_ "has %s not %s", $c_sentinels, $t_sentinels)
5592 if $c_sentinels ne $t_sentinels;
5594 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5595 $commitdata =~ m/\n\n/;
5597 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5598 @parents = map { { Commit => $_, Child => $c } } @parents;
5600 $not->($c, __ "root commit") if !@parents;
5602 foreach my $p (@parents) {
5603 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5605 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5606 $not->($c, f_ "merge (%s nontrivial parents)", $ndiffers)
5609 foreach my $p (@parents) {
5610 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5612 my @cmd= (@git, qw(diff-tree -r --name-only),
5613 $p->{Commit},$c->{Commit},
5614 qw(-- debian/patches .pc debian/source/format));
5615 my $patchstackchange = cmdoutput @cmd;
5616 if (length $patchstackchange) {
5617 $patchstackchange =~ s/\n/,/g;
5618 $not->($p, f_ "changed %s", $patchstackchange);
5621 printdebug " search queue P=$p->{Commit} ",
5622 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5628 printdebug "quiltify want to smash\n";
5631 my $x = $_[0]{Commit};
5632 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5635 if ($quilt_mode eq 'linear') {
5637 "\n%s: error: quilt fixup cannot be linear. Stopped at:\n",
5639 my $all_gdr = !!@nots;
5640 foreach my $notp (@nots) {
5641 my $c = $notp->{Child};
5642 my $cprange = $abbrev->($notp);
5643 $cprange .= "..".$abbrev->($c) if $c;
5644 print STDERR f_ "%s: %s: %s\n",
5645 $us, $cprange, $notp->{Whynot};
5646 $all_gdr &&= $notp->{Child} &&
5647 (git_cat_file $notp->{Child}{Commit}, 'commit')
5648 =~ m{^\[git-debrebase(?! split[: ]).*\]$}m;
5652 [ grep { $_->[0] ne 'quilt-mode' } @$failsuggestion ]
5654 print STDERR "$us: $_->[1]\n" foreach @$failsuggestion;
5656 "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n";
5657 } elsif ($quilt_mode eq 'smash') {
5658 } elsif ($quilt_mode eq 'auto') {
5659 progress __ "quilt fixup cannot be linear, smashing...";
5661 confess "$quilt_mode ?";
5664 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5665 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5667 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5669 quiltify_dpkg_commit "auto-$version-$target-$time",
5670 (getfield $clogp, 'Maintainer'),
5671 (f_ "Automatically generated patch (%s)\n".
5672 "Last (up to) %s git changes, FYI:\n\n",
5673 $clogp->{Version}, $ncommits).
5678 progress __ "quiltify linearisation planning successful, executing...";
5680 for (my $p = $sref_S;
5681 my $c = $p->{Child};
5683 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5684 next unless $p->{Nontrivial};
5686 my $cc = $c->{Commit};
5688 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5689 $commitdata =~ m/\n\n/ or die "$c ?";
5692 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5695 my $commitdate = cmdoutput
5696 @git, qw(log -n1 --pretty=format:%aD), $cc;
5698 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5700 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5707 my $gbp_check_suitable = sub {
5712 die __ "contains unexpected slashes\n" if m{//} || m{/$};
5713 die __ "contains leading punctuation\n" if m{^\W} || m{/\W};
5714 die __ "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5715 die __ "is series file\n" if m{$series_filename_re}o;
5716 die __ "too long\n" if length > 200;
5718 return $_ unless $@;
5720 "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s",
5725 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5727 (\S+) \s* \n //ixm) {
5728 $patchname = $gbp_check_suitable->($1, 'Name');
5730 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5732 (\S+) \s* \n //ixm) {
5733 $patchdir = $gbp_check_suitable->($1, 'Topic');
5738 if (!defined $patchname) {
5739 $patchname = $title;
5740 $patchname =~ s/[.:]$//;
5743 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5744 my $translitname = $converter->convert($patchname);
5745 die unless defined $translitname;
5746 $patchname = $translitname;
5749 +(f_ "dgit: patch title transliteration error: %s", $@)
5751 $patchname =~ y/ A-Z/-a-z/;
5752 $patchname =~ y/-a-z0-9_.+=~//cd;
5753 $patchname =~ s/^\W/x-$&/;
5754 $patchname = substr($patchname,0,40);
5755 $patchname .= ".patch";
5757 if (!defined $patchdir) {
5760 if (length $patchdir) {
5761 $patchname = "$patchdir/$patchname";
5763 if ($patchname =~ m{^(.*)/}) {
5764 mkpath "debian/patches/$1";
5769 stat "debian/patches/$patchname$index";
5771 $!==ENOENT or confess "$patchname$index $!";
5773 runcmd @git, qw(checkout -q), $cc;
5775 # We use the tip's changelog so that dpkg-source doesn't
5776 # produce complaining messages from dpkg-parsechangelog. None
5777 # of the information dpkg-source gets from the changelog is
5778 # actually relevant - it gets put into the original message
5779 # which dpkg-source provides our stunt editor, and then
5781 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5783 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5784 "Date: $commitdate\n".
5785 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5787 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5791 sub build_maybe_quilt_fixup () {
5792 my ($format,$fopts) = get_source_format;
5793 return unless madformat_wantfixup $format;
5796 check_for_vendor_patches();
5798 my $clogp = parsechangelog();
5799 my $headref = git_rev_parse('HEAD');
5800 my $symref = git_get_symref();
5801 my $upstreamversion = upstreamversion $version;
5804 changedir $playground;
5806 my $splitbrain_cachekey;
5808 if (do_split_brain()) {
5810 ($cachehit, $splitbrain_cachekey) =
5811 quilt_check_splitbrain_cache($headref, $upstreamversion);
5818 unpack_playtree_need_cd_work($headref);
5819 if (do_split_brain()) {
5820 runcmd @git, qw(checkout -q -b dgit-view);
5821 # so long as work is not deleted, its current branch will
5822 # remain dgit-view, rather than master, so subsequent calls to
5823 # unpack_playtree_need_cd_work
5824 # will DTRT, resetting dgit-view.
5825 confess if $made_split_brain;
5826 $made_split_brain = 1;
5830 if ($fopts->{'single-debian-patch'}) {
5832 "quilt mode %s does not make sense (or is not supported) with single-debian-patch",
5834 if quiltmode_splitting();
5835 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5837 quilt_fixup_multipatch($clogp, $headref, $upstreamversion,
5838 $splitbrain_cachekey);
5841 if (do_split_brain()) {
5842 my $dgitview = git_rev_parse 'HEAD';
5845 reflog_cache_insert "refs/$splitbraincache",
5846 $splitbrain_cachekey, $dgitview;
5848 changedir "$playground/work";
5850 my $saved = maybe_split_brain_save $headref, $dgitview, __ "converted";
5851 progress f_ "dgit view: created (%s)", $saved;
5855 runcmd_ordryrun_local
5856 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5859 sub build_check_quilt_splitbrain () {
5860 build_maybe_quilt_fixup();
5863 sub unpack_playtree_need_cd_work ($) {
5866 # prep_ud() must have been called already.
5867 if (!chdir "work") {
5868 # Check in the filesystem because sometimes we run prep_ud
5869 # in between multiple calls to unpack_playtree_need_cd_work.
5870 confess "$!" unless $!==ENOENT;
5871 mkdir "work" or confess "$!";
5873 mktree_in_ud_here();
5875 runcmd @git, qw(reset -q --hard), $headref;
5878 sub unpack_playtree_linkorigs ($$) {
5879 my ($upstreamversion, $fn) = @_;
5880 # calls $fn->($leafname);
5882 my $bpd_abs = bpd_abs();
5884 dotdot_bpd_transfer_origs $bpd_abs, $upstreamversion, sub { 1 };
5886 opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!";
5887 while ($!=0, defined(my $leaf = readdir QFD)) {
5888 my $f = bpd_abs()."/".$leaf;
5890 local ($debuglevel) = $debuglevel-1;
5891 printdebug "QF linkorigs bpd $leaf, $f ?\n";
5893 next unless is_orig_file_of_vsn $leaf, $upstreamversion;
5894 printdebug "QF linkorigs $leaf, $f Y\n";
5895 link_ltarget $f, $leaf or die "$leaf $!";
5898 die "$buildproductsdir: $!" if $!;
5902 sub quilt_fixup_delete_pc () {
5903 runcmd @git, qw(rm -rqf .pc);
5904 commit_admin +(__ <<END).<<ENDU
5905 Commit removal of .pc (quilt series tracking data)
5908 [dgit ($our_version) upgrade quilt-remove-pc]
5912 sub quilt_fixup_singlepatch ($$$) {
5913 my ($clogp, $headref, $upstreamversion) = @_;
5915 progress __ "starting quiltify (single-debian-patch)";
5917 # dpkg-source --commit generates new patches even if
5918 # single-debian-patch is in debian/source/options. In order to
5919 # get it to generate debian/patches/debian-changes, it is
5920 # necessary to build the source package.
5922 unpack_playtree_linkorigs($upstreamversion, sub { });
5923 unpack_playtree_need_cd_work($headref);
5925 rmtree("debian/patches");
5927 runcmd @dpkgsource, qw(-b .);
5929 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5930 rename srcfn("$upstreamversion", "/debian/patches"),
5931 "work/debian/patches"
5933 or confess "install d/patches: $!";
5936 commit_quilty_patch();
5939 sub quilt_need_fake_dsc ($) {
5940 # cwd should be playground
5941 my ($upstreamversion) = @_;
5943 return if stat_exists "fake.dsc";
5944 # ^ OK to test this as a sentinel because if we created it
5945 # we must either have done the rest too, or crashed.
5947 my $fakeversion="$upstreamversion-~~DGITFAKE";
5949 my $fakedsc=new IO::File 'fake.dsc', '>' or confess "$!";
5950 print $fakedsc <<END or confess "$!";
5953 Version: $fakeversion
5957 my $dscaddfile=sub {
5960 my $md = new Digest::MD5;
5962 my $fh = new IO::File $leaf, '<' or die "$leaf $!";
5963 stat $fh or confess "$!";
5967 print $fakedsc " ".$md->hexdigest." $size $leaf\n" or confess "$!";
5970 unpack_playtree_linkorigs($upstreamversion, $dscaddfile);
5972 my @files=qw(debian/source/format debian/rules
5973 debian/control debian/changelog);
5974 foreach my $maybe (qw(debian/patches debian/source/options
5975 debian/tests/control)) {
5976 next unless stat_exists "$maindir/$maybe";
5977 push @files, $maybe;
5980 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5981 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5983 $dscaddfile->($debtar);
5984 close $fakedsc or confess "$!";
5987 sub quilt_fakedsc2unapplied ($$) {
5988 my ($headref, $upstreamversion) = @_;
5989 # must be run in the playground
5990 # quilt_need_fake_dsc must have been called
5992 quilt_need_fake_dsc($upstreamversion);
5994 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5996 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5997 rename $fakexdir, "fake" or die "$fakexdir $!";
6001 remove_stray_gits(__ "source package");
6002 mktree_in_ud_here();
6006 rmtree 'debian'; # git checkout commitish paths does not delete!
6007 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
6008 my $unapplied=git_add_write_tree();
6009 printdebug "fake orig tree object $unapplied\n";
6013 sub quilt_check_splitbrain_cache ($$) {
6014 my ($headref, $upstreamversion) = @_;
6015 # Called only if we are in (potentially) split brain mode.
6016 # Called in playground.
6017 # Computes the cache key and looks in the cache.
6018 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
6020 quilt_need_fake_dsc($upstreamversion);
6022 my $splitbrain_cachekey;
6025 "dgit: split brain (separate dgit view) may be needed (--quilt=%s).",
6027 # we look in the reflog of dgit-intern/quilt-cache
6028 # we look for an entry whose message is the key for the cache lookup
6029 my @cachekey = (qw(dgit), $our_version);
6030 push @cachekey, $upstreamversion;
6031 push @cachekey, $quilt_mode;
6032 push @cachekey, $headref;
6033 push @cachekey, $quilt_upstream_commitish // '-';
6035 push @cachekey, hashfile('fake.dsc');
6037 my $srcshash = Digest::SHA->new(256);
6038 my %sfs = ( %INC, '$0(dgit)' => $0 );
6039 foreach my $sfk (sort keys %sfs) {
6040 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
6041 $srcshash->add($sfk," ");
6042 $srcshash->add(hashfile($sfs{$sfk}));
6043 $srcshash->add("\n");
6045 push @cachekey, $srcshash->hexdigest();
6046 $splitbrain_cachekey = "@cachekey";
6048 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
6050 my $cachehit = reflog_cache_lookup
6051 "refs/$splitbraincache", $splitbrain_cachekey;
6054 unpack_playtree_need_cd_work($headref);
6055 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
6056 if ($cachehit ne $headref) {
6057 progress f_ "dgit view: found cached (%s)", $saved;
6058 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
6059 $made_split_brain = 1;
6060 return ($cachehit, $splitbrain_cachekey);
6062 progress __ "dgit view: found cached, no changes required";
6063 return ($headref, $splitbrain_cachekey);
6066 printdebug "splitbrain cache miss\n";
6067 return (undef, $splitbrain_cachekey);
6070 sub baredebian_origtarballs_scan ($$$) {
6071 my ($fakedfi, $upstreamversion, $dir) = @_;
6072 if (!opendir OD, $dir) {
6073 return if $! == ENOENT;
6074 fail "opendir $dir (origs): $!";
6077 while ($!=0, defined(my $leaf = readdir OD)) {
6079 local ($debuglevel) = $debuglevel-1;
6080 printdebug "BDOS $dir $leaf ?\n";
6082 next unless is_orig_file_of_vsn $leaf, $upstreamversion;
6083 next if grep { $_->{Filename} eq $leaf } @$fakedfi;
6086 Path => "$dir/$leaf",
6090 die "$dir; $!" if $!;
6094 sub quilt_fixup_multipatch ($$$) {
6095 my ($clogp, $headref, $upstreamversion, $splitbrain_cachekey) = @_;
6097 progress f_ "examining quilt state (multiple patches, %s mode)",
6101 # - honour any existing .pc in case it has any strangeness
6102 # - determine the git commit corresponding to the tip of
6103 # the patch stack (if there is one)
6104 # - if there is such a git commit, convert each subsequent
6105 # git commit into a quilt patch with dpkg-source --commit
6106 # - otherwise convert all the differences in the tree into
6107 # a single git commit
6111 # Our git tree doesn't necessarily contain .pc. (Some versions of
6112 # dgit would include the .pc in the git tree.) If there isn't
6113 # one, we need to generate one by unpacking the patches that we
6116 # We first look for a .pc in the git tree. If there is one, we
6117 # will use it. (This is not the normal case.)
6119 # Otherwise need to regenerate .pc so that dpkg-source --commit
6120 # can work. We do this as follows:
6121 # 1. Collect all relevant .orig from parent directory
6122 # 2. Generate a debian.tar.gz out of
6123 # debian/{patches,rules,source/format,source/options}
6124 # 3. Generate a fake .dsc containing just these fields:
6125 # Format Source Version Files
6126 # 4. Extract the fake .dsc
6127 # Now the fake .dsc has a .pc directory.
6128 # (In fact we do this in every case, because in future we will
6129 # want to search for a good base commit for generating patches.)
6131 # Then we can actually do the dpkg-source --commit
6132 # 1. Make a new working tree with the same object
6133 # store as our main tree and check out the main
6135 # 2. Copy .pc from the fake's extraction, if necessary
6136 # 3. Run dpkg-source --commit
6137 # 4. If the result has changes to debian/, then
6138 # - git add them them
6139 # - git add .pc if we had a .pc in-tree
6141 # 5. If we had a .pc in-tree, delete it, and git commit
6142 # 6. Back in the main tree, fast forward to the new HEAD
6144 # Another situation we may have to cope with is gbp-style
6145 # patches-unapplied trees.
6147 # We would want to detect these, so we know to escape into
6148 # quilt_fixup_gbp. However, this is in general not possible.
6149 # Consider a package with a one patch which the dgit user reverts
6150 # (with git revert or the moral equivalent).
6152 # That is indistinguishable in contents from a patches-unapplied
6153 # tree. And looking at the history to distinguish them is not
6154 # useful because the user might have made a confusing-looking git
6155 # history structure (which ought to produce an error if dgit can't
6156 # cope, not a silent reintroduction of an unwanted patch).
6158 # So gbp users will have to pass an option. But we can usually
6159 # detect their failure to do so: if the tree is not a clean
6160 # patches-applied tree, quilt linearisation fails, but the tree
6161 # _is_ a clean patches-unapplied tree, we can suggest that maybe
6162 # they want --quilt=unapplied.
6164 # To help detect this, when we are extracting the fake dsc, we
6165 # first extract it with --skip-patches, and then apply the patches
6166 # afterwards with dpkg-source --before-build. That lets us save a
6167 # tree object corresponding to .origs.
6169 if ($quilt_mode eq 'linear'
6170 && branch_is_gdr($headref)) {
6171 # This is much faster. It also makes patches that gdr
6172 # likes better for future updates without laundering.
6174 # However, it can fail in some casses where we would
6175 # succeed: if there are existing patches, which correspond
6176 # to a prefix of the branch, but are not in gbp/gdr
6177 # format, gdr will fail (exiting status 7), but we might
6178 # be able to figure out where to start linearising. That
6179 # will be slower so hopefully there's not much to do.
6181 unpack_playtree_need_cd_work $headref;
6183 my @cmd = (@git_debrebase,
6184 qw(--noop-ok -funclean-mixed -funclean-ordering
6185 make-patches --quiet-would-amend));
6186 # We tolerate soe snags that gdr wouldn't, by default.
6192 and not ($? == 7*256 or
6193 $? == -1 && $!==ENOENT);
6197 $headref = git_rev_parse('HEAD');
6202 my $unapplied=quilt_fakedsc2unapplied($headref, $upstreamversion);
6206 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
6208 if (system @bbcmd) {
6209 failedcmd @bbcmd if $? < 0;
6211 failed to apply your git tree's patch stack (from debian/patches/) to
6212 the corresponding upstream tarball(s). Your source tree and .orig
6213 are probably too inconsistent. dgit can only fix up certain kinds of
6214 anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).
6220 unpack_playtree_need_cd_work($headref);
6223 if (stat_exists ".pc") {
6225 progress __ "Tree already contains .pc - will use it then delete it.";
6228 rename '../fake/.pc','.pc' or confess "$!";
6231 changedir '../fake';
6233 my $oldtiptree=git_add_write_tree();
6234 printdebug "fake o+d/p tree object $unapplied\n";
6235 changedir '../work';
6238 # We calculate some guesswork now about what kind of tree this might
6239 # be. This is mostly for error reporting.
6241 my $tentries = cmdoutput @git, qw(ls-tree --name-only -z), $headref;
6242 my $onlydebian = $tentries eq "debian\0";
6244 my $uheadref = $headref;
6245 my $uhead_whatshort = 'HEAD';
6247 if ($quilt_mode =~ m/baredebian\+tarball/) {
6248 # We need to make a tarball import. Yuk.
6249 # We want to do this here so that we have a $uheadref value
6252 baredebian_origtarballs_scan \@fakedfi, $upstreamversion, bpd_abs();
6253 baredebian_origtarballs_scan \@fakedfi, $upstreamversion,
6254 "$maindir/.." unless $buildproductsdir eq '..';
6257 my @tartrees = import_tarball_tartrees $upstreamversion, \@fakedfi;
6259 fail __ "baredebian quilt fixup: could not find any origs"
6263 my ($authline, $r1authline, $clogp,) =
6264 import_tarball_commits \@tartrees, $upstreamversion;
6266 if (@tartrees == 1) {
6267 $uheadref = $tartrees[0]{Commit};
6268 # TRANSLATORS: this translation must fit in the ASCII art
6269 # quilt differences display. The untranslated display
6270 # says %9.9s, so with that display it must be at most 9
6272 $uhead_whatshort = __ 'tarball';
6274 # on .dsc import we do not make a separate commit, but
6275 # here we need to do so
6276 rm_subdir_cached '.';
6278 foreach my $ti (@tartrees) {
6279 my $c = $ti->{Commit};
6280 if ($ti->{OrigPart} eq 'orig') {
6281 runcmd qw(git read-tree), $c;
6282 } elsif ($ti->{OrigPart} =~ m/orig-/) {
6283 read_tree_subdir $', $c;
6285 confess "$ti->OrigPart} ?"
6287 $parents .= "parent $c\n";
6289 my $tree = git_write_tree();
6290 my $mbody = f_ 'Combine orig tarballs for %s %s',
6291 $package, $upstreamversion;
6292 $uheadref = hash_commit_text <<END;
6294 ${parents}author $r1authline
6295 committer $r1authline
6299 [dgit import tarballs combine $package $upstreamversion]
6301 # TRANSLATORS: this translation must fit in the ASCII art
6302 # quilt differences display. The untranslated display
6303 # says %9.9s, so with that display it must be at most 9
6304 # characters. This fragmentt is referring to multiple
6305 # orig tarballs in a source package.
6306 $uhead_whatshort = __ 'tarballs';
6308 runcmd @git, qw(reset -q);
6310 $quilt_upstream_commitish = $uheadref;
6311 $quilt_upstream_commitish_used = '*orig*';
6312 $quilt_upstream_commitish_message = '';
6314 if ($quilt_mode =~ m/baredebian$/) {
6315 $uheadref = $quilt_upstream_commitish;
6316 # TRANSLATORS: this translation must fit in the ASCII art
6317 # quilt differences display. The untranslated display
6318 # says %9.9s, so with that display it must be at most 9
6320 $uhead_whatshort = __ 'upstream';
6327 # O = orig, without patches applied
6328 # A = "applied", ie orig with H's debian/patches applied
6329 O2H => quiltify_trees_differ($unapplied,$uheadref, 1,
6330 \%editedignores, \@unrepres),
6331 H2A => quiltify_trees_differ($uheadref, $oldtiptree,1),
6332 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
6336 foreach my $bits (qw(01 02)) {
6337 foreach my $v (qw(O2H O2A H2A)) {
6338 push @dl, ($diffbits->{$v} & $bits) ? '##' : '==';
6341 printdebug "differences \@dl @dl.\n";
6344 "%s: base trees orig=%.20s o+d/p=%.20s",
6345 $us, $unapplied, $oldtiptree;
6346 # TRANSLATORS: Try to keep this ascii-art layout right. The 0s in
6347 # %9.00009s will be ignored and are there to make the format the
6348 # same length (9 characters) as the output it generates. If you
6349 # change the value 9, your translations of "upstream" and
6350 # 'tarball' must fit into the new length, and you should change
6351 # the number of 0s. Do not reduce it below 4 as HEAD has to fit
6354 "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
6355 "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p",
6356 $us, $dl[0], $dl[1], $dl[3], $dl[4],
6357 $us, $uhead_whatshort, $dl[2], $uhead_whatshort, $dl[5];
6359 if (@unrepres && $quilt_mode !~ m/baredebian/) {
6360 # With baredebian, even if the upstream commitish has this
6361 # problem, we don't want to print this message, as nothing
6362 # is going to try to make a patch out of it anyway.
6363 print STDERR f_ "dgit: cannot represent change: %s: %s\n",
6366 forceable_fail [qw(unrepresentable)], __ <<END;
6367 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
6373 push @failsuggestion, [ 'onlydebian', __
6374 "This has only a debian/ directory; you probably want --quilt=bare debian." ]
6375 unless $quilt_mode =~ m/baredebian/;
6376 } elsif (!($diffbits->{O2H} & $diffbits->{O2A})) {
6377 push @failsuggestion, [ 'unapplied', __
6378 "This might be a patches-unapplied branch." ];
6379 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
6380 push @failsuggestion, [ 'applied', __
6381 "This might be a patches-applied branch." ];
6383 push @failsuggestion, [ 'quilt-mode', __
6384 "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" ];
6386 push @failsuggestion, [ 'gitattrs', __
6387 "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." ]
6388 if stat_exists '.gitattributes';
6390 push @failsuggestion, [ 'origs', __
6391 "Maybe orig tarball(s) are not identical to git representation?" ]
6392 unless $onlydebian && $quilt_mode !~ m/baredebian/;
6393 # ^ in that case, we didn't really look properly
6395 if (quiltmode_splitting()) {
6396 quiltify_splitting($clogp, $unapplied, $headref, $oldtiptree,
6397 $diffbits, \%editedignores,
6398 $splitbrain_cachekey);
6402 progress f_ "starting quiltify (multiple patches, %s mode)", $quilt_mode;
6403 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
6404 runcmd @git, qw(checkout -q), (qw(master dgit-view)[do_split_brain()]);
6406 if (!open P, '>>', ".pc/applied-patches") {
6407 $!==&ENOENT or confess "$!";
6412 commit_quilty_patch();
6414 if ($mustdeletepc) {
6415 quilt_fixup_delete_pc();
6419 sub quilt_fixup_editor () {
6420 my $descfn = $ENV{$fakeeditorenv};
6421 my $editing = $ARGV[$#ARGV];
6422 open I1, '<', $descfn or confess "$descfn: $!";
6423 open I2, '<', $editing or confess "$editing: $!";
6424 unlink $editing or confess "$editing: $!";
6425 open O, '>', $editing or confess "$editing: $!";
6426 while (<I1>) { print O or confess "$!"; } I1->error and confess "$!";
6429 $copying ||= m/^\-\-\- /;
6430 next unless $copying;
6431 print O or confess "$!";
6433 I2->error and confess "$!";
6438 sub maybe_apply_patches_dirtily () {
6439 return unless $quilt_mode =~ m/gbp|unapplied|baredebian/;
6440 print STDERR __ <<END or confess "$!";
6442 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
6443 dgit: Have to apply the patches - making the tree dirty.
6444 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
6447 $patches_applied_dirtily = 01;
6448 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
6449 runcmd qw(dpkg-source --before-build .);
6452 sub maybe_unapply_patches_again () {
6453 progress __ "dgit: Unapplying patches again to tidy up the tree."
6454 if $patches_applied_dirtily;
6455 runcmd qw(dpkg-source --after-build .)
6456 if $patches_applied_dirtily & 01;
6458 if $patches_applied_dirtily & 02;
6459 $patches_applied_dirtily = 0;
6462 #----- other building -----
6464 sub clean_tree_check_git ($$$) {
6465 my ($honour_ignores, $message, $ignmessage) = @_;
6466 my @cmd = (@git, qw(clean -dn));
6467 push @cmd, qw(-x) unless $honour_ignores;
6468 my $leftovers = cmdoutput @cmd;
6469 if (length $leftovers) {
6470 print STDERR $leftovers, "\n" or confess "$!";
6471 $message .= $ignmessage if $honour_ignores;
6476 sub clean_tree_check_git_wd ($) {
6478 return if $cleanmode =~ m{no-check};
6479 return if $patches_applied_dirtily; # yuk
6480 clean_tree_check_git +($cleanmode !~ m{all-check}),
6481 $message, "\n".__ <<END;
6482 If this is just missing .gitignore entries, use a different clean
6483 mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them
6484 or --clean=git (-wg/-wgf) to use \`git clean' instead.
6488 sub clean_tree_check () {
6489 # This function needs to not care about modified but tracked files.
6490 # That was done by check_not_dirty, and by now we may have run
6491 # the rules clean target which might modify tracked files (!)
6492 if ($cleanmode =~ m{^check}) {
6493 clean_tree_check_git +($cleanmode =~ m{ignores}), __
6494 "tree contains uncommitted files and --clean=check specified", '';
6495 } elsif ($cleanmode =~ m{^dpkg-source}) {
6496 clean_tree_check_git_wd __
6497 "tree contains uncommitted files (NB dgit didn't run rules clean)";
6498 } elsif ($cleanmode =~ m{^git}) {
6499 clean_tree_check_git 1, __
6500 "tree contains uncommited, untracked, unignored files\n".
6501 "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.", '';
6502 } elsif ($cleanmode eq 'none') {
6504 confess "$cleanmode ?";
6509 # We always clean the tree ourselves, rather than leave it to the
6510 # builder (dpkg-source, or soemthing which calls dpkg-source).
6511 if ($quilt_mode =~ m/baredebian/ and $cleanmode =~ m/git/) {
6512 fail f_ <<END, $quilt_mode, $cleanmode;
6513 quilt mode %s (generally needs untracked upstream files)
6514 contradicts clean mode %s (which would delete them)
6516 # This is not 100% true: dgit build-source and push-source
6517 # (for example) could operate just fine with no upstream
6518 # source in the working tree. But it doesn't seem likely that
6519 # the user wants dgit to proactively delete such things.
6520 # -wn, for example, would produce identical output without
6521 # deleting anything from the working tree.
6523 if ($cleanmode =~ m{^dpkg-source}) {
6524 my @cmd = @dpkgbuildpackage;
6525 push @cmd, qw(-d) if $cleanmode =~ m{^dpkg-source-d};
6526 push @cmd, qw(-T clean);
6527 maybe_apply_patches_dirtily();
6528 runcmd_ordryrun_local @cmd;
6529 clean_tree_check_git_wd __
6530 "tree contains uncommitted files (after running rules clean)";
6531 } elsif ($cleanmode =~ m{^git(?!-)}) {
6532 runcmd_ordryrun_local @git, qw(clean -xdf);
6533 } elsif ($cleanmode =~ m{^git-ff}) {
6534 runcmd_ordryrun_local @git, qw(clean -xdff);
6535 } elsif ($cleanmode =~ m{^check}) {
6537 } elsif ($cleanmode eq 'none') {
6539 confess "$cleanmode ?";
6544 badusage __ "clean takes no additional arguments" if @ARGV;
6547 maybe_unapply_patches_again();
6550 # return values from massage_dbp_args are one or both of these flags
6551 sub WANTSRC_SOURCE () { 01; } # caller should build source (separately)
6552 sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
6554 sub build_or_push_prep_early () {
6555 our $build_or_push_prep_early_done //= 0;
6556 return if $build_or_push_prep_early_done++;
6557 badusage f_ "-p is not allowed with dgit %s", $subcommand
6558 if defined $package;
6559 my $clogp = parsechangelog();
6560 $isuite = getfield $clogp, 'Distribution';
6561 $package = getfield $clogp, 'Source';
6562 $version = getfield $clogp, 'Version';
6563 $dscfn = dscfn($version);
6566 sub build_or_push_prep_modes () {
6567 my ($format,) = determine_whether_split_brain();
6569 fail __ "dgit: --include-dirty is not supported with split view".
6570 " (including with view-splitting quilt modes)"
6571 if do_split_brain() && $includedirty;
6573 if (madformat_wantfixup $format and $quilt_mode =~ m/baredebian$/) {
6574 ($quilt_upstream_commitish, $quilt_upstream_commitish_used,
6575 $quilt_upstream_commitish_message)
6576 = resolve_upstream_version
6577 $quilt_upstream_commitish, upstreamversion $version;
6578 progress f_ "dgit: --quilt=%s, %s", $quilt_mode,
6579 $quilt_upstream_commitish_message;
6580 } elsif (defined $quilt_upstream_commitish) {
6582 "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
6586 sub build_prep_early () {
6587 build_or_push_prep_early();
6589 build_or_push_prep_modes();
6593 sub build_prep ($) {
6597 if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)
6598 # Clean the tree because we're going to use the contents of
6599 # $maindir. (We trying to include dirty changes in the source
6600 # package, or we are running the builder in $maindir.)
6601 || $cleanmode =~ m{always}) {
6602 # Or because the user asked us to.
6605 # We don't actually need to do anything in $maindir, but we
6606 # should do some kind of cleanliness check because (i) the
6607 # user may have forgotten a `git add', and (ii) if the user
6608 # said -wc we should still do the check.
6611 build_check_quilt_splitbrain();
6613 my $pat = changespat $version;
6614 foreach my $f (glob "$buildproductsdir/$pat") {
6617 fail f_ "remove old changes file %s: %s", $f, $!;
6619 progress f_ "would remove %s", $f;
6625 sub changesopts_initial () {
6626 my @opts =@changesopts[1..$#changesopts];
6629 sub changesopts_version () {
6630 if (!defined $changes_since_version) {
6633 @vsns = archive_query('archive_query');
6634 my @quirk = access_quirk();
6635 if ($quirk[0] eq 'backports') {
6636 local $isuite = $quirk[2];
6638 canonicalise_suite();
6639 push @vsns, archive_query('archive_query');
6645 "archive query failed (queried because --since-version not specified)";
6648 @vsns = map { $_->[0] } @vsns;
6649 @vsns = sort { -version_compare($a, $b) } @vsns;
6650 $changes_since_version = $vsns[0];
6651 progress f_ "changelog will contain changes since %s", $vsns[0];
6653 $changes_since_version = '_';
6654 progress __ "package seems new, not specifying -v<version>";
6657 if ($changes_since_version ne '_') {
6658 return ("-v$changes_since_version");
6664 sub changesopts () {
6665 return (changesopts_initial(), changesopts_version());
6668 sub massage_dbp_args ($;$) {
6669 my ($cmd,$xargs) = @_;
6670 # Since we split the source build out so we can do strange things
6671 # to it, massage the arguments to dpkg-buildpackage so that the
6672 # main build doessn't build source (or add an argument to stop it
6673 # building source by default).
6674 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6675 # -nc has the side effect of specifying -b if nothing else specified
6676 # and some combinations of -S, -b, et al, are errors, rather than
6677 # later simply overriding earlie. So we need to:
6678 # - search the command line for these options
6679 # - pick the last one
6680 # - perhaps add our own as a default
6681 # - perhaps adjust it to the corresponding non-source-building version
6683 foreach my $l ($cmd, $xargs) {
6685 @$l = grep { !(m/^-[SgGFABb]$|^--build=/s and $dmode=$_) } @$l;
6688 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6689 my $r = WANTSRC_BUILDER;
6690 printdebug "massage split $dmode.\n";
6691 if ($dmode =~ s/^--build=//) {
6693 my @d = split /,/, $dmode;
6694 $r |= WANTSRC_SOURCE if grep { s/^full$/binary/ } @d;
6695 $r |= WANTSRC_SOURCE if grep { s/^source$// } @d;
6696 $r |= WANTSRC_BUILDER if grep { m/./ } @d;
6697 fail __ "Wanted to build nothing!" unless $r;
6698 $dmode = '--build='. join ',', grep m/./, @d;
6701 $dmode =~ m/[S]/ ? WANTSRC_SOURCE :
6702 $dmode =~ y/gGF/ABb/ ? WANTSRC_SOURCE | WANTSRC_BUILDER :
6703 $dmode =~ m/[ABb]/ ? WANTSRC_BUILDER :
6706 printdebug "massage done $r $dmode.\n";
6708 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6714 my $wasdir = must_getcwd();
6715 changedir $buildproductsdir;
6720 # this sub must run with CWD=$buildproductsdir (eg in in_bpd)
6721 sub postbuild_mergechanges ($) {
6722 my ($msg_if_onlyone) = @_;
6723 # If there is only one .changes file, fail with $msg_if_onlyone,
6724 # or if that is undef, be a no-op.
6725 # Returns the changes file to report to the user.
6726 my $pat = changespat $version;
6727 my @changesfiles = grep { !m/_multi\.changes/ } glob $pat;
6728 @changesfiles = sort {
6729 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6733 if (@changesfiles==1) {
6734 fail +(f_ <<END, "@changesfiles").$msg_if_onlyone
6735 only one changes file from build (%s)
6737 if defined $msg_if_onlyone;
6738 $result = $changesfiles[0];
6739 } elsif (@changesfiles==2) {
6740 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6741 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6742 fail f_ "%s found in binaries changes file %s", $l, $binchanges
6745 runcmd_ordryrun_local @mergechanges, @changesfiles;
6746 my $multichanges = changespat $version,'multi';
6748 stat_exists $multichanges or fail f_
6749 "%s unexpectedly not created by build", $multichanges;
6750 foreach my $cf (glob $pat) {
6751 next if $cf eq $multichanges;
6752 rename "$cf", "$cf.inmulti" or fail f_
6753 "install new changes %s\{,.inmulti}: %s", $cf, $!;
6756 $result = $multichanges;
6758 fail f_ "wrong number of different changes files (%s)",
6761 printdone f_ "build successful, results in %s\n", $result
6765 sub midbuild_checkchanges () {
6766 my $pat = changespat $version;
6767 return if $rmchanges;
6768 my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
6770 $_ ne changespat $version,'source' and
6771 $_ ne changespat $version,'multi'
6773 fail +(f_ <<END, $pat, "@unwanted")
6774 changes files other than source matching %s already present; building would result in ambiguity about the intended results.
6775 Suggest you delete %s.
6780 sub midbuild_checkchanges_vanilla ($) {
6782 midbuild_checkchanges() if $wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER);
6785 sub postbuild_mergechanges_vanilla ($) {
6787 if ($wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER)) {
6789 postbuild_mergechanges(undef);
6792 printdone __ "build successful\n";
6798 $buildproductsdir eq '..' or print STDERR +(f_ <<END, $us, $us);
6799 %s: warning: build-products-dir set, but not supported by dpkg-buildpackage
6800 %s: warning: build-products-dir will be ignored; files will go to ..
6802 $buildproductsdir = '..';
6803 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6804 my $wantsrc = massage_dbp_args \@dbp;
6805 build_prep($wantsrc);
6806 if ($wantsrc & WANTSRC_SOURCE) {
6808 midbuild_checkchanges_vanilla $wantsrc;
6810 if ($wantsrc & WANTSRC_BUILDER) {
6811 push @dbp, changesopts_version();
6812 maybe_apply_patches_dirtily();
6813 runcmd_ordryrun_local @dbp;
6815 maybe_unapply_patches_again();
6816 postbuild_mergechanges_vanilla $wantsrc;
6820 $quilt_mode //= 'gbp';
6826 # gbp can make .origs out of thin air. In my tests it does this
6827 # even for a 1.0 format package, with no origs present. So I
6828 # guess it keys off just the version number. We don't know
6829 # exactly what .origs ought to exist, but let's assume that we
6830 # should run gbp if: the version has an upstream part and the main
6832 my $upstreamversion = upstreamversion $version;
6833 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6834 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "$bpd_glob/$origfnpat");
6836 if ($gbp_make_orig) {
6838 $cleanmode = 'none'; # don't do it again
6841 my @dbp = @dpkgbuildpackage;
6843 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6845 if (!length $gbp_build[0]) {
6846 if (length executable_on_path('git-buildpackage')) {
6847 $gbp_build[0] = qw(git-buildpackage);
6849 $gbp_build[0] = 'gbp buildpackage';
6852 my @cmd = opts_opt_multi_cmd [], @gbp_build;
6854 push @cmd, (qw(-us -uc --git-no-sign-tags),
6855 "--git-builder=".(shellquote @dbp));
6857 if ($gbp_make_orig) {
6858 my $priv = dgit_privdir();
6859 my $ok = "$priv/origs-gen-ok";
6860 unlink $ok or $!==&ENOENT or confess "$!";
6861 my @origs_cmd = @cmd;
6862 push @origs_cmd, qw(--git-cleaner=true);
6863 push @origs_cmd, "--git-prebuild=".
6864 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6865 push @origs_cmd, @ARGV;
6867 debugcmd @origs_cmd;
6869 do { local $!; stat_exists $ok; }
6870 or failedcmd @origs_cmd;
6872 dryrun_report @origs_cmd;
6876 build_prep($wantsrc);
6877 if ($wantsrc & WANTSRC_SOURCE) {
6879 midbuild_checkchanges_vanilla $wantsrc;
6881 push @cmd, '--git-cleaner=true';
6883 maybe_unapply_patches_again();
6884 if ($wantsrc & WANTSRC_BUILDER) {
6885 push @cmd, changesopts();
6886 runcmd_ordryrun_local @cmd, @ARGV;
6888 postbuild_mergechanges_vanilla $wantsrc;
6890 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6892 sub building_source_in_playtree {
6893 # If $includedirty, we have to build the source package from the
6894 # working tree, not a playtree, so that uncommitted changes are
6895 # included (copying or hardlinking them into the playtree could
6898 # Note that if we are building a source package in split brain
6899 # mode we do not support including uncommitted changes, because
6900 # that makes quilt fixup too hard. I.e. ($made_split_brain && (dgit is
6901 # building a source package)) => !$includedirty
6902 return !$includedirty;
6906 $sourcechanges = changespat $version,'source';
6908 unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
6909 or fail f_ "remove %s: %s", $sourcechanges, $!;
6911 # confess unless !!$made_split_brain == do_split_brain();
6913 my @cmd = (@dpkgsource, qw(-b --));
6915 if (building_source_in_playtree()) {
6917 my $headref = git_rev_parse('HEAD');
6918 # If we are in split brain, there is already a playtree with
6919 # the thing we should package into a .dsc (thanks to quilt
6920 # fixup). If not, make a playtree
6921 prep_ud() unless $made_split_brain;
6922 changedir $playground;
6923 unless ($made_split_brain) {
6924 my $upstreamversion = upstreamversion $version;
6925 unpack_playtree_linkorigs($upstreamversion, sub { });
6926 unpack_playtree_need_cd_work($headref);
6930 $leafdir = basename $maindir;
6932 if ($buildproductsdir ne '..') {
6933 # Well, we are going to run dpkg-source -b which consumes
6934 # origs from .. and generates output there. To make this
6935 # work when the bpd is not .. , we would have to (i) link
6936 # origs from bpd to .. , (ii) check for files that
6937 # dpkg-source -b would/might overwrite, and afterwards
6938 # (iii) move all the outputs back to the bpd (iv) except
6939 # for the origs which should be deleted from .. if they
6940 # weren't there beforehand. And if there is an error and
6941 # we don't run to completion we would necessarily leave a
6942 # mess. This is too much. The real way to fix this
6943 # is for dpkg-source to have bpd support.
6944 confess unless $includedirty;
6946 "--include-dirty not supported with --build-products-dir, sorry";
6951 runcmd_ordryrun_local @cmd, $leafdir;
6954 runcmd_ordryrun_local qw(sh -ec),
6955 'exec >../$1; shift; exec "$@"','x', $sourcechanges,
6956 @dpkggenchanges, qw(-S), changesopts();
6959 printdebug "moving $dscfn, $sourcechanges, etc. to ".bpd_abs()."\n";
6960 $dsc = parsecontrol($dscfn, "source package");
6964 printdebug " renaming ($why) $l\n";
6965 rename_link_xf 0, "$l", bpd_abs()."/$l"
6966 or fail f_ "put in place new built file (%s): %s", $l, $@;
6968 foreach my $l (split /\n/, getfield $dsc, 'Files') {
6969 $l =~ m/\S+$/ or next;
6972 $mv->('dsc', $dscfn);
6973 $mv->('changes', $sourcechanges);
6978 sub cmd_build_source {
6979 badusage __ "build-source takes no additional arguments" if @ARGV;
6980 build_prep(WANTSRC_SOURCE);
6982 maybe_unapply_patches_again();
6983 printdone f_ "source built, results in %s and %s",
6984 $dscfn, $sourcechanges;
6987 sub cmd_push_source {
6990 "dgit push-source: --include-dirty/--ignore-dirty does not make".
6991 "sense with push-source!"
6993 build_check_quilt_splitbrain();
6995 my $changes = parsecontrol("$buildproductsdir/$changesfile",
6996 __ "source changes file");
6997 unless (test_source_only_changes($changes)) {
6998 fail __ "user-specified changes file is not source-only";
7001 # Building a source package is very fast, so just do it
7003 confess "er, patches are applied dirtily but shouldn't be.."
7004 if $patches_applied_dirtily;
7005 $changesfile = $sourcechanges;
7010 sub binary_builder {
7011 my ($bbuilder, $pbmc_msg, @args) = @_;
7012 build_prep(WANTSRC_SOURCE);
7014 midbuild_checkchanges();
7017 stat_exists $dscfn or fail f_
7018 "%s (in build products dir): %s", $dscfn, $!;
7019 stat_exists $sourcechanges or fail f_
7020 "%s (in build products dir): %s", $sourcechanges, $!;
7022 runcmd_ordryrun_local @$bbuilder, @args;
7024 maybe_unapply_patches_again();
7026 postbuild_mergechanges($pbmc_msg);
7032 binary_builder(\@sbuild, (__ <<END), qw(-d), $isuite, @ARGV, $dscfn);
7033 perhaps you need to pass -A ? (sbuild's default is to build only
7034 arch-specific binaries; dgit 1.4 used to override that.)
7039 my ($pbuilder) = @_;
7041 # @ARGV is allowed to contain only things that should be passed to
7042 # pbuilder under debbuildopts; just massage those
7043 my $wantsrc = massage_dbp_args \@ARGV;
7045 "you asked for a builder but your debbuildopts didn't ask for".
7046 " any binaries -- is this really what you meant?"
7047 unless $wantsrc & WANTSRC_BUILDER;
7049 "we must build a .dsc to pass to the builder but your debbuiltopts".
7050 " forbids the building of a source package; cannot continue"
7051 unless $wantsrc & WANTSRC_SOURCE;
7052 # We do not want to include the verb "build" in @pbuilder because
7053 # the user can customise @pbuilder and they shouldn't be required
7054 # to include "build" in their customised value. However, if the
7055 # user passes any additional args to pbuilder using the dgit
7056 # option --pbuilder:foo, such args need to come after the "build"
7057 # verb. opts_opt_multi_cmd does all of that.
7058 binary_builder([opts_opt_multi_cmd ["build"], @$pbuilder], undef,
7059 qw(--debbuildopts), "@ARGV", qw(--distribution), $isuite,
7064 pbuilder(\@pbuilder);
7067 sub cmd_cowbuilder {
7068 pbuilder(\@cowbuilder);
7071 sub cmd_quilt_fixup {
7072 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
7075 build_maybe_quilt_fixup();
7078 sub cmd_print_unapplied_treeish {
7079 badusage __ "incorrect arguments to dgit print-unapplied-treeish"
7081 my $headref = git_rev_parse('HEAD');
7082 my $clogp = commit_getclogp $headref;
7083 $package = getfield $clogp, 'Source';
7084 $version = getfield $clogp, 'Version';
7085 $isuite = getfield $clogp, 'Distribution';
7086 $csuite = $isuite; # we want this to be offline!
7090 changedir $playground;
7091 my $uv = upstreamversion $version;
7092 my $u = quilt_fakedsc2unapplied($headref, $uv);
7093 print $u, "\n" or confess "$!";
7096 sub import_dsc_result {
7097 my ($dstref, $newhash, $what_log, $what_msg) = @_;
7098 my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
7100 check_gitattrs($newhash, __ "source tree");
7102 progress f_ "dgit: import-dsc: %s", $what_msg;
7105 sub cmd_import_dsc {
7109 last unless $ARGV[0] =~ m/^-/;
7112 if (m/^--require-valid-signature$/) {
7115 badusage f_ "unknown dgit import-dsc sub-option \`%s'", $_;
7119 badusage __ "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
7121 my ($dscfn, $dstbranch) = @ARGV;
7123 badusage __ "dry run makes no sense with import-dsc"
7126 my $force = $dstbranch =~ s/^\+// ? +1 :
7127 $dstbranch =~ s/^\.\.// ? -1 :
7129 my $info = $force ? " $&" : '';
7130 $info = "$dscfn$info";
7132 my $specbranch = $dstbranch;
7133 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
7134 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
7136 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
7137 my $chead = cmdoutput_errok @symcmd;
7138 defined $chead or $?==256 or failedcmd @symcmd;
7140 fail f_ "%s is checked out - will not update it", $dstbranch
7141 if defined $chead and $chead eq $dstbranch;
7143 my $oldhash = git_get_ref $dstbranch;
7145 open D, "<", $dscfn or fail f_ "open import .dsc (%s): %s", $dscfn, $!;
7146 $dscdata = do { local $/ = undef; <D>; };
7147 D->error and fail f_ "read %s: %s", $dscfn, $!;
7150 # we don't normally need this so import it here
7151 use Dpkg::Source::Package;
7152 my $dp = new Dpkg::Source::Package filename => $dscfn,
7153 require_valid_signature => $needsig;
7155 local $SIG{__WARN__} = sub {
7157 return unless $needsig;
7158 fail __ "import-dsc signature check failed";
7160 if (!$dp->is_signed()) {
7161 warn f_ "%s: warning: importing unsigned .dsc\n", $us;
7163 my $r = $dp->check_signature();
7164 confess "->check_signature => $r" if $needsig && $r;
7170 $package = getfield $dsc, 'Source';
7172 parse_dsc_field($dsc, __ "Dgit metadata in .dsc")
7173 unless forceing [qw(import-dsc-with-dgit-field)];
7174 parse_dsc_field_def_dsc_distro();
7176 $isuite = 'DGIT-IMPORT-DSC';
7177 $idistro //= $dsc_distro;
7181 if (defined $dsc_hash) {
7183 "dgit: import-dsc of .dsc with Dgit field, using git hash";
7184 resolve_dsc_field_commit undef, undef;
7186 if (defined $dsc_hash) {
7187 my @cmd = (qw(sh -ec),
7188 "echo $dsc_hash | git cat-file --batch-check");
7189 my $objgot = cmdoutput @cmd;
7190 if ($objgot =~ m#^\w+ missing\b#) {
7191 fail f_ <<END, $dsc_hash
7192 .dsc contains Dgit field referring to object %s
7193 Your git tree does not have that object. Try `git fetch' from a
7194 plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.
7197 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
7199 progress __ "Not fast forward, forced update.";
7201 fail f_ "Not fast forward to %s", $dsc_hash;
7204 import_dsc_result $dstbranch, $dsc_hash,
7205 "dgit import-dsc (Dgit): $info",
7206 f_ "updated git ref %s", $dstbranch;
7210 fail f_ <<END, $dstbranch, $specbranch, $specbranch
7211 Branch %s already exists
7212 Specify ..%s for a pseudo-merge, binding in existing history
7213 Specify +%s to overwrite, discarding existing history
7215 if $oldhash && !$force;
7217 my @dfi = dsc_files_info();
7218 foreach my $fi (@dfi) {
7219 my $f = $fi->{Filename};
7220 # We transfer all the pieces of the dsc to the bpd, not just
7221 # origs. This is by analogy with dgit fetch, which wants to
7222 # keep them somewhere to avoid downloading them again.
7223 # We make symlinks, though. If the user wants copies, then
7224 # they can copy the parts of the dsc to the bpd using dcmd,
7226 my $here = "$buildproductsdir/$f";
7231 fail f_ "lstat %s works but stat gives %s !", $here, $!;
7233 fail f_ "stat %s: %s", $here, $! unless $! == ENOENT;
7234 printdebug "not in bpd, $f ...\n";
7235 # $f does not exist in bpd, we need to transfer it
7237 $there =~ s{[^/]+$}{$f} or confess "$there ?";
7238 # $there is file we want, relative to user's cwd, or abs
7239 printdebug "not in bpd, $f, test $there ...\n";
7240 stat $there or fail f_
7241 "import %s requires %s, but: %s", $dscfn, $there, $!;
7242 if ($there =~ m#^(?:\./+)?\.\./+#) {
7243 # $there is relative to user's cwd
7244 my $there_from_parent = $';
7245 if ($buildproductsdir !~ m{^/}) {
7246 # abs2rel, despite its name, can take two relative paths
7247 $there = File::Spec->abs2rel($there,$buildproductsdir);
7248 # now $there is relative to bpd, great
7249 printdebug "not in bpd, $f, abs2rel, $there ...\n";
7251 $there = (dirname $maindir)."/$there_from_parent";
7252 # now $there is absoute
7253 printdebug "not in bpd, $f, rel2rel, $there ...\n";
7255 } elsif ($there =~ m#^/#) {
7256 # $there is absolute already
7257 printdebug "not in bpd, $f, abs, $there ...\n";
7260 "cannot import %s which seems to be inside working tree!",
7263 symlink $there, $here or fail f_
7264 "symlink %s to %s: %s", $there, $here, $!;
7265 progress f_ "made symlink %s -> %s", $here, $there;
7266 # print STDERR Dumper($fi);
7268 my @mergeinputs = generate_commits_from_dsc();
7269 die unless @mergeinputs == 1;
7271 my $newhash = $mergeinputs[0]{Commit};
7276 "Import, forced update - synthetic orphan git history.";
7277 } elsif ($force < 0) {
7278 progress __ "Import, merging.";
7279 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
7280 my $version = getfield $dsc, 'Version';
7281 my $clogp = commit_getclogp $newhash;
7282 my $authline = clogp_authline $clogp;
7283 $newhash = hash_commit_text <<ENDU
7291 .(f_ <<END, $package, $version, $dstbranch);
7292 Merge %s (%s) import into %s
7295 die; # caught earlier
7299 import_dsc_result $dstbranch, $newhash,
7300 "dgit import-dsc: $info",
7301 f_ "results are in git ref %s", $dstbranch;
7304 sub pre_archive_api_query () {
7305 not_necessarily_a_tree();
7307 sub cmd_archive_api_query {
7308 badusage __ "need only 1 subpath argument" unless @ARGV==1;
7309 my ($subpath) = @ARGV;
7310 local $isuite = 'DGIT-API-QUERY-CMD';
7311 my @cmd = archive_api_query_cmd($subpath);
7314 exec @cmd or fail f_ "exec curl: %s\n", $!;
7317 sub repos_server_url () {
7318 $package = '_dgit-repos-server';
7319 local $access_forpush = 1;
7320 local $isuite = 'DGIT-REPOS-SERVER';
7321 my $url = access_giturl();
7324 sub pre_clone_dgit_repos_server () {
7325 not_necessarily_a_tree();
7327 sub cmd_clone_dgit_repos_server {
7328 badusage __ "need destination argument" unless @ARGV==1;
7329 my ($destdir) = @ARGV;
7330 my $url = repos_server_url();
7331 my @cmd = (@git, qw(clone), $url, $destdir);
7333 exec @cmd or fail f_ "exec git clone: %s\n", $!;
7336 sub pre_print_dgit_repos_server_source_url () {
7337 not_necessarily_a_tree();
7339 sub cmd_print_dgit_repos_server_source_url {
7341 "no arguments allowed to dgit print-dgit-repos-server-source-url"
7343 my $url = repos_server_url();
7344 print $url, "\n" or confess "$!";
7347 sub pre_print_dpkg_source_ignores {
7348 not_necessarily_a_tree();
7350 sub cmd_print_dpkg_source_ignores {
7352 "no arguments allowed to dgit print-dpkg-source-ignores"
7354 print "@dpkg_source_ignores\n" or confess "$!";
7357 sub cmd_setup_mergechangelogs {
7358 badusage __ "no arguments allowed to dgit setup-mergechangelogs"
7360 local $isuite = 'DGIT-SETUP-TREE';
7361 setup_mergechangelogs(1);
7364 sub cmd_setup_useremail {
7365 badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
7366 local $isuite = 'DGIT-SETUP-TREE';
7370 sub cmd_setup_gitattributes {
7371 badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
7372 local $isuite = 'DGIT-SETUP-TREE';
7376 sub cmd_setup_new_tree {
7377 badusage __ "no arguments allowed to dgit setup-tree" if @ARGV;
7378 local $isuite = 'DGIT-SETUP-TREE';
7382 #---------- argument parsing and main program ----------
7385 print "dgit version $our_version\n" or confess "$!";
7389 our (%valopts_long, %valopts_short);
7390 our (%funcopts_long);
7392 our (@modeopt_cfgs);
7394 sub defvalopt ($$$$) {
7395 my ($long,$short,$val_re,$how) = @_;
7396 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
7397 $valopts_long{$long} = $oi;
7398 $valopts_short{$short} = $oi;
7399 # $how subref should:
7400 # do whatever assignemnt or thing it likes with $_[0]
7401 # if the option should not be passed on to remote, @rvalopts=()
7402 # or $how can be a scalar ref, meaning simply assign the value
7405 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
7406 defvalopt '--distro', '-d', '.+', \$idistro;
7407 defvalopt '', '-k', '.+', \$keyid;
7408 defvalopt '--existing-package','', '.*', \$existing_package;
7409 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
7410 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
7411 defvalopt '--package', '-p', $package_re, \$package;
7412 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
7414 defvalopt '', '-C', '.+', sub {
7415 ($changesfile) = (@_);
7416 if ($changesfile =~ s#^(.*)/##) {
7417 $buildproductsdir = $1;
7421 defvalopt '--initiator-tempdir','','.*', sub {
7422 ($initiator_tempdir) = (@_);
7423 $initiator_tempdir =~ m#^/# or
7424 badusage __ "--initiator-tempdir must be used specify an".
7425 " absolute, not relative, directory."
7428 sub defoptmodes ($@) {
7429 my ($varref, $cfgkey, $default, %optmap) = @_;
7431 while (my ($opt,$val) = each %optmap) {
7432 $funcopts_long{$opt} = sub { $$varref = $val; };
7433 $permit{$val} = $val;
7435 push @modeopt_cfgs, {
7438 Default => $default,
7443 defoptmodes \$dodep14tag, qw( dep14tag want
7446 --always-dep14tag always );
7451 if (defined $ENV{'DGIT_SSH'}) {
7452 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
7453 } elsif (defined $ENV{'GIT_SSH'}) {
7454 @ssh = ($ENV{'GIT_SSH'});
7462 if (!defined $val) {
7463 badusage f_ "%s needs a value", $what unless @ARGV;
7465 push @rvalopts, $val;
7467 badusage f_ "bad value \`%s' for %s", $val, $what unless
7468 $val =~ m/^$oi->{Re}$(?!\n)/s;
7469 my $how = $oi->{How};
7470 if (ref($how) eq 'SCALAR') {
7475 push @ropts, @rvalopts;
7479 last unless $ARGV[0] =~ m/^-/;
7483 if (m/^--dry-run$/) {
7486 } elsif (m/^--damp-run$/) {
7489 } elsif (m/^--no-sign$/) {
7492 } elsif (m/^--help$/) {
7494 } elsif (m/^--version$/) {
7496 } elsif (m/^--new$/) {
7499 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
7500 ($om = $opts_opt_map{$1}) &&
7504 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
7505 !$opts_opt_cmdonly{$1} &&
7506 ($om = $opts_opt_map{$1})) {
7509 } elsif (m/^--([-0-9a-z]+)\!:(.*)/s &&
7510 !$opts_opt_cmdonly{$1} &&
7511 ($om = $opts_opt_map{$1})) {
7513 my $cmd = shift @$om;
7514 @$om = ($cmd, grep { $_ ne $2 } @$om);
7515 } elsif (m/^--($quilt_options_re)$/s) {
7516 push @ropts, "--quilt=$1";
7518 } elsif (m/^--(?:ignore|include)-dirty$/s) {
7521 } elsif (m/^--no-quilt-fixup$/s) {
7523 $quilt_mode = 'nocheck';
7524 } elsif (m/^--no-rm-on-error$/s) {
7527 } elsif (m/^--no-chase-dsc-distro$/s) {
7529 $chase_dsc_distro = 0;
7530 } elsif (m/^--overwrite$/s) {
7532 $overwrite_version = '';
7533 } elsif (m/^--split-(?:view|brain)$/s) {
7535 $splitview_mode = 'always';
7536 } elsif (m/^--split-(?:view|brain)=($splitview_modes_re)$/s) {
7538 $splitview_mode = $1;
7539 } elsif (m/^--overwrite=(.+)$/s) {
7541 $overwrite_version = $1;
7542 } elsif (m/^--delayed=(\d+)$/s) {
7545 } elsif (m/^--upstream-commitish=(.+)$/s) {
7547 $quilt_upstream_commitish = $1;
7548 } elsif (m/^--save-(dgit-view)=(.+)$/s ||
7549 m/^--(dgit-view)-save=(.+)$/s
7551 my ($k,$v) = ($1,$2);
7553 $v =~ s#^(?!refs/)#refs/heads/#;
7554 $internal_object_save{$k} = $v;
7555 } elsif (m/^--(no-)?rm-old-changes$/s) {
7558 } elsif (m/^--deliberately-($deliberately_re)$/s) {
7560 push @deliberatelies, $&;
7561 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
7565 } elsif (m/^--force-/) {
7567 f_ "%s: warning: ignoring unknown force option %s\n",
7570 } elsif (m/^--config-lookup-explode=(.+)$/s) {
7571 # undocumented, for testing
7573 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
7574 # ^ it's supposed to be an array ref
7575 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
7576 $val = $2 ? $' : undef; #';
7577 $valopt->($oi->{Long});
7578 } elsif ($funcopts_long{$_}) {
7580 $funcopts_long{$_}();
7582 badusage f_ "unknown long option \`%s'", $_;
7589 } elsif (s/^-L/-/) {
7592 } elsif (s/^-h/-/) {
7594 } elsif (s/^-D/-/) {
7598 } elsif (s/^-N/-/) {
7603 push @changesopts, $_;
7605 } elsif (s/^-wn$//s) {
7607 $cleanmode = 'none';
7608 } elsif (s/^-wg(f?)(a?)$//s) {
7611 $cleanmode .= '-ff' if $1;
7612 $cleanmode .= ',always' if $2;
7613 } elsif (s/^-wd(d?)([na]?)$//s) {
7615 $cleanmode = 'dpkg-source';
7616 $cleanmode .= '-d' if $1;
7617 $cleanmode .= ',no-check' if $2 eq 'n';
7618 $cleanmode .= ',all-check' if $2 eq 'a';
7619 } elsif (s/^-wc$//s) {
7621 $cleanmode = 'check';
7622 } elsif (s/^-wci$//s) {
7624 $cleanmode = 'check,ignores';
7625 } elsif (s/^-c([^=]*)\=(.*)$//s) {
7626 push @git, '-c', $&;
7627 $gitcfgs{cmdline}{$1} = [ $2 ];
7628 } elsif (s/^-c([^=]+)$//s) {
7629 push @git, '-c', $&;
7630 $gitcfgs{cmdline}{$1} = [ 'true' ];
7631 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
7633 $val = undef unless length $val;
7634 $valopt->($oi->{Short});
7637 badusage f_ "unknown short option \`%s'", $_;
7644 sub check_env_sanity () {
7645 my $blocked = new POSIX::SigSet;
7646 sigprocmask SIG_UNBLOCK, $blocked, $blocked or confess "$!";
7649 foreach my $name (qw(PIPE CHLD)) {
7650 my $signame = "SIG$name";
7651 my $signum = eval "POSIX::$signame" // die;
7652 die f_ "%s is set to something other than SIG_DFL\n",
7654 if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT';
7655 $blocked->ismember($signum) and
7656 die f_ "%s is blocked\n", $signame;
7662 On entry to dgit, %s
7663 This is a bug produced by something in your execution environment.
7669 sub parseopts_late_defaults () {
7670 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
7671 if defined $idistro;
7672 $isuite //= cfg('dgit.default.default-suite');
7674 foreach my $k (keys %opts_opt_map) {
7675 my $om = $opts_opt_map{$k};
7677 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
7679 badcfg f_ "cannot set command for %s", $k
7680 unless length $om->[0];
7684 foreach my $c (access_cfg_cfgs("opts-$k")) {
7686 map { $_ ? @$_ : () }
7687 map { $gitcfgs{$_}{$c} }
7688 reverse @gitcfgsources;
7689 printdebug "CL $c ", (join " ", map { shellquote } @vl),
7690 "\n" if $debuglevel >= 4;
7692 badcfg f_ "cannot configure options for %s", $k
7693 if $opts_opt_cmdonly{$k};
7694 my $insertpos = $opts_cfg_insertpos{$k};
7695 @$om = ( @$om[0..$insertpos-1],
7697 @$om[$insertpos..$#$om] );
7701 if (!defined $rmchanges) {
7702 local $access_forpush;
7703 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
7706 if (!defined $quilt_mode) {
7707 local $access_forpush;
7708 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
7709 // access_cfg('quilt-mode', 'RETURN-UNDEF')
7711 $quilt_mode =~ m/^($quilt_modes_re)$/
7712 or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
7716 foreach my $moc (@modeopt_cfgs) {
7717 local $access_forpush;
7718 my $vr = $moc->{Var};
7719 next if defined $$vr;
7720 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
7721 my $v = $moc->{Vals}{$$vr};
7722 badcfg f_ "unknown %s setting \`%s'", $moc->{Key}, $$vr
7728 local $access_forpush;
7729 default_from_access_cfg(\$cleanmode, 'clean-mode', 'dpkg-source',
7733 $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
7734 $buildproductsdir //= '..';
7735 $bpd_glob = $buildproductsdir;
7736 $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
7739 setlocale(LC_MESSAGES, "");
7742 if ($ENV{$fakeeditorenv}) {
7744 quilt_fixup_editor();
7750 print STDERR __ "DRY RUN ONLY\n" if $dryrun_level > 1;
7751 print STDERR __ "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
7752 if $dryrun_level == 1;
7754 print STDERR __ $helpmsg or confess "$!";
7757 $cmd = $subcommand = shift @ARGV;
7760 my $pre_fn = ${*::}{"pre_$cmd"};
7761 $pre_fn->() if $pre_fn;
7763 if ($invoked_in_git_tree) {
7764 changedir_git_toplevel();
7769 my $fn = ${*::}{"cmd_$cmd"};
7770 $fn or badusage f_ "unknown operation %s", $cmd;