3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2019 Ian Jackson
6 # Copyright (C)2017-2019 Sean Whitton
7 # Copyright (C)2019 Matthew Vernon / Sanger Institute
9 # This program is free software: you can redistribute it and/or modify
10 # it under the terms of the GNU General Public License as published by
11 # the Free Software Foundation, either version 3 of the License, or
12 # (at your option) any later version.
14 # This program is distributed in the hope that it will be useful,
15 # but WITHOUT ANY WARRANTY; without even the implied warranty of
16 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 # GNU General Public License for more details.
19 # You should have received a copy of the GNU General Public License
20 # along with this program. If not, see <http://www.gnu.org/licenses/>.
22 END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
23 use Debian::Dgit::ExitStatus;
24 use Debian::Dgit::I18n;
28 use Debian::Dgit qw(:DEFAULT :playground);
34 use Dpkg::Control::Hash;
37 use File::Temp qw(tempdir);
40 use Dpkg::Compression;
41 use Dpkg::Compression::Process;
47 use List::MoreUtils qw(pairwise);
48 use Text::Glob qw(match_glob);
49 use Fcntl qw(:DEFAULT :flock);
54 our $our_version = 'UNRELEASED'; ###substituted###
55 our $absurdity = undef; ###substituted###
57 our @rpushprotovsn_support = qw(6 5 4); # Reverse order!
68 our $dryrun_level = 0;
70 our $buildproductsdir;
73 our $includedirty = 0;
77 our $existing_package = 'dpkg';
79 our $changes_since_version;
81 our $overwrite_version; # undef: not specified; '': check changelog
83 our $quilt_upstream_commitish;
84 our $quilt_upstream_commitish_used;
85 our $quilt_upstream_commitish_message;
86 our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball|\+git)?';
87 our $quilt_modes_re = "linear|smash|auto|nofix|nocheck|unapplied|$quilt_options_re";
89 our $splitview_modes_re = qr{auto|always|never};
91 our %internal_object_save;
92 our $we_are_responder;
93 our $we_are_initiator;
94 our $initiator_tempdir;
95 our $patches_applied_dirtily = 00;
96 our $chase_dsc_distro=1;
98 our %forceopts = map { $_=>0 }
99 qw(unrepresentable unsupported-source-format
100 dsc-changes-mismatch changes-origs-exactly
101 uploading-binaries uploading-source-only
102 import-gitapply-absurd
103 import-gitapply-no-absurd
104 import-dsc-with-dgit-field);
106 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
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 (@dget) = qw(dget);
121 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
122 our (@dput) = qw(dput);
123 our (@debsign) = qw(debsign);
124 our (@gpg) = qw(gpg);
125 our (@sbuild) = (qw(sbuild --no-source));
127 our (@dgit) = qw(dgit);
128 our (@git_debrebase) = qw(git-debrebase);
129 our (@aptget) = qw(apt-get);
130 our (@aptcache) = qw(apt-cache);
131 our (@dpkgbuildpackage) = (qw(dpkg-buildpackage), @dpkg_source_ignores);
132 our (@dpkgsource) = (qw(dpkg-source), @dpkg_source_ignores);
133 our (@dpkggenchanges) = qw(dpkg-genchanges);
134 our (@mergechanges) = qw(mergechanges -f);
135 our (@gbp_build) = ('');
136 our (@gbp_pq) = ('gbp pq');
137 our (@changesopts) = ('');
138 our (@pbuilder) = ("sudo -E pbuilder","--no-source-only-changes");
139 our (@cowbuilder) = ("sudo -E cowbuilder","--no-source-only-changes");
141 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
144 'debsign' => \@debsign,
146 'sbuild' => \@sbuild,
150 'git-debrebase' => \@git_debrebase,
151 'apt-get' => \@aptget,
152 'apt-cache' => \@aptcache,
153 'dpkg-source' => \@dpkgsource,
154 'dpkg-buildpackage' => \@dpkgbuildpackage,
155 'dpkg-genchanges' => \@dpkggenchanges,
156 'gbp-build' => \@gbp_build,
157 'gbp-pq' => \@gbp_pq,
158 'ch' => \@changesopts,
159 'mergechanges' => \@mergechanges,
160 'pbuilder' => \@pbuilder,
161 'cowbuilder' => \@cowbuilder);
163 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
164 our %opts_cfg_insertpos = map {
166 scalar @{ $opts_opt_map{$_} }
167 } keys %opts_opt_map;
169 sub parseopts_late_defaults();
170 sub quiltify_trees_differ ($$;$$$);
171 sub setup_gitattrs(;$);
172 sub check_gitattrs($$);
179 our $supplementary_message = '';
180 our $made_split_brain = 0;
183 # Interactions between quilt mode and split brain
184 # (currently, split brain only implemented iff
185 # madformat_wantfixup && quiltmode_splitting)
187 # source format sane `3.0 (quilt)'
188 # madformat_wantfixup()
190 # quilt mode normal quiltmode
191 # (eg linear) _splitbrain
193 # ------------ ------------------------------------------------
195 # no split no q cache no q cache forbidden,
196 # brain PM on master q fixup on master prevented
197 # !do_split_brain() PM on master
199 # split brain no q cache q fixup cached, to dgit view
200 # PM in dgit view PM in dgit view
202 # PM = pseudomerge to make ff, due to overwrite (or split view)
203 # "no q cache" = do not record in cache on build, do not check cache
204 # `3.0 (quilt)' with --quilt=nocheck is treated as sane format
208 return unless forkcheck_mainprocess();
209 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
212 our $remotename = 'dgit';
213 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
217 if (!defined $absurdity) {
219 $absurdity =~ s{/[^/]+$}{/absurd} or die;
222 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
224 sub lbranch () { return "$branchprefix/$csuite"; }
225 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
226 sub lref () { return "refs/heads/".lbranch(); }
227 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
228 sub rrref () { return server_ref($csuite); }
231 my ($vsn, $sfx) = @_;
232 return &source_file_leafname($package, $vsn, $sfx);
234 sub is_orig_file_of_vsn ($$) {
235 my ($f, $upstreamvsn) = @_;
236 return is_orig_file_of_p_v($f, $package, $upstreamvsn);
241 return srcfn($vsn,".dsc");
244 sub changespat ($;$) {
245 my ($vsn, $arch) = @_;
246 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
255 return unless forkcheck_mainprocess();
256 foreach my $f (@end) {
258 print STDERR "$us: cleanup: $@" if length $@;
263 print STDERR f_ "%s: invalid configuration: %s\n", $us, "@_";
267 sub forceable_fail ($$) {
268 my ($forceoptsl, $msg) = @_;
269 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
270 print STDERR +(__ "warning: overriding problem due to --force:\n"). $msg;
274 my ($forceoptsl) = @_;
275 my @got = grep { $forceopts{$_} } @$forceoptsl;
276 return 0 unless @got;
278 "warning: skipping checks or functionality due to --force-%s\n",
282 sub no_such_package () {
283 print STDERR f_ "%s: source package %s does not exist in suite %s\n",
284 $us, $package, $isuite;
288 sub deliberately ($) {
290 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
293 sub deliberately_not_fast_forward () {
294 foreach (qw(not-fast-forward fresh-repo)) {
295 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
299 sub quiltmode_splitting () {
300 $quilt_mode =~ m/gbp|dpm|unapplied|baredebian/;
302 sub format_quiltmode_splitting ($) {
304 return madformat_wantfixup($format) && quiltmode_splitting();
307 sub do_split_brain () { !!($do_split_brain // confess) }
309 sub opts_opt_multi_cmd {
312 push @cmd, split /\s+/, shift @_;
319 return opts_opt_multi_cmd [], @gbp_pq;
322 sub dgit_privdir () {
323 our $dgit_privdir_made //= ensure_a_playground 'dgit';
327 my $r = $buildproductsdir;
328 $r = "$maindir/$r" unless $r =~ m{^/};
332 sub get_tree_of_commit ($) {
333 my ($commitish) = @_;
334 my $cdata = cmdoutput @git, qw(cat-file commit), $commitish;
335 $cdata =~ m/\n\n/; $cdata = $`;
336 $cdata =~ m/^tree (\w+)$/m or confess "cdata $cdata ?";
340 sub branch_gdr_info ($$) {
341 my ($symref, $head) = @_;
342 my ($status, $msg, $current, $ffq_prev, $gdrlast) =
343 gdr_ffq_prev_branchinfo($symref);
344 return () unless $status eq 'branch';
345 $ffq_prev = git_get_ref $ffq_prev;
346 $gdrlast = git_get_ref $gdrlast;
347 $gdrlast &&= is_fast_fwd $gdrlast, $head;
348 return ($ffq_prev, $gdrlast);
351 sub branch_is_gdr_unstitched_ff ($$$) {
352 my ($symref, $head, $ancestor) = @_;
353 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
354 return 0 unless $ffq_prev;
355 return 0 unless !defined $ancestor or is_fast_fwd $ancestor, $ffq_prev;
359 sub branch_is_gdr ($) {
361 # This is quite like git-debrebase's keycommits.
362 # We have our own implementation because:
363 # - our algorighm can do fewer tests so is faster
364 # - it saves testing to see if gdr is installed
366 # NB we use this jsut for deciding whether to run gdr make-patches
367 # Before reusing this algorithm for somthing else, its
368 # suitability should be reconsidered.
371 local $Debian::Dgit::debugcmd_when_debuglevel = 3;
372 printdebug "branch_is_gdr $head...\n";
373 my $get_patches = sub {
374 my $t = git_cat_file "$_[0]:debian/patches", [qw(missing tree)];
377 my $tip_patches = $get_patches->($head);
380 my $cdata = git_cat_file $walk, 'commit';
381 my ($hdrs,$msg) = $cdata =~ m{\n\n} ? ($`,$') : ($cdata,'');
382 if ($msg =~ m{^\[git-debrebase\ (
383 anchor | changelog | make-patches |
384 merged-breakwater | pseudomerge
386 # no need to analyse this - it's sufficient
387 # (gdr classifications: Anchor, MergedBreakwaters)
388 # (made by gdr: Pseudomerge, Changelog)
389 printdebug "branch_is_gdr $walk gdr $1 YES\n";
392 my @parents = ($hdrs =~ m/^parent (\w+)$/gm);
394 my $walk_tree = get_tree_of_commit $walk;
395 foreach my $p (@parents) {
396 my $p_tree = get_tree_of_commit $p;
397 if ($p_tree eq $walk_tree) { # pseudomerge contriburor
398 # (gdr classification: Pseudomerge; not made by gdr)
399 printdebug "branch_is_gdr $walk unmarked pseudomerge\n"
405 # some other non-gdr merge
406 # (gdr classification: VanillaMerge, DgitImportUnpatched, ?)
407 printdebug "branch_is_gdr $walk ?-2-merge NO\n";
411 # (gdr classification: ?)
412 printdebug "branch_is_gdr $walk ?-octopus NO\n";
416 printdebug "branch_is_gdr $walk origin\n";
419 if ($get_patches->($walk) ne $tip_patches) {
420 # Our parent added, removed, or edited patches, and wasn't
421 # a gdr make-patches commit. gdr make-patches probably
422 # won't do that well, then.
423 # (gdr classification of parent: AddPatches or ?)
424 printdebug "branch_is_gdr $walk ?-patches NO\n";
427 if ($tip_patches eq '' and
428 !defined git_cat_file "$walk~:debian" and
429 !quiltify_trees_differ "$walk~", $walk
431 # (gdr classification of parent: BreakwaterStart
432 printdebug "branch_is_gdr $walk unmarked BreakwaterStart YES\n";
435 # (gdr classification: Upstream Packaging Mixed Changelog)
436 printdebug "branch_is_gdr $walk plain\n"
442 #---------- remote protocol support, common ----------
444 # remote push initiator/responder protocol:
445 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
446 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
447 # < dgit-remote-push-ready <actual-proto-vsn>
454 # > supplementary-message NBYTES
459 # > file parsed-changelog
460 # [indicates that output of dpkg-parsechangelog follows]
461 # > data-block NBYTES
462 # > [NBYTES bytes of data (no newline)]
463 # [maybe some more blocks]
472 # > param head DGIT-VIEW-HEAD
473 # > param csuite SUITE
474 # > param tagformat new # $protovsn == 4
475 # > param splitbrain 0|1 # $protovsn >= 6
476 # > param maint-view MAINT-VIEW-HEAD
478 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
479 # > file buildinfo # for buildinfos to sign
481 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
482 # # goes into tag, for replay prevention
485 # [indicates that signed tag is wanted]
486 # < data-block NBYTES
487 # < [NBYTES bytes of data (no newline)]
488 # [maybe some more blocks]
492 # > want signed-dsc-changes
493 # < data-block NBYTES [transfer of signed dsc]
495 # < data-block NBYTES [transfer of signed changes]
497 # < data-block NBYTES [transfer of each signed buildinfo
498 # [etc] same number and order as "file buildinfo"]
506 sub i_child_report () {
507 # Sees if our child has died, and reap it if so. Returns a string
508 # describing how it died if it failed, or undef otherwise.
509 return undef unless $i_child_pid;
510 my $got = waitpid $i_child_pid, WNOHANG;
511 return undef if $got <= 0;
512 die unless $got == $i_child_pid;
513 $i_child_pid = undef;
514 return undef unless $?;
515 return f_ "build host child %s", waitstatusmsg();
520 fail f_ "connection lost: %s", $! if $fh->error;
521 fail f_ "protocol violation; %s not expected", $m;
524 sub badproto_badread ($$) {
526 fail f_ "connection lost: %s", $! if $!;
527 my $report = i_child_report();
528 fail $report if defined $report;
529 badproto $fh, f_ "eof (reading %s)", $wh;
532 sub protocol_expect (&$) {
533 my ($match, $fh) = @_;
536 defined && chomp or badproto_badread $fh, __ "protocol message";
544 badproto $fh, f_ "\`%s'", $_;
547 sub protocol_send_file ($$) {
548 my ($fh, $ourfn) = @_;
549 open PF, "<", $ourfn or die "$ourfn: $!";
552 my $got = read PF, $d, 65536;
553 die "$ourfn: $!" unless defined $got;
555 print $fh "data-block ".length($d)."\n" or confess "$!";
556 print $fh $d or confess "$!";
558 PF->error and die "$ourfn $!";
559 print $fh "data-end\n" or confess "$!";
563 sub protocol_read_bytes ($$) {
564 my ($fh, $nbytes) = @_;
565 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, __ "bad byte count";
567 my $got = read $fh, $d, $nbytes;
568 $got==$nbytes or badproto_badread $fh, __ "data block";
572 sub protocol_receive_file ($$) {
573 my ($fh, $ourfn) = @_;
574 printdebug "() $ourfn\n";
575 open PF, ">", $ourfn or die "$ourfn: $!";
577 my ($y,$l) = protocol_expect {
578 m/^data-block (.*)$/ ? (1,$1) :
579 m/^data-end$/ ? (0,) :
583 my $d = protocol_read_bytes $fh, $l;
584 print PF $d or confess "$!";
586 close PF or confess "$!";
589 #---------- remote protocol support, responder ----------
591 sub responder_send_command ($) {
593 return unless $we_are_responder;
594 # called even without $we_are_responder
595 printdebug ">> $command\n";
596 print PO $command, "\n" or confess "$!";
599 sub responder_send_file ($$) {
600 my ($keyword, $ourfn) = @_;
601 return unless $we_are_responder;
602 printdebug "]] $keyword $ourfn\n";
603 responder_send_command "file $keyword";
604 protocol_send_file \*PO, $ourfn;
607 sub responder_receive_files ($@) {
608 my ($keyword, @ourfns) = @_;
609 die unless $we_are_responder;
610 printdebug "[[ $keyword @ourfns\n";
611 responder_send_command "want $keyword";
612 foreach my $fn (@ourfns) {
613 protocol_receive_file \*PI, $fn;
616 protocol_expect { m/^files-end$/ } \*PI;
619 #---------- remote protocol support, initiator ----------
621 sub initiator_expect (&) {
623 protocol_expect { &$match } \*RO;
626 #---------- end remote code ----------
629 if ($we_are_responder) {
631 responder_send_command "progress ".length($m) or confess "$!";
632 print PO $m or confess "$!";
642 $ua = LWP::UserAgent->new();
646 progress "downloading $what...";
647 my $r = $ua->get(@_) or confess "$!";
648 return undef if $r->code == 404;
649 $r->is_success or fail f_ "failed to fetch %s: %s",
650 $what, $r->status_line;
651 return $r->decoded_content(charset => 'none');
654 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
656 sub act_local () { return $dryrun_level <= 1; }
657 sub act_scary () { return !$dryrun_level; }
660 if (!$dryrun_level) {
661 progress f_ "%s ok: %s", $us, "@_";
663 progress f_ "would be ok: %s (but dry run only)", "@_";
668 printcmd(\*STDERR,$debugprefix."#",@_);
671 sub runcmd_ordryrun {
679 sub runcmd_ordryrun_local {
687 our $helpmsg = i_ <<END;
689 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
690 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
691 dgit [dgit-opts] build [dpkg-buildpackage-opts]
692 dgit [dgit-opts] sbuild [sbuild-opts]
693 dgit [dgit-opts] pbuilder|cowbuilder [debbuildopts]
694 dgit [dgit-opts] push [dgit-opts] [suite]
695 dgit [dgit-opts] push-source [dgit-opts] [suite]
696 dgit [dgit-opts] rpush build-host:build-dir ...
697 important dgit options:
698 -k<keyid> sign tag and package with <keyid> instead of default
699 --dry-run -n do not change anything, but go through the motions
700 --damp-run -L like --dry-run but make local changes, without signing
701 --new -N allow introducing a new package
702 --debug -D increase debug level
703 -c<name>=<value> set git config option (used directly by dgit too)
706 our $later_warning_msg = i_ <<END;
707 Perhaps the upload is stuck in incoming. Using the version from git.
711 print STDERR f_ "%s: %s\n%s", $us, "@_", __ $helpmsg or confess "$!";
716 @ARGV or badusage __ "too few arguments";
717 return scalar shift @ARGV;
721 not_necessarily_a_tree();
724 print __ $helpmsg or confess "$!";
728 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
730 our %defcfg = ('dgit.default.distro' => 'debian',
731 'dgit.default.default-suite' => 'unstable',
732 'dgit.default.old-dsc-distro' => 'debian',
733 'dgit-suite.*-security.distro' => 'debian-security',
734 'dgit.default.username' => '',
735 'dgit.default.archive-query-default-component' => 'main',
736 'dgit.default.ssh' => 'ssh',
737 'dgit.default.archive-query' => 'madison:',
738 'dgit.default.sshpsql-dbname' => 'service=projectb',
739 'dgit.default.aptget-components' => 'main',
740 'dgit.default.source-only-uploads' => 'ok',
741 'dgit.dsc-url-proto-ok.http' => 'true',
742 'dgit.dsc-url-proto-ok.https' => 'true',
743 'dgit.dsc-url-proto-ok.git' => 'true',
744 'dgit.vcs-git.suites', => 'sid', # ;-separated
745 'dgit.default.dsc-url-proto-ok' => 'false',
746 # old means "repo server accepts pushes with old dgit tags"
747 # new means "repo server accepts pushes with new dgit tags"
748 # maint means "repo server accepts split brain pushes"
749 # hist means "repo server may have old pushes without new tag"
750 # ("hist" is implied by "old")
751 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
752 'dgit-distro.debian.git-check' => 'url',
753 'dgit-distro.debian.git-check-suffix' => '/info/refs',
754 'dgit-distro.debian.new-private-pushers' => 't',
755 'dgit-distro.debian.source-only-uploads' => 'not-wholly-new',
756 'dgit-distro.debian/push.git-url' => '',
757 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
758 'dgit-distro.debian/push.git-user-force' => 'dgit',
759 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
760 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
761 'dgit-distro.debian/push.git-create' => 'true',
762 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
763 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
764 # 'dgit-distro.debian.archive-query-tls-key',
765 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
766 # ^ this does not work because curl is broken nowadays
767 # Fixing #790093 properly will involve providing providing the key
768 # in some pacagke and maybe updating these paths.
770 # 'dgit-distro.debian.archive-query-tls-curl-args',
771 # '--ca-path=/etc/ssl/ca-debian',
772 # ^ this is a workaround but works (only) on DSA-administered machines
773 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
774 'dgit-distro.debian.git-url-suffix' => '',
775 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
776 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
777 'dgit-distro.debian-security.archive-query' => 'aptget:',
778 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
779 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
780 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
781 'dgit-distro.debian-security.nominal-distro' => 'debian',
782 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
783 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
784 'dgit-distro.ubuntu.git-check' => 'false',
785 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
786 'dgit-distro.ubuntucloud.git-check' => 'false',
787 'dgit-distro.ubuntucloud.nominal-distro' => 'ubuntu',
788 'dgit-distro.ubuntucloud.archive-query' => 'aptget:',
789 'dgit-distro.ubuntucloud.mirror' => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
790 'dgit-distro.ubuntucloud.aptget-suite-map' => 's#^([^-]+):([^:]+)$#${1}-updates/$2#; s#^(.+)-(.+):(.+)#$1-$2/$3#;',
791 'dgit-distro.ubuntucloud.aptget-suite-rmap' => 's#/(.+)$#-$1#',
792 'dgit-distro.test-dummy.ssh' => "$td/ssh",
793 'dgit-distro.test-dummy.username' => "alice",
794 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
795 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
796 'dgit-distro.test-dummy.git-url' => "$td/git",
797 'dgit-distro.test-dummy.git-host' => "git",
798 'dgit-distro.test-dummy.git-path' => "$td/git",
799 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
800 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
801 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
802 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
806 our @gitcfgsources = qw(cmdline local global system);
807 our $invoked_in_git_tree = 1;
809 sub git_slurp_config () {
810 # This algoritm is a bit subtle, but this is needed so that for
811 # options which we want to be single-valued, we allow the
812 # different config sources to override properly. See #835858.
813 foreach my $src (@gitcfgsources) {
814 next if $src eq 'cmdline';
815 # we do this ourselves since git doesn't handle it
817 $gitcfgs{$src} = git_slurp_config_src $src;
821 sub git_get_config ($) {
823 foreach my $src (@gitcfgsources) {
824 my $l = $gitcfgs{$src}{$c};
825 confess "internal error ($l $c)" if $l && !ref $l;
826 printdebug"C $c ".(defined $l ?
827 join " ", map { messagequote "'$_'" } @$l :
832 f_ "multiple values for %s (in %s git config)", $c, $src
834 $l->[0] =~ m/\n/ and badcfg f_
835 "value for config option %s (in %s git config) contains newline(s)!",
844 return undef if $c =~ /RETURN-UNDEF/;
845 printdebug "C? $c\n" if $debuglevel >= 5;
846 my $v = git_get_config($c);
847 return $v if defined $v;
848 my $dv = $defcfg{$c};
850 printdebug "CD $c $dv\n" if $debuglevel >= 4;
855 "need value for one of: %s\n".
856 "%s: distro or suite appears not to be (properly) supported",
860 sub not_necessarily_a_tree () {
861 # needs to be called from pre_*
862 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
863 $invoked_in_git_tree = 0;
866 sub access_basedistro__noalias () {
867 if (defined $idistro) {
870 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
871 return $def if defined $def;
872 foreach my $src (@gitcfgsources, 'internal') {
873 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
875 foreach my $k (keys %$kl) {
876 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
878 next unless match_glob $dpat, $isuite;
882 return cfg("dgit.default.distro");
886 sub access_basedistro () {
887 my $noalias = access_basedistro__noalias();
888 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
889 return $canon // $noalias;
892 sub access_nomdistro () {
893 my $base = access_basedistro();
894 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
895 $r =~ m/^$distro_re$/ or badcfg
896 f_ "bad syntax for (nominal) distro \`%s' (does not match %s)",
897 $r, "/^$distro_re$/";
901 sub access_quirk () {
902 # returns (quirk name, distro to use instead or undef, quirk-specific info)
903 my $basedistro = access_basedistro();
904 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
906 if (defined $backports_quirk) {
907 my $re = $backports_quirk;
908 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
910 $re =~ s/\%/([-0-9a-z_]+)/
911 or $re =~ m/[()]/ or badcfg __ "backports-quirk needs \% or ( )";
912 if ($isuite =~ m/^$re$/) {
913 return ('backports',"$basedistro-backports",$1);
916 return ('none',undef);
921 sub parse_cfg_bool ($$$) {
922 my ($what,$def,$v) = @_;
925 $v =~ m/^[ty1]/ ? 1 :
926 $v =~ m/^[fn0]/ ? 0 :
927 badcfg f_ "%s needs t (true, y, 1) or f (false, n, 0) not \`%s'",
931 sub access_forpush_config () {
932 my $d = access_basedistro();
936 parse_cfg_bool('new-private-pushers', 0,
937 cfg("dgit-distro.$d.new-private-pushers",
940 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
943 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
944 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
945 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
947 "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
950 sub access_forpush () {
951 $access_forpush //= access_forpush_config();
952 return $access_forpush;
955 sub default_from_access_cfg ($$$;$) {
956 my ($var, $keybase, $defval, $permit_re) = @_;
957 return if defined $$var;
959 $$var = access_cfg("$keybase-newer", 'RETURN-UNDEF');
960 $$var = undef if $$var && $$var !~ m/^$permit_re$/;
962 $$var //= access_cfg($keybase, 'RETURN-UNDEF');
965 badcfg f_ "unknown %s \`%s'", $keybase, $$var
966 if defined $permit_re and $$var !~ m/$permit_re/;
970 confess +(__ 'internal error').' '.Dumper($access_forpush)," ?" if
971 defined $access_forpush and !$access_forpush;
972 badcfg __ "pushing but distro is configured readonly"
973 if access_forpush_config() eq '0';
975 $supplementary_message = __ <<'END' unless $we_are_responder;
976 Push failed, before we got started.
977 You can retry the push, after fixing the problem, if you like.
979 parseopts_late_defaults();
983 parseopts_late_defaults();
986 sub determine_whether_split_brain ($) {
989 local $access_forpush;
990 default_from_access_cfg(\$splitview_mode, 'split-view', 'auto',
991 $splitview_modes_re);
992 $do_split_brain = 1 if $splitview_mode eq 'always';
995 printdebug "format $format, quilt mode $quilt_mode\n";
997 if (format_quiltmode_splitting $format) {
998 $splitview_mode ne 'never' or
999 fail f_ "dgit: quilt mode \`%s' (for format \`%s')".
1000 " implies split view, but split-view set to \`%s'",
1001 $quilt_mode, $format, $splitview_mode;
1002 $do_split_brain = 1;
1004 $do_split_brain //= 0;
1007 sub supplementary_message ($) {
1009 if (!$we_are_responder) {
1010 $supplementary_message = $msg;
1013 responder_send_command "supplementary-message ".length($msg)
1015 print PO $msg or confess "$!";
1019 sub access_distros () {
1020 # Returns list of distros to try, in order
1023 # 0. `instead of' distro name(s) we have been pointed to
1024 # 1. the access_quirk distro, if any
1025 # 2a. the user's specified distro, or failing that } basedistro
1026 # 2b. the distro calculated from the suite }
1027 my @l = access_basedistro();
1029 my (undef,$quirkdistro) = access_quirk();
1030 unshift @l, $quirkdistro;
1031 unshift @l, $instead_distro;
1032 @l = grep { defined } @l;
1034 push @l, access_nomdistro();
1036 if (access_forpush()) {
1037 @l = map { ("$_/push", $_) } @l;
1042 sub access_cfg_cfgs (@) {
1045 # The nesting of these loops determines the search order. We put
1046 # the key loop on the outside so that we search all the distros
1047 # for each key, before going on to the next key. That means that
1048 # if access_cfg is called with a more specific, and then a less
1049 # specific, key, an earlier distro can override the less specific
1050 # without necessarily overriding any more specific keys. (If the
1051 # distro wants to override the more specific keys it can simply do
1052 # so; whereas if we did the loop the other way around, it would be
1053 # impossible to for an earlier distro to override a less specific
1054 # key but not the more specific ones without restating the unknown
1055 # values of the more specific keys.
1058 # We have to deal with RETURN-UNDEF specially, so that we don't
1059 # terminate the search prematurely.
1061 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
1064 foreach my $d (access_distros()) {
1065 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
1067 push @cfgs, map { "dgit.default.$_" } @realkeys;
1068 push @cfgs, @rundef;
1072 sub access_cfg (@) {
1074 my (@cfgs) = access_cfg_cfgs(@keys);
1075 my $value = cfg(@cfgs);
1079 sub access_cfg_bool ($$) {
1080 my ($def, @keys) = @_;
1081 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
1084 sub string_to_ssh ($) {
1086 if ($spec =~ m/\s/) {
1087 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
1093 sub access_cfg_ssh () {
1094 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
1095 if (!defined $gitssh) {
1098 return string_to_ssh $gitssh;
1102 sub access_runeinfo ($) {
1104 return ": dgit ".access_basedistro()." $info ;";
1107 sub access_someuserhost ($) {
1109 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
1110 defined($user) && length($user) or
1111 $user = access_cfg("$some-user",'username');
1112 my $host = access_cfg("$some-host");
1113 return length($user) ? "$user\@$host" : $host;
1116 sub access_gituserhost () {
1117 return access_someuserhost('git');
1120 sub access_giturl (;$) {
1121 my ($optional) = @_;
1122 my $url = access_cfg('git-url','RETURN-UNDEF');
1125 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
1126 return undef unless defined $proto;
1129 access_gituserhost().
1130 access_cfg('git-path');
1132 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
1135 return "$url/$package$suffix";
1138 sub commit_getclogp ($) {
1139 # Returns the parsed changelog hashref for a particular commit
1141 our %commit_getclogp_memo;
1142 my $memo = $commit_getclogp_memo{$objid};
1143 return $memo if $memo;
1145 my $mclog = dgit_privdir()."clog";
1146 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1147 "$objid:debian/changelog";
1148 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1151 sub parse_dscdata () {
1152 my $dscfh = new IO::File \$dscdata, '<' or confess "$!";
1153 printdebug Dumper($dscdata) if $debuglevel>1;
1154 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1155 printdebug Dumper($dsc) if $debuglevel>1;
1160 sub archive_query ($;@) {
1161 my ($method) = shift @_;
1162 fail __ "this operation does not support multiple comma-separated suites"
1164 my $query = access_cfg('archive-query','RETURN-UNDEF');
1165 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1168 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1171 sub archive_query_prepend_mirror {
1172 my $m = access_cfg('mirror');
1173 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1176 sub pool_dsc_subpath ($$) {
1177 my ($vsn,$component) = @_; # $package is implict arg
1178 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1179 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1182 sub cfg_apply_map ($$$) {
1183 my ($varref, $what, $mapspec) = @_;
1184 return unless $mapspec;
1186 printdebug "config $what EVAL{ $mapspec; }\n";
1188 eval "package Dgit::Config; $mapspec;";
1193 #---------- `ftpmasterapi' archive query method (nascent) ----------
1195 sub archive_api_query_cmd ($) {
1197 my @cmd = (@curl, qw(-sS));
1198 my $url = access_cfg('archive-query-url');
1199 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1201 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1202 foreach my $key (split /\:/, $keys) {
1203 $key =~ s/\%HOST\%/$host/g;
1205 fail "for $url: stat $key: $!" unless $!==ENOENT;
1208 fail f_ "config requested specific TLS key but do not know".
1209 " how to get curl to use exactly that EE key (%s)",
1211 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1212 # # Sadly the above line does not work because of changes
1213 # # to gnutls. The real fix for #790093 may involve
1214 # # new curl options.
1217 # Fixing #790093 properly will involve providing a value
1218 # for this on clients.
1219 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1220 push @cmd, split / /, $kargs if defined $kargs;
1222 push @cmd, $url.$subpath;
1226 sub api_query ($$;$) {
1228 my ($data, $subpath, $ok404) = @_;
1229 badcfg __ "ftpmasterapi archive query method takes no data part"
1231 my @cmd = archive_api_query_cmd($subpath);
1232 my $url = $cmd[$#cmd];
1233 push @cmd, qw(-w %{http_code});
1234 my $json = cmdoutput @cmd;
1235 unless ($json =~ s/\d+\d+\d$//) {
1236 failedcmd_report_cmd undef, @cmd;
1237 fail __ "curl failed to print 3-digit HTTP code";
1240 return undef if $code eq '404' && $ok404;
1241 fail f_ "fetch of %s gave HTTP code %s", $url, $code
1242 unless $url =~ m#^file://# or $code =~ m/^2/;
1243 return decode_json($json);
1246 sub canonicalise_suite_ftpmasterapi {
1247 my ($proto,$data) = @_;
1248 my $suites = api_query($data, 'suites');
1250 foreach my $entry (@$suites) {
1252 my $v = $entry->{$_};
1253 defined $v && $v eq $isuite;
1254 } qw(codename name);
1255 push @matched, $entry;
1257 fail f_ "unknown suite %s, maybe -d would help", $isuite
1261 @matched==1 or die f_ "multiple matches for suite %s\n", $isuite;
1262 $cn = "$matched[0]{codename}";
1263 defined $cn or die f_ "suite %s info has no codename\n", $isuite;
1264 $cn =~ m/^$suite_re$/
1265 or die f_ "suite %s maps to bad codename\n", $isuite;
1267 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper(\@matched)
1272 sub archive_query_ftpmasterapi {
1273 my ($proto,$data) = @_;
1274 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1276 my $digester = Digest::SHA->new(256);
1277 foreach my $entry (@$info) {
1279 my $vsn = "$entry->{version}";
1280 my ($ok,$msg) = version_check $vsn;
1281 die f_ "bad version: %s\n", $msg unless $ok;
1282 my $component = "$entry->{component}";
1283 $component =~ m/^$component_re$/ or die __ "bad component";
1284 my $filename = "$entry->{filename}";
1285 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1286 or die __ "bad filename";
1287 my $sha256sum = "$entry->{sha256sum}";
1288 $sha256sum =~ m/^[0-9a-f]+$/ or die __ "bad sha256sum";
1289 push @rows, [ $vsn, "/pool/$component/$filename",
1290 $digester, $sha256sum ];
1292 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper($entry)
1295 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1296 return archive_query_prepend_mirror @rows;
1299 sub file_in_archive_ftpmasterapi {
1300 my ($proto,$data,$filename) = @_;
1301 my $pat = $filename;
1304 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1305 my $info = api_query($data, "file_in_archive/$pat", 1);
1308 sub package_not_wholly_new_ftpmasterapi {
1309 my ($proto,$data,$pkg) = @_;
1310 my $info = api_query($data,"madison?package=${pkg}&f=json");
1314 #---------- `aptget' archive query method ----------
1317 our $aptget_releasefile;
1318 our $aptget_configpath;
1320 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1321 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1323 sub aptget_cache_clean {
1324 runcmd_ordryrun_local qw(sh -ec),
1325 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1329 sub aptget_lock_acquire () {
1330 my $lockfile = "$aptget_base/lock";
1331 open APTGET_LOCK, '>', $lockfile or confess "open $lockfile: $!";
1332 flock APTGET_LOCK, LOCK_EX or confess "lock $lockfile: $!";
1335 sub aptget_prep ($) {
1337 return if defined $aptget_base;
1339 badcfg __ "aptget archive query method takes no data part"
1342 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1345 ensuredir "$cache/dgit";
1347 access_cfg('aptget-cachekey','RETURN-UNDEF')
1348 // access_nomdistro();
1350 $aptget_base = "$cache/dgit/aptget";
1351 ensuredir $aptget_base;
1353 my $quoted_base = $aptget_base;
1354 confess "$quoted_base contains bad chars, cannot continue"
1355 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1357 ensuredir $aptget_base;
1359 aptget_lock_acquire();
1361 aptget_cache_clean();
1363 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1364 my $sourceslist = "source.list#$cachekey";
1366 my $aptsuites = $isuite;
1367 cfg_apply_map(\$aptsuites, 'suite map',
1368 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1370 open SRCS, ">", "$aptget_base/$sourceslist" or confess "$!";
1371 printf SRCS "deb-src %s %s %s\n",
1372 access_cfg('mirror'),
1374 access_cfg('aptget-components')
1377 ensuredir "$aptget_base/cache";
1378 ensuredir "$aptget_base/lists";
1380 open CONF, ">", $aptget_configpath or confess "$!";
1382 Debug::NoLocking "true";
1383 APT::Get::List-Cleanup "false";
1384 #clear APT::Update::Post-Invoke-Success;
1385 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1386 Dir::State::Lists "$quoted_base/lists";
1387 Dir::Etc::preferences "$quoted_base/preferences";
1388 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1389 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1392 foreach my $key (qw(
1395 Dir::Cache::Archives
1396 Dir::Etc::SourceParts
1397 Dir::Etc::preferencesparts
1399 ensuredir "$aptget_base/$key";
1400 print CONF "$key \"$quoted_base/$key\";\n" or confess "$!";
1403 my $oldatime = (time // confess "$!") - 1;
1404 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1405 next unless stat_exists $oldlist;
1406 my ($mtime) = (stat _)[9];
1407 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1410 runcmd_ordryrun_local aptget_aptget(), qw(update);
1413 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1414 next unless stat_exists $oldlist;
1415 my ($atime) = (stat _)[8];
1416 next if $atime == $oldatime;
1417 push @releasefiles, $oldlist;
1419 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1420 @releasefiles = @inreleasefiles if @inreleasefiles;
1421 if (!@releasefiles) {
1422 fail f_ <<END, $isuite, $cache;
1423 apt seemed to not to update dgit's cached Release files for %s.
1425 is on a filesystem mounted `noatime'; if so, please use `relatime'.)
1428 confess "apt updated too many Release files (@releasefiles), erk"
1429 unless @releasefiles == 1;
1431 ($aptget_releasefile) = @releasefiles;
1434 sub canonicalise_suite_aptget {
1435 my ($proto,$data) = @_;
1438 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1440 foreach my $name (qw(Codename Suite)) {
1441 my $val = $release->{$name};
1443 printdebug "release file $name: $val\n";
1444 cfg_apply_map(\$val, 'suite rmap',
1445 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1446 $val =~ m/^$suite_re$/o or fail f_
1447 "Release file (%s) specifies intolerable %s",
1448 $aptget_releasefile, $name;
1455 sub archive_query_aptget {
1456 my ($proto,$data) = @_;
1459 ensuredir "$aptget_base/source";
1460 foreach my $old (<$aptget_base/source/*.dsc>) {
1461 unlink $old or die "$old: $!";
1464 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1465 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1466 # avoids apt-get source failing with ambiguous error code
1468 runcmd_ordryrun_local
1469 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1470 aptget_aptget(), qw(--download-only --only-source source), $package;
1472 my @dscs = <$aptget_base/source/*.dsc>;
1473 fail __ "apt-get source did not produce a .dsc" unless @dscs;
1474 fail f_ "apt-get source produced several .dscs (%s)", "@dscs"
1477 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1480 my $uri = "file://". uri_escape $dscs[0];
1481 $uri =~ s{\%2f}{/}gi;
1482 return [ (getfield $pre_dsc, 'Version'), $uri ];
1485 sub file_in_archive_aptget () { return undef; }
1486 sub package_not_wholly_new_aptget () { return undef; }
1488 #---------- `dummyapicat' archive query method ----------
1489 # (untranslated, because this is for testing purposes etc.)
1491 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1492 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1494 sub dummycatapi_run_in_mirror ($@) {
1495 # runs $fn with FIA open onto rune
1496 my ($rune, $argl, $fn) = @_;
1498 my $mirror = access_cfg('mirror');
1499 $mirror =~ s#^file://#/# or die "$mirror ?";
1500 my @cmd = (qw(sh -ec), 'cd "$1"; shift'."\n".$rune,
1501 qw(x), $mirror, @$argl);
1502 debugcmd "-|", @cmd;
1503 open FIA, "-|", @cmd or confess "$!";
1505 close FIA or ($!==0 && $?==141) or die failedcmd @cmd;
1509 sub file_in_archive_dummycatapi ($$$) {
1510 my ($proto,$data,$filename) = @_;
1512 dummycatapi_run_in_mirror '
1513 find -name "$1" -print0 |
1515 ', [$filename], sub {
1518 printdebug "| $_\n";
1519 m/^(\w+) (\S+)$/ or die "$_ ?";
1520 push @out, { sha256sum => $1, filename => $2 };
1526 sub package_not_wholly_new_dummycatapi {
1527 my ($proto,$data,$pkg) = @_;
1528 dummycatapi_run_in_mirror "
1529 find -name ${pkg}_*.dsc
1536 #---------- `madison' archive query method ----------
1538 sub archive_query_madison {
1539 return archive_query_prepend_mirror
1540 map { [ @$_[0..1] ] } madison_get_parse(@_);
1543 sub madison_get_parse {
1544 my ($proto,$data) = @_;
1545 die unless $proto eq 'madison';
1546 if (!length $data) {
1547 $data= access_cfg('madison-distro','RETURN-UNDEF');
1548 $data //= access_basedistro();
1550 $rmad{$proto,$data,$package} ||= cmdoutput
1551 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1552 my $rmad = $rmad{$proto,$data,$package};
1555 foreach my $l (split /\n/, $rmad) {
1556 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1557 \s*( [^ \t|]+ )\s* \|
1558 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1559 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1560 $1 eq $package or die "$rmad $package ?";
1567 $component = access_cfg('archive-query-default-component');
1569 $5 eq 'source' or die "$rmad ?";
1570 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1572 return sort { -version_compare($a->[0],$b->[0]); } @out;
1575 sub canonicalise_suite_madison {
1576 # madison canonicalises for us
1577 my @r = madison_get_parse(@_);
1579 "unable to canonicalise suite using package %s".
1580 " which does not appear to exist in suite %s;".
1581 " --existing-package may help",
1586 sub file_in_archive_madison { return undef; }
1587 sub package_not_wholly_new_madison { return undef; }
1589 #---------- `sshpsql' archive query method ----------
1590 # (untranslated, because this is obsolete)
1593 my ($data,$runeinfo,$sql) = @_;
1594 if (!length $data) {
1595 $data= access_someuserhost('sshpsql').':'.
1596 access_cfg('sshpsql-dbname');
1598 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1599 my ($userhost,$dbname) = ($`,$'); #';
1601 my @cmd = (access_cfg_ssh, $userhost,
1602 access_runeinfo("ssh-psql $runeinfo").
1603 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1604 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1606 open P, "-|", @cmd or confess "$!";
1609 printdebug(">|$_|\n");
1612 $!=0; $?=0; close P or failedcmd @cmd;
1614 my $nrows = pop @rows;
1615 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1616 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1617 @rows = map { [ split /\|/, $_ ] } @rows;
1618 my $ncols = scalar @{ shift @rows };
1619 die if grep { scalar @$_ != $ncols } @rows;
1623 sub sql_injection_check {
1624 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1627 sub archive_query_sshpsql ($$) {
1628 my ($proto,$data) = @_;
1629 sql_injection_check $isuite, $package;
1630 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1631 SELECT source.version, component.name, files.filename, files.sha256sum
1633 JOIN src_associations ON source.id = src_associations.source
1634 JOIN suite ON suite.id = src_associations.suite
1635 JOIN dsc_files ON dsc_files.source = source.id
1636 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1637 JOIN component ON component.id = files_archive_map.component_id
1638 JOIN files ON files.id = dsc_files.file
1639 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1640 AND source.source='$package'
1641 AND files.filename LIKE '%.dsc';
1643 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1644 my $digester = Digest::SHA->new(256);
1646 my ($vsn,$component,$filename,$sha256sum) = @$_;
1647 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1649 return archive_query_prepend_mirror @rows;
1652 sub canonicalise_suite_sshpsql ($$) {
1653 my ($proto,$data) = @_;
1654 sql_injection_check $isuite;
1655 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1656 SELECT suite.codename
1657 FROM suite where suite_name='$isuite' or codename='$isuite';
1659 @rows = map { $_->[0] } @rows;
1660 fail "unknown suite $isuite" unless @rows;
1661 die "ambiguous $isuite: @rows ?" if @rows>1;
1665 sub file_in_archive_sshpsql ($$$) { return undef; }
1666 sub package_not_wholly_new_sshpsql ($$$) { return undef; }
1668 #---------- `dummycat' archive query method ----------
1669 # (untranslated, because this is for testing purposes etc.)
1671 sub canonicalise_suite_dummycat ($$) {
1672 my ($proto,$data) = @_;
1673 my $dpath = "$data/suite.$isuite";
1674 if (!open C, "<", $dpath) {
1675 $!==ENOENT or die "$dpath: $!";
1676 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1680 chomp or die "$dpath: $!";
1682 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1686 sub archive_query_dummycat ($$) {
1687 my ($proto,$data) = @_;
1688 canonicalise_suite();
1689 my $dpath = "$data/package.$csuite.$package";
1690 if (!open C, "<", $dpath) {
1691 $!==ENOENT or die "$dpath: $!";
1692 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1700 printdebug "dummycat query $csuite $package $dpath | $_\n";
1701 my @row = split /\s+/, $_;
1702 @row==2 or die "$dpath: $_ ?";
1705 C->error and die "$dpath: $!";
1707 return archive_query_prepend_mirror
1708 sort { -version_compare($a->[0],$b->[0]); } @rows;
1711 sub file_in_archive_dummycat () { return undef; }
1712 sub package_not_wholly_new_dummycat () { return undef; }
1714 #---------- archive query entrypoints and rest of program ----------
1716 sub canonicalise_suite () {
1717 return if defined $csuite;
1718 fail f_ "cannot operate on %s suite", $isuite if $isuite eq 'UNRELEASED';
1719 $csuite = archive_query('canonicalise_suite');
1720 if ($isuite ne $csuite) {
1721 progress f_ "canonical suite name for %s is %s", $isuite, $csuite;
1723 progress f_ "canonical suite name is %s", $csuite;
1727 sub get_archive_dsc () {
1728 canonicalise_suite();
1729 my @vsns = archive_query('archive_query');
1730 foreach my $vinfo (@vsns) {
1731 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1732 $dscurl = $vsn_dscurl;
1733 $dscdata = url_get($dscurl);
1735 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1740 $digester->add($dscdata);
1741 my $got = $digester->hexdigest();
1743 fail f_ "%s has hash %s but archive told us to expect %s",
1744 $dscurl, $got, $digest;
1747 my $fmt = getfield $dsc, 'Format';
1748 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1749 f_ "unsupported source format %s, sorry", $fmt;
1751 $dsc_checked = !!$digester;
1752 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1756 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1759 sub check_for_git ();
1760 sub check_for_git () {
1762 my $how = access_cfg('git-check');
1763 if ($how eq 'ssh-cmd') {
1765 (access_cfg_ssh, access_gituserhost(),
1766 access_runeinfo("git-check $package").
1767 " set -e; cd ".access_cfg('git-path').";".
1768 " if test -d $package.git; then echo 1; else echo 0; fi");
1769 my $r= cmdoutput @cmd;
1770 if (defined $r and $r =~ m/^divert (\w+)$/) {
1772 my ($usedistro,) = access_distros();
1773 # NB that if we are pushing, $usedistro will be $distro/push
1774 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1775 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1776 progress f_ "diverting to %s (using config for %s)",
1777 $divert, $instead_distro;
1778 return check_for_git();
1780 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1782 } elsif ($how eq 'url') {
1783 my $prefix = access_cfg('git-check-url','git-url');
1784 my $suffix = access_cfg('git-check-suffix','git-suffix',
1785 'RETURN-UNDEF') // '.git';
1786 my $url = "$prefix/$package$suffix";
1787 my @cmd = (@curl, qw(-sS -I), $url);
1788 my $result = cmdoutput @cmd;
1789 $result =~ s/^\S+ 200 .*\n\r?\n//;
1790 # curl -sS -I with https_proxy prints
1791 # HTTP/1.0 200 Connection established
1792 $result =~ m/^\S+ (404|200) /s or
1793 fail +(__ "unexpected results from git check query - ").
1794 Dumper($prefix, $result);
1796 if ($code eq '404') {
1798 } elsif ($code eq '200') {
1803 } elsif ($how eq 'true') {
1805 } elsif ($how eq 'false') {
1808 badcfg f_ "unknown git-check \`%s'", $how;
1812 sub create_remote_git_repo () {
1813 my $how = access_cfg('git-create');
1814 if ($how eq 'ssh-cmd') {
1816 (access_cfg_ssh, access_gituserhost(),
1817 access_runeinfo("git-create $package").
1818 "set -e; cd ".access_cfg('git-path').";".
1819 " cp -a _template $package.git");
1820 } elsif ($how eq 'true') {
1823 badcfg f_ "unknown git-create \`%s'", $how;
1827 our ($dsc_hash,$lastpush_mergeinput);
1828 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1832 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1833 $playground = fresh_playground 'dgit/unpack';
1836 sub mktree_in_ud_here () {
1837 playtree_setup $gitcfgs{local};
1840 sub git_write_tree () {
1841 my $tree = cmdoutput @git, qw(write-tree);
1842 $tree =~ m/^\w+$/ or die "$tree ?";
1846 sub git_add_write_tree () {
1847 runcmd @git, qw(add -Af .);
1848 return git_write_tree();
1851 sub remove_stray_gits ($) {
1853 my @gitscmd = qw(find -name .git -prune -print0);
1854 debugcmd "|",@gitscmd;
1855 open GITS, "-|", @gitscmd or confess "$!";
1860 print STDERR f_ "%s: warning: removing from %s: %s\n",
1861 $us, $what, (messagequote $_);
1865 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1868 sub mktree_in_ud_from_only_subdir ($;$) {
1869 my ($what,$raw) = @_;
1870 # changes into the subdir
1873 confess "expected one subdir but found @dirs ?" unless @dirs==1;
1874 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1878 remove_stray_gits($what);
1879 mktree_in_ud_here();
1881 my ($format, $fopts) = get_source_format();
1882 if (madformat($format)) {
1887 my $tree=git_add_write_tree();
1888 return ($tree,$dir);
1891 our @files_csum_info_fields =
1892 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1893 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1894 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1896 sub dsc_files_info () {
1897 foreach my $csumi (@files_csum_info_fields) {
1898 my ($fname, $module, $method) = @$csumi;
1899 my $field = $dsc->{$fname};
1900 next unless defined $field;
1901 eval "use $module; 1;" or die $@;
1903 foreach (split /\n/, $field) {
1905 m/^(\w+) (\d+) (\S+)$/ or
1906 fail f_ "could not parse .dsc %s line \`%s'", $fname, $_;
1907 my $digester = eval "$module"."->$method;" or die $@;
1912 Digester => $digester,
1917 fail f_ "missing any supported Checksums-* or Files field in %s",
1918 $dsc->get_option('name');
1922 map { $_->{Filename} } dsc_files_info();
1925 sub files_compare_inputs (@) {
1930 my $showinputs = sub {
1931 return join "; ", map { $_->get_option('name') } @$inputs;
1934 foreach my $in (@$inputs) {
1936 my $in_name = $in->get_option('name');
1938 printdebug "files_compare_inputs $in_name\n";
1940 foreach my $csumi (@files_csum_info_fields) {
1941 my ($fname) = @$csumi;
1942 printdebug "files_compare_inputs $in_name $fname\n";
1944 my $field = $in->{$fname};
1945 next unless defined $field;
1948 foreach (split /\n/, $field) {
1951 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1952 fail "could not parse $in_name $fname line \`$_'";
1954 printdebug "files_compare_inputs $in_name $fname $f\n";
1958 my $re = \ $record{$f}{$fname};
1960 $fchecked{$f}{$in_name} = 1;
1963 "hash or size of %s varies in %s fields (between: %s)",
1964 $f, $fname, $showinputs->();
1969 @files = sort @files;
1970 $expected_files //= \@files;
1971 "@$expected_files" eq "@files" or
1972 fail f_ "file list in %s varies between hash fields!",
1976 fail f_ "%s has no files list field(s)", $in_name;
1978 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1981 grep { keys %$_ == @$inputs-1 } values %fchecked
1982 or fail f_ "no file appears in all file lists (looked in: %s)",
1986 sub is_orig_file_in_dsc ($$) {
1987 my ($f, $dsc_files_info) = @_;
1988 return 0 if @$dsc_files_info <= 1;
1989 # One file means no origs, and the filename doesn't have a "what
1990 # part of dsc" component. (Consider versions ending `.orig'.)
1991 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1995 # This function determines whether a .changes file is source-only from
1996 # the point of view of dak. Thus, it permits *_source.buildinfo
1999 # It does not, however, permit any other buildinfo files. After a
2000 # source-only upload, the buildds will try to upload files like
2001 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
2002 # named like this in their (otherwise) source-only upload, the uploads
2003 # of the buildd can be rejected by dak. Fixing the resultant
2004 # situation can require manual intervention. So we block such
2005 # .buildinfo files when the user tells us to perform a source-only
2006 # upload (such as when using the push-source subcommand with the -C
2007 # option, which calls this function).
2009 # Note, though, that when dgit is told to prepare a source-only
2010 # upload, such as when subcommands like build-source and push-source
2011 # without -C are used, dgit has a more restrictive notion of
2012 # source-only .changes than dak: such uploads will never include
2013 # *_source.buildinfo files. This is because there is no use for such
2014 # files when using a tool like dgit to produce the source package, as
2015 # dgit ensures the source is identical to git HEAD.
2016 sub test_source_only_changes ($) {
2018 foreach my $l (split /\n/, getfield $changes, 'Files') {
2019 $l =~ m/\S+$/ or next;
2020 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
2021 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
2022 print f_ "purportedly source-only changes polluted by %s\n", $&;
2029 sub changes_update_origs_from_dsc ($$$$) {
2030 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
2032 printdebug "checking origs needed ($upstreamvsn)...\n";
2033 $_ = getfield $changes, 'Files';
2034 m/^\w+ \d+ (\S+ \S+) \S+$/m or
2035 fail __ "cannot find section/priority from .changes Files field";
2036 my $placementinfo = $1;
2038 printdebug "checking origs needed placement '$placementinfo'...\n";
2039 foreach my $l (split /\n/, getfield $dsc, 'Files') {
2040 $l =~ m/\S+$/ or next;
2042 printdebug "origs $file | $l\n";
2043 next unless is_orig_file_of_vsn $file, $upstreamvsn;
2044 printdebug "origs $file is_orig\n";
2045 my $have = archive_query('file_in_archive', $file);
2046 if (!defined $have) {
2047 print STDERR __ <<END;
2048 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
2054 printdebug "origs $file \$#\$have=$#$have\n";
2055 foreach my $h (@$have) {
2058 foreach my $csumi (@files_csum_info_fields) {
2059 my ($fname, $module, $method, $archivefield) = @$csumi;
2060 next unless defined $h->{$archivefield};
2061 $_ = $dsc->{$fname};
2062 next unless defined;
2063 m/^(\w+) .* \Q$file\E$/m or
2064 fail f_ ".dsc %s missing entry for %s", $fname, $file;
2065 if ($h->{$archivefield} eq $1) {
2069 "%s: %s (archive) != %s (local .dsc)",
2070 $archivefield, $h->{$archivefield}, $1;
2073 confess "$file ".Dumper($h)." ?!" if $same && @differ;
2077 f_ "archive %s: %s", $h->{filename}, join "; ", @differ
2080 printdebug "origs $file f.same=$found_same".
2081 " #f._differ=$#found_differ\n";
2082 if (@found_differ && !$found_same) {
2084 (f_ "archive contains %s with different checksum", $file),
2087 # Now we edit the changes file to add or remove it
2088 foreach my $csumi (@files_csum_info_fields) {
2089 my ($fname, $module, $method, $archivefield) = @$csumi;
2090 next unless defined $changes->{$fname};
2092 # in archive, delete from .changes if it's there
2093 $changed{$file} = "removed" if
2094 $changes->{$fname} =~ s/\n.* \Q$file\E$(?:)$//m;
2095 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)$/m) {
2096 # not in archive, but it's here in the .changes
2098 my $dsc_data = getfield $dsc, $fname;
2099 $dsc_data =~ m/^(.* \Q$file\E$)$/m or die "$dsc_data $file ?";
2101 $extra =~ s/ \d+ /$&$placementinfo /
2102 or confess "$fname $extra >$dsc_data< ?"
2103 if $fname eq 'Files';
2104 $changes->{$fname} .= "\n". $extra;
2105 $changed{$file} = "added";
2110 foreach my $file (keys %changed) {
2112 "edited .changes for archive .orig contents: %s %s",
2113 $changed{$file}, $file;
2115 my $chtmp = "$changesfile.tmp";
2116 $changes->save($chtmp);
2118 rename $chtmp,$changesfile or die "$changesfile $!";
2120 progress f_ "[new .changes left in %s]", $changesfile;
2123 progress f_ "%s already has appropriate .orig(s) (if any)",
2128 sub clogp_authline ($) {
2130 my $author = getfield $clogp, 'Maintainer';
2131 if ($author =~ m/^[^"\@]+\,/) {
2132 # single entry Maintainer field with unquoted comma
2133 $author = ($& =~ y/,//rd).$'; # strip the comma
2135 # git wants a single author; any remaining commas in $author
2136 # are by now preceded by @ (or "). It seems safer to punt on
2137 # "..." for now rather than attempting to dequote or something.
2138 $author =~ s#,.*##ms unless $author =~ m/"/;
2139 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2140 my $authline = "$author $date";
2141 $authline =~ m/$git_authline_re/o or
2142 fail f_ "unexpected commit author line format \`%s'".
2143 " (was generated from changelog Maintainer field)",
2145 return ($1,$2,$3) if wantarray;
2149 sub vendor_patches_distro ($$) {
2150 my ($checkdistro, $what) = @_;
2151 return unless defined $checkdistro;
2153 my $series = "debian/patches/\L$checkdistro\E.series";
2154 printdebug "checking for vendor-specific $series ($what)\n";
2156 if (!open SERIES, "<", $series) {
2157 confess "$series $!" unless $!==ENOENT;
2164 print STDERR __ <<END;
2166 Unfortunately, this source package uses a feature of dpkg-source where
2167 the same source package unpacks to different source code on different
2168 distros. dgit cannot safely operate on such packages on affected
2169 distros, because the meaning of source packages is not stable.
2171 Please ask the distro/maintainer to remove the distro-specific series
2172 files and use a different technique (if necessary, uploading actually
2173 different packages, if different distros are supposed to have
2177 fail f_ "Found active distro-specific series file for".
2178 " %s (%s): %s, cannot continue",
2179 $checkdistro, $what, $series;
2181 die "$series $!" if SERIES->error;
2185 sub check_for_vendor_patches () {
2186 # This dpkg-source feature doesn't seem to be documented anywhere!
2187 # But it can be found in the changelog (reformatted):
2189 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2190 # Author: Raphael Hertzog <hertzog@debian.org>
2191 # Date: Sun Oct 3 09:36:48 2010 +0200
2193 # dpkg-source: correctly create .pc/.quilt_series with alternate
2196 # If you have debian/patches/ubuntu.series and you were
2197 # unpacking the source package on ubuntu, quilt was still
2198 # directed to debian/patches/series instead of
2199 # debian/patches/ubuntu.series.
2201 # debian/changelog | 3 +++
2202 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2203 # 2 files changed, 6 insertions(+), 1 deletion(-)
2206 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2207 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2208 __ "Dpkg::Vendor \`current vendor'");
2209 vendor_patches_distro(access_basedistro(),
2210 __ "(base) distro being accessed");
2211 vendor_patches_distro(access_nomdistro(),
2212 __ "(nominal) distro being accessed");
2215 sub check_bpd_exists () {
2216 stat $buildproductsdir
2217 or fail f_ "build-products-dir %s is not accessible: %s\n",
2218 $buildproductsdir, $!;
2221 sub dotdot_bpd_transfer_origs ($$$) {
2222 my ($bpd_abs, $upstreamversion, $wanted) = @_;
2223 # checks is_orig_file_of_vsn and if
2224 # calls $wanted->{$leaf} and expects boolish
2226 return if $buildproductsdir eq '..';
2229 my $dotdot = $maindir;
2230 $dotdot =~ s{/[^/]+$}{};
2231 opendir DD, $dotdot or fail "opendir .. ($dotdot): $!";
2232 while ($!=0, defined(my $leaf = readdir DD)) {
2234 local ($debuglevel) = $debuglevel-1;
2235 printdebug "DD_BPD $leaf ?\n";
2237 next unless is_orig_file_of_vsn $leaf, $upstreamversion;
2238 next unless $wanted->($leaf);
2239 next if lstat "$bpd_abs/$leaf";
2242 "%s: found orig(s) in .. missing from build-products-dir, transferring:\n",
2245 $! == &ENOENT or fail f_
2246 "check orig file %s in bpd %s: %s", $leaf, $bpd_abs, $!;
2247 lstat "$dotdot/$leaf" or fail f_
2248 "check orig file %s in ..: %s", $leaf, $!;
2250 stat "$dotdot/$leaf" or fail f_
2251 "check target of orig symlink %s in ..: %s", $leaf, $!;
2252 my $ltarget = readlink "$dotdot/$leaf" or
2253 die "readlink $dotdot/$leaf: $!";
2254 if ($ltarget !~ m{^/}) {
2255 $ltarget = "$dotdot/$ltarget";
2257 symlink $ltarget, "$bpd_abs/$leaf"
2258 or die "$ltarget $bpd_abs $leaf: $!";
2260 "%s: cloned orig symlink from ..: %s\n",
2262 } elsif (link "$dotdot/$leaf", "$bpd_abs/$leaf") {
2264 "%s: hardlinked orig from ..: %s\n",
2266 } elsif ($! != EXDEV) {
2267 fail f_ "failed to make %s a hardlink to %s: %s",
2268 "$bpd_abs/$leaf", "$dotdot/$leaf", $!;
2270 symlink "$bpd_abs/$leaf", "$dotdot/$leaf"
2271 or die "$bpd_abs $dotdot $leaf $!";
2273 "%s: symmlinked orig from .. on other filesystem: %s\n",
2277 die "$dotdot; $!" if $!;
2281 sub import_tarball_tartrees ($$) {
2282 my ($upstreamv, $dfi) = @_;
2283 # cwd should be the playground
2285 # We unpack and record the orig tarballs first, so that we only
2286 # need disk space for one private copy of the unpacked source.
2287 # But we can't make them into commits until we have the metadata
2288 # from the debian/changelog, so we record the tree objects now and
2289 # make them into commits later.
2291 my $orig_f_base = srcfn $upstreamv, '';
2293 foreach my $fi (@$dfi) {
2294 # We actually import, and record as a commit, every tarball
2295 # (unless there is only one file, in which case there seems
2298 my $f = $fi->{Filename};
2299 printdebug "import considering $f ";
2300 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2301 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2305 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2307 printdebug "Y ", (join ' ', map { $_//"(none)" }
2308 $compr_ext, $orig_f_part
2311 my $path = $fi->{Path} // $f;
2312 my $input = new IO::File $f, '<' or die "$f $!";
2316 if (defined $compr_ext) {
2318 Dpkg::Compression::compression_guess_from_filename $f;
2319 fail "Dpkg::Compression cannot handle file $f in source package"
2320 if defined $compr_ext && !defined $cname;
2322 new Dpkg::Compression::Process compression => $cname;
2323 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2324 my $compr_fh = new IO::Handle;
2325 my $compr_pid = open $compr_fh, "-|" // confess "$!";
2327 open STDIN, "<&", $input or confess "$!";
2329 die "dgit (child): exec $compr_cmd[0]: $!\n";
2334 rmtree "_unpack-tar";
2335 mkdir "_unpack-tar" or confess "$!";
2336 my @tarcmd = qw(tar -x -f -
2337 --no-same-owner --no-same-permissions
2338 --no-acls --no-xattrs --no-selinux);
2339 my $tar_pid = fork // confess "$!";
2341 chdir "_unpack-tar" or confess "$!";
2342 open STDIN, "<&", $input or confess "$!";
2344 die f_ "dgit (child): exec %s: %s", $tarcmd[0], $!;
2346 $!=0; (waitpid $tar_pid, 0) == $tar_pid or confess "$!";
2347 !$? or failedcmd @tarcmd;
2350 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2352 # finally, we have the results in "tarball", but maybe
2353 # with the wrong permissions
2355 runcmd qw(chmod -R +rwX _unpack-tar);
2356 changedir "_unpack-tar";
2357 remove_stray_gits($f);
2358 mktree_in_ud_here();
2360 my ($tree) = git_add_write_tree();
2361 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2362 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2364 printdebug "one subtree $1\n";
2366 printdebug "multiple subtrees\n";
2369 rmtree "_unpack-tar";
2371 my $ent = [ $f, $tree ];
2373 Orig => !!$orig_f_part,
2374 Sort => (!$orig_f_part ? 2 :
2375 $orig_f_part =~ m/-/g ? 1 :
2377 OrigPart => $orig_f_part, # 'orig', 'orig-XXX', or undef
2384 # put any without "_" first (spec is not clear whether files
2385 # are always in the usual order). Tarballs without "_" are
2386 # the main orig or the debian tarball.
2387 $a->{Sort} <=> $b->{Sort} or
2394 sub import_tarball_commits ($$) {
2395 my ($tartrees, $upstreamv) = @_;
2396 # cwd should be a playtree which has a relevant debian/changelog
2397 # fills in $tt->{Commit} for each one
2399 my $any_orig = grep { $_->{Orig} } @$tartrees;
2401 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2405 printdebug "import clog search...\n";
2406 parsechangelog_loop \@clogcmd, (__ "package changelog"), sub {
2407 my ($thisstanza, $desc) = @_;
2408 no warnings qw(exiting);
2410 $clogp //= $thisstanza;
2412 printdebug "import clog $thisstanza->{version} $desc...\n";
2414 last if !$any_orig; # we don't need $r1clogp
2416 # We look for the first (most recent) changelog entry whose
2417 # version number is lower than the upstream version of this
2418 # package. Then the last (least recent) previous changelog
2419 # entry is treated as the one which introduced this upstream
2420 # version and used for the synthetic commits for the upstream
2423 # One might think that a more sophisticated algorithm would be
2424 # necessary. But: we do not want to scan the whole changelog
2425 # file. Stopping when we see an earlier version, which
2426 # necessarily then is an earlier upstream version, is the only
2427 # realistic way to do that. Then, either the earliest
2428 # changelog entry we have seen so far is indeed the earliest
2429 # upload of this upstream version; or there are only changelog
2430 # entries relating to later upstream versions (which is not
2431 # possible unless the changelog and .dsc disagree about the
2432 # version). Then it remains to choose between the physically
2433 # last entry in the file, and the one with the lowest version
2434 # number. If these are not the same, we guess that the
2435 # versions were created in a non-monotonic order rather than
2436 # that the changelog entries have been misordered.
2438 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2440 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2441 $r1clogp = $thisstanza;
2443 printdebug "import clog $r1clogp->{version} becomes r1\n";
2446 $clogp or fail __ "package changelog has no entries!";
2448 my $authline = clogp_authline $clogp;
2449 my $changes = getfield $clogp, 'Changes';
2450 $changes =~ s/^\n//; # Changes: \n
2451 my $cversion = getfield $clogp, 'Version';
2455 $r1clogp //= $clogp; # maybe there's only one entry;
2456 $r1authline = clogp_authline $r1clogp;
2457 # Strictly, r1authline might now be wrong if it's going to be
2458 # unused because !$any_orig. Whatever.
2460 printdebug "import tartrees authline $authline\n";
2461 printdebug "import tartrees r1authline $r1authline\n";
2463 foreach my $tt (@$tartrees) {
2464 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2466 # untranslated so that different people's imports are identical
2467 my $mbody = sprintf "Import %s", $tt->{F};
2468 $tt->{Commit} = hash_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2471 committer $r1authline
2475 [dgit import orig $tt->{F}]
2483 [dgit import tarball $package $cversion $tt->{F}]
2488 return ($authline, $r1authline, $clogp, $changes);
2491 sub generate_commits_from_dsc () {
2492 # See big comment in fetch_from_archive, below.
2493 # See also README.dsc-import.
2495 changedir $playground;
2497 my $bpd_abs = bpd_abs();
2498 my $upstreamv = upstreamversion $dsc->{version};
2499 my @dfi = dsc_files_info();
2501 dotdot_bpd_transfer_origs $bpd_abs, $upstreamv,
2502 sub { grep { $_->{Filename} eq $_[0] } @dfi };
2504 foreach my $fi (@dfi) {
2505 my $f = $fi->{Filename};
2506 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2507 my $upper_f = "$bpd_abs/$f";
2509 printdebug "considering reusing $f: ";
2511 if (link_ltarget "$upper_f,fetch", $f) {
2512 printdebug "linked (using ...,fetch).\n";
2513 } elsif ((printdebug "($!) "),
2515 fail f_ "accessing %s: %s", "$buildproductsdir/$f,fetch", $!;
2516 } elsif (link_ltarget $upper_f, $f) {
2517 printdebug "linked.\n";
2518 } elsif ((printdebug "($!) "),
2520 fail f_ "accessing %s: %s", "$buildproductsdir/$f", $!;
2522 printdebug "absent.\n";
2526 complete_file_from_dsc('.', $fi, \$refetched)
2529 printdebug "considering saving $f: ";
2531 if (rename_link_xf 1, $f, $upper_f) {
2532 printdebug "linked.\n";
2533 } elsif ((printdebug "($@) "),
2535 fail f_ "saving %s: %s", "$buildproductsdir/$f", $@;
2536 } elsif (!$refetched) {
2537 printdebug "no need.\n";
2538 } elsif (rename_link_xf 1, $f, "$upper_f,fetch") {
2539 printdebug "linked (using ...,fetch).\n";
2540 } elsif ((printdebug "($@) "),
2542 fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $@;
2544 printdebug "cannot.\n";
2549 @tartrees = import_tarball_tartrees($upstreamv, \@dfi)
2550 unless @dfi == 1; # only one file in .dsc
2552 my $dscfn = "$package.dsc";
2554 my $treeimporthow = 'package';
2556 open D, ">", $dscfn or die "$dscfn: $!";
2557 print D $dscdata or die "$dscfn: $!";
2558 close D or die "$dscfn: $!";
2559 my @cmd = qw(dpkg-source);
2560 push @cmd, '--no-check' if $dsc_checked;
2561 if (madformat $dsc->{format}) {
2562 push @cmd, '--skip-patches';
2563 $treeimporthow = 'unpatched';
2565 push @cmd, qw(-x --), $dscfn;
2568 my ($tree,$dir) = mktree_in_ud_from_only_subdir(__ "source package");
2569 if (madformat $dsc->{format}) {
2570 check_for_vendor_patches();
2574 if (madformat $dsc->{format}) {
2575 my @pcmd = qw(dpkg-source --before-build .);
2576 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2578 $dappliedtree = git_add_write_tree();
2581 my ($authline, $r1authline, $clogp, $changes) =
2582 import_tarball_commits(\@tartrees, $upstreamv);
2584 my $cversion = getfield $clogp, 'Version';
2586 printdebug "import main commit\n";
2588 open C, ">../commit.tmp" or confess "$!";
2589 print C <<END or confess "$!";
2592 print C <<END or confess "$!" foreach @tartrees;
2595 print C <<END or confess "$!";
2601 [dgit import $treeimporthow $package $cversion]
2604 close C or confess "$!";
2605 my $rawimport_hash = hash_commit qw(../commit.tmp);
2607 if (madformat $dsc->{format}) {
2608 printdebug "import apply patches...\n";
2610 # regularise the state of the working tree so that
2611 # the checkout of $rawimport_hash works nicely.
2612 my $dappliedcommit = hash_commit_text(<<END);
2619 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2621 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2623 # We need the answers to be reproducible
2624 my @authline = clogp_authline($clogp);
2625 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2626 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2627 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2628 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2629 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2630 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2632 my $path = $ENV{PATH} or die;
2634 # we use ../../gbp-pq-output, which (given that we are in
2635 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2638 foreach my $use_absurd (qw(0 1)) {
2639 runcmd @git, qw(checkout -q unpa);
2640 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2641 local $ENV{PATH} = $path;
2644 progress "warning: $@";
2645 $path = "$absurdity:$path";
2646 progress f_ "%s: trying slow absurd-git-apply...", $us;
2647 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2652 die "forbid absurd git-apply\n" if $use_absurd
2653 && forceing [qw(import-gitapply-no-absurd)];
2654 die "only absurd git-apply!\n" if !$use_absurd
2655 && forceing [qw(import-gitapply-absurd)];
2657 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2658 local $ENV{PATH} = $path if $use_absurd;
2660 my @showcmd = (gbp_pq, qw(import));
2661 my @realcmd = shell_cmd
2662 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2663 debugcmd "+",@realcmd;
2664 if (system @realcmd) {
2665 die f_ "%s failed: %s\n",
2666 +(shellquote @showcmd),
2667 failedcmd_waitstatus();
2670 my $gapplied = git_rev_parse('HEAD');
2671 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2672 $gappliedtree eq $dappliedtree or
2673 fail f_ <<END, $gapplied, $gappliedtree, $dappliedtree;
2674 gbp-pq import and dpkg-source disagree!
2675 gbp-pq import gave commit %s
2676 gbp-pq import gave tree %s
2677 dpkg-source --before-build gave tree %s
2679 $rawimport_hash = $gapplied;
2684 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2689 progress f_ "synthesised git commit from .dsc %s", $cversion;
2691 my $rawimport_mergeinput = {
2692 Commit => $rawimport_hash,
2693 Info => __ "Import of source package",
2695 my @output = ($rawimport_mergeinput);
2697 if ($lastpush_mergeinput) {
2698 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2699 my $oversion = getfield $oldclogp, 'Version';
2701 version_compare($oversion, $cversion);
2703 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2704 { ReverseParents => 1,
2705 # untranslated so that different people's pseudomerges
2706 # are not needlessly different (although they will
2707 # still differ if the series of pulls is different)
2708 Message => (sprintf <<END, $package, $cversion, $csuite) });
2709 Record %s (%s) in archive suite %s
2711 } elsif ($vcmp > 0) {
2712 print STDERR f_ <<END, $cversion, $oversion,
2714 Version actually in archive: %s (older)
2715 Last version pushed with dgit: %s (newer or same)
2718 __ $later_warning_msg or confess "$!";
2719 @output = $lastpush_mergeinput;
2721 # Same version. Use what's in the server git branch,
2722 # discarding our own import. (This could happen if the
2723 # server automatically imports all packages into git.)
2724 @output = $lastpush_mergeinput;
2732 sub complete_file_from_dsc ($$;$) {
2733 our ($dstdir, $fi, $refetched) = @_;
2734 # Ensures that we have, in $dstdir, the file $fi, with the correct
2735 # contents. (Downloading it from alongside $dscurl if necessary.)
2736 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2737 # and will set $$refetched=1 if it did so (or tried to).
2739 my $f = $fi->{Filename};
2740 my $tf = "$dstdir/$f";
2744 my $checkhash = sub {
2745 open F, "<", "$tf" or die "$tf: $!";
2746 $fi->{Digester}->reset();
2747 $fi->{Digester}->addfile(*F);
2748 F->error and confess "$!";
2749 $got = $fi->{Digester}->hexdigest();
2750 return $got eq $fi->{Hash};
2753 if (stat_exists $tf) {
2754 if ($checkhash->()) {
2755 progress f_ "using existing %s", $f;
2759 fail f_ "file %s has hash %s but .dsc demands hash %s".
2760 " (perhaps you should delete this file?)",
2761 $f, $got, $fi->{Hash};
2763 progress f_ "need to fetch correct version of %s", $f;
2764 unlink $tf or die "$tf $!";
2767 printdebug "$tf does not exist, need to fetch\n";
2771 $furl =~ s{/[^/]+$}{};
2773 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2774 die "$f ?" if $f =~ m#/#;
2775 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2776 return 0 if !act_local();
2779 fail f_ "file %s has hash %s but .dsc demands hash %s".
2780 " (got wrong file from archive!)",
2781 $f, $got, $fi->{Hash};
2786 sub ensure_we_have_orig () {
2787 my @dfi = dsc_files_info();
2788 foreach my $fi (@dfi) {
2789 my $f = $fi->{Filename};
2790 next unless is_orig_file_in_dsc($f, \@dfi);
2791 complete_file_from_dsc($buildproductsdir, $fi)
2796 #---------- git fetch ----------
2798 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2799 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2801 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2802 # locally fetched refs because they have unhelpful names and clutter
2803 # up gitk etc. So we track whether we have "used up" head ref (ie,
2804 # whether we have made another local ref which refers to this object).
2806 # (If we deleted them unconditionally, then we might end up
2807 # re-fetching the same git objects each time dgit fetch was run.)
2809 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2810 # in git_fetch_us to fetch the refs in question, and possibly a call
2811 # to lrfetchref_used.
2813 our (%lrfetchrefs_f, %lrfetchrefs_d);
2814 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2816 sub lrfetchref_used ($) {
2817 my ($fullrefname) = @_;
2818 my $objid = $lrfetchrefs_f{$fullrefname};
2819 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2822 sub git_lrfetch_sane {
2823 my ($url, $supplementary, @specs) = @_;
2824 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2825 # at least as regards @specs. Also leave the results in
2826 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2827 # able to clean these up.
2829 # With $supplementary==1, @specs must not contain wildcards
2830 # and we add to our previous fetches (non-atomically).
2832 # This is rather miserable:
2833 # When git fetch --prune is passed a fetchspec ending with a *,
2834 # it does a plausible thing. If there is no * then:
2835 # - it matches subpaths too, even if the supplied refspec
2836 # starts refs, and behaves completely madly if the source
2837 # has refs/refs/something. (See, for example, Debian #NNNN.)
2838 # - if there is no matching remote ref, it bombs out the whole
2840 # We want to fetch a fixed ref, and we don't know in advance
2841 # if it exists, so this is not suitable.
2843 # Our workaround is to use git ls-remote. git ls-remote has its
2844 # own qairks. Notably, it has the absurd multi-tail-matching
2845 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2846 # refs/refs/foo etc.
2848 # Also, we want an idempotent snapshot, but we have to make two
2849 # calls to the remote: one to git ls-remote and to git fetch. The
2850 # solution is use git ls-remote to obtain a target state, and
2851 # git fetch to try to generate it. If we don't manage to generate
2852 # the target state, we try again.
2854 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2856 my $specre = join '|', map {
2859 my $wildcard = $x =~ s/\\\*$/.*/;
2860 die if $wildcard && $supplementary;
2863 printdebug "git_lrfetch_sane specre=$specre\n";
2864 my $wanted_rref = sub {
2866 return m/^(?:$specre)$/;
2869 my $fetch_iteration = 0;
2872 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2873 if (++$fetch_iteration > 10) {
2874 fail __ "too many iterations trying to get sane fetch!";
2877 my @look = map { "refs/$_" } @specs;
2878 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2882 open GITLS, "-|", @lcmd or confess "$!";
2884 printdebug "=> ", $_;
2885 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2886 my ($objid,$rrefname) = ($1,$2);
2887 if (!$wanted_rref->($rrefname)) {
2888 print STDERR f_ <<END, "@look", $rrefname;
2889 warning: git ls-remote %s reported %s; this is silly, ignoring it.
2893 $wantr{$rrefname} = $objid;
2896 close GITLS or failedcmd @lcmd;
2898 # OK, now %want is exactly what we want for refs in @specs
2900 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2901 "+refs/$_:".lrfetchrefs."/$_";
2904 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2906 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2907 runcmd_ordryrun_local @fcmd if @fspecs;
2909 if (!$supplementary) {
2910 %lrfetchrefs_f = ();
2914 git_for_each_ref(lrfetchrefs, sub {
2915 my ($objid,$objtype,$lrefname,$reftail) = @_;
2916 $lrfetchrefs_f{$lrefname} = $objid;
2917 $objgot{$objid} = 1;
2920 if ($supplementary) {
2924 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2925 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2926 if (!exists $wantr{$rrefname}) {
2927 if ($wanted_rref->($rrefname)) {
2929 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2932 print STDERR f_ <<END, "@fspecs", $lrefname
2933 warning: git fetch %s created %s; this is silly, deleting it.
2936 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2937 delete $lrfetchrefs_f{$lrefname};
2941 foreach my $rrefname (sort keys %wantr) {
2942 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2943 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2944 my $want = $wantr{$rrefname};
2945 next if $got eq $want;
2946 if (!defined $objgot{$want}) {
2947 fail __ <<END unless act_local();
2948 --dry-run specified but we actually wanted the results of git fetch,
2949 so this is not going to work. Try running dgit fetch first,
2950 or using --damp-run instead of --dry-run.
2952 print STDERR f_ <<END, $lrefname, $want;
2953 warning: git ls-remote suggests we want %s
2954 warning: and it should refer to %s
2955 warning: but git fetch didn't fetch that object to any relevant ref.
2956 warning: This may be due to a race with someone updating the server.
2957 warning: Will try again...
2959 next FETCH_ITERATION;
2962 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2964 runcmd_ordryrun_local @git, qw(update-ref -m),
2965 "dgit fetch git fetch fixup", $lrefname, $want;
2966 $lrfetchrefs_f{$lrefname} = $want;
2971 if (defined $csuite) {
2972 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2973 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2974 my ($objid,$objtype,$lrefname,$reftail) = @_;
2975 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2976 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2980 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2981 Dumper(\%lrfetchrefs_f);
2984 sub git_fetch_us () {
2985 # Want to fetch only what we are going to use, unless
2986 # deliberately-not-ff, in which case we must fetch everything.
2988 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2989 map { "tags/$_" } debiantags('*',access_nomdistro);
2990 push @specs, server_branch($csuite);
2991 push @specs, $rewritemap;
2992 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2994 my $url = access_giturl();
2995 git_lrfetch_sane $url, 0, @specs;
2998 my @tagpats = debiantags('*',access_nomdistro);
3000 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
3001 my ($objid,$objtype,$fullrefname,$reftail) = @_;
3002 printdebug "currently $fullrefname=$objid\n";
3003 $here{$fullrefname} = $objid;
3005 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
3006 my ($objid,$objtype,$fullrefname,$reftail) = @_;
3007 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
3008 printdebug "offered $lref=$objid\n";
3009 if (!defined $here{$lref}) {
3010 my @upd = (@git, qw(update-ref), $lref, $objid, '');
3011 runcmd_ordryrun_local @upd;
3012 lrfetchref_used $fullrefname;
3013 } elsif ($here{$lref} eq $objid) {
3014 lrfetchref_used $fullrefname;
3016 print STDERR f_ "Not updating %s from %s to %s.\n",
3017 $lref, $here{$lref}, $objid;
3022 #---------- dsc and archive handling ----------
3024 sub mergeinfo_getclogp ($) {
3025 # Ensures thit $mi->{Clogp} exists and returns it
3027 $mi->{Clogp} = commit_getclogp($mi->{Commit});
3030 sub mergeinfo_version ($) {
3031 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
3034 sub fetch_from_archive_record_1 ($) {
3036 runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
3037 cmdoutput @git, qw(log -n2), $hash;
3038 # ... gives git a chance to complain if our commit is malformed
3041 sub fetch_from_archive_record_2 ($) {
3043 my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
3047 dryrun_report @upd_cmd;
3051 sub parse_dsc_field_def_dsc_distro () {
3052 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
3053 dgit.default.distro);
3056 sub parse_dsc_field ($$) {
3057 my ($dsc, $what) = @_;
3059 foreach my $field (@ourdscfield) {
3060 $f = $dsc->{$field};
3065 progress f_ "%s: NO git hash", $what;
3066 parse_dsc_field_def_dsc_distro();
3067 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
3068 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
3069 progress f_ "%s: specified git info (%s)", $what, $dsc_distro;
3070 $dsc_hint_tag = [ $dsc_hint_tag ];
3071 } elsif ($f =~ m/^\w+\s*$/) {
3073 parse_dsc_field_def_dsc_distro();
3074 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
3076 progress f_ "%s: specified git hash", $what;
3078 fail f_ "%s: invalid Dgit info", $what;
3082 sub resolve_dsc_field_commit ($$) {
3083 my ($already_distro, $already_mapref) = @_;
3085 return unless defined $dsc_hash;
3088 defined $already_mapref &&
3089 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
3090 ? $already_mapref : undef;
3094 my ($what, @fetch) = @_;
3096 local $idistro = $dsc_distro;
3097 my $lrf = lrfetchrefs;
3099 if (!$chase_dsc_distro) {
3100 progress f_ "not chasing .dsc distro %s: not fetching %s",
3105 progress f_ ".dsc names distro %s: fetching %s", $dsc_distro, $what;
3107 my $url = access_giturl();
3108 if (!defined $url) {
3109 defined $dsc_hint_url or fail f_ <<END, $dsc_distro;
3110 .dsc Dgit metadata is in context of distro %s
3111 for which we have no configured url and .dsc provides no hint
3114 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
3115 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
3116 parse_cfg_bool "dsc-url-proto-ok", 'false',
3117 cfg("dgit.dsc-url-proto-ok.$proto",
3118 "dgit.default.dsc-url-proto-ok")
3119 or fail f_ <<END, $dsc_distro, $proto;
3120 .dsc Dgit metadata is in context of distro %s
3121 for which we have no configured url;
3122 .dsc provides hinted url with protocol %s which is unsafe.
3123 (can be overridden by config - consult documentation)
3125 $url = $dsc_hint_url;
3128 git_lrfetch_sane $url, 1, @fetch;
3133 my $rewrite_enable = do {
3134 local $idistro = $dsc_distro;
3135 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
3138 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
3139 if (!defined $mapref) {
3140 my $lrf = $do_fetch->((__ "rewrite map"), $rewritemap) or return;
3141 $mapref = $lrf.'/'.$rewritemap;
3143 my $rewritemapdata = git_cat_file $mapref.':map';
3144 if (defined $rewritemapdata
3145 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
3147 "server's git history rewrite map contains a relevant entry!";
3150 if (defined $dsc_hash) {
3151 progress __ "using rewritten git hash in place of .dsc value";
3153 progress __ "server data says .dsc hash is to be disregarded";
3158 if (!defined git_cat_file $dsc_hash) {
3159 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
3160 my $lrf = $do_fetch->((__ "additional commits"), @tags) &&
3161 defined git_cat_file $dsc_hash
3162 or fail f_ <<END, $dsc_hash;
3163 .dsc Dgit metadata requires commit %s
3164 but we could not obtain that object anywhere.
3166 foreach my $t (@tags) {
3167 my $fullrefname = $lrf.'/'.$t;
3168 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
3169 next unless $lrfetchrefs_f{$fullrefname};
3170 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
3171 lrfetchref_used $fullrefname;
3176 sub fetch_from_archive () {
3178 ensure_setup_existing_tree();
3180 # Ensures that lrref() is what is actually in the archive, one way
3181 # or another, according to us - ie this client's
3182 # appropritaely-updated archive view. Also returns the commit id.
3183 # If there is nothing in the archive, leaves lrref alone and
3184 # returns undef. git_fetch_us must have already been called.
3188 parse_dsc_field($dsc, __ 'last upload to archive');
3189 resolve_dsc_field_commit access_basedistro,
3190 lrfetchrefs."/".$rewritemap
3192 progress __ "no version available from the archive";
3195 # If the archive's .dsc has a Dgit field, there are three
3196 # relevant git commitids we need to choose between and/or merge
3198 # 1. $dsc_hash: the Dgit field from the archive
3199 # 2. $lastpush_hash: the suite branch on the dgit git server
3200 # 3. $lastfetch_hash: our local tracking brach for the suite
3202 # These may all be distinct and need not be in any fast forward
3205 # If the dsc was pushed to this suite, then the server suite
3206 # branch will have been updated; but it might have been pushed to
3207 # a different suite and copied by the archive. Conversely a more
3208 # recent version may have been pushed with dgit but not appeared
3209 # in the archive (yet).
3211 # $lastfetch_hash may be awkward because archive imports
3212 # (particularly, imports of Dgit-less .dscs) are performed only as
3213 # needed on individual clients, so different clients may perform a
3214 # different subset of them - and these imports are only made
3215 # public during push. So $lastfetch_hash may represent a set of
3216 # imports different to a subsequent upload by a different dgit
3219 # Our approach is as follows:
3221 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3222 # descendant of $dsc_hash, then it was pushed by a dgit user who
3223 # had based their work on $dsc_hash, so we should prefer it.
3224 # Otherwise, $dsc_hash was installed into this suite in the
3225 # archive other than by a dgit push, and (necessarily) after the
3226 # last dgit push into that suite (since a dgit push would have
3227 # been descended from the dgit server git branch); thus, in that
3228 # case, we prefer the archive's version (and produce a
3229 # pseudo-merge to overwrite the dgit server git branch).
3231 # (If there is no Dgit field in the archive's .dsc then
3232 # generate_commit_from_dsc uses the version numbers to decide
3233 # whether the suite branch or the archive is newer. If the suite
3234 # branch is newer it ignores the archive's .dsc; otherwise it
3235 # generates an import of the .dsc, and produces a pseudo-merge to
3236 # overwrite the suite branch with the archive contents.)
3238 # The outcome of that part of the algorithm is the `public view',
3239 # and is same for all dgit clients: it does not depend on any
3240 # unpublished history in the local tracking branch.
3242 # As between the public view and the local tracking branch: The
3243 # local tracking branch is only updated by dgit fetch, and
3244 # whenever dgit fetch runs it includes the public view in the
3245 # local tracking branch. Therefore if the public view is not
3246 # descended from the local tracking branch, the local tracking
3247 # branch must contain history which was imported from the archive
3248 # but never pushed; and, its tip is now out of date. So, we make
3249 # a pseudo-merge to overwrite the old imports and stitch the old
3252 # Finally: we do not necessarily reify the public view (as
3253 # described above). This is so that we do not end up stacking two
3254 # pseudo-merges. So what we actually do is figure out the inputs
3255 # to any public view pseudo-merge and put them in @mergeinputs.
3258 # $mergeinputs[]{Commit}
3259 # $mergeinputs[]{Info}
3260 # $mergeinputs[0] is the one whose tree we use
3261 # @mergeinputs is in the order we use in the actual commit)
3264 # $mergeinputs[]{Message} is a commit message to use
3265 # $mergeinputs[]{ReverseParents} if def specifies that parent
3266 # list should be in opposite order
3267 # Such an entry has no Commit or Info. It applies only when found
3268 # in the last entry. (This ugliness is to support making
3269 # identical imports to previous dgit versions.)
3271 my $lastpush_hash = git_get_ref(lrfetchref());
3272 printdebug "previous reference hash=$lastpush_hash\n";
3273 $lastpush_mergeinput = $lastpush_hash && {
3274 Commit => $lastpush_hash,
3275 Info => (__ "dgit suite branch on dgit git server"),
3278 my $lastfetch_hash = git_get_ref(lrref());
3279 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3280 my $lastfetch_mergeinput = $lastfetch_hash && {
3281 Commit => $lastfetch_hash,
3282 Info => (__ "dgit client's archive history view"),
3285 my $dsc_mergeinput = $dsc_hash && {
3286 Commit => $dsc_hash,
3287 Info => (__ "Dgit field in .dsc from archive"),
3291 my $del_lrfetchrefs = sub {
3294 printdebug "del_lrfetchrefs...\n";
3295 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3296 my $objid = $lrfetchrefs_d{$fullrefname};
3297 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3299 $gur ||= new IO::Handle;
3300 open $gur, "|-", qw(git update-ref --stdin) or confess "$!";
3302 printf $gur "delete %s %s\n", $fullrefname, $objid;
3305 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3309 if (defined $dsc_hash) {
3310 ensure_we_have_orig();
3311 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3312 @mergeinputs = $dsc_mergeinput
3313 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3314 print STDERR f_ <<END, $dsc_hash, $lastpush_hash,
3316 Git commit in archive is behind the last version allegedly pushed/uploaded.
3317 Commit referred to by archive: %s
3318 Last version pushed with dgit: %s
3321 __ $later_warning_msg or confess "$!";
3322 @mergeinputs = ($lastpush_mergeinput);
3324 # Archive has .dsc which is not a descendant of the last dgit
3325 # push. This can happen if the archive moves .dscs about.
3326 # Just follow its lead.
3327 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3328 progress __ "archive .dsc names newer git commit";
3329 @mergeinputs = ($dsc_mergeinput);
3331 progress __ "archive .dsc names other git commit, fixing up";
3332 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3336 @mergeinputs = generate_commits_from_dsc();
3337 # We have just done an import. Now, our import algorithm might
3338 # have been improved. But even so we do not want to generate
3339 # a new different import of the same package. So if the
3340 # version numbers are the same, just use our existing version.
3341 # If the version numbers are different, the archive has changed
3342 # (perhaps, rewound).
3343 if ($lastfetch_mergeinput &&
3344 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3345 (mergeinfo_version $mergeinputs[0]) )) {
3346 @mergeinputs = ($lastfetch_mergeinput);
3348 } elsif ($lastpush_hash) {
3349 # only in git, not in the archive yet
3350 @mergeinputs = ($lastpush_mergeinput);
3351 print STDERR f_ <<END,
3353 Package not found in the archive, but has allegedly been pushed using dgit.
3356 __ $later_warning_msg or confess "$!";
3358 printdebug "nothing found!\n";
3359 if (defined $skew_warning_vsn) {
3360 print STDERR f_ <<END, $skew_warning_vsn or confess "$!";
3362 Warning: relevant archive skew detected.
3363 Archive allegedly contains %s
3364 But we were not able to obtain any version from the archive or git.
3368 unshift @end, $del_lrfetchrefs;
3372 if ($lastfetch_hash &&
3374 my $h = $_->{Commit};
3375 $h and is_fast_fwd($lastfetch_hash, $h);
3376 # If true, one of the existing parents of this commit
3377 # is a descendant of the $lastfetch_hash, so we'll
3378 # be ff from that automatically.
3382 push @mergeinputs, $lastfetch_mergeinput;
3385 printdebug "fetch mergeinfos:\n";
3386 foreach my $mi (@mergeinputs) {
3388 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3390 printdebug sprintf " ReverseParents=%d Message=%s",
3391 $mi->{ReverseParents}, $mi->{Message};
3395 my $compat_info= pop @mergeinputs
3396 if $mergeinputs[$#mergeinputs]{Message};
3398 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3401 if (@mergeinputs > 1) {
3403 my $tree_commit = $mergeinputs[0]{Commit};
3405 my $tree = get_tree_of_commit $tree_commit;;
3407 # We use the changelog author of the package in question the
3408 # author of this pseudo-merge. This is (roughly) correct if
3409 # this commit is simply representing aa non-dgit upload.
3410 # (Roughly because it does not record sponsorship - but we
3411 # don't have sponsorship info because that's in the .changes,
3412 # which isn't in the archivw.)
3414 # But, it might be that we are representing archive history
3415 # updates (including in-archive copies). These are not really
3416 # the responsibility of the person who created the .dsc, but
3417 # there is no-one whose name we should better use. (The
3418 # author of the .dsc-named commit is clearly worse.)
3420 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3421 my $author = clogp_authline $useclogp;
3422 my $cversion = getfield $useclogp, 'Version';
3424 my $mcf = dgit_privdir()."/mergecommit";
3425 open MC, ">", $mcf or die "$mcf $!";
3426 print MC <<END or confess "$!";
3430 my @parents = grep { $_->{Commit} } @mergeinputs;
3431 @parents = reverse @parents if $compat_info->{ReverseParents};
3432 print MC <<END or confess "$!" foreach @parents;
3436 print MC <<END or confess "$!";
3442 if (defined $compat_info->{Message}) {
3443 print MC $compat_info->{Message} or confess "$!";
3445 print MC f_ <<END, $package, $cversion, $csuite or confess "$!";
3446 Record %s (%s) in archive suite %s
3450 my $message_add_info = sub {
3452 my $mversion = mergeinfo_version $mi;
3453 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3457 $message_add_info->($mergeinputs[0]);
3458 print MC __ <<END or confess "$!";
3459 should be treated as descended from
3461 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3464 close MC or confess "$!";
3465 $hash = hash_commit $mcf;
3467 $hash = $mergeinputs[0]{Commit};
3469 printdebug "fetch hash=$hash\n";
3472 my ($lasth, $what) = @_;
3473 return unless $lasth;
3474 confess "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3477 $chkff->($lastpush_hash, __ 'dgit repo server tip (last push)')
3479 $chkff->($lastfetch_hash, __ 'local tracking tip (last fetch)');
3481 fetch_from_archive_record_1($hash);
3483 if (defined $skew_warning_vsn) {
3484 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3485 my $gotclogp = commit_getclogp($hash);
3486 my $got_vsn = getfield $gotclogp, 'Version';
3487 printdebug "SKEW CHECK GOT $got_vsn\n";
3488 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3489 print STDERR f_ <<END, $skew_warning_vsn, $got_vsn or confess "$!";
3491 Warning: archive skew detected. Using the available version:
3492 Archive allegedly contains %s
3493 We were able to obtain only %s
3499 if ($lastfetch_hash ne $hash) {
3500 fetch_from_archive_record_2($hash);
3503 lrfetchref_used lrfetchref();
3505 check_gitattrs($hash, __ "fetched source tree");
3507 unshift @end, $del_lrfetchrefs;
3511 sub set_local_git_config ($$) {
3513 runcmd @git, qw(config), $k, $v;
3516 sub setup_mergechangelogs (;$) {
3518 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3520 my $driver = 'dpkg-mergechangelogs';
3521 my $cb = "merge.$driver";
3522 confess unless defined $maindir;
3523 my $attrs = "$maindir_gitcommon/info/attributes";
3524 ensuredir "$maindir_gitcommon/info";
3526 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3527 if (!open ATTRS, "<", $attrs) {
3528 $!==ENOENT or die "$attrs: $!";
3532 next if m{^debian/changelog\s};
3533 print NATTRS $_, "\n" or confess "$!";
3535 ATTRS->error and confess "$!";
3538 print NATTRS "debian/changelog merge=$driver\n" or confess "$!";
3541 set_local_git_config "$cb.name", __ 'debian/changelog merge driver';
3542 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3544 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3547 sub setup_useremail (;$) {
3549 return unless $always || access_cfg_bool(1, 'setup-useremail');
3552 my ($k, $envvar) = @_;
3553 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3554 return unless defined $v;
3555 set_local_git_config "user.$k", $v;
3558 $setup->('email', 'DEBEMAIL');
3559 $setup->('name', 'DEBFULLNAME');
3562 sub ensure_setup_existing_tree () {
3563 my $k = "remote.$remotename.skipdefaultupdate";
3564 my $c = git_get_config $k;
3565 return if defined $c;
3566 set_local_git_config $k, 'true';
3569 sub open_main_gitattrs () {
3570 confess 'internal error no maindir' unless defined $maindir;
3571 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3573 or die "open $maindir_gitcommon/info/attributes: $!";
3577 our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
3579 sub is_gitattrs_setup () {
3582 # 1: gitattributes set up and should be left alone
3584 # 0: there is a dgit-defuse-attrs but it needs fixing
3585 # undef: there is none
3586 my $gai = open_main_gitattrs();
3587 return 0 unless $gai;
3589 next unless m{$gitattrs_ourmacro_re};
3590 return 1 if m{\s-working-tree-encoding\s};
3591 printdebug "is_gitattrs_setup: found old macro\n";
3594 $gai->error and confess "$!";
3595 printdebug "is_gitattrs_setup: found nothing\n";
3599 sub setup_gitattrs (;$) {
3601 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3603 my $already = is_gitattrs_setup();
3606 [attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
3607 not doing further gitattributes setup
3611 my $new = "[attr]dgit-defuse-attrs $negate_harmful_gitattrs";
3612 my $af = "$maindir_gitcommon/info/attributes";
3613 ensuredir "$maindir_gitcommon/info";
3615 open GAO, "> $af.new" or confess "$!";
3616 print GAO <<END, __ <<ENDT or confess "$!" unless defined $already;
3620 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3622 my $gai = open_main_gitattrs();
3625 if (m{$gitattrs_ourmacro_re}) {
3626 die unless defined $already;
3630 print GAO $_, "\n" or confess "$!";
3632 $gai->error and confess "$!";
3634 close GAO or confess "$!";
3635 rename "$af.new", "$af" or fail f_ "install %s: %s", $af, $!;
3638 sub setup_new_tree () {
3639 setup_mergechangelogs();
3644 sub check_gitattrs ($$) {
3645 my ($treeish, $what) = @_;
3647 return if is_gitattrs_setup;
3650 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3652 my $gafl = new IO::File;
3653 open $gafl, "-|", @cmd or confess "$!";
3656 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3658 next unless m{(?:^|/)\.gitattributes$};
3660 # oh dear, found one
3661 print STDERR f_ <<END, $what;
3662 dgit: warning: %s contains .gitattributes
3663 dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree.
3668 # tree contains no .gitattributes files
3669 $?=0; $!=0; close $gafl or failedcmd @cmd;
3673 sub multisuite_suite_child ($$$) {
3674 my ($tsuite, $mergeinputs, $fn) = @_;
3675 # in child, sets things up, calls $fn->(), and returns undef
3676 # in parent, returns canonical suite name for $tsuite
3677 my $canonsuitefh = IO::File::new_tmpfile;
3678 my $pid = fork // confess "$!";
3682 $us .= " [$isuite]";
3683 $debugprefix .= " ";
3684 progress f_ "fetching %s...", $tsuite;
3685 canonicalise_suite();
3686 print $canonsuitefh $csuite, "\n" or confess "$!";
3687 close $canonsuitefh or confess "$!";
3691 waitpid $pid,0 == $pid or confess "$!";
3692 fail f_ "failed to obtain %s: %s", $tsuite, waitstatusmsg()
3694 seek $canonsuitefh,0,0 or confess "$!";
3695 local $csuite = <$canonsuitefh>;
3696 confess "$!" unless defined $csuite && chomp $csuite;
3698 printdebug "multisuite $tsuite missing\n";
3701 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3702 push @$mergeinputs, {
3709 sub fork_for_multisuite ($) {
3710 my ($before_fetch_merge) = @_;
3711 # if nothing unusual, just returns ''
3714 # returns 0 to caller in child, to do first of the specified suites
3715 # in child, $csuite is not yet set
3717 # returns 1 to caller in parent, to finish up anything needed after
3718 # in parent, $csuite is set to canonicalised portmanteau
3720 my $org_isuite = $isuite;
3721 my @suites = split /\,/, $isuite;
3722 return '' unless @suites > 1;
3723 printdebug "fork_for_multisuite: @suites\n";
3727 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3729 return 0 unless defined $cbasesuite;
3731 fail f_ "package %s missing in (base suite) %s", $package, $cbasesuite
3732 unless @mergeinputs;
3734 my @csuites = ($cbasesuite);
3736 $before_fetch_merge->();
3738 foreach my $tsuite (@suites[1..$#suites]) {
3739 $tsuite =~ s/^-/$cbasesuite-/;
3740 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3747 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3748 push @csuites, $csubsuite;
3751 foreach my $mi (@mergeinputs) {
3752 my $ref = git_get_ref $mi->{Ref};
3753 die "$mi->{Ref} ?" unless length $ref;
3754 $mi->{Commit} = $ref;
3757 $csuite = join ",", @csuites;
3759 my $previous = git_get_ref lrref;
3761 unshift @mergeinputs, {
3762 Commit => $previous,
3763 Info => (__ "local combined tracking branch"),
3765 "archive seems to have rewound: local tracking branch is ahead!"),
3769 foreach my $ix (0..$#mergeinputs) {
3770 $mergeinputs[$ix]{Index} = $ix;
3773 @mergeinputs = sort {
3774 -version_compare(mergeinfo_version $a,
3775 mergeinfo_version $b) # highest version first
3777 $a->{Index} <=> $b->{Index}; # earliest in spec first
3783 foreach my $mi (@mergeinputs) {
3784 printdebug "multisuite merge check $mi->{Info}\n";
3785 foreach my $previous (@needed) {
3786 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3787 printdebug "multisuite merge un-needed $previous->{Info}\n";
3791 printdebug "multisuite merge this-needed\n";
3792 $mi->{Character} = '+';
3795 $needed[0]{Character} = '*';
3797 my $output = $needed[0]{Commit};
3800 printdebug "multisuite merge nontrivial\n";
3801 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3803 my $commit = "tree $tree\n";
3804 my $msg = f_ "Combine archive branches %s [dgit]\n\n".
3805 "Input branches:\n",
3808 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3809 printdebug "multisuite merge include $mi->{Info}\n";
3810 $mi->{Character} //= ' ';
3811 $commit .= "parent $mi->{Commit}\n";
3812 $msg .= sprintf " %s %-25s %s\n",
3814 (mergeinfo_version $mi),
3817 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3818 $msg .= __ "\nKey\n".
3819 " * marks the highest version branch, which choose to use\n".
3820 " + marks each branch which was not already an ancestor\n\n";
3822 "[dgit multi-suite $csuite]\n";
3824 "author $authline\n".
3825 "committer $authline\n\n";
3826 $output = hash_commit_text $commit.$msg;
3827 printdebug "multisuite merge generated $output\n";
3830 fetch_from_archive_record_1($output);
3831 fetch_from_archive_record_2($output);
3833 progress f_ "calculated combined tracking suite %s", $csuite;
3838 sub clone_set_head () {
3839 open H, "> .git/HEAD" or confess "$!";
3840 print H "ref: ".lref()."\n" or confess "$!";
3841 close H or confess "$!";
3843 sub clone_finish ($) {
3845 runcmd @git, qw(reset --hard), lrref();
3846 runcmd qw(bash -ec), <<'END';
3848 git ls-tree -r --name-only -z HEAD | \
3849 xargs -0r touch -h -r . --
3851 printdone f_ "ready for work in %s", $dstdir;
3855 # in multisuite, returns twice!
3856 # once in parent after first suite fetched,
3857 # and then again in child after everything is finished
3859 badusage __ "dry run makes no sense with clone" unless act_local();
3861 my $multi_fetched = fork_for_multisuite(sub {
3862 printdebug "multi clone before fetch merge\n";
3866 if ($multi_fetched) {
3867 printdebug "multi clone after fetch merge\n";
3869 clone_finish($dstdir);
3872 printdebug "clone main body\n";
3874 mkdir $dstdir or fail f_ "create \`%s': %s", $dstdir, $!;
3878 canonicalise_suite();
3879 my $hasgit = check_for_git();
3881 runcmd @git, qw(init -q);
3885 my $giturl = access_giturl(1);
3886 if (defined $giturl) {
3887 runcmd @git, qw(remote add), 'origin', $giturl;
3890 progress __ "fetching existing git history";
3892 runcmd_ordryrun_local @git, qw(fetch origin);
3894 progress __ "starting new git history";
3896 fetch_from_archive() or no_such_package;
3897 my $vcsgiturl = $dsc->{'Vcs-Git'};
3898 if (length $vcsgiturl) {
3899 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3900 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3902 clone_finish($dstdir);
3906 canonicalise_suite();
3907 if (check_for_git()) {
3910 fetch_from_archive() or no_such_package();
3912 my $vcsgiturl = $dsc && $dsc->{'Vcs-Git'};
3913 if (length $vcsgiturl and
3914 (grep { $csuite eq $_ }
3916 cfg 'dgit.vcs-git.suites')) {
3917 my $current = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
3918 if (defined $current && $current ne $vcsgiturl) {
3919 print STDERR f_ <<END, $csuite;
3920 FYI: Vcs-Git in %s has different url to your vcs-git remote.
3921 Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?
3925 printdone f_ "fetched into %s", lrref();
3929 my $multi_fetched = fork_for_multisuite(sub { });
3930 fetch_one() unless $multi_fetched; # parent
3931 finish 0 if $multi_fetched eq '0'; # child
3936 runcmd_ordryrun_local @git, qw(merge -m),
3937 (f_ "Merge from %s [dgit]", $csuite),
3939 printdone f_ "fetched to %s and merged into HEAD", lrref();
3942 sub check_not_dirty () {
3943 my @forbid = qw(local-options local-patch-header);
3944 @forbid = map { "debian/source/$_" } @forbid;
3945 foreach my $f (@forbid) {
3946 if (stat_exists $f) {
3947 fail f_ "git tree contains %s", $f;
3951 my @cmd = (@git, qw(status -uall --ignored --porcelain));
3952 push @cmd, qw(debian/source/format debian/source/options);
3955 my $bad = cmdoutput @cmd;
3958 "you have uncommitted changes to critical files, cannot continue:\n").
3962 return if $includedirty;
3964 git_check_unmodified();
3967 sub commit_admin ($) {
3970 runcmd_ordryrun_local @git, qw(commit -m), $m;
3973 sub quiltify_nofix_bail ($$) {
3974 my ($headinfo, $xinfo) = @_;
3975 if ($quilt_mode eq 'nofix') {
3977 "quilt fixup required but quilt mode is \`nofix'\n".
3978 "HEAD commit%s differs from tree implied by debian/patches%s",
3983 sub commit_quilty_patch () {
3984 my $output = cmdoutput @git, qw(status --ignored --porcelain);
3986 foreach my $l (split /\n/, $output) {
3987 next unless $l =~ m/\S/;
3988 if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
3992 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3994 progress __ "nothing quilty to commit, ok.";
3997 quiltify_nofix_bail "", __ " (wanted to commit patch update)";
3998 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3999 runcmd_ordryrun_local @git, qw(add -f), @adds;
4000 commit_admin +(__ <<ENDT).<<END
4001 Commit Debian 3.0 (quilt) metadata
4004 [dgit ($our_version) quilt-fixup]
4008 sub get_source_format () {
4010 if (open F, "debian/source/options") {
4014 s/\s+$//; # ignore missing final newline
4016 my ($k, $v) = ($`, $'); #');
4017 $v =~ s/^"(.*)"$/$1/;
4023 F->error and confess "$!";
4026 confess "$!" unless $!==&ENOENT;
4029 if (!open F, "debian/source/format") {
4030 confess "$!" unless $!==&ENOENT;
4034 F->error and confess "$!";
4036 return ($_, \%options);
4039 sub madformat_wantfixup ($) {
4041 return 0 unless $format eq '3.0 (quilt)';
4042 our $quilt_mode_warned;
4043 if ($quilt_mode eq 'nocheck') {
4044 progress f_ "Not doing any fixup of \`%s'".
4045 " due to ----no-quilt-fixup or --quilt=nocheck", $format
4046 unless $quilt_mode_warned++;
4049 progress f_ "Format \`%s', need to check/update patch stack", $format
4050 unless $quilt_mode_warned++;
4054 sub maybe_split_brain_save ($$$) {
4055 my ($headref, $dgitview, $msg) = @_;
4056 # => message fragment "$saved" describing disposition of $dgitview
4057 # (used inside parens, in the English texts)
4058 my $save = $internal_object_save{'dgit-view'};
4059 return f_ "commit id %s", $dgitview unless defined $save;
4060 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
4062 "dgit --dgit-view-save $msg HEAD=$headref",
4065 return f_ "and left in %s", $save;
4068 # An "infopair" is a tuple [ $thing, $what ]
4069 # (often $thing is a commit hash; $what is a description)
4071 sub infopair_cond_equal ($$) {
4073 $x->[0] eq $y->[0] or fail <<END;
4074 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
4078 sub infopair_lrf_tag_lookup ($$) {
4079 my ($tagnames, $what) = @_;
4080 # $tagname may be an array ref
4081 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
4082 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
4083 foreach my $tagname (@tagnames) {
4084 my $lrefname = lrfetchrefs."/tags/$tagname";
4085 my $tagobj = $lrfetchrefs_f{$lrefname};
4086 next unless defined $tagobj;
4087 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
4088 return [ git_rev_parse($tagobj), $what ];
4090 fail @tagnames==1 ? (f_ <<END, $what, "@tagnames")
4091 Wanted tag %s (%s) on dgit server, but not found
4093 : (f_ <<END, $what, "@tagnames");
4094 Wanted tag %s (one of: %s) on dgit server, but not found
4098 sub infopair_cond_ff ($$) {
4099 my ($anc,$desc) = @_;
4100 is_fast_fwd($anc->[0], $desc->[0]) or
4101 fail f_ <<END, $anc->[1], $anc->[0], $desc->[1], $desc->[0];
4102 %s (%s) .. %s (%s) is not fast forward
4106 sub pseudomerge_version_check ($$) {
4107 my ($clogp, $archive_hash) = @_;
4109 my $arch_clogp = commit_getclogp $archive_hash;
4110 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
4111 __ 'version currently in archive' ];
4112 if (defined $overwrite_version) {
4113 if (length $overwrite_version) {
4114 infopair_cond_equal([ $overwrite_version,
4115 '--overwrite= version' ],
4118 my $v = $i_arch_v->[0];
4120 "Checking package changelog for archive version %s ...", $v;
4123 my @xa = ("-f$v", "-t$v");
4124 my $vclogp = parsechangelog @xa;
4127 [ (getfield $vclogp, $fn),
4128 (f_ "%s field from dpkg-parsechangelog %s",
4131 my $cv = $gf->('Version');
4132 infopair_cond_equal($i_arch_v, $cv);
4133 $cd = $gf->('Distribution');
4137 $@ =~ s/^dgit: //gm;
4139 f_ "Perhaps debian/changelog does not mention %s ?", $v;
4141 fail f_ <<END, $cd->[1], $cd->[0], $v
4143 Your tree seems to based on earlier (not uploaded) %s.
4145 if $cd->[0] =~ m/UNRELEASED/;
4149 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
4153 sub pseudomerge_hash_commit ($$$$ $$) {
4154 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
4155 $msg_cmd, $msg_msg) = @_;
4156 progress f_ "Declaring that HEAD includes all changes in %s...",
4159 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
4160 my $authline = clogp_authline $clogp;
4164 !defined $overwrite_version ? ""
4165 : !length $overwrite_version ? " --overwrite"
4166 : " --overwrite=".$overwrite_version;
4168 # Contributing parent is the first parent - that makes
4169 # git rev-list --first-parent DTRT.
4170 my $pmf = dgit_privdir()."/pseudomerge";
4171 open MC, ">", $pmf or die "$pmf $!";
4172 print MC <<END or confess "$!";
4175 parent $archive_hash
4183 close MC or confess "$!";
4185 return hash_commit($pmf);
4188 sub splitbrain_pseudomerge ($$$$) {
4189 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
4190 # => $merged_dgitview
4191 printdebug "splitbrain_pseudomerge...\n";
4193 # We: debian/PREVIOUS HEAD($maintview)
4194 # expect: o ----------------- o
4197 # a/d/PREVIOUS $dgitview
4200 # we do: `------------------ o
4204 return $dgitview unless defined $archive_hash;
4205 return $dgitview if deliberately_not_fast_forward();
4207 printdebug "splitbrain_pseudomerge...\n";
4209 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4211 if (!defined $overwrite_version) {
4212 progress __ "Checking that HEAD includes all changes in archive...";
4215 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
4217 if (defined $overwrite_version) {
4219 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
4220 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14,
4221 __ "maintainer view tag");
4222 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
4223 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, __ "dgit view tag");
4224 my $i_archive = [ $archive_hash, __ "current archive contents" ];
4226 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
4228 infopair_cond_equal($i_dgit, $i_archive);
4229 infopair_cond_ff($i_dep14, $i_dgit);
4230 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
4233 $@ =~ s/^\n//; chomp $@;
4234 print STDERR <<END.(__ <<ENDT);
4237 | Not fast forward; maybe --overwrite is needed ? Please see dgit(1).
4242 my $arch_v = $i_arch_v->[0];
4243 my $r = pseudomerge_hash_commit
4244 $clogp, $dgitview, $archive_hash, $i_arch_v,
4245 "dgit --quilt=$quilt_mode",
4246 (defined $overwrite_version
4247 ? f_ "Declare fast forward from %s\n", $arch_v
4248 : f_ "Make fast forward from %s\n", $arch_v);
4250 maybe_split_brain_save $maintview, $r, "pseudomerge";
4252 progress f_ "Made pseudo-merge of %s into dgit view.", $arch_v;
4256 sub plain_overwrite_pseudomerge ($$$) {
4257 my ($clogp, $head, $archive_hash) = @_;
4259 printdebug "plain_overwrite_pseudomerge...";
4261 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4263 return $head if is_fast_fwd $archive_hash, $head;
4265 my $m = f_ "Declare fast forward from %s", $i_arch_v->[0];
4267 my $r = pseudomerge_hash_commit
4268 $clogp, $head, $archive_hash, $i_arch_v,
4271 runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
4273 progress f_ "Make pseudo-merge of %s into your HEAD.", $i_arch_v->[0];
4277 sub push_parse_changelog ($) {
4280 my $clogp = Dpkg::Control::Hash->new();
4281 $clogp->load($clogpfn) or die;
4283 my $clogpackage = getfield $clogp, 'Source';
4284 $package //= $clogpackage;
4285 fail f_ "-p specified %s but changelog specified %s",
4286 $package, $clogpackage
4287 unless $package eq $clogpackage;
4288 my $cversion = getfield $clogp, 'Version';
4290 if (!$we_are_initiator) {
4291 # rpush initiator can't do this because it doesn't have $isuite yet
4292 my $tag = debiantag_new($cversion, access_nomdistro);
4293 runcmd @git, qw(check-ref-format), $tag;
4296 my $dscfn = dscfn($cversion);
4298 return ($clogp, $cversion, $dscfn);
4301 sub push_parse_dsc ($$$) {
4302 my ($dscfn,$dscfnwhat, $cversion) = @_;
4303 $dsc = parsecontrol($dscfn,$dscfnwhat);
4304 my $dversion = getfield $dsc, 'Version';
4305 my $dscpackage = getfield $dsc, 'Source';
4306 ($dscpackage eq $package && $dversion eq $cversion) or
4307 fail f_ "%s is for %s %s but debian/changelog is for %s %s",
4308 $dscfn, $dscpackage, $dversion,
4309 $package, $cversion;
4312 sub push_tagwants ($$$$) {
4313 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4316 TagFn => \&debiantag_new,
4321 if (defined $maintviewhead) {
4323 TagFn => \&debiantag_maintview,
4324 Objid => $maintviewhead,
4325 TfSuffix => '-maintview',
4328 } elsif ($dodep14tag ne 'no') {
4330 TagFn => \&debiantag_maintview,
4332 TfSuffix => '-dgit',
4336 foreach my $tw (@tagwants) {
4337 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4338 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4340 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4344 sub push_mktags ($$ $$ $) {
4346 $changesfile,$changesfilewhat,
4349 die unless $tagwants->[0]{View} eq 'dgit';
4351 my $declaredistro = access_nomdistro();
4352 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4353 $dsc->{$ourdscfield[0]} = join " ",
4354 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4356 $dsc->save("$dscfn.tmp") or confess "$!";
4358 my $changes = parsecontrol($changesfile,$changesfilewhat);
4359 foreach my $field (qw(Source Distribution Version)) {
4360 $changes->{$field} eq $clogp->{$field} or
4361 fail f_ "changes field %s \`%s' does not match changelog \`%s'",
4362 $field, $changes->{$field}, $clogp->{$field};
4365 my $cversion = getfield $clogp, 'Version';
4366 my $clogsuite = getfield $clogp, 'Distribution';
4367 my $format = getfield $dsc, 'Format';
4369 # We make the git tag by hand because (a) that makes it easier
4370 # to control the "tagger" (b) we can do remote signing
4371 my $authline = clogp_authline $clogp;
4375 my $tfn = $tw->{Tfn};
4376 my $head = $tw->{Objid};
4377 my $tag = $tw->{Tag};
4379 open TO, '>', $tfn->('.tmp') or confess "$!";
4380 print TO <<END or confess "$!";
4388 my @dtxinfo = @deliberatelies;
4389 unshift @dtxinfo, "--quilt=$quilt_mode" if madformat($format);
4390 unshift @dtxinfo, do_split_brain() ? "split" : "no-split"
4391 # rpush protocol 5 and earlier don't tell us
4392 unless $we_are_initiator && $protovsn < 6;
4393 my $dtxinfo = join(" ", "",@dtxinfo);
4394 my $tag_metadata = <<END;
4395 [dgit distro=$declaredistro$dtxinfo]
4397 foreach my $ref (sort keys %previously) {
4398 $tag_metadata .= <<END or confess "$!";
4399 [dgit previously:$ref=$previously{$ref}]
4403 if ($tw->{View} eq 'dgit') {
4404 print TO sprintf <<ENDT, $package, $cversion, $clogsuite, $csuite
4405 %s release %s for %s (%s) [dgit]
4408 } elsif ($tw->{View} eq 'maint') {
4409 print TO sprintf <<END, $package, $cversion, $clogsuite, $csuite;
4410 %s release %s for %s (%s)
4414 (maintainer view tag generated by dgit --quilt=%s)
4419 confess Dumper($tw)."?";
4421 print TO "\n", $tag_metadata;
4423 close TO or confess "$!";
4425 my $tagobjfn = $tfn->('.tmp');
4427 if (!defined $keyid) {
4428 $keyid = access_cfg('keyid','RETURN-UNDEF');
4430 if (!defined $keyid) {
4431 $keyid = getfield $clogp, 'Maintainer';
4433 unlink $tfn->('.tmp.asc') or $!==&ENOENT or confess "$!";
4434 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4435 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4436 push @sign_cmd, $tfn->('.tmp');
4437 runcmd_ordryrun @sign_cmd;
4439 $tagobjfn = $tfn->('.signed.tmp');
4440 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4441 $tfn->('.tmp'), $tfn->('.tmp.asc');
4447 my @r = map { $mktag->($_); } @$tagwants;
4451 sub sign_changes ($) {
4452 my ($changesfile) = @_;
4454 my @debsign_cmd = @debsign;
4455 push @debsign_cmd, "-k$keyid" if defined $keyid;
4456 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4457 push @debsign_cmd, $changesfile;
4458 runcmd_ordryrun @debsign_cmd;
4463 printdebug "actually entering push\n";
4465 supplementary_message(__ <<'END');
4466 Push failed, while checking state of the archive.
4467 You can retry the push, after fixing the problem, if you like.
4469 if (check_for_git()) {
4472 my $archive_hash = fetch_from_archive();
4473 if (!$archive_hash) {
4475 fail __ "package appears to be new in this suite;".
4476 " if this is intentional, use --new";
4479 supplementary_message(__ <<'END');
4480 Push failed, while preparing your push.
4481 You can retry the push, after fixing the problem, if you like.
4486 access_giturl(); # check that success is vaguely likely
4487 rpush_handle_protovsn_bothends() if $we_are_initiator;
4489 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4490 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4492 responder_send_file('parsed-changelog', $clogpfn);
4494 my ($clogp, $cversion, $dscfn) =
4495 push_parse_changelog("$clogpfn");
4497 my $dscpath = "$buildproductsdir/$dscfn";
4498 stat_exists $dscpath or
4499 fail f_ "looked for .dsc %s, but %s; maybe you forgot to build",
4502 responder_send_file('dsc', $dscpath);
4504 push_parse_dsc($dscpath, $dscfn, $cversion);
4506 my $format = getfield $dsc, 'Format';
4508 my $symref = git_get_symref();
4509 my $actualhead = git_rev_parse('HEAD');
4511 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4512 if (quiltmode_splitting()) {
4513 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $actualhead);
4514 fail f_ <<END, $ffq_prev, $quilt_mode;
4515 Branch is managed by git-debrebase (%s
4516 exists), but quilt mode (%s) implies a split view.
4517 Pass the right --quilt option or adjust your git config.
4518 Or, maybe, run git-debrebase forget-was-ever-debrebase.
4521 runcmd_ordryrun_local @git_debrebase, 'stitch';
4522 $actualhead = git_rev_parse('HEAD');
4525 my $dgithead = $actualhead;
4526 my $maintviewhead = undef;
4528 my $upstreamversion = upstreamversion $clogp->{Version};
4530 if (madformat_wantfixup($format)) {
4531 # user might have not used dgit build, so maybe do this now:
4532 if (do_split_brain()) {
4533 changedir $playground;
4535 ($dgithead, $cachekey) =
4536 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4537 $dgithead or fail f_
4538 "--quilt=%s but no cached dgit view:
4539 perhaps HEAD changed since dgit build[-source] ?",
4542 if (!do_split_brain()) {
4543 # In split brain mode, do not attempt to incorporate dirty
4544 # stuff from the user's working tree. That would be mad.
4545 commit_quilty_patch();
4548 if (do_split_brain()) {
4549 $made_split_brain = 1;
4550 $dgithead = splitbrain_pseudomerge($clogp,
4551 $actualhead, $dgithead,
4553 $maintviewhead = $actualhead;
4555 prep_ud(); # so _only_subdir() works, below
4558 if (defined $overwrite_version && !defined $maintviewhead
4560 $dgithead = plain_overwrite_pseudomerge($clogp,
4568 if ($archive_hash) {
4569 if (is_fast_fwd($archive_hash, $dgithead)) {
4571 } elsif (deliberately_not_fast_forward) {
4574 fail __ "dgit push: HEAD is not a descendant".
4575 " of the archive's version.\n".
4576 "To overwrite the archive's contents,".
4577 " pass --overwrite[=VERSION].\n".
4578 "To rewind history, if permitted by the archive,".
4579 " use --deliberately-not-fast-forward.";
4583 confess unless !!$made_split_brain == do_split_brain();
4585 changedir $playground;
4586 progress f_ "checking that %s corresponds to HEAD", $dscfn;
4587 runcmd qw(dpkg-source -x --),
4588 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4589 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4590 check_for_vendor_patches() if madformat($dsc->{format});
4592 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4593 debugcmd "+",@diffcmd;
4595 my $r = system @diffcmd;
4598 my $referent = $made_split_brain ? $dgithead : 'HEAD';
4599 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4602 my $raw = cmdoutput @git,
4603 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4605 foreach (split /\0/, $raw) {
4606 if (defined $changed) {
4607 push @mode_changes, "$changed: $_\n" if $changed;
4610 } elsif (m/^:0+ 0+ /) {
4612 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4613 $changed = "Mode change from $1 to $2"
4618 if (@mode_changes) {
4619 fail +(f_ <<ENDT, $dscfn).<<END
4620 HEAD specifies a different tree to %s:
4624 .(join '', @mode_changes)
4625 .(f_ <<ENDT, $tree, $referent);
4626 There is a problem with your source tree (see dgit(7) for some hints).
4627 To see a full diff, run git diff %s %s
4631 fail +(f_ <<ENDT, $dscfn).<<END.(f_ <<ENDT, $tree, $referent);
4632 HEAD specifies a different tree to %s:
4636 Perhaps you forgot to build. Or perhaps there is a problem with your
4637 source tree (see dgit(7) for some hints). To see a full diff, run
4644 if (!$changesfile) {
4645 my $pat = changespat $cversion;
4646 my @cs = glob "$buildproductsdir/$pat";
4647 fail f_ "failed to find unique changes file".
4648 " (looked for %s in %s);".
4649 " perhaps you need to use dgit -C",
4650 $pat, $buildproductsdir
4652 ($changesfile) = @cs;
4654 $changesfile = "$buildproductsdir/$changesfile";
4657 # Check that changes and .dsc agree enough
4658 $changesfile =~ m{[^/]*$};
4659 my $changes = parsecontrol($changesfile,$&);
4660 files_compare_inputs($dsc, $changes)
4661 unless forceing [qw(dsc-changes-mismatch)];
4663 # Check whether this is a source only upload
4664 my $hasdebs = $changes->{Files} =~ m{\.deb$}m;
4665 my $sourceonlypolicy = access_cfg 'source-only-uploads';
4666 if ($sourceonlypolicy eq 'ok') {
4667 } elsif ($sourceonlypolicy eq 'always') {
4668 forceable_fail [qw(uploading-binaries)],
4669 __ "uploading binaries, although distro policy is source only"
4671 } elsif ($sourceonlypolicy eq 'never') {
4672 forceable_fail [qw(uploading-source-only)],
4673 __ "source-only upload, although distro policy requires .debs"
4675 } elsif ($sourceonlypolicy eq 'not-wholly-new') {
4676 forceable_fail [qw(uploading-source-only)],
4677 f_ "source-only upload, even though package is entirely NEW\n".
4678 "(this is contrary to policy in %s)",
4682 && !(archive_query('package_not_wholly_new', $package) // 1);
4684 badcfg f_ "unknown source-only-uploads policy \`%s'",
4688 # Perhaps adjust .dsc to contain right set of origs
4689 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4691 unless forceing [qw(changes-origs-exactly)];
4693 # Checks complete, we're going to try and go ahead:
4695 responder_send_file('changes',$changesfile);
4696 responder_send_command("param head $dgithead");
4697 responder_send_command("param csuite $csuite");
4698 responder_send_command("param isuite $isuite");
4699 responder_send_command("param tagformat new"); # needed in $protovsn==4
4700 responder_send_command("param splitbrain $do_split_brain");
4701 if (defined $maintviewhead) {
4702 responder_send_command("param maint-view $maintviewhead");
4705 # Perhaps send buildinfo(s) for signing
4706 my $changes_files = getfield $changes, 'Files';
4707 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4708 foreach my $bi (@buildinfos) {
4709 responder_send_command("param buildinfo-filename $bi");
4710 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4713 if (deliberately_not_fast_forward) {
4714 git_for_each_ref(lrfetchrefs, sub {
4715 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4716 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4717 responder_send_command("previously $rrefname=$objid");
4718 $previously{$rrefname} = $objid;
4722 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4723 dgit_privdir()."/tag");
4726 supplementary_message(__ <<'END');
4727 Push failed, while signing the tag.
4728 You can retry the push, after fixing the problem, if you like.
4730 # If we manage to sign but fail to record it anywhere, it's fine.
4731 if ($we_are_responder) {
4732 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4733 responder_receive_files('signed-tag', @tagobjfns);
4735 @tagobjfns = push_mktags($clogp,$dscpath,
4736 $changesfile,$changesfile,
4739 supplementary_message(__ <<'END');
4740 Push failed, *after* signing the tag.
4741 If you want to try again, you should use a new version number.
4744 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4746 foreach my $tw (@tagwants) {
4747 my $tag = $tw->{Tag};
4748 my $tagobjfn = $tw->{TagObjFn};
4750 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4751 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4752 runcmd_ordryrun_local
4753 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4756 supplementary_message(__ <<'END');
4757 Push failed, while updating the remote git repository - see messages above.
4758 If you want to try again, you should use a new version number.
4760 if (!check_for_git()) {
4761 create_remote_git_repo();
4764 my @pushrefs = $forceflag.$dgithead.":".rrref();
4765 foreach my $tw (@tagwants) {
4766 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4769 runcmd_ordryrun @git,
4770 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4771 runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
4773 supplementary_message(__ <<'END');
4774 Push failed, while obtaining signatures on the .changes and .dsc.
4775 If it was just that the signature failed, you may try again by using
4776 debsign by hand to sign the changes file (see the command dgit tried,
4777 above), and then dput that changes file to complete the upload.
4778 If you need to change the package, you must use a new version number.
4780 if ($we_are_responder) {
4781 my $dryrunsuffix = act_local() ? "" : ".tmp";
4782 my @rfiles = ($dscpath, $changesfile);
4783 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4784 responder_receive_files('signed-dsc-changes',
4785 map { "$_$dryrunsuffix" } @rfiles);
4788 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4790 progress f_ "[new .dsc left in %s.tmp]", $dscpath;
4792 sign_changes $changesfile;
4795 supplementary_message(f_ <<END, $changesfile);
4796 Push failed, while uploading package(s) to the archive server.
4797 You can retry the upload of exactly these same files with dput of:
4799 If that .changes file is broken, you will need to use a new version
4800 number for your next attempt at the upload.
4802 my $host = access_cfg('upload-host','RETURN-UNDEF');
4803 my @hostarg = defined($host) ? ($host,) : ();
4804 runcmd_ordryrun @dput, @hostarg, $changesfile;
4805 printdone f_ "pushed and uploaded %s", $cversion;
4807 supplementary_message('');
4808 responder_send_command("complete");
4812 not_necessarily_a_tree();
4817 badusage __ "-p is not allowed with clone; specify as argument instead"
4818 if defined $package;
4821 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4822 ($package,$isuite) = @ARGV;
4823 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4824 ($package,$dstdir) = @ARGV;
4825 } elsif (@ARGV==3) {
4826 ($package,$isuite,$dstdir) = @ARGV;
4828 badusage __ "incorrect arguments to dgit clone";
4832 $dstdir ||= "$package";
4833 if (stat_exists $dstdir) {
4834 fail f_ "%s already exists", $dstdir;
4838 if ($rmonerror && !$dryrun_level) {
4839 $cwd_remove= getcwd();
4841 return unless defined $cwd_remove;
4842 if (!chdir "$cwd_remove") {
4843 return if $!==&ENOENT;
4844 confess "chdir $cwd_remove: $!";
4846 printdebug "clone rmonerror removing $dstdir\n";
4848 rmtree($dstdir) or fail f_ "remove %s: %s\n", $dstdir, $!;
4849 } elsif (grep { $! == $_ }
4850 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4852 print STDERR f_ "check whether to remove %s: %s\n",
4859 $cwd_remove = undef;
4862 sub branchsuite () {
4863 my $branch = git_get_symref();
4864 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4871 sub package_from_d_control () {
4872 if (!defined $package) {
4873 my $sourcep = parsecontrol('debian/control','debian/control');
4874 $package = getfield $sourcep, 'Source';
4878 sub fetchpullargs () {
4879 package_from_d_control();
4881 $isuite = branchsuite();
4883 my $clogp = parsechangelog();
4884 my $clogsuite = getfield $clogp, 'Distribution';
4885 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4887 } elsif (@ARGV==1) {
4890 badusage __ "incorrect arguments to dgit fetch or dgit pull";
4904 determine_whether_split_brain get_source_format();
4905 if (do_split_brain()) {
4906 my ($format, $fopts) = get_source_format();
4907 madformat($format) and fail f_ <<END, $quilt_mode
4908 dgit pull not yet supported in split view mode (including with view-splitting quilt modes)
4916 package_from_d_control();
4917 @ARGV==1 or badusage __ "dgit checkout needs a suite argument";
4921 foreach my $canon (qw(0 1)) {
4926 canonicalise_suite();
4928 if (length git_get_ref lref()) {
4929 # local branch already exists, yay
4932 if (!length git_get_ref lrref()) {
4940 runcmd (@git, qw(update-ref), lref(), lrref(), '');
4943 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
4944 "dgit checkout $isuite";
4945 runcmd (@git, qw(checkout), lbranch());
4948 sub cmd_update_vcs_git () {
4950 if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
4951 ($specsuite,) = split /\;/, cfg 'dgit.vcs-git.suites';
4953 ($specsuite) = (@ARGV);
4958 if ($ARGV[0] eq '-') {
4960 } elsif ($ARGV[0] eq '-') {
4965 package_from_d_control();
4967 if ($specsuite eq '.') {
4968 $ctrl = parsecontrol 'debian/control', 'debian/control';
4970 $isuite = $specsuite;
4974 my $url = getfield $ctrl, 'Vcs-Git';
4977 my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
4978 if (!defined $orgurl) {
4979 print STDERR f_ "setting up vcs-git: %s\n", $url;
4980 @cmd = (@git, qw(remote add vcs-git), $url);
4981 } elsif ($orgurl eq $url) {
4982 print STDERR f_ "vcs git already configured: %s\n", $url;
4984 print STDERR f_ "changing vcs-git url to: %s\n", $url;
4985 @cmd = (@git, qw(remote set-url vcs-git), $url);
4987 runcmd_ordryrun_local @cmd;
4989 print f_ "fetching (%s)\n", "@ARGV";
4990 runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
4996 build_or_push_prep_early();
4998 build_or_push_prep_modes();
5002 } elsif (@ARGV==1) {
5003 ($specsuite) = (@ARGV);
5005 badusage f_ "incorrect arguments to dgit %s", $subcommand;
5008 local ($package) = $existing_package; # this is a hack
5009 canonicalise_suite();
5011 canonicalise_suite();
5013 if (defined $specsuite &&
5014 $specsuite ne $isuite &&
5015 $specsuite ne $csuite) {
5016 fail f_ "dgit %s: changelog specifies %s (%s)".
5017 " but command line specifies %s",
5018 $subcommand, $isuite, $csuite, $specsuite;
5027 #---------- remote commands' implementation ----------
5029 sub pre_remote_push_build_host {
5030 my ($nrargs) = shift @ARGV;
5031 my (@rargs) = @ARGV[0..$nrargs-1];
5032 @ARGV = @ARGV[$nrargs..$#ARGV];
5034 my ($dir,$vsnwant) = @rargs;
5035 # vsnwant is a comma-separated list; we report which we have
5036 # chosen in our ready response (so other end can tell if they
5039 $we_are_responder = 1;
5040 $us .= " (build host)";
5042 open PI, "<&STDIN" or confess "$!";
5043 open STDIN, "/dev/null" or confess "$!";
5044 open PO, ">&STDOUT" or confess "$!";
5046 open STDOUT, ">&STDERR" or confess "$!";
5050 ($protovsn) = grep {
5051 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
5052 } @rpushprotovsn_support;
5054 fail f_ "build host has dgit rpush protocol versions %s".
5055 " but invocation host has %s",
5056 (join ",", @rpushprotovsn_support), $vsnwant
5057 unless defined $protovsn;
5061 sub cmd_remote_push_build_host {
5062 responder_send_command("dgit-remote-push-ready $protovsn");
5066 sub pre_remote_push_responder { pre_remote_push_build_host(); }
5067 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
5068 # ... for compatibility with proto vsn.1 dgit (just so that user gets
5069 # a good error message)
5071 sub rpush_handle_protovsn_bothends () {
5078 my $report = i_child_report();
5079 if (defined $report) {
5080 printdebug "($report)\n";
5081 } elsif ($i_child_pid) {
5082 printdebug "(killing build host child $i_child_pid)\n";
5083 kill 15, $i_child_pid;
5085 if (defined $i_tmp && !defined $initiator_tempdir) {
5087 eval { rmtree $i_tmp; };
5092 return unless forkcheck_mainprocess();
5097 my ($base,$selector,@args) = @_;
5098 $selector =~ s/\-/_/g;
5099 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
5103 not_necessarily_a_tree();
5108 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
5116 push @rargs, join ",", @rpushprotovsn_support;
5119 push @rdgit, @ropts;
5120 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
5122 my @cmd = (@ssh, $host, shellquote @rdgit);
5125 $we_are_initiator=1;
5127 if (defined $initiator_tempdir) {
5128 rmtree $initiator_tempdir;
5129 mkdir $initiator_tempdir, 0700
5130 or fail f_ "create %s: %s", $initiator_tempdir, $!;
5131 $i_tmp = $initiator_tempdir;
5135 $i_child_pid = open2(\*RO, \*RI, @cmd);
5137 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
5138 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
5141 my ($icmd,$iargs) = initiator_expect {
5142 m/^(\S+)(?: (.*))?$/;
5145 i_method "i_resp", $icmd, $iargs;
5149 sub i_resp_progress ($) {
5151 my $msg = protocol_read_bytes \*RO, $rhs;
5155 sub i_resp_supplementary_message ($) {
5157 $supplementary_message = protocol_read_bytes \*RO, $rhs;
5160 sub i_resp_complete {
5161 my $pid = $i_child_pid;
5162 $i_child_pid = undef; # prevents killing some other process with same pid
5163 printdebug "waiting for build host child $pid...\n";
5164 my $got = waitpid $pid, 0;
5165 confess "$!" unless $got == $pid;
5166 fail f_ "build host child failed: %s", waitstatusmsg() if $?;
5169 printdebug __ "all done\n";
5173 sub i_resp_file ($) {
5175 my $localname = i_method "i_localname", $keyword;
5176 my $localpath = "$i_tmp/$localname";
5177 stat_exists $localpath and
5178 badproto \*RO, f_ "file %s (%s) twice", $keyword, $localpath;
5179 protocol_receive_file \*RO, $localpath;
5180 i_method "i_file", $keyword;
5185 sub i_resp_param ($) {
5186 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, __ "bad param spec";
5190 sub i_resp_previously ($) {
5191 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
5192 or badproto \*RO, __ "bad previously spec";
5193 my $r = system qw(git check-ref-format), $1;
5194 confess "bad previously ref spec ($r)" if $r;
5195 $previously{$1} = $2;
5199 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
5201 sub i_resp_want ($) {
5203 die "$keyword ?" if $i_wanted{$keyword}++;
5205 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
5206 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
5207 die unless $isuite =~ m/^$suite_re$/;
5209 if (!defined $dsc) {
5211 rpush_handle_protovsn_bothends();
5212 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
5213 if ($protovsn >= 6) {
5214 determine_whether_split_brain getfield $dsc, 'Format';
5215 $do_split_brain eq ($i_param{'splitbrain'} // '<unsent>')
5217 "split brain mismatch, $do_split_brain != $i_param{'split_brain'}";
5218 printdebug "rpush split brain $do_split_brain\n";
5222 my @localpaths = i_method "i_want", $keyword;
5223 printdebug "[[ $keyword @localpaths\n";
5224 foreach my $localpath (@localpaths) {
5225 protocol_send_file \*RI, $localpath;
5227 print RI "files-end\n" or confess "$!";
5230 sub i_localname_parsed_changelog {
5231 return "remote-changelog.822";
5233 sub i_file_parsed_changelog {
5234 ($i_clogp, $i_version, $i_dscfn) =
5235 push_parse_changelog "$i_tmp/remote-changelog.822";
5236 die if $i_dscfn =~ m#/|^\W#;
5239 sub i_localname_dsc {
5240 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5245 sub i_localname_buildinfo ($) {
5246 my $bi = $i_param{'buildinfo-filename'};
5247 defined $bi or badproto \*RO, "buildinfo before filename";
5248 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
5249 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
5250 or badproto \*RO, "improper buildinfo filename";
5253 sub i_file_buildinfo {
5254 my $bi = $i_param{'buildinfo-filename'};
5255 my $bd = parsecontrol "$i_tmp/$bi", $bi;
5256 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
5257 if (!forceing [qw(buildinfo-changes-mismatch)]) {
5258 files_compare_inputs($bd, $ch);
5259 (getfield $bd, $_) eq (getfield $ch, $_) or
5260 fail f_ "buildinfo mismatch in field %s", $_
5261 foreach qw(Source Version);
5262 !defined $bd->{$_} or
5263 fail f_ "buildinfo contains forbidden field %s", $_
5264 foreach qw(Changes Changed-by Distribution);
5266 push @i_buildinfos, $bi;
5267 delete $i_param{'buildinfo-filename'};
5270 sub i_localname_changes {
5271 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5272 $i_changesfn = $i_dscfn;
5273 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
5274 return $i_changesfn;
5276 sub i_file_changes { }
5278 sub i_want_signed_tag {
5279 printdebug Dumper(\%i_param, $i_dscfn);
5280 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
5281 && defined $i_param{'csuite'}
5282 or badproto \*RO, "premature desire for signed-tag";
5283 my $head = $i_param{'head'};
5284 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
5286 my $maintview = $i_param{'maint-view'};
5287 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
5289 if ($protovsn == 4) {
5290 my $p = $i_param{'tagformat'} // '<undef>';
5292 or badproto \*RO, "tag format mismatch: $p vs. new";
5295 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
5297 defined $dsc or badproto \*RO, "dsc (before parsed-changelog)";
5299 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
5302 push_mktags $i_clogp, $i_dscfn,
5303 $i_changesfn, (__ 'remote changes file'),
5307 sub i_want_signed_dsc_changes {
5308 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
5309 sign_changes $i_changesfn;
5310 return ($i_dscfn, $i_changesfn, @i_buildinfos);
5313 #---------- building etc. ----------
5319 #----- `3.0 (quilt)' handling -----
5321 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
5323 sub quiltify_dpkg_commit ($$$;$) {
5324 my ($patchname,$author,$msg, $xinfo) = @_;
5327 mkpath '.git/dgit'; # we are in playtree
5328 my $descfn = ".git/dgit/quilt-description.tmp";
5329 open O, '>', $descfn or confess "$descfn: $!";
5330 $msg =~ s/\n+/\n\n/;
5331 print O <<END or confess "$!";
5333 ${xinfo}Subject: $msg
5337 close O or confess "$!";
5340 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
5341 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
5342 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
5343 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
5347 sub quiltify_trees_differ ($$;$$$) {
5348 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
5349 # returns true iff the two tree objects differ other than in debian/
5350 # with $finegrained,
5351 # returns bitmask 01 - differ in upstream files except .gitignore
5352 # 02 - differ in .gitignore
5353 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
5354 # is set for each modified .gitignore filename $fn
5355 # if $unrepres is defined, array ref to which is appeneded
5356 # a list of unrepresentable changes (removals of upstream files
5359 my @cmd = (@git, qw(diff-tree -z --no-renames));
5360 push @cmd, qw(--name-only) unless $unrepres;
5361 push @cmd, qw(-r) if $finegrained || $unrepres;
5363 my $diffs= cmdoutput @cmd;
5366 foreach my $f (split /\0/, $diffs) {
5367 if ($unrepres && !@lmodes) {
5368 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
5371 my ($oldmode,$newmode) = @lmodes;
5374 next if $f =~ m#^debian(?:/.*)?$#s;
5378 die __ "not a plain file or symlink\n"
5379 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5380 $oldmode =~ m/^(?:10|12)\d{4}$/;
5381 if ($oldmode =~ m/[^0]/ &&
5382 $newmode =~ m/[^0]/) {
5383 # both old and new files exist
5384 die __ "mode or type changed\n" if $oldmode ne $newmode;
5385 die __ "modified symlink\n" unless $newmode =~ m/^10/;
5386 } elsif ($oldmode =~ m/[^0]/) {
5388 die __ "deletion of symlink\n"
5389 unless $oldmode =~ m/^10/;
5392 die __ "creation with non-default mode\n"
5393 unless $newmode =~ m/^100644$/ or
5394 $newmode =~ m/^120000$/;
5398 local $/="\n"; chomp $@;
5399 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5403 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5404 $r |= $isignore ? 02 : 01;
5405 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5407 printdebug "quiltify_trees_differ $x $y => $r\n";
5411 sub quiltify_tree_sentinelfiles ($) {
5412 # lists the `sentinel' files present in the tree
5414 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5415 qw(-- debian/rules debian/control);
5420 sub quiltify_splitting ($$$$$$$) {
5421 my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
5422 $editedignores, $cachekey) = @_;
5423 my $gitignore_special = 1;
5424 if ($quilt_mode !~ m/gbp|dpm|baredebian/) {
5425 # treat .gitignore just like any other upstream file
5426 $diffbits = { %$diffbits };
5427 $_ = !!$_ foreach values %$diffbits;
5428 $gitignore_special = 0;
5430 # We would like any commits we generate to be reproducible
5431 my @authline = clogp_authline($clogp);
5432 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5433 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5434 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5435 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5436 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5437 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5439 confess unless do_split_brain();
5441 my $fulldiffhint = sub {
5443 my $cmd = "git diff $x $y -- :/ ':!debian'";
5444 $cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special;
5445 return f_ "\nFor full diff showing the problem(s), type:\n %s\n",
5449 if ($quilt_mode =~ m/gbp|unapplied|baredebian/ &&
5450 ($diffbits->{O2H} & 01)) {
5452 "--quilt=%s specified, implying patches-unapplied git tree\n".
5453 " but git tree differs from orig in upstream files.",
5455 $msg .= $fulldiffhint->($unapplied, 'HEAD');
5456 if (!stat_exists "debian/patches" and $quilt_mode !~ m/baredebian/) {
5458 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5462 if ($quilt_mode =~ m/dpm/ &&
5463 ($diffbits->{H2A} & 01)) {
5464 fail +(f_ <<END, $quilt_mode). $fulldiffhint->($oldtiptree,'HEAD');
5465 --quilt=%s specified, implying patches-applied git tree
5466 but git tree differs from result of applying debian/patches to upstream
5469 if ($quilt_mode =~ m/baredebian/) {
5470 # We need to construct a merge which has upstream files from
5471 # upstream and debian/ files from HEAD.
5473 read_tree_upstream $quilt_upstream_commitish, 1, $headref;
5474 my $version = getfield $clogp, 'Version';
5475 my $upsversion = upstreamversion $version;
5476 my $merge = make_commit
5477 [ $headref, $quilt_upstream_commitish ],
5478 [ +(f_ <<ENDT, $upsversion), $quilt_upstream_commitish_message, <<ENDU ];
5479 Combine debian/ with upstream source for %s
5481 [dgit ($our_version) baredebian-merge $version $quilt_upstream_commitish_used]
5483 runcmd @git, qw(reset -q --hard), $merge;
5485 if ($quilt_mode =~ m/gbp|unapplied|baredebian/ &&
5486 ($diffbits->{O2A} & 01)) { # some patches
5487 progress __ "dgit view: creating patches-applied version using gbp pq";
5488 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5489 # gbp pq import creates a fresh branch; push back to dgit-view
5490 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5491 runcmd @git, qw(checkout -q dgit-view);
5493 if ($quilt_mode =~ m/gbp|dpm/ &&
5494 ($diffbits->{O2A} & 02)) {
5495 fail f_ <<END, $quilt_mode;
5496 --quilt=%s specified, implying that HEAD is for use with a
5497 tool which does not create patches for changes to upstream
5498 .gitignores: but, such patches exist in debian/patches.
5501 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5502 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5504 "dgit view: creating patch to represent .gitignore changes";
5505 ensuredir "debian/patches";
5506 my $gipatch = "debian/patches/auto-gitignore";
5507 open GIPATCH, ">>", "$gipatch" or confess "$gipatch: $!";
5508 stat GIPATCH or confess "$gipatch: $!";
5509 fail f_ "%s already exists; but want to create it".
5510 " to record .gitignore changes",
5513 print GIPATCH +(__ <<END).<<ENDU or die "$gipatch: $!";
5514 Subject: Update .gitignore from Debian packaging branch
5516 The Debian packaging git branch contains these updates to the upstream
5517 .gitignore file(s). This patch is autogenerated, to provide these
5518 updates to users of the official Debian archive view of the package.
5521 [dgit ($our_version) update-gitignore]
5524 close GIPATCH or die "$gipatch: $!";
5525 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5526 $unapplied, $headref, "--", sort keys %$editedignores;
5527 open SERIES, "+>>", "debian/patches/series" or confess "$!";
5528 defined seek SERIES, -1, 2 or $!==EINVAL or confess "$!";
5530 defined read SERIES, $newline, 1 or confess "$!";
5531 print SERIES "\n" or confess "$!" unless $newline eq "\n";
5532 print SERIES "auto-gitignore\n" or confess "$!";
5533 close SERIES or die $!;
5534 runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
5535 commit_admin +(__ <<END).<<ENDU
5536 Commit patch to update .gitignore
5539 [dgit ($our_version) update-gitignore-quilt-fixup]
5544 sub quiltify ($$$$) {
5545 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5547 # Quilt patchification algorithm
5549 # We search backwards through the history of the main tree's HEAD
5550 # (T) looking for a start commit S whose tree object is identical
5551 # to to the patch tip tree (ie the tree corresponding to the
5552 # current dpkg-committed patch series). For these purposes
5553 # `identical' disregards anything in debian/ - this wrinkle is
5554 # necessary because dpkg-source treates debian/ specially.
5556 # We can only traverse edges where at most one of the ancestors'
5557 # trees differs (in changes outside in debian/). And we cannot
5558 # handle edges which change .pc/ or debian/patches. To avoid
5559 # going down a rathole we avoid traversing edges which introduce
5560 # debian/rules or debian/control. And we set a limit on the
5561 # number of edges we are willing to look at.
5563 # If we succeed, we walk forwards again. For each traversed edge
5564 # PC (with P parent, C child) (starting with P=S and ending with
5565 # C=T) to we do this:
5567 # - dpkg-source --commit with a patch name and message derived from C
5568 # After traversing PT, we git commit the changes which
5569 # should be contained within debian/patches.
5571 # The search for the path S..T is breadth-first. We maintain a
5572 # todo list containing search nodes. A search node identifies a
5573 # commit, and looks something like this:
5575 # Commit => $git_commit_id,
5576 # Child => $c, # or undef if P=T
5577 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5578 # Nontrivial => true iff $p..$c has relevant changes
5585 my %considered; # saves being exponential on some weird graphs
5587 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5590 my ($search,$whynot) = @_;
5591 printdebug " search NOT $search->{Commit} $whynot\n";
5592 $search->{Whynot} = $whynot;
5593 push @nots, $search;
5594 no warnings qw(exiting);
5603 my $c = shift @todo;
5604 next if $considered{$c->{Commit}}++;
5606 $not->($c, __ "maximum search space exceeded") if --$max_work <= 0;
5608 printdebug "quiltify investigate $c->{Commit}\n";
5611 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5612 printdebug " search finished hooray!\n";
5617 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5618 if ($quilt_mode eq 'smash') {
5619 printdebug " search quitting smash\n";
5623 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5624 $not->($c, f_ "has %s not %s", $c_sentinels, $t_sentinels)
5625 if $c_sentinels ne $t_sentinels;
5627 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5628 $commitdata =~ m/\n\n/;
5630 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5631 @parents = map { { Commit => $_, Child => $c } } @parents;
5633 $not->($c, __ "root commit") if !@parents;
5635 foreach my $p (@parents) {
5636 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5638 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5639 $not->($c, f_ "merge (%s nontrivial parents)", $ndiffers)
5642 foreach my $p (@parents) {
5643 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5645 my @cmd= (@git, qw(diff-tree -r --name-only),
5646 $p->{Commit},$c->{Commit},
5647 qw(-- debian/patches .pc debian/source/format));
5648 my $patchstackchange = cmdoutput @cmd;
5649 if (length $patchstackchange) {
5650 $patchstackchange =~ s/\n/,/g;
5651 $not->($p, f_ "changed %s", $patchstackchange);
5654 printdebug " search queue P=$p->{Commit} ",
5655 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5661 printdebug "quiltify want to smash\n";
5664 my $x = $_[0]{Commit};
5665 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5668 if ($quilt_mode eq 'linear') {
5670 "\n%s: error: quilt fixup cannot be linear. Stopped at:\n",
5672 my $all_gdr = !!@nots;
5673 foreach my $notp (@nots) {
5674 my $c = $notp->{Child};
5675 my $cprange = $abbrev->($notp);
5676 $cprange .= "..".$abbrev->($c) if $c;
5677 print STDERR f_ "%s: %s: %s\n",
5678 $us, $cprange, $notp->{Whynot};
5679 $all_gdr &&= $notp->{Child} &&
5680 (git_cat_file $notp->{Child}{Commit}, 'commit')
5681 =~ m{^\[git-debrebase(?! split[: ]).*\]$}m;
5685 [ grep { $_->[0] ne 'quilt-mode' } @$failsuggestion ]
5687 print STDERR "$us: $_->[1]\n" foreach @$failsuggestion;
5689 "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n";
5690 } elsif ($quilt_mode eq 'smash') {
5691 } elsif ($quilt_mode eq 'auto') {
5692 progress __ "quilt fixup cannot be linear, smashing...";
5694 confess "$quilt_mode ?";
5697 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5698 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5700 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5702 quiltify_dpkg_commit "auto-$version-$target-$time",
5703 (getfield $clogp, 'Maintainer'),
5704 (f_ "Automatically generated patch (%s)\n".
5705 "Last (up to) %s git changes, FYI:\n\n",
5706 $clogp->{Version}, $ncommits).
5711 progress __ "quiltify linearisation planning successful, executing...";
5713 for (my $p = $sref_S;
5714 my $c = $p->{Child};
5716 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5717 next unless $p->{Nontrivial};
5719 my $cc = $c->{Commit};
5721 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5722 $commitdata =~ m/\n\n/ or die "$c ?";
5725 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5728 my $commitdate = cmdoutput
5729 @git, qw(log -n1 --pretty=format:%aD), $cc;
5731 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5733 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5740 my $gbp_check_suitable = sub {
5745 die __ "contains unexpected slashes\n" if m{//} || m{/$};
5746 die __ "contains leading punctuation\n" if m{^\W} || m{/\W};
5747 die __ "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5748 die __ "is series file\n" if m{$series_filename_re}o;
5749 die __ "too long\n" if length > 200;
5751 return $_ unless $@;
5753 "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s",
5758 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5760 (\S+) \s* \n //ixm) {
5761 $patchname = $gbp_check_suitable->($1, 'Name');
5763 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5765 (\S+) \s* \n //ixm) {
5766 $patchdir = $gbp_check_suitable->($1, 'Topic');
5771 if (!defined $patchname) {
5772 $patchname = $title;
5773 $patchname =~ s/[.:]$//;
5776 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5777 my $translitname = $converter->convert($patchname);
5778 die unless defined $translitname;
5779 $patchname = $translitname;
5782 +(f_ "dgit: patch title transliteration error: %s", $@)
5784 $patchname =~ y/ A-Z/-a-z/;
5785 $patchname =~ y/-a-z0-9_.+=~//cd;
5786 $patchname =~ s/^\W/x-$&/;
5787 $patchname = substr($patchname,0,40);
5788 $patchname .= ".patch";
5790 if (!defined $patchdir) {
5793 if (length $patchdir) {
5794 $patchname = "$patchdir/$patchname";
5796 if ($patchname =~ m{^(.*)/}) {
5797 mkpath "debian/patches/$1";
5802 stat "debian/patches/$patchname$index";
5804 $!==ENOENT or confess "$patchname$index $!";
5806 runcmd @git, qw(checkout -q), $cc;
5808 # We use the tip's changelog so that dpkg-source doesn't
5809 # produce complaining messages from dpkg-parsechangelog. None
5810 # of the information dpkg-source gets from the changelog is
5811 # actually relevant - it gets put into the original message
5812 # which dpkg-source provides our stunt editor, and then
5814 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5816 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5817 "Date: $commitdate\n".
5818 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5820 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5824 sub build_maybe_quilt_fixup () {
5825 my ($format,$fopts) = get_source_format;
5826 return unless madformat_wantfixup $format;
5829 check_for_vendor_patches();
5831 my $clogp = parsechangelog();
5832 my $headref = git_rev_parse('HEAD');
5833 my $symref = git_get_symref();
5834 my $upstreamversion = upstreamversion $version;
5837 changedir $playground;
5839 my $splitbrain_cachekey;
5841 if (do_split_brain()) {
5843 ($cachehit, $splitbrain_cachekey) =
5844 quilt_check_splitbrain_cache($headref, $upstreamversion);
5851 unpack_playtree_need_cd_work($headref);
5852 if (do_split_brain()) {
5853 runcmd @git, qw(checkout -q -b dgit-view);
5854 # so long as work is not deleted, its current branch will
5855 # remain dgit-view, rather than master, so subsequent calls to
5856 # unpack_playtree_need_cd_work
5857 # will DTRT, resetting dgit-view.
5858 confess if $made_split_brain;
5859 $made_split_brain = 1;
5863 if ($fopts->{'single-debian-patch'}) {
5865 "quilt mode %s does not make sense (or is not supported) with single-debian-patch",
5867 if quiltmode_splitting();
5868 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5870 quilt_fixup_multipatch($clogp, $headref, $upstreamversion,
5871 $splitbrain_cachekey);
5874 if (do_split_brain()) {
5875 my $dgitview = git_rev_parse 'HEAD';
5878 reflog_cache_insert "refs/$splitbraincache",
5879 $splitbrain_cachekey, $dgitview;
5881 changedir "$playground/work";
5883 my $saved = maybe_split_brain_save $headref, $dgitview, __ "converted";
5884 progress f_ "dgit view: created (%s)", $saved;
5888 runcmd_ordryrun_local
5889 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5892 sub build_check_quilt_splitbrain () {
5893 build_maybe_quilt_fixup();
5896 sub unpack_playtree_need_cd_work ($) {
5899 # prep_ud() must have been called already.
5900 if (!chdir "work") {
5901 # Check in the filesystem because sometimes we run prep_ud
5902 # in between multiple calls to unpack_playtree_need_cd_work.
5903 confess "$!" unless $!==ENOENT;
5904 mkdir "work" or confess "$!";
5906 mktree_in_ud_here();
5908 runcmd @git, qw(reset -q --hard), $headref;
5911 sub unpack_playtree_linkorigs ($$) {
5912 my ($upstreamversion, $fn) = @_;
5913 # calls $fn->($leafname);
5915 my $bpd_abs = bpd_abs();
5917 dotdot_bpd_transfer_origs $bpd_abs, $upstreamversion, sub { 1 };
5919 opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!";
5920 while ($!=0, defined(my $leaf = readdir QFD)) {
5921 my $f = bpd_abs()."/".$leaf;
5923 local ($debuglevel) = $debuglevel-1;
5924 printdebug "QF linkorigs bpd $leaf, $f ?\n";
5926 next unless is_orig_file_of_vsn $leaf, $upstreamversion;
5927 printdebug "QF linkorigs $leaf, $f Y\n";
5928 link_ltarget $f, $leaf or die "$leaf $!";
5931 die "$buildproductsdir: $!" if $!;
5935 sub quilt_fixup_delete_pc () {
5936 runcmd @git, qw(rm -rqf .pc);
5937 commit_admin +(__ <<END).<<ENDU
5938 Commit removal of .pc (quilt series tracking data)
5941 [dgit ($our_version) upgrade quilt-remove-pc]
5945 sub quilt_fixup_singlepatch ($$$) {
5946 my ($clogp, $headref, $upstreamversion) = @_;
5948 progress __ "starting quiltify (single-debian-patch)";
5950 # dpkg-source --commit generates new patches even if
5951 # single-debian-patch is in debian/source/options. In order to
5952 # get it to generate debian/patches/debian-changes, it is
5953 # necessary to build the source package.
5955 unpack_playtree_linkorigs($upstreamversion, sub { });
5956 unpack_playtree_need_cd_work($headref);
5958 rmtree("debian/patches");
5960 runcmd @dpkgsource, qw(-b .);
5962 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5963 rename srcfn("$upstreamversion", "/debian/patches"),
5964 "work/debian/patches"
5966 or confess "install d/patches: $!";
5969 commit_quilty_patch();
5972 sub quilt_need_fake_dsc ($) {
5973 # cwd should be playground
5974 my ($upstreamversion) = @_;
5976 return if stat_exists "fake.dsc";
5977 # ^ OK to test this as a sentinel because if we created it
5978 # we must either have done the rest too, or crashed.
5980 my $fakeversion="$upstreamversion-~~DGITFAKE";
5982 my $fakedsc=new IO::File 'fake.dsc', '>' or confess "$!";
5983 print $fakedsc <<END or confess "$!";
5986 Version: $fakeversion
5990 my $dscaddfile=sub {
5993 my $md = new Digest::MD5;
5995 my $fh = new IO::File $leaf, '<' or die "$leaf $!";
5996 stat $fh or confess "$!";
6000 print $fakedsc " ".$md->hexdigest." $size $leaf\n" or confess "$!";
6003 unpack_playtree_linkorigs($upstreamversion, $dscaddfile);
6005 my @files=qw(debian/source/format debian/rules
6006 debian/control debian/changelog);
6007 foreach my $maybe (qw(debian/patches debian/source/options
6008 debian/tests/control)) {
6009 next unless stat_exists "$maindir/$maybe";
6010 push @files, $maybe;
6013 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
6014 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
6016 $dscaddfile->($debtar);
6017 close $fakedsc or confess "$!";
6020 sub quilt_fakedsc2unapplied ($$) {
6021 my ($headref, $upstreamversion) = @_;
6022 # must be run in the playground
6023 # quilt_need_fake_dsc must have been called
6025 quilt_need_fake_dsc($upstreamversion);
6027 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
6029 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
6030 rename $fakexdir, "fake" or die "$fakexdir $!";
6034 remove_stray_gits(__ "source package");
6035 mktree_in_ud_here();
6039 rmtree 'debian'; # git checkout commitish paths does not delete!
6040 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
6041 my $unapplied=git_add_write_tree();
6042 printdebug "fake orig tree object $unapplied\n";
6046 sub quilt_check_splitbrain_cache ($$) {
6047 my ($headref, $upstreamversion) = @_;
6048 # Called only if we are in (potentially) split brain mode.
6049 # Called in playground.
6050 # Computes the cache key and looks in the cache.
6051 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
6053 quilt_need_fake_dsc($upstreamversion);
6055 my $splitbrain_cachekey;
6058 "dgit: split brain (separate dgit view) may be needed (--quilt=%s).",
6060 # we look in the reflog of dgit-intern/quilt-cache
6061 # we look for an entry whose message is the key for the cache lookup
6062 my @cachekey = (qw(dgit), $our_version);
6063 push @cachekey, $upstreamversion;
6064 push @cachekey, $quilt_mode;
6065 push @cachekey, $headref;
6066 push @cachekey, $quilt_upstream_commitish // '-';
6068 push @cachekey, hashfile('fake.dsc');
6070 my $srcshash = Digest::SHA->new(256);
6071 my %sfs = ( %INC, '$0(dgit)' => $0 );
6072 foreach my $sfk (sort keys %sfs) {
6073 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
6074 $srcshash->add($sfk," ");
6075 $srcshash->add(hashfile($sfs{$sfk}));
6076 $srcshash->add("\n");
6078 push @cachekey, $srcshash->hexdigest();
6079 $splitbrain_cachekey = "@cachekey";
6081 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
6083 my $cachehit = reflog_cache_lookup
6084 "refs/$splitbraincache", $splitbrain_cachekey;
6087 unpack_playtree_need_cd_work($headref);
6088 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
6089 if ($cachehit ne $headref) {
6090 progress f_ "dgit view: found cached (%s)", $saved;
6091 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
6092 $made_split_brain = 1;
6093 return ($cachehit, $splitbrain_cachekey);
6095 progress __ "dgit view: found cached, no changes required";
6096 return ($headref, $splitbrain_cachekey);
6099 printdebug "splitbrain cache miss\n";
6100 return (undef, $splitbrain_cachekey);
6103 sub baredebian_origtarballs_scan ($$$) {
6104 my ($fakedfi, $upstreamversion, $dir) = @_;
6105 if (!opendir OD, $dir) {
6106 return if $! == ENOENT;
6107 fail "opendir $dir (origs): $!";
6110 while ($!=0, defined(my $leaf = readdir OD)) {
6112 local ($debuglevel) = $debuglevel-1;
6113 printdebug "BDOS $dir $leaf ?\n";
6115 next unless is_orig_file_of_vsn $leaf, $upstreamversion;
6116 next if grep { $_->{Filename} eq $leaf } @$fakedfi;
6119 Path => "$dir/$leaf",
6123 die "$dir; $!" if $!;
6127 sub quilt_fixup_multipatch ($$$) {
6128 my ($clogp, $headref, $upstreamversion, $splitbrain_cachekey) = @_;
6130 progress f_ "examining quilt state (multiple patches, %s mode)",
6134 # - honour any existing .pc in case it has any strangeness
6135 # - determine the git commit corresponding to the tip of
6136 # the patch stack (if there is one)
6137 # - if there is such a git commit, convert each subsequent
6138 # git commit into a quilt patch with dpkg-source --commit
6139 # - otherwise convert all the differences in the tree into
6140 # a single git commit
6144 # Our git tree doesn't necessarily contain .pc. (Some versions of
6145 # dgit would include the .pc in the git tree.) If there isn't
6146 # one, we need to generate one by unpacking the patches that we
6149 # We first look for a .pc in the git tree. If there is one, we
6150 # will use it. (This is not the normal case.)
6152 # Otherwise need to regenerate .pc so that dpkg-source --commit
6153 # can work. We do this as follows:
6154 # 1. Collect all relevant .orig from parent directory
6155 # 2. Generate a debian.tar.gz out of
6156 # debian/{patches,rules,source/format,source/options}
6157 # 3. Generate a fake .dsc containing just these fields:
6158 # Format Source Version Files
6159 # 4. Extract the fake .dsc
6160 # Now the fake .dsc has a .pc directory.
6161 # (In fact we do this in every case, because in future we will
6162 # want to search for a good base commit for generating patches.)
6164 # Then we can actually do the dpkg-source --commit
6165 # 1. Make a new working tree with the same object
6166 # store as our main tree and check out the main
6168 # 2. Copy .pc from the fake's extraction, if necessary
6169 # 3. Run dpkg-source --commit
6170 # 4. If the result has changes to debian/, then
6171 # - git add them them
6172 # - git add .pc if we had a .pc in-tree
6174 # 5. If we had a .pc in-tree, delete it, and git commit
6175 # 6. Back in the main tree, fast forward to the new HEAD
6177 # Another situation we may have to cope with is gbp-style
6178 # patches-unapplied trees.
6180 # We would want to detect these, so we know to escape into
6181 # quilt_fixup_gbp. However, this is in general not possible.
6182 # Consider a package with a one patch which the dgit user reverts
6183 # (with git revert or the moral equivalent).
6185 # That is indistinguishable in contents from a patches-unapplied
6186 # tree. And looking at the history to distinguish them is not
6187 # useful because the user might have made a confusing-looking git
6188 # history structure (which ought to produce an error if dgit can't
6189 # cope, not a silent reintroduction of an unwanted patch).
6191 # So gbp users will have to pass an option. But we can usually
6192 # detect their failure to do so: if the tree is not a clean
6193 # patches-applied tree, quilt linearisation fails, but the tree
6194 # _is_ a clean patches-unapplied tree, we can suggest that maybe
6195 # they want --quilt=unapplied.
6197 # To help detect this, when we are extracting the fake dsc, we
6198 # first extract it with --skip-patches, and then apply the patches
6199 # afterwards with dpkg-source --before-build. That lets us save a
6200 # tree object corresponding to .origs.
6202 if ($quilt_mode eq 'linear'
6203 && branch_is_gdr($headref)) {
6204 # This is much faster. It also makes patches that gdr
6205 # likes better for future updates without laundering.
6207 # However, it can fail in some casses where we would
6208 # succeed: if there are existing patches, which correspond
6209 # to a prefix of the branch, but are not in gbp/gdr
6210 # format, gdr will fail (exiting status 7), but we might
6211 # be able to figure out where to start linearising. That
6212 # will be slower so hopefully there's not much to do.
6214 unpack_playtree_need_cd_work $headref;
6216 my @cmd = (@git_debrebase,
6217 qw(--noop-ok -funclean-mixed -funclean-ordering
6218 make-patches --quiet-would-amend));
6219 # We tolerate soe snags that gdr wouldn't, by default.
6225 and not ($? == 7*256 or
6226 $? == -1 && $!==ENOENT);
6230 $headref = git_rev_parse('HEAD');
6235 my $unapplied=quilt_fakedsc2unapplied($headref, $upstreamversion);
6239 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
6241 if (system @bbcmd) {
6242 failedcmd @bbcmd if $? < 0;
6244 failed to apply your git tree's patch stack (from debian/patches/) to
6245 the corresponding upstream tarball(s). Your source tree and .orig
6246 are probably too inconsistent. dgit can only fix up certain kinds of
6247 anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).
6253 unpack_playtree_need_cd_work($headref);
6256 if (stat_exists ".pc") {
6258 progress __ "Tree already contains .pc - will use it then delete it.";
6261 rename '../fake/.pc','.pc' or confess "$!";
6264 changedir '../fake';
6266 my $oldtiptree=git_add_write_tree();
6267 printdebug "fake o+d/p tree object $unapplied\n";
6268 changedir '../work';
6271 # We calculate some guesswork now about what kind of tree this might
6272 # be. This is mostly for error reporting.
6274 my $tentries = cmdoutput @git, qw(ls-tree --name-only -z), $headref;
6275 my $onlydebian = $tentries eq "debian\0";
6277 my $uheadref = $headref;
6278 my $uhead_whatshort = 'HEAD';
6280 if ($quilt_mode =~ m/baredebian\+tarball/) {
6281 # We need to make a tarball import. Yuk.
6282 # We want to do this here so that we have a $uheadref value
6285 baredebian_origtarballs_scan \@fakedfi, $upstreamversion, bpd_abs();
6286 baredebian_origtarballs_scan \@fakedfi, $upstreamversion,
6287 "$maindir/.." unless $buildproductsdir eq '..';
6290 my @tartrees = import_tarball_tartrees $upstreamversion, \@fakedfi;
6292 fail __ "baredebian quilt fixup: could not find any origs"
6296 my ($authline, $r1authline, $clogp,) =
6297 import_tarball_commits \@tartrees, $upstreamversion;
6299 if (@tartrees == 1) {
6300 $uheadref = $tartrees[0]{Commit};
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
6305 $uhead_whatshort = __ 'tarball';
6307 # on .dsc import we do not make a separate commit, but
6308 # here we need to do so
6309 rm_subdir_cached '.';
6311 foreach my $ti (@tartrees) {
6312 my $c = $ti->{Commit};
6313 if ($ti->{OrigPart} eq 'orig') {
6314 runcmd qw(git read-tree), $c;
6315 } elsif ($ti->{OrigPart} =~ m/orig-/) {
6316 read_tree_subdir $', $c;
6318 confess "$ti->OrigPart} ?"
6320 $parents .= "parent $c\n";
6322 my $tree = git_write_tree();
6323 my $mbody = f_ 'Combine orig tarballs for %s %s',
6324 $package, $upstreamversion;
6325 $uheadref = hash_commit_text <<END;
6327 ${parents}author $r1authline
6328 committer $r1authline
6332 [dgit import tarballs combine $package $upstreamversion]
6334 # TRANSLATORS: this translation must fit in the ASCII art
6335 # quilt differences display. The untranslated display
6336 # says %9.9s, so with that display it must be at most 9
6337 # characters. This fragmentt is referring to multiple
6338 # orig tarballs in a source package.
6339 $uhead_whatshort = __ 'tarballs';
6341 runcmd @git, qw(reset -q);
6343 $quilt_upstream_commitish = $uheadref;
6344 $quilt_upstream_commitish_used = '*orig*';
6345 $quilt_upstream_commitish_message = '';
6347 if ($quilt_mode =~ m/baredebian$/) {
6348 $uheadref = $quilt_upstream_commitish;
6349 # TRANSLATORS: this translation must fit in the ASCII art
6350 # quilt differences display. The untranslated display
6351 # says %9.9s, so with that display it must be at most 9
6353 $uhead_whatshort = __ 'upstream';
6360 # O = orig, without patches applied
6361 # A = "applied", ie orig with H's debian/patches applied
6362 O2H => quiltify_trees_differ($unapplied,$uheadref, 1,
6363 \%editedignores, \@unrepres),
6364 H2A => quiltify_trees_differ($uheadref, $oldtiptree,1),
6365 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
6369 foreach my $bits (qw(01 02)) {
6370 foreach my $v (qw(O2H O2A H2A)) {
6371 push @dl, ($diffbits->{$v} & $bits) ? '##' : '==';
6374 printdebug "differences \@dl @dl.\n";
6377 "%s: base trees orig=%.20s o+d/p=%.20s",
6378 $us, $unapplied, $oldtiptree;
6379 # TRANSLATORS: Try to keep this ascii-art layout right. The 0s in
6380 # %9.00009s will be ignored and are there to make the format the
6381 # same length (9 characters) as the output it generates. If you
6382 # change the value 9, your translations of "upstream" and
6383 # 'tarball' must fit into the new length, and you should change
6384 # the number of 0s. Do not reduce it below 4 as HEAD has to fit
6387 "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
6388 "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p",
6389 $us, $dl[0], $dl[1], $dl[3], $dl[4],
6390 $us, $uhead_whatshort, $dl[2], $uhead_whatshort, $dl[5];
6392 if (@unrepres && $quilt_mode !~ m/baredebian/) {
6393 # With baredebian, even if the upstream commitish has this
6394 # problem, we don't want to print this message, as nothing
6395 # is going to try to make a patch out of it anyway.
6396 print STDERR f_ "dgit: cannot represent change: %s: %s\n",
6399 forceable_fail [qw(unrepresentable)], __ <<END;
6400 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
6406 push @failsuggestion, [ 'onlydebian', __
6407 "This has only a debian/ directory; you probably want --quilt=bare debian." ]
6408 unless $quilt_mode =~ m/baredebian/;
6409 } elsif (!($diffbits->{O2H} & $diffbits->{O2A})) {
6410 push @failsuggestion, [ 'unapplied', __
6411 "This might be a patches-unapplied branch." ];
6412 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
6413 push @failsuggestion, [ 'applied', __
6414 "This might be a patches-applied branch." ];
6416 push @failsuggestion, [ 'quilt-mode', __
6417 "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" ];
6419 push @failsuggestion, [ 'gitattrs', __
6420 "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." ]
6421 if stat_exists '.gitattributes';
6423 push @failsuggestion, [ 'origs', __
6424 "Maybe orig tarball(s) are not identical to git representation?" ]
6425 unless $onlydebian && $quilt_mode !~ m/baredebian/;
6426 # ^ in that case, we didn't really look properly
6428 if (quiltmode_splitting()) {
6429 quiltify_splitting($clogp, $unapplied, $headref, $oldtiptree,
6430 $diffbits, \%editedignores,
6431 $splitbrain_cachekey);
6435 progress f_ "starting quiltify (multiple patches, %s mode)", $quilt_mode;
6436 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
6437 runcmd @git, qw(checkout -q), (qw(master dgit-view)[do_split_brain()]);
6439 if (!open P, '>>', ".pc/applied-patches") {
6440 $!==&ENOENT or confess "$!";
6445 commit_quilty_patch();
6447 if ($mustdeletepc) {
6448 quilt_fixup_delete_pc();
6452 sub quilt_fixup_editor () {
6453 my $descfn = $ENV{$fakeeditorenv};
6454 my $editing = $ARGV[$#ARGV];
6455 open I1, '<', $descfn or confess "$descfn: $!";
6456 open I2, '<', $editing or confess "$editing: $!";
6457 unlink $editing or confess "$editing: $!";
6458 open O, '>', $editing or confess "$editing: $!";
6459 while (<I1>) { print O or confess "$!"; } I1->error and confess "$!";
6462 $copying ||= m/^\-\-\- /;
6463 next unless $copying;
6464 print O or confess "$!";
6466 I2->error and confess "$!";
6471 sub maybe_apply_patches_dirtily () {
6472 return unless $quilt_mode =~ m/gbp|unapplied|baredebian/;
6473 print STDERR __ <<END or confess "$!";
6475 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
6476 dgit: Have to apply the patches - making the tree dirty.
6477 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
6480 $patches_applied_dirtily = 01;
6481 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
6482 runcmd qw(dpkg-source --before-build .);
6485 sub maybe_unapply_patches_again () {
6486 progress __ "dgit: Unapplying patches again to tidy up the tree."
6487 if $patches_applied_dirtily;
6488 runcmd qw(dpkg-source --after-build .)
6489 if $patches_applied_dirtily & 01;
6491 if $patches_applied_dirtily & 02;
6492 $patches_applied_dirtily = 0;
6495 #----- other building -----
6497 sub clean_tree_check_git ($$$) {
6498 my ($honour_ignores, $message, $ignmessage) = @_;
6499 my @cmd = (@git, qw(clean -dn));
6500 push @cmd, qw(-x) unless $honour_ignores;
6501 my $leftovers = cmdoutput @cmd;
6502 if (length $leftovers) {
6503 print STDERR $leftovers, "\n" or confess "$!";
6504 $message .= $ignmessage if $honour_ignores;
6509 sub clean_tree_check_git_wd ($) {
6511 return if $cleanmode =~ m{no-check};
6512 return if $patches_applied_dirtily; # yuk
6513 clean_tree_check_git +($cleanmode !~ m{all-check}),
6514 $message, "\n".__ <<END;
6515 If this is just missing .gitignore entries, use a different clean
6516 mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them
6517 or --clean=git (-wg/-wgf) to use \`git clean' instead.
6521 sub clean_tree_check () {
6522 # This function needs to not care about modified but tracked files.
6523 # That was done by check_not_dirty, and by now we may have run
6524 # the rules clean target which might modify tracked files (!)
6525 if ($cleanmode =~ m{^check}) {
6526 clean_tree_check_git +($cleanmode =~ m{ignores}), __
6527 "tree contains uncommitted files and --clean=check specified", '';
6528 } elsif ($cleanmode =~ m{^dpkg-source}) {
6529 clean_tree_check_git_wd __
6530 "tree contains uncommitted files (NB dgit didn't run rules clean)";
6531 } elsif ($cleanmode =~ m{^git}) {
6532 clean_tree_check_git 1, __
6533 "tree contains uncommited, untracked, unignored files\n".
6534 "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.", '';
6535 } elsif ($cleanmode eq 'none') {
6537 confess "$cleanmode ?";
6542 # We always clean the tree ourselves, rather than leave it to the
6543 # builder (dpkg-source, or soemthing which calls dpkg-source).
6544 if ($quilt_mode =~ m/baredebian/ and $cleanmode =~ m/git/) {
6545 fail f_ <<END, $quilt_mode, $cleanmode;
6546 quilt mode %s (generally needs untracked upstream files)
6547 contradicts clean mode %s (which would delete them)
6549 # This is not 100% true: dgit build-source and push-source
6550 # (for example) could operate just fine with no upstream
6551 # source in the working tree. But it doesn't seem likely that
6552 # the user wants dgit to proactively delete such things.
6553 # -wn, for example, would produce identical output without
6554 # deleting anything from the working tree.
6556 if ($cleanmode =~ m{^dpkg-source}) {
6557 my @cmd = @dpkgbuildpackage;
6558 push @cmd, qw(-d) if $cleanmode =~ m{^dpkg-source-d};
6559 push @cmd, qw(-T clean);
6560 maybe_apply_patches_dirtily();
6561 runcmd_ordryrun_local @cmd;
6562 clean_tree_check_git_wd __
6563 "tree contains uncommitted files (after running rules clean)";
6564 } elsif ($cleanmode =~ m{^git(?!-)}) {
6565 runcmd_ordryrun_local @git, qw(clean -xdf);
6566 } elsif ($cleanmode =~ m{^git-ff}) {
6567 runcmd_ordryrun_local @git, qw(clean -xdff);
6568 } elsif ($cleanmode =~ m{^check}) {
6570 } elsif ($cleanmode eq 'none') {
6572 confess "$cleanmode ?";
6577 badusage __ "clean takes no additional arguments" if @ARGV;
6580 maybe_unapply_patches_again();
6583 # return values from massage_dbp_args are one or both of these flags
6584 sub WANTSRC_SOURCE () { 01; } # caller should build source (separately)
6585 sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
6587 sub build_or_push_prep_early () {
6588 our $build_or_push_prep_early_done //= 0;
6589 return if $build_or_push_prep_early_done++;
6590 my $clogp = parsechangelog();
6591 $isuite = getfield $clogp, 'Distribution';
6592 my $gotpackage = getfield $clogp, 'Source';
6593 $version = getfield $clogp, 'Version';
6594 $package //= $gotpackage;
6595 if ($package ne $gotpackage) {
6596 fail f_ "-p specified package %s, but changelog says %s",
6597 $package, $gotpackage;
6599 $dscfn = dscfn($version);
6602 sub build_or_push_prep_modes () {
6603 my ($format) = get_source_format();
6604 determine_whether_split_brain($format);
6606 fail __ "dgit: --include-dirty is not supported with split view".
6607 " (including with view-splitting quilt modes)"
6608 if do_split_brain() && $includedirty;
6610 if (madformat_wantfixup $format and $quilt_mode =~ m/baredebian$/) {
6611 ($quilt_upstream_commitish, $quilt_upstream_commitish_used,
6612 $quilt_upstream_commitish_message)
6613 = resolve_upstream_version
6614 $quilt_upstream_commitish, upstreamversion $version;
6615 progress f_ "dgit: --quilt=%s, %s", $quilt_mode,
6616 $quilt_upstream_commitish_message;
6617 } elsif (defined $quilt_upstream_commitish) {
6619 "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
6623 sub build_prep_early () {
6624 build_or_push_prep_early();
6626 build_or_push_prep_modes();
6630 sub build_prep ($) {
6634 if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)
6635 # Clean the tree because we're going to use the contents of
6636 # $maindir. (We trying to include dirty changes in the source
6637 # package, or we are running the builder in $maindir.)
6638 || $cleanmode =~ m{always}) {
6639 # Or because the user asked us to.
6642 # We don't actually need to do anything in $maindir, but we
6643 # should do some kind of cleanliness check because (i) the
6644 # user may have forgotten a `git add', and (ii) if the user
6645 # said -wc we should still do the check.
6648 build_check_quilt_splitbrain();
6650 my $pat = changespat $version;
6651 foreach my $f (glob "$buildproductsdir/$pat") {
6654 fail f_ "remove old changes file %s: %s", $f, $!;
6656 progress f_ "would remove %s", $f;
6662 sub changesopts_initial () {
6663 my @opts =@changesopts[1..$#changesopts];
6666 sub changesopts_version () {
6667 if (!defined $changes_since_version) {
6670 @vsns = archive_query('archive_query');
6671 my @quirk = access_quirk();
6672 if ($quirk[0] eq 'backports') {
6673 local $isuite = $quirk[2];
6675 canonicalise_suite();
6676 push @vsns, archive_query('archive_query');
6682 "archive query failed (queried because --since-version not specified)";
6685 @vsns = map { $_->[0] } @vsns;
6686 @vsns = sort { -version_compare($a, $b) } @vsns;
6687 $changes_since_version = $vsns[0];
6688 progress f_ "changelog will contain changes since %s", $vsns[0];
6690 $changes_since_version = '_';
6691 progress __ "package seems new, not specifying -v<version>";
6694 if ($changes_since_version ne '_') {
6695 return ("-v$changes_since_version");
6701 sub changesopts () {
6702 return (changesopts_initial(), changesopts_version());
6705 sub massage_dbp_args ($;$) {
6706 my ($cmd,$xargs) = @_;
6707 # Since we split the source build out so we can do strange things
6708 # to it, massage the arguments to dpkg-buildpackage so that the
6709 # main build doessn't build source (or add an argument to stop it
6710 # building source by default).
6711 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6712 # -nc has the side effect of specifying -b if nothing else specified
6713 # and some combinations of -S, -b, et al, are errors, rather than
6714 # later simply overriding earlie. So we need to:
6715 # - search the command line for these options
6716 # - pick the last one
6717 # - perhaps add our own as a default
6718 # - perhaps adjust it to the corresponding non-source-building version
6720 foreach my $l ($cmd, $xargs) {
6722 @$l = grep { !(m/^-[SgGFABb]$|^--build=/s and $dmode=$_) } @$l;
6725 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6726 my $r = WANTSRC_BUILDER;
6727 printdebug "massage split $dmode.\n";
6728 if ($dmode =~ s/^--build=//) {
6730 my @d = split /,/, $dmode;
6731 $r |= WANTSRC_SOURCE if grep { s/^full$/binary/ } @d;
6732 $r |= WANTSRC_SOURCE if grep { s/^source$// } @d;
6733 $r |= WANTSRC_BUILDER if grep { m/./ } @d;
6734 fail __ "Wanted to build nothing!" unless $r;
6735 $dmode = '--build='. join ',', grep m/./, @d;
6738 $dmode =~ m/[S]/ ? WANTSRC_SOURCE :
6739 $dmode =~ y/gGF/ABb/ ? WANTSRC_SOURCE | WANTSRC_BUILDER :
6740 $dmode =~ m/[ABb]/ ? WANTSRC_BUILDER :
6743 printdebug "massage done $r $dmode.\n";
6745 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6751 my $wasdir = must_getcwd();
6752 changedir $buildproductsdir;
6757 # this sub must run with CWD=$buildproductsdir (eg in in_bpd)
6758 sub postbuild_mergechanges ($) {
6759 my ($msg_if_onlyone) = @_;
6760 # If there is only one .changes file, fail with $msg_if_onlyone,
6761 # or if that is undef, be a no-op.
6762 # Returns the changes file to report to the user.
6763 my $pat = changespat $version;
6764 my @changesfiles = grep { !m/_multi\.changes/ } glob $pat;
6765 @changesfiles = sort {
6766 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6770 if (@changesfiles==1) {
6771 fail +(f_ <<END, "@changesfiles").$msg_if_onlyone
6772 only one changes file from build (%s)
6774 if defined $msg_if_onlyone;
6775 $result = $changesfiles[0];
6776 } elsif (@changesfiles==2) {
6777 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6778 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6779 fail f_ "%s found in binaries changes file %s", $l, $binchanges
6782 runcmd_ordryrun_local @mergechanges, @changesfiles;
6783 my $multichanges = changespat $version,'multi';
6785 stat_exists $multichanges or fail f_
6786 "%s unexpectedly not created by build", $multichanges;
6787 foreach my $cf (glob $pat) {
6788 next if $cf eq $multichanges;
6789 rename "$cf", "$cf.inmulti" or fail f_
6790 "install new changes %s\{,.inmulti}: %s", $cf, $!;
6793 $result = $multichanges;
6795 fail f_ "wrong number of different changes files (%s)",
6798 printdone f_ "build successful, results in %s\n", $result
6802 sub midbuild_checkchanges () {
6803 my $pat = changespat $version;
6804 return if $rmchanges;
6805 my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
6807 $_ ne changespat $version,'source' and
6808 $_ ne changespat $version,'multi'
6810 fail +(f_ <<END, $pat, "@unwanted")
6811 changes files other than source matching %s already present; building would result in ambiguity about the intended results.
6812 Suggest you delete %s.
6817 sub midbuild_checkchanges_vanilla ($) {
6819 midbuild_checkchanges() if $wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER);
6822 sub postbuild_mergechanges_vanilla ($) {
6824 if ($wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER)) {
6826 postbuild_mergechanges(undef);
6829 printdone __ "build successful\n";
6835 $buildproductsdir eq '..' or print STDERR +(f_ <<END, $us, $us);
6836 %s: warning: build-products-dir set, but not supported by dpkg-buildpackage
6837 %s: warning: build-products-dir will be ignored; files will go to ..
6839 $buildproductsdir = '..';
6840 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6841 my $wantsrc = massage_dbp_args \@dbp;
6842 build_prep($wantsrc);
6843 if ($wantsrc & WANTSRC_SOURCE) {
6845 midbuild_checkchanges_vanilla $wantsrc;
6847 if ($wantsrc & WANTSRC_BUILDER) {
6848 push @dbp, changesopts_version();
6849 maybe_apply_patches_dirtily();
6850 runcmd_ordryrun_local @dbp;
6852 maybe_unapply_patches_again();
6853 postbuild_mergechanges_vanilla $wantsrc;
6857 $quilt_mode //= 'gbp';
6863 # gbp can make .origs out of thin air. In my tests it does this
6864 # even for a 1.0 format package, with no origs present. So I
6865 # guess it keys off just the version number. We don't know
6866 # exactly what .origs ought to exist, but let's assume that we
6867 # should run gbp if: the version has an upstream part and the main
6869 my $upstreamversion = upstreamversion $version;
6870 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6871 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "$bpd_glob/$origfnpat");
6873 if ($gbp_make_orig) {
6875 $cleanmode = 'none'; # don't do it again
6878 my @dbp = @dpkgbuildpackage;
6880 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6882 if (!length $gbp_build[0]) {
6883 if (length executable_on_path('git-buildpackage')) {
6884 $gbp_build[0] = qw(git-buildpackage);
6886 $gbp_build[0] = 'gbp buildpackage';
6889 my @cmd = opts_opt_multi_cmd [], @gbp_build;
6891 push @cmd, (qw(-us -uc --git-no-sign-tags),
6892 "--git-builder=".(shellquote @dbp));
6894 if ($gbp_make_orig) {
6895 my $priv = dgit_privdir();
6896 my $ok = "$priv/origs-gen-ok";
6897 unlink $ok or $!==&ENOENT or confess "$!";
6898 my @origs_cmd = @cmd;
6899 push @origs_cmd, qw(--git-cleaner=true);
6900 push @origs_cmd, "--git-prebuild=".
6901 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6902 push @origs_cmd, @ARGV;
6904 debugcmd @origs_cmd;
6906 do { local $!; stat_exists $ok; }
6907 or failedcmd @origs_cmd;
6909 dryrun_report @origs_cmd;
6913 build_prep($wantsrc);
6914 if ($wantsrc & WANTSRC_SOURCE) {
6916 midbuild_checkchanges_vanilla $wantsrc;
6918 push @cmd, '--git-cleaner=true';
6920 maybe_unapply_patches_again();
6921 if ($wantsrc & WANTSRC_BUILDER) {
6922 push @cmd, changesopts();
6923 runcmd_ordryrun_local @cmd, @ARGV;
6925 postbuild_mergechanges_vanilla $wantsrc;
6927 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6929 sub building_source_in_playtree {
6930 # If $includedirty, we have to build the source package from the
6931 # working tree, not a playtree, so that uncommitted changes are
6932 # included (copying or hardlinking them into the playtree could
6935 # Note that if we are building a source package in split brain
6936 # mode we do not support including uncommitted changes, because
6937 # that makes quilt fixup too hard. I.e. ($made_split_brain && (dgit is
6938 # building a source package)) => !$includedirty
6939 return !$includedirty;
6943 $sourcechanges = changespat $version,'source';
6945 unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
6946 or fail f_ "remove %s: %s", $sourcechanges, $!;
6948 # confess unless !!$made_split_brain == do_split_brain();
6950 my @cmd = (@dpkgsource, qw(-b --));
6952 if (building_source_in_playtree()) {
6954 my $headref = git_rev_parse('HEAD');
6955 # If we are in split brain, there is already a playtree with
6956 # the thing we should package into a .dsc (thanks to quilt
6957 # fixup). If not, make a playtree
6958 prep_ud() unless $made_split_brain;
6959 changedir $playground;
6960 unless ($made_split_brain) {
6961 my $upstreamversion = upstreamversion $version;
6962 unpack_playtree_linkorigs($upstreamversion, sub { });
6963 unpack_playtree_need_cd_work($headref);
6967 $leafdir = basename $maindir;
6969 if ($buildproductsdir ne '..') {
6970 # Well, we are going to run dpkg-source -b which consumes
6971 # origs from .. and generates output there. To make this
6972 # work when the bpd is not .. , we would have to (i) link
6973 # origs from bpd to .. , (ii) check for files that
6974 # dpkg-source -b would/might overwrite, and afterwards
6975 # (iii) move all the outputs back to the bpd (iv) except
6976 # for the origs which should be deleted from .. if they
6977 # weren't there beforehand. And if there is an error and
6978 # we don't run to completion we would necessarily leave a
6979 # mess. This is too much. The real way to fix this
6980 # is for dpkg-source to have bpd support.
6981 confess unless $includedirty;
6983 "--include-dirty not supported with --build-products-dir, sorry";
6988 runcmd_ordryrun_local @cmd, $leafdir;
6991 runcmd_ordryrun_local qw(sh -ec),
6992 'exec >../$1; shift; exec "$@"','x', $sourcechanges,
6993 @dpkggenchanges, qw(-S), changesopts();
6996 printdebug "moving $dscfn, $sourcechanges, etc. to ".bpd_abs()."\n";
6997 $dsc = parsecontrol($dscfn, "source package");
7001 printdebug " renaming ($why) $l\n";
7002 rename_link_xf 0, "$l", bpd_abs()."/$l"
7003 or fail f_ "put in place new built file (%s): %s", $l, $@;
7005 foreach my $l (split /\n/, getfield $dsc, 'Files') {
7006 $l =~ m/\S+$/ or next;
7009 $mv->('dsc', $dscfn);
7010 $mv->('changes', $sourcechanges);
7015 sub cmd_build_source {
7016 badusage __ "build-source takes no additional arguments" if @ARGV;
7017 build_prep(WANTSRC_SOURCE);
7019 maybe_unapply_patches_again();
7020 printdone f_ "source built, results in %s and %s",
7021 $dscfn, $sourcechanges;
7024 sub cmd_push_source {
7027 "dgit push-source: --include-dirty/--ignore-dirty does not make".
7028 "sense with push-source!"
7030 build_check_quilt_splitbrain();
7032 my $changes = parsecontrol("$buildproductsdir/$changesfile",
7033 __ "source changes file");
7034 unless (test_source_only_changes($changes)) {
7035 fail __ "user-specified changes file is not source-only";
7038 # Building a source package is very fast, so just do it
7040 confess "er, patches are applied dirtily but shouldn't be.."
7041 if $patches_applied_dirtily;
7042 $changesfile = $sourcechanges;
7047 sub binary_builder {
7048 my ($bbuilder, $pbmc_msg, @args) = @_;
7049 build_prep(WANTSRC_SOURCE);
7051 midbuild_checkchanges();
7054 stat_exists $dscfn or fail f_
7055 "%s (in build products dir): %s", $dscfn, $!;
7056 stat_exists $sourcechanges or fail f_
7057 "%s (in build products dir): %s", $sourcechanges, $!;
7059 runcmd_ordryrun_local @$bbuilder, @args;
7061 maybe_unapply_patches_again();
7063 postbuild_mergechanges($pbmc_msg);
7069 binary_builder(\@sbuild, (__ <<END), qw(-d), $isuite, @ARGV, $dscfn);
7070 perhaps you need to pass -A ? (sbuild's default is to build only
7071 arch-specific binaries; dgit 1.4 used to override that.)
7076 my ($pbuilder) = @_;
7078 # @ARGV is allowed to contain only things that should be passed to
7079 # pbuilder under debbuildopts; just massage those
7080 my $wantsrc = massage_dbp_args \@ARGV;
7082 "you asked for a builder but your debbuildopts didn't ask for".
7083 " any binaries -- is this really what you meant?"
7084 unless $wantsrc & WANTSRC_BUILDER;
7086 "we must build a .dsc to pass to the builder but your debbuiltopts".
7087 " forbids the building of a source package; cannot continue"
7088 unless $wantsrc & WANTSRC_SOURCE;
7089 # We do not want to include the verb "build" in @pbuilder because
7090 # the user can customise @pbuilder and they shouldn't be required
7091 # to include "build" in their customised value. However, if the
7092 # user passes any additional args to pbuilder using the dgit
7093 # option --pbuilder:foo, such args need to come after the "build"
7094 # verb. opts_opt_multi_cmd does all of that.
7095 binary_builder([opts_opt_multi_cmd ["build"], @$pbuilder], undef,
7096 qw(--debbuildopts), "@ARGV", qw(--distribution), $isuite,
7101 pbuilder(\@pbuilder);
7104 sub cmd_cowbuilder {
7105 pbuilder(\@cowbuilder);
7108 sub cmd_quilt_fixup {
7109 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
7112 build_maybe_quilt_fixup();
7115 sub cmd_print_unapplied_treeish {
7116 badusage __ "incorrect arguments to dgit print-unapplied-treeish"
7118 my $headref = git_rev_parse('HEAD');
7119 my $clogp = commit_getclogp $headref;
7120 $package = getfield $clogp, 'Source';
7121 $version = getfield $clogp, 'Version';
7122 $isuite = getfield $clogp, 'Distribution';
7123 $csuite = $isuite; # we want this to be offline!
7127 changedir $playground;
7128 my $uv = upstreamversion $version;
7129 my $u = quilt_fakedsc2unapplied($headref, $uv);
7130 print $u, "\n" or confess "$!";
7133 sub import_dsc_result {
7134 my ($dstref, $newhash, $what_log, $what_msg) = @_;
7135 my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
7137 check_gitattrs($newhash, __ "source tree");
7139 progress f_ "dgit: import-dsc: %s", $what_msg;
7142 sub cmd_import_dsc {
7146 last unless $ARGV[0] =~ m/^-/;
7149 if (m/^--require-valid-signature$/) {
7152 badusage f_ "unknown dgit import-dsc sub-option \`%s'", $_;
7156 badusage __ "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
7158 my ($dscfn, $dstbranch) = @ARGV;
7160 badusage __ "dry run makes no sense with import-dsc"
7163 my $force = $dstbranch =~ s/^\+// ? +1 :
7164 $dstbranch =~ s/^\.\.// ? -1 :
7166 my $info = $force ? " $&" : '';
7167 $info = "$dscfn$info";
7169 my $specbranch = $dstbranch;
7170 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
7171 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
7173 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
7174 my $chead = cmdoutput_errok @symcmd;
7175 defined $chead or $?==256 or failedcmd @symcmd;
7177 fail f_ "%s is checked out - will not update it", $dstbranch
7178 if defined $chead and $chead eq $dstbranch;
7180 my $oldhash = git_get_ref $dstbranch;
7182 open D, "<", $dscfn or fail f_ "open import .dsc (%s): %s", $dscfn, $!;
7183 $dscdata = do { local $/ = undef; <D>; };
7184 D->error and fail f_ "read %s: %s", $dscfn, $!;
7187 # we don't normally need this so import it here
7188 use Dpkg::Source::Package;
7189 my $dp = new Dpkg::Source::Package filename => $dscfn,
7190 require_valid_signature => $needsig;
7192 local $SIG{__WARN__} = sub {
7194 return unless $needsig;
7195 fail __ "import-dsc signature check failed";
7197 if (!$dp->is_signed()) {
7198 warn f_ "%s: warning: importing unsigned .dsc\n", $us;
7200 my $r = $dp->check_signature();
7201 confess "->check_signature => $r" if $needsig && $r;
7207 $package = getfield $dsc, 'Source';
7209 parse_dsc_field($dsc, __ "Dgit metadata in .dsc")
7210 unless forceing [qw(import-dsc-with-dgit-field)];
7211 parse_dsc_field_def_dsc_distro();
7213 $isuite = 'DGIT-IMPORT-DSC';
7214 $idistro //= $dsc_distro;
7218 if (defined $dsc_hash) {
7220 "dgit: import-dsc of .dsc with Dgit field, using git hash";
7221 resolve_dsc_field_commit undef, undef;
7223 if (defined $dsc_hash) {
7224 my @cmd = (qw(sh -ec),
7225 "echo $dsc_hash | git cat-file --batch-check");
7226 my $objgot = cmdoutput @cmd;
7227 if ($objgot =~ m#^\w+ missing\b#) {
7228 fail f_ <<END, $dsc_hash
7229 .dsc contains Dgit field referring to object %s
7230 Your git tree does not have that object. Try `git fetch' from a
7231 plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.
7234 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
7236 progress __ "Not fast forward, forced update.";
7238 fail f_ "Not fast forward to %s", $dsc_hash;
7241 import_dsc_result $dstbranch, $dsc_hash,
7242 "dgit import-dsc (Dgit): $info",
7243 f_ "updated git ref %s", $dstbranch;
7247 fail f_ <<END, $dstbranch, $specbranch, $specbranch
7248 Branch %s already exists
7249 Specify ..%s for a pseudo-merge, binding in existing history
7250 Specify +%s to overwrite, discarding existing history
7252 if $oldhash && !$force;
7254 my @dfi = dsc_files_info();
7255 foreach my $fi (@dfi) {
7256 my $f = $fi->{Filename};
7257 # We transfer all the pieces of the dsc to the bpd, not just
7258 # origs. This is by analogy with dgit fetch, which wants to
7259 # keep them somewhere to avoid downloading them again.
7260 # We make symlinks, though. If the user wants copies, then
7261 # they can copy the parts of the dsc to the bpd using dcmd,
7263 my $here = "$buildproductsdir/$f";
7268 fail f_ "lstat %s works but stat gives %s !", $here, $!;
7270 fail f_ "stat %s: %s", $here, $! unless $! == ENOENT;
7271 printdebug "not in bpd, $f ...\n";
7272 # $f does not exist in bpd, we need to transfer it
7274 $there =~ s{[^/]+$}{$f} or confess "$there ?";
7275 # $there is file we want, relative to user's cwd, or abs
7276 printdebug "not in bpd, $f, test $there ...\n";
7277 stat $there or fail f_
7278 "import %s requires %s, but: %s", $dscfn, $there, $!;
7279 if ($there =~ m#^(?:\./+)?\.\./+#) {
7280 # $there is relative to user's cwd
7281 my $there_from_parent = $';
7282 if ($buildproductsdir !~ m{^/}) {
7283 # abs2rel, despite its name, can take two relative paths
7284 $there = File::Spec->abs2rel($there,$buildproductsdir);
7285 # now $there is relative to bpd, great
7286 printdebug "not in bpd, $f, abs2rel, $there ...\n";
7288 $there = (dirname $maindir)."/$there_from_parent";
7289 # now $there is absoute
7290 printdebug "not in bpd, $f, rel2rel, $there ...\n";
7292 } elsif ($there =~ m#^/#) {
7293 # $there is absolute already
7294 printdebug "not in bpd, $f, abs, $there ...\n";
7297 "cannot import %s which seems to be inside working tree!",
7300 symlink $there, $here or fail f_
7301 "symlink %s to %s: %s", $there, $here, $!;
7302 progress f_ "made symlink %s -> %s", $here, $there;
7303 # print STDERR Dumper($fi);
7305 my @mergeinputs = generate_commits_from_dsc();
7306 die unless @mergeinputs == 1;
7308 my $newhash = $mergeinputs[0]{Commit};
7313 "Import, forced update - synthetic orphan git history.";
7314 } elsif ($force < 0) {
7315 progress __ "Import, merging.";
7316 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
7317 my $version = getfield $dsc, 'Version';
7318 my $clogp = commit_getclogp $newhash;
7319 my $authline = clogp_authline $clogp;
7320 $newhash = hash_commit_text <<ENDU
7328 .(f_ <<END, $package, $version, $dstbranch);
7329 Merge %s (%s) import into %s
7332 die; # caught earlier
7336 import_dsc_result $dstbranch, $newhash,
7337 "dgit import-dsc: $info",
7338 f_ "results are in git ref %s", $dstbranch;
7341 sub pre_archive_api_query () {
7342 not_necessarily_a_tree();
7344 sub cmd_archive_api_query {
7345 badusage __ "need only 1 subpath argument" unless @ARGV==1;
7346 my ($subpath) = @ARGV;
7347 local $isuite = 'DGIT-API-QUERY-CMD';
7348 my @cmd = archive_api_query_cmd($subpath);
7351 exec @cmd or fail f_ "exec curl: %s\n", $!;
7354 sub repos_server_url () {
7355 $package = '_dgit-repos-server';
7356 local $access_forpush = 1;
7357 local $isuite = 'DGIT-REPOS-SERVER';
7358 my $url = access_giturl();
7361 sub pre_clone_dgit_repos_server () {
7362 not_necessarily_a_tree();
7364 sub cmd_clone_dgit_repos_server {
7365 badusage __ "need destination argument" unless @ARGV==1;
7366 my ($destdir) = @ARGV;
7367 my $url = repos_server_url();
7368 my @cmd = (@git, qw(clone), $url, $destdir);
7370 exec @cmd or fail f_ "exec git clone: %s\n", $!;
7373 sub pre_print_dgit_repos_server_source_url () {
7374 not_necessarily_a_tree();
7376 sub cmd_print_dgit_repos_server_source_url {
7378 "no arguments allowed to dgit print-dgit-repos-server-source-url"
7380 my $url = repos_server_url();
7381 print $url, "\n" or confess "$!";
7384 sub pre_print_dpkg_source_ignores {
7385 not_necessarily_a_tree();
7387 sub cmd_print_dpkg_source_ignores {
7389 "no arguments allowed to dgit print-dpkg-source-ignores"
7391 print "@dpkg_source_ignores\n" or confess "$!";
7394 sub cmd_setup_mergechangelogs {
7395 badusage __ "no arguments allowed to dgit setup-mergechangelogs"
7397 local $isuite = 'DGIT-SETUP-TREE';
7398 setup_mergechangelogs(1);
7401 sub cmd_setup_useremail {
7402 badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
7403 local $isuite = 'DGIT-SETUP-TREE';
7407 sub cmd_setup_gitattributes {
7408 badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
7409 local $isuite = 'DGIT-SETUP-TREE';
7413 sub cmd_setup_new_tree {
7414 badusage __ "no arguments allowed to dgit setup-tree" if @ARGV;
7415 local $isuite = 'DGIT-SETUP-TREE';
7419 #---------- argument parsing and main program ----------
7422 print "dgit version $our_version\n" or confess "$!";
7426 our (%valopts_long, %valopts_short);
7427 our (%funcopts_long);
7429 our (@modeopt_cfgs);
7431 sub defvalopt ($$$$) {
7432 my ($long,$short,$val_re,$how) = @_;
7433 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
7434 $valopts_long{$long} = $oi;
7435 $valopts_short{$short} = $oi;
7436 # $how subref should:
7437 # do whatever assignemnt or thing it likes with $_[0]
7438 # if the option should not be passed on to remote, @rvalopts=()
7439 # or $how can be a scalar ref, meaning simply assign the value
7442 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
7443 defvalopt '--distro', '-d', '.+', \$idistro;
7444 defvalopt '', '-k', '.+', \$keyid;
7445 defvalopt '--existing-package','', '.*', \$existing_package;
7446 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
7447 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
7448 defvalopt '--package', '-p', $package_re, \$package;
7449 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
7451 defvalopt '', '-C', '.+', sub {
7452 ($changesfile) = (@_);
7453 if ($changesfile =~ s#^(.*)/##) {
7454 $buildproductsdir = $1;
7458 defvalopt '--initiator-tempdir','','.*', sub {
7459 ($initiator_tempdir) = (@_);
7460 $initiator_tempdir =~ m#^/# or
7461 badusage __ "--initiator-tempdir must be used specify an".
7462 " absolute, not relative, directory."
7465 sub defoptmodes ($@) {
7466 my ($varref, $cfgkey, $default, %optmap) = @_;
7468 while (my ($opt,$val) = each %optmap) {
7469 $funcopts_long{$opt} = sub { $$varref = $val; };
7470 $permit{$val} = $val;
7472 push @modeopt_cfgs, {
7475 Default => $default,
7480 defoptmodes \$dodep14tag, qw( dep14tag want
7483 --always-dep14tag always );
7488 if (defined $ENV{'DGIT_SSH'}) {
7489 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
7490 } elsif (defined $ENV{'GIT_SSH'}) {
7491 @ssh = ($ENV{'GIT_SSH'});
7499 if (!defined $val) {
7500 badusage f_ "%s needs a value", $what unless @ARGV;
7502 push @rvalopts, $val;
7504 badusage f_ "bad value \`%s' for %s", $val, $what unless
7505 $val =~ m/^$oi->{Re}$(?!\n)/s;
7506 my $how = $oi->{How};
7507 if (ref($how) eq 'SCALAR') {
7512 push @ropts, @rvalopts;
7516 last unless $ARGV[0] =~ m/^-/;
7520 if (m/^--dry-run$/) {
7523 } elsif (m/^--damp-run$/) {
7526 } elsif (m/^--no-sign$/) {
7529 } elsif (m/^--help$/) {
7531 } elsif (m/^--version$/) {
7533 } elsif (m/^--new$/) {
7536 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
7537 ($om = $opts_opt_map{$1}) &&
7541 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
7542 !$opts_opt_cmdonly{$1} &&
7543 ($om = $opts_opt_map{$1})) {
7546 } elsif (m/^--([-0-9a-z]+)\!:(.*)/s &&
7547 !$opts_opt_cmdonly{$1} &&
7548 ($om = $opts_opt_map{$1})) {
7550 my $cmd = shift @$om;
7551 @$om = ($cmd, grep { $_ ne $2 } @$om);
7552 } elsif (m/^--($quilt_options_re)$/s) {
7553 push @ropts, "--quilt=$1";
7555 } elsif (m/^--(?:ignore|include)-dirty$/s) {
7558 } elsif (m/^--no-quilt-fixup$/s) {
7560 $quilt_mode = 'nocheck';
7561 } elsif (m/^--no-rm-on-error$/s) {
7564 } elsif (m/^--no-chase-dsc-distro$/s) {
7566 $chase_dsc_distro = 0;
7567 } elsif (m/^--overwrite$/s) {
7569 $overwrite_version = '';
7570 } elsif (m/^--split-(?:view|brain)$/s) {
7572 $splitview_mode = 'always';
7573 } elsif (m/^--split-(?:view|brain)=($splitview_modes_re)$/s) {
7575 $splitview_mode = $1;
7576 } elsif (m/^--overwrite=(.+)$/s) {
7578 $overwrite_version = $1;
7579 } elsif (m/^--delayed=(\d+)$/s) {
7582 } elsif (m/^--upstream-commitish=(.+)$/s) {
7584 $quilt_upstream_commitish = $1;
7585 } elsif (m/^--save-(dgit-view)=(.+)$/s ||
7586 m/^--(dgit-view)-save=(.+)$/s
7588 my ($k,$v) = ($1,$2);
7590 $v =~ s#^(?!refs/)#refs/heads/#;
7591 $internal_object_save{$k} = $v;
7592 } elsif (m/^--(no-)?rm-old-changes$/s) {
7595 } elsif (m/^--deliberately-($deliberately_re)$/s) {
7597 push @deliberatelies, $&;
7598 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
7602 } elsif (m/^--force-/) {
7604 f_ "%s: warning: ignoring unknown force option %s\n",
7607 } elsif (m/^--config-lookup-explode=(.+)$/s) {
7608 # undocumented, for testing
7610 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
7611 # ^ it's supposed to be an array ref
7612 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
7613 $val = $2 ? $' : undef; #';
7614 $valopt->($oi->{Long});
7615 } elsif ($funcopts_long{$_}) {
7617 $funcopts_long{$_}();
7619 badusage f_ "unknown long option \`%s'", $_;
7626 } elsif (s/^-L/-/) {
7629 } elsif (s/^-h/-/) {
7631 } elsif (s/^-D/-/) {
7635 } elsif (s/^-N/-/) {
7640 push @changesopts, $_;
7642 } elsif (s/^-wn$//s) {
7644 $cleanmode = 'none';
7645 } elsif (s/^-wg(f?)(a?)$//s) {
7648 $cleanmode .= '-ff' if $1;
7649 $cleanmode .= ',always' if $2;
7650 } elsif (s/^-wd(d?)([na]?)$//s) {
7652 $cleanmode = 'dpkg-source';
7653 $cleanmode .= '-d' if $1;
7654 $cleanmode .= ',no-check' if $2 eq 'n';
7655 $cleanmode .= ',all-check' if $2 eq 'a';
7656 } elsif (s/^-wc$//s) {
7658 $cleanmode = 'check';
7659 } elsif (s/^-wci$//s) {
7661 $cleanmode = 'check,ignores';
7662 } elsif (s/^-c([^=]*)\=(.*)$//s) {
7663 push @git, '-c', $&;
7664 $gitcfgs{cmdline}{$1} = [ $2 ];
7665 } elsif (s/^-c([^=]+)$//s) {
7666 push @git, '-c', $&;
7667 $gitcfgs{cmdline}{$1} = [ 'true' ];
7668 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
7670 $val = undef unless length $val;
7671 $valopt->($oi->{Short});
7674 badusage f_ "unknown short option \`%s'", $_;
7681 sub check_env_sanity () {
7682 my $blocked = new POSIX::SigSet;
7683 sigprocmask SIG_UNBLOCK, $blocked, $blocked or confess "$!";
7686 foreach my $name (qw(PIPE CHLD)) {
7687 my $signame = "SIG$name";
7688 my $signum = eval "POSIX::$signame" // die;
7689 die f_ "%s is set to something other than SIG_DFL\n",
7691 if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT';
7692 $blocked->ismember($signum) and
7693 die f_ "%s is blocked\n", $signame;
7699 On entry to dgit, %s
7700 This is a bug produced by something in your execution environment.
7706 sub parseopts_late_defaults () {
7707 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
7708 if defined $idistro;
7709 $isuite //= cfg('dgit.default.default-suite');
7711 foreach my $k (keys %opts_opt_map) {
7712 my $om = $opts_opt_map{$k};
7714 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
7716 badcfg f_ "cannot set command for %s", $k
7717 unless length $om->[0];
7721 foreach my $c (access_cfg_cfgs("opts-$k")) {
7723 map { $_ ? @$_ : () }
7724 map { $gitcfgs{$_}{$c} }
7725 reverse @gitcfgsources;
7726 printdebug "CL $c ", (join " ", map { shellquote } @vl),
7727 "\n" if $debuglevel >= 4;
7729 badcfg f_ "cannot configure options for %s", $k
7730 if $opts_opt_cmdonly{$k};
7731 my $insertpos = $opts_cfg_insertpos{$k};
7732 @$om = ( @$om[0..$insertpos-1],
7734 @$om[$insertpos..$#$om] );
7738 if (!defined $rmchanges) {
7739 local $access_forpush;
7740 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
7743 if (!defined $quilt_mode) {
7744 local $access_forpush;
7745 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
7746 // access_cfg('quilt-mode', 'RETURN-UNDEF')
7748 $quilt_mode =~ m/^($quilt_modes_re)$/
7749 or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
7752 $quilt_mode =~ s/^(baredebian)\+git$/$1/;
7754 foreach my $moc (@modeopt_cfgs) {
7755 local $access_forpush;
7756 my $vr = $moc->{Var};
7757 next if defined $$vr;
7758 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
7759 my $v = $moc->{Vals}{$$vr};
7760 badcfg f_ "unknown %s setting \`%s'", $moc->{Key}, $$vr
7766 local $access_forpush;
7767 default_from_access_cfg(\$cleanmode, 'clean-mode', 'dpkg-source',
7771 $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
7772 $buildproductsdir //= '..';
7773 $bpd_glob = $buildproductsdir;
7774 $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
7777 setlocale(LC_MESSAGES, "");
7780 if ($ENV{$fakeeditorenv}) {
7782 quilt_fixup_editor();
7788 print STDERR __ "DRY RUN ONLY\n" if $dryrun_level > 1;
7789 print STDERR __ "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
7790 if $dryrun_level == 1;
7792 print STDERR __ $helpmsg or confess "$!";
7795 $cmd = $subcommand = shift @ARGV;
7798 my $pre_fn = ${*::}{"pre_$cmd"};
7799 $pre_fn->() if $pre_fn;
7801 if ($invoked_in_git_tree) {
7802 changedir_git_toplevel();
7807 my $fn = ${*::}{"cmd_$cmd"};
7808 $fn or badusage f_ "unknown operation %s", $cmd;