3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2018 Ian Jackson
6 # Copyright (C)2017-2018 Sean Whitton
8 # This program is free software: you can redistribute it and/or modify
9 # it under the terms of the GNU General Public License as published by
10 # the Free Software Foundation, either version 3 of the License, or
11 # (at your option) any later version.
13 # This program is distributed in the hope that it will be useful,
14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 # GNU General Public License for more details.
18 # You should have received a copy of the GNU General Public License
19 # along with this program. If not, see <http://www.gnu.org/licenses/>.
21 END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
22 use Debian::Dgit::ExitStatus;
23 use Debian::Dgit::I18n;
27 use Debian::Dgit qw(:DEFAULT :playground);
33 use Dpkg::Control::Hash;
35 use File::Temp qw(tempdir);
38 use Dpkg::Compression;
39 use Dpkg::Compression::Process;
45 use List::MoreUtils qw(pairwise);
46 use Text::Glob qw(match_glob);
47 use Fcntl qw(:DEFAULT :flock);
52 our $our_version = 'UNRELEASED'; ###substituted###
53 our $absurdity = undef; ###substituted###
55 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
66 our $dryrun_level = 0;
68 our $buildproductsdir;
71 our $includedirty = 0;
75 our $existing_package = 'dpkg';
77 our $changes_since_version;
79 our $overwrite_version; # undef: not specified; '': check changelog
81 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
83 our %internal_object_save;
84 our $we_are_responder;
85 our $we_are_initiator;
86 our $initiator_tempdir;
87 our $patches_applied_dirtily = 00;
91 our $chase_dsc_distro=1;
93 our %forceopts = map { $_=>0 }
94 qw(unrepresentable unsupported-source-format
95 dsc-changes-mismatch changes-origs-exactly
96 uploading-binaries uploading-source-only
97 import-gitapply-absurd
98 import-gitapply-no-absurd
99 import-dsc-with-dgit-field);
101 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
103 our $suite_re = '[-+.0-9a-z]+';
104 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
106 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
107 our $splitbraincache = 'dgit-intern/quilt-cache';
108 our $rewritemap = 'dgit-rewrite/map';
110 our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
112 our (@git) = qw(git);
113 our (@dget) = qw(dget);
114 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
115 our (@dput) = qw(dput);
116 our (@debsign) = qw(debsign);
117 our (@gpg) = qw(gpg);
118 our (@sbuild) = (qw(sbuild --no-source));
120 our (@dgit) = qw(dgit);
121 our (@git_debrebase) = qw(git-debrebase);
122 our (@aptget) = qw(apt-get);
123 our (@aptcache) = qw(apt-cache);
124 our (@dpkgbuildpackage) = (qw(dpkg-buildpackage), @dpkg_source_ignores);
125 our (@dpkgsource) = (qw(dpkg-source), @dpkg_source_ignores);
126 our (@dpkggenchanges) = qw(dpkg-genchanges);
127 our (@mergechanges) = qw(mergechanges -f);
128 our (@gbp_build) = ('');
129 our (@gbp_pq) = ('gbp pq');
130 our (@changesopts) = ('');
131 our (@pbuilder) = ("sudo -E pbuilder");
132 our (@cowbuilder) = ("sudo -E cowbuilder");
134 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
137 'debsign' => \@debsign,
139 'sbuild' => \@sbuild,
143 'git-debrebase' => \@git_debrebase,
144 'apt-get' => \@aptget,
145 'apt-cache' => \@aptcache,
146 'dpkg-source' => \@dpkgsource,
147 'dpkg-buildpackage' => \@dpkgbuildpackage,
148 'dpkg-genchanges' => \@dpkggenchanges,
149 'gbp-build' => \@gbp_build,
150 'gbp-pq' => \@gbp_pq,
151 'ch' => \@changesopts,
152 'mergechanges' => \@mergechanges,
153 'pbuilder' => \@pbuilder,
154 'cowbuilder' => \@cowbuilder);
156 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
157 our %opts_cfg_insertpos = map {
159 scalar @{ $opts_opt_map{$_} }
160 } keys %opts_opt_map;
162 sub parseopts_late_defaults();
163 sub setup_gitattrs(;$);
164 sub check_gitattrs($$);
171 our $supplementary_message = '';
172 our $split_brain = 0;
176 return unless forkcheck_mainprocess();
177 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
180 our $remotename = 'dgit';
181 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
185 if (!defined $absurdity) {
187 $absurdity =~ s{/[^/]+$}{/absurd} or die;
191 my ($v,$distro) = @_;
192 return $tagformatfn->($v, $distro);
195 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
197 sub lbranch () { return "$branchprefix/$csuite"; }
198 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
199 sub lref () { return "refs/heads/".lbranch(); }
200 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
201 sub rrref () { return server_ref($csuite); }
204 my ($vsn, $sfx) = @_;
205 return &source_file_leafname($package, $vsn, $sfx);
207 sub is_orig_file_of_vsn ($$) {
208 my ($f, $upstreamvsn) = @_;
209 return is_orig_file_of_p_v($f, $package, $upstreamvsn);
214 return srcfn($vsn,".dsc");
217 sub changespat ($;$) {
218 my ($vsn, $arch) = @_;
219 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
228 return unless forkcheck_mainprocess();
229 foreach my $f (@end) {
231 print STDERR "$us: cleanup: $@" if length $@;
236 print STDERR f_ "%s: invalid configuration: %s\n", $us, "@_";
240 sub forceable_fail ($$) {
241 my ($forceoptsl, $msg) = @_;
242 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
243 print STDERR +(__ "warning: overriding problem due to --force:\n"). $msg;
247 my ($forceoptsl) = @_;
248 my @got = grep { $forceopts{$_} } @$forceoptsl;
249 return 0 unless @got;
251 "warning: skipping checks or functionality due to --force-%s\n",
255 sub no_such_package () {
256 print STDERR f_ "%s: package %s does not exist in suite %s\n",
257 $us, $package, $isuite;
261 sub deliberately ($) {
263 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
266 sub deliberately_not_fast_forward () {
267 foreach (qw(not-fast-forward fresh-repo)) {
268 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
272 sub quiltmode_splitbrain () {
273 $quilt_mode =~ m/gbp|dpm|unapplied/;
276 sub opts_opt_multi_cmd {
279 push @cmd, split /\s+/, shift @_;
286 return opts_opt_multi_cmd [], @gbp_pq;
289 sub dgit_privdir () {
290 our $dgit_privdir_made //= ensure_a_playground 'dgit';
294 my $r = $buildproductsdir;
295 $r = "$maindir/$r" unless $r =~ m{^/};
299 sub get_tree_of_commit ($) {
300 my ($commitish) = @_;
301 my $cdata = cmdoutput @git, qw(cat-file commit), $commitish;
302 $cdata =~ m/\n\n/; $cdata = $`;
303 $cdata =~ m/^tree (\w+)$/m or confess "cdata $cdata ?";
307 sub branch_gdr_info ($$) {
308 my ($symref, $head) = @_;
309 my ($status, $msg, $current, $ffq_prev, $gdrlast) =
310 gdr_ffq_prev_branchinfo($symref);
311 return () unless $status eq 'branch';
312 $ffq_prev = git_get_ref $ffq_prev;
313 $gdrlast = git_get_ref $gdrlast;
314 $gdrlast &&= is_fast_fwd $gdrlast, $head;
315 return ($ffq_prev, $gdrlast);
318 sub branch_is_gdr_unstitched_ff ($$$) {
319 my ($symref, $head, $ancestor) = @_;
320 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
321 return 0 unless $ffq_prev;
322 return 0 unless !defined $ancestor or is_fast_fwd $ancestor, $ffq_prev;
326 sub branch_is_gdr ($) {
328 # This is quite like git-debrebase's keycommits.
329 # We have our own implementation because:
330 # - our algorighm can do fewer tests so is faster
331 # - it saves testing to see if gdr is installed
333 # NB we use this jsut for deciding whether to run gdr make-patches
334 # Before reusing this algorithm for somthing else, its
335 # suitability should be reconsidered.
338 local $Debian::Dgit::debugcmd_when_debuglevel = 3;
339 printdebug "branch_is_gdr $head...\n";
340 my $get_patches = sub {
341 my $t = git_cat_file "$_[0]:debian/patches", [qw(missing tree)];
344 my $tip_patches = $get_patches->($head);
347 my $cdata = git_cat_file $walk, 'commit';
348 my ($hdrs,$msg) = $cdata =~ m{\n\n} ? ($`,$') : ($cdata,'');
349 if ($msg =~ m{^\[git-debrebase\ (
350 anchor | changelog | make-patches |
351 merged-breakwater | pseudomerge
353 # no need to analyse this - it's sufficient
354 # (gdr classifications: Anchor, MergedBreakwaters)
355 # (made by gdr: Pseudomerge, Changelog)
356 printdebug "branch_is_gdr $walk gdr $1 YES\n";
359 my @parents = ($hdrs =~ m/^parent (\w+)$/gm);
361 my $walk_tree = get_tree_of_commit $walk;
362 foreach my $p (@parents) {
363 my $p_tree = get_tree_of_commit $p;
364 if ($p_tree eq $walk_tree) { # pseudomerge contriburor
365 # (gdr classification: Pseudomerge; not made by gdr)
366 printdebug "branch_is_gdr $walk unmarked pseudomerge\n"
372 # some other non-gdr merge
373 # (gdr classification: VanillaMerge, DgitImportUnpatched, ?)
374 printdebug "branch_is_gdr $walk ?-2-merge NO\n";
378 # (gdr classification: ?)
379 printdebug "branch_is_gdr $walk ?-octopus NO\n";
382 if ($get_patches->($walk) ne $tip_patches) {
383 # Our parent added, removed, or edited patches, and wasn't
384 # a gdr make-patches commit. gdr make-patches probably
385 # won't do that well, then.
386 # (gdr classification of parent: AddPatches or ?)
387 printdebug "branch_is_gdr $walk ?-patches NO\n";
390 if ($tip_patches eq '' and
391 !defined git_cat_file "$walk:debian") {
392 # (gdr classification of parent: BreakwaterStart
393 printdebug "branch_is_gdr $walk unmarked BreakwaterStart YES\n";
396 # (gdr classification: Upstream Packaging Mixed Changelog)
397 printdebug "branch_is_gdr $walk plain\n"
403 #---------- remote protocol support, common ----------
405 # remote push initiator/responder protocol:
406 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
407 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
408 # < dgit-remote-push-ready <actual-proto-vsn>
415 # > supplementary-message NBYTES # $protovsn >= 3
420 # > file parsed-changelog
421 # [indicates that output of dpkg-parsechangelog follows]
422 # > data-block NBYTES
423 # > [NBYTES bytes of data (no newline)]
424 # [maybe some more blocks]
433 # > param head DGIT-VIEW-HEAD
434 # > param csuite SUITE
435 # > param tagformat old|new
436 # > param maint-view MAINT-VIEW-HEAD
438 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
439 # > file buildinfo # for buildinfos to sign
441 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
442 # # goes into tag, for replay prevention
445 # [indicates that signed tag is wanted]
446 # < data-block NBYTES
447 # < [NBYTES bytes of data (no newline)]
448 # [maybe some more blocks]
452 # > want signed-dsc-changes
453 # < data-block NBYTES [transfer of signed dsc]
455 # < data-block NBYTES [transfer of signed changes]
457 # < data-block NBYTES [transfer of each signed buildinfo
458 # [etc] same number and order as "file buildinfo"]
466 sub i_child_report () {
467 # Sees if our child has died, and reap it if so. Returns a string
468 # describing how it died if it failed, or undef otherwise.
469 return undef unless $i_child_pid;
470 my $got = waitpid $i_child_pid, WNOHANG;
471 return undef if $got <= 0;
472 die unless $got == $i_child_pid;
473 $i_child_pid = undef;
474 return undef unless $?;
475 return f_ "build host child %s", waitstatusmsg();
480 fail f_ "connection lost: %s", $! if $fh->error;
481 fail f_ "protocol violation; %s not expected", $m;
484 sub badproto_badread ($$) {
486 fail f_ "connection lost: %s", $! if $!;
487 my $report = i_child_report();
488 fail $report if defined $report;
489 badproto $fh, f_ "eof (reading %s)", $wh;
492 sub protocol_expect (&$) {
493 my ($match, $fh) = @_;
496 defined && chomp or badproto_badread $fh, __ "protocol message";
504 badproto $fh, f_ "\`%s'", $_;
507 sub protocol_send_file ($$) {
508 my ($fh, $ourfn) = @_;
509 open PF, "<", $ourfn or die "$ourfn: $!";
512 my $got = read PF, $d, 65536;
513 die "$ourfn: $!" unless defined $got;
515 print $fh "data-block ".length($d)."\n" or confess $!;
516 print $fh $d or confess $!;
518 PF->error and die "$ourfn $!";
519 print $fh "data-end\n" or confess $!;
523 sub protocol_read_bytes ($$) {
524 my ($fh, $nbytes) = @_;
525 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, __ "bad byte count";
527 my $got = read $fh, $d, $nbytes;
528 $got==$nbytes or badproto_badread $fh, __ "data block";
532 sub protocol_receive_file ($$) {
533 my ($fh, $ourfn) = @_;
534 printdebug "() $ourfn\n";
535 open PF, ">", $ourfn or die "$ourfn: $!";
537 my ($y,$l) = protocol_expect {
538 m/^data-block (.*)$/ ? (1,$1) :
539 m/^data-end$/ ? (0,) :
543 my $d = protocol_read_bytes $fh, $l;
544 print PF $d or confess $!;
546 close PF or confess $!;
549 #---------- remote protocol support, responder ----------
551 sub responder_send_command ($) {
553 return unless $we_are_responder;
554 # called even without $we_are_responder
555 printdebug ">> $command\n";
556 print PO $command, "\n" or confess $!;
559 sub responder_send_file ($$) {
560 my ($keyword, $ourfn) = @_;
561 return unless $we_are_responder;
562 printdebug "]] $keyword $ourfn\n";
563 responder_send_command "file $keyword";
564 protocol_send_file \*PO, $ourfn;
567 sub responder_receive_files ($@) {
568 my ($keyword, @ourfns) = @_;
569 die unless $we_are_responder;
570 printdebug "[[ $keyword @ourfns\n";
571 responder_send_command "want $keyword";
572 foreach my $fn (@ourfns) {
573 protocol_receive_file \*PI, $fn;
576 protocol_expect { m/^files-end$/ } \*PI;
579 #---------- remote protocol support, initiator ----------
581 sub initiator_expect (&) {
583 protocol_expect { &$match } \*RO;
586 #---------- end remote code ----------
589 if ($we_are_responder) {
591 responder_send_command "progress ".length($m) or confess $!;
592 print PO $m or confess $!;
602 $ua = LWP::UserAgent->new();
606 progress "downloading $what...";
607 my $r = $ua->get(@_) or confess $!;
608 return undef if $r->code == 404;
609 $r->is_success or fail f_ "failed to fetch %s: %s",
610 $what, $r->status_line;
611 return $r->decoded_content(charset => 'none');
614 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
616 sub act_local () { return $dryrun_level <= 1; }
617 sub act_scary () { return !$dryrun_level; }
620 if (!$dryrun_level) {
621 progress f_ "%s ok: %s", $us, "@_";
623 progress f_ "would be ok: %s (but dry run only)", "@_";
628 printcmd(\*STDERR,$debugprefix."#",@_);
631 sub runcmd_ordryrun {
639 sub runcmd_ordryrun_local {
647 our $helpmsg = i_ <<END;
649 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
650 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
651 dgit [dgit-opts] build [dpkg-buildpackage-opts]
652 dgit [dgit-opts] sbuild [sbuild-opts]
653 dgit [dgit-opts] pbuilder|cowbuilder [debbuildopts]
654 dgit [dgit-opts] push [dgit-opts] [suite]
655 dgit [dgit-opts] push-source [dgit-opts] [suite]
656 dgit [dgit-opts] rpush build-host:build-dir ...
657 important dgit options:
658 -k<keyid> sign tag and package with <keyid> instead of default
659 --dry-run -n do not change anything, but go through the motions
660 --damp-run -L like --dry-run but make local changes, without signing
661 --new -N allow introducing a new package
662 --debug -D increase debug level
663 -c<name>=<value> set git config option (used directly by dgit too)
666 our $later_warning_msg = i_ <<END;
667 Perhaps the upload is stuck in incoming. Using the version from git.
671 print STDERR f_ "%s: %s\n%s", $us, "@_", __ $helpmsg or confess $!;
676 @ARGV or badusage __ "too few arguments";
677 return scalar shift @ARGV;
681 not_necessarily_a_tree();
684 print __ $helpmsg or confess $!;
688 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
690 our %defcfg = ('dgit.default.distro' => 'debian',
691 'dgit.default.default-suite' => 'unstable',
692 'dgit.default.old-dsc-distro' => 'debian',
693 'dgit-suite.*-security.distro' => 'debian-security',
694 'dgit.default.username' => '',
695 'dgit.default.archive-query-default-component' => 'main',
696 'dgit.default.ssh' => 'ssh',
697 'dgit.default.archive-query' => 'madison:',
698 'dgit.default.sshpsql-dbname' => 'service=projectb',
699 'dgit.default.aptget-components' => 'main',
700 'dgit.default.dgit-tag-format' => 'new,old,maint',
701 'dgit.default.source-only-uploads' => 'ok',
702 'dgit.dsc-url-proto-ok.http' => 'true',
703 'dgit.dsc-url-proto-ok.https' => 'true',
704 'dgit.dsc-url-proto-ok.git' => 'true',
705 'dgit.vcs-git.suites', => 'sid', # ;-separated
706 'dgit.default.dsc-url-proto-ok' => 'false',
707 # old means "repo server accepts pushes with old dgit tags"
708 # new means "repo server accepts pushes with new dgit tags"
709 # maint means "repo server accepts split brain pushes"
710 # hist means "repo server may have old pushes without new tag"
711 # ("hist" is implied by "old")
712 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
713 'dgit-distro.debian.git-check' => 'url',
714 'dgit-distro.debian.git-check-suffix' => '/info/refs',
715 'dgit-distro.debian.new-private-pushers' => 't',
716 'dgit-distro.debian.source-only-uploads' => 'not-wholly-new',
717 'dgit-distro.debian/push.git-url' => '',
718 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
719 'dgit-distro.debian/push.git-user-force' => 'dgit',
720 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
721 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
722 'dgit-distro.debian/push.git-create' => 'true',
723 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
724 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
725 # 'dgit-distro.debian.archive-query-tls-key',
726 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
727 # ^ this does not work because curl is broken nowadays
728 # Fixing #790093 properly will involve providing providing the key
729 # in some pacagke and maybe updating these paths.
731 # 'dgit-distro.debian.archive-query-tls-curl-args',
732 # '--ca-path=/etc/ssl/ca-debian',
733 # ^ this is a workaround but works (only) on DSA-administered machines
734 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
735 'dgit-distro.debian.git-url-suffix' => '',
736 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
737 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
738 'dgit-distro.debian-security.archive-query' => 'aptget:',
739 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
740 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
741 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
742 'dgit-distro.debian-security.nominal-distro' => 'debian',
743 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
744 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
745 'dgit-distro.ubuntu.git-check' => 'false',
746 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
747 'dgit-distro.test-dummy.ssh' => "$td/ssh",
748 'dgit-distro.test-dummy.username' => "alice",
749 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
750 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
751 'dgit-distro.test-dummy.git-url' => "$td/git",
752 'dgit-distro.test-dummy.git-host' => "git",
753 'dgit-distro.test-dummy.git-path' => "$td/git",
754 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
755 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
756 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
757 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
761 our @gitcfgsources = qw(cmdline local global system);
762 our $invoked_in_git_tree = 1;
764 sub git_slurp_config () {
765 # This algoritm is a bit subtle, but this is needed so that for
766 # options which we want to be single-valued, we allow the
767 # different config sources to override properly. See #835858.
768 foreach my $src (@gitcfgsources) {
769 next if $src eq 'cmdline';
770 # we do this ourselves since git doesn't handle it
772 $gitcfgs{$src} = git_slurp_config_src $src;
776 sub git_get_config ($) {
778 foreach my $src (@gitcfgsources) {
779 my $l = $gitcfgs{$src}{$c};
780 confess "internal error ($l $c)" if $l && !ref $l;
781 printdebug"C $c ".(defined $l ?
782 join " ", map { messagequote "'$_'" } @$l :
787 f_ "multiple values for %s (in %s git config)", $c, $src
796 return undef if $c =~ /RETURN-UNDEF/;
797 printdebug "C? $c\n" if $debuglevel >= 5;
798 my $v = git_get_config($c);
799 return $v if defined $v;
800 my $dv = $defcfg{$c};
802 printdebug "CD $c $dv\n" if $debuglevel >= 4;
807 "need value for one of: %s\n".
808 "%s: distro or suite appears not to be (properly) supported",
812 sub not_necessarily_a_tree () {
813 # needs to be called from pre_*
814 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
815 $invoked_in_git_tree = 0;
818 sub access_basedistro__noalias () {
819 if (defined $idistro) {
822 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
823 return $def if defined $def;
824 foreach my $src (@gitcfgsources, 'internal') {
825 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
827 foreach my $k (keys %$kl) {
828 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
830 next unless match_glob $dpat, $isuite;
834 return cfg("dgit.default.distro");
838 sub access_basedistro () {
839 my $noalias = access_basedistro__noalias();
840 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
841 return $canon // $noalias;
844 sub access_nomdistro () {
845 my $base = access_basedistro();
846 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
847 $r =~ m/^$distro_re$/ or badcfg
848 f_ "bad syntax for (nominal) distro \`%s' (does not match %s)",
849 $r, "/^$distro_re$/";
853 sub access_quirk () {
854 # returns (quirk name, distro to use instead or undef, quirk-specific info)
855 my $basedistro = access_basedistro();
856 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
858 if (defined $backports_quirk) {
859 my $re = $backports_quirk;
860 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
862 $re =~ s/\%/([-0-9a-z_]+)/
863 or $re =~ m/[()]/ or badcfg __ "backports-quirk needs \% or ( )";
864 if ($isuite =~ m/^$re$/) {
865 return ('backports',"$basedistro-backports",$1);
868 return ('none',undef);
873 sub parse_cfg_bool ($$$) {
874 my ($what,$def,$v) = @_;
877 $v =~ m/^[ty1]/ ? 1 :
878 $v =~ m/^[fn0]/ ? 0 :
879 badcfg f_ "%s needs t (true, y, 1) or f (false, n, 0) not \`%s'",
883 sub access_forpush_config () {
884 my $d = access_basedistro();
888 parse_cfg_bool('new-private-pushers', 0,
889 cfg("dgit-distro.$d.new-private-pushers",
892 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
895 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
896 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
897 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
899 "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
902 sub access_forpush () {
903 $access_forpush //= access_forpush_config();
904 return $access_forpush;
908 confess +(__ 'internal error').' '.Dumper($access_forpush)," ?" if
909 defined $access_forpush and !$access_forpush;
910 badcfg __ "pushing but distro is configured readonly"
911 if access_forpush_config() eq '0';
913 $supplementary_message = __ <<'END' unless $we_are_responder;
914 Push failed, before we got started.
915 You can retry the push, after fixing the problem, if you like.
917 parseopts_late_defaults();
921 parseopts_late_defaults();
924 sub supplementary_message ($) {
926 if (!$we_are_responder) {
927 $supplementary_message = $msg;
929 } elsif ($protovsn >= 3) {
930 responder_send_command "supplementary-message ".length($msg)
932 print PO $msg or confess $!;
936 sub access_distros () {
937 # Returns list of distros to try, in order
940 # 0. `instead of' distro name(s) we have been pointed to
941 # 1. the access_quirk distro, if any
942 # 2a. the user's specified distro, or failing that } basedistro
943 # 2b. the distro calculated from the suite }
944 my @l = access_basedistro();
946 my (undef,$quirkdistro) = access_quirk();
947 unshift @l, $quirkdistro;
948 unshift @l, $instead_distro;
949 @l = grep { defined } @l;
951 push @l, access_nomdistro();
953 if (access_forpush()) {
954 @l = map { ("$_/push", $_) } @l;
959 sub access_cfg_cfgs (@) {
962 # The nesting of these loops determines the search order. We put
963 # the key loop on the outside so that we search all the distros
964 # for each key, before going on to the next key. That means that
965 # if access_cfg is called with a more specific, and then a less
966 # specific, key, an earlier distro can override the less specific
967 # without necessarily overriding any more specific keys. (If the
968 # distro wants to override the more specific keys it can simply do
969 # so; whereas if we did the loop the other way around, it would be
970 # impossible to for an earlier distro to override a less specific
971 # key but not the more specific ones without restating the unknown
972 # values of the more specific keys.
975 # We have to deal with RETURN-UNDEF specially, so that we don't
976 # terminate the search prematurely.
978 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
981 foreach my $d (access_distros()) {
982 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
984 push @cfgs, map { "dgit.default.$_" } @realkeys;
991 my (@cfgs) = access_cfg_cfgs(@keys);
992 my $value = cfg(@cfgs);
996 sub access_cfg_bool ($$) {
997 my ($def, @keys) = @_;
998 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
1001 sub string_to_ssh ($) {
1003 if ($spec =~ m/\s/) {
1004 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
1010 sub access_cfg_ssh () {
1011 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
1012 if (!defined $gitssh) {
1015 return string_to_ssh $gitssh;
1019 sub access_runeinfo ($) {
1021 return ": dgit ".access_basedistro()." $info ;";
1024 sub access_someuserhost ($) {
1026 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
1027 defined($user) && length($user) or
1028 $user = access_cfg("$some-user",'username');
1029 my $host = access_cfg("$some-host");
1030 return length($user) ? "$user\@$host" : $host;
1033 sub access_gituserhost () {
1034 return access_someuserhost('git');
1037 sub access_giturl (;$) {
1038 my ($optional) = @_;
1039 my $url = access_cfg('git-url','RETURN-UNDEF');
1042 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
1043 return undef unless defined $proto;
1046 access_gituserhost().
1047 access_cfg('git-path');
1049 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
1052 return "$url/$package$suffix";
1055 sub commit_getclogp ($) {
1056 # Returns the parsed changelog hashref for a particular commit
1058 our %commit_getclogp_memo;
1059 my $memo = $commit_getclogp_memo{$objid};
1060 return $memo if $memo;
1062 my $mclog = dgit_privdir()."clog";
1063 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1064 "$objid:debian/changelog";
1065 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1068 sub parse_dscdata () {
1069 my $dscfh = new IO::File \$dscdata, '<' or confess $!;
1070 printdebug Dumper($dscdata) if $debuglevel>1;
1071 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1072 printdebug Dumper($dsc) if $debuglevel>1;
1077 sub archive_query ($;@) {
1078 my ($method) = shift @_;
1079 fail __ "this operation does not support multiple comma-separated suites"
1081 my $query = access_cfg('archive-query','RETURN-UNDEF');
1082 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1085 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1088 sub archive_query_prepend_mirror {
1089 my $m = access_cfg('mirror');
1090 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1093 sub pool_dsc_subpath ($$) {
1094 my ($vsn,$component) = @_; # $package is implict arg
1095 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1096 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1099 sub cfg_apply_map ($$$) {
1100 my ($varref, $what, $mapspec) = @_;
1101 return unless $mapspec;
1103 printdebug "config $what EVAL{ $mapspec; }\n";
1105 eval "package Dgit::Config; $mapspec;";
1110 #---------- `ftpmasterapi' archive query method (nascent) ----------
1112 sub archive_api_query_cmd ($) {
1114 my @cmd = (@curl, qw(-sS));
1115 my $url = access_cfg('archive-query-url');
1116 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1118 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1119 foreach my $key (split /\:/, $keys) {
1120 $key =~ s/\%HOST\%/$host/g;
1122 fail "for $url: stat $key: $!" unless $!==ENOENT;
1125 fail f_ "config requested specific TLS key but do not know".
1126 " how to get curl to use exactly that EE key (%s)",
1128 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1129 # # Sadly the above line does not work because of changes
1130 # # to gnutls. The real fix for #790093 may involve
1131 # # new curl options.
1134 # Fixing #790093 properly will involve providing a value
1135 # for this on clients.
1136 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1137 push @cmd, split / /, $kargs if defined $kargs;
1139 push @cmd, $url.$subpath;
1143 sub api_query ($$;$) {
1145 my ($data, $subpath, $ok404) = @_;
1146 badcfg __ "ftpmasterapi archive query method takes no data part"
1148 my @cmd = archive_api_query_cmd($subpath);
1149 my $url = $cmd[$#cmd];
1150 push @cmd, qw(-w %{http_code});
1151 my $json = cmdoutput @cmd;
1152 unless ($json =~ s/\d+\d+\d$//) {
1153 failedcmd_report_cmd undef, @cmd;
1154 fail __ "curl failed to print 3-digit HTTP code";
1157 return undef if $code eq '404' && $ok404;
1158 fail f_ "fetch of %s gave HTTP code %s", $url, $code
1159 unless $url =~ m#^file://# or $code =~ m/^2/;
1160 return decode_json($json);
1163 sub canonicalise_suite_ftpmasterapi {
1164 my ($proto,$data) = @_;
1165 my $suites = api_query($data, 'suites');
1167 foreach my $entry (@$suites) {
1169 my $v = $entry->{$_};
1170 defined $v && $v eq $isuite;
1171 } qw(codename name);
1172 push @matched, $entry;
1174 fail f_ "unknown suite %s, maybe -d would help", $isuite
1178 @matched==1 or die f_ "multiple matches for suite %s\n", $isuite;
1179 $cn = "$matched[0]{codename}";
1180 defined $cn or die f_ "suite %s info has no codename\n", $isuite;
1181 $cn =~ m/^$suite_re$/
1182 or die f_ "suite %s maps to bad codename\n", $isuite;
1184 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper(\@matched)
1189 sub archive_query_ftpmasterapi {
1190 my ($proto,$data) = @_;
1191 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1193 my $digester = Digest::SHA->new(256);
1194 foreach my $entry (@$info) {
1196 my $vsn = "$entry->{version}";
1197 my ($ok,$msg) = version_check $vsn;
1198 die f_ "bad version: %s\n", $msg unless $ok;
1199 my $component = "$entry->{component}";
1200 $component =~ m/^$component_re$/ or die __ "bad component";
1201 my $filename = "$entry->{filename}";
1202 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1203 or die __ "bad filename";
1204 my $sha256sum = "$entry->{sha256sum}";
1205 $sha256sum =~ m/^[0-9a-f]+$/ or die __ "bad sha256sum";
1206 push @rows, [ $vsn, "/pool/$component/$filename",
1207 $digester, $sha256sum ];
1209 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper($entry)
1212 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1213 return archive_query_prepend_mirror @rows;
1216 sub file_in_archive_ftpmasterapi {
1217 my ($proto,$data,$filename) = @_;
1218 my $pat = $filename;
1221 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1222 my $info = api_query($data, "file_in_archive/$pat", 1);
1225 sub package_not_wholly_new_ftpmasterapi {
1226 my ($proto,$data,$pkg) = @_;
1227 my $info = api_query($data,"madison?package=${pkg}&f=json");
1231 #---------- `aptget' archive query method ----------
1234 our $aptget_releasefile;
1235 our $aptget_configpath;
1237 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1238 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1240 sub aptget_cache_clean {
1241 runcmd_ordryrun_local qw(sh -ec),
1242 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1246 sub aptget_lock_acquire () {
1247 my $lockfile = "$aptget_base/lock";
1248 open APTGET_LOCK, '>', $lockfile or confess "open $lockfile: $!";
1249 flock APTGET_LOCK, LOCK_EX or confess "lock $lockfile: $!";
1252 sub aptget_prep ($) {
1254 return if defined $aptget_base;
1256 badcfg __ "aptget archive query method takes no data part"
1259 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1262 ensuredir "$cache/dgit";
1264 access_cfg('aptget-cachekey','RETURN-UNDEF')
1265 // access_nomdistro();
1267 $aptget_base = "$cache/dgit/aptget";
1268 ensuredir $aptget_base;
1270 my $quoted_base = $aptget_base;
1271 confess "$quoted_base contains bad chars, cannot continue"
1272 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1274 ensuredir $aptget_base;
1276 aptget_lock_acquire();
1278 aptget_cache_clean();
1280 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1281 my $sourceslist = "source.list#$cachekey";
1283 my $aptsuites = $isuite;
1284 cfg_apply_map(\$aptsuites, 'suite map',
1285 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1287 open SRCS, ">", "$aptget_base/$sourceslist" or confess $!;
1288 printf SRCS "deb-src %s %s %s\n",
1289 access_cfg('mirror'),
1291 access_cfg('aptget-components')
1294 ensuredir "$aptget_base/cache";
1295 ensuredir "$aptget_base/lists";
1297 open CONF, ">", $aptget_configpath or confess $!;
1299 Debug::NoLocking "true";
1300 APT::Get::List-Cleanup "false";
1301 #clear APT::Update::Post-Invoke-Success;
1302 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1303 Dir::State::Lists "$quoted_base/lists";
1304 Dir::Etc::preferences "$quoted_base/preferences";
1305 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1306 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1309 foreach my $key (qw(
1312 Dir::Cache::Archives
1313 Dir::Etc::SourceParts
1314 Dir::Etc::preferencesparts
1316 ensuredir "$aptget_base/$key";
1317 print CONF "$key \"$quoted_base/$key\";\n" or confess $!;
1320 my $oldatime = (time // confess $!) - 1;
1321 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1322 next unless stat_exists $oldlist;
1323 my ($mtime) = (stat _)[9];
1324 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1327 runcmd_ordryrun_local aptget_aptget(), qw(update);
1330 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1331 next unless stat_exists $oldlist;
1332 my ($atime) = (stat _)[8];
1333 next if $atime == $oldatime;
1334 push @releasefiles, $oldlist;
1336 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1337 @releasefiles = @inreleasefiles if @inreleasefiles;
1338 if (!@releasefiles) {
1339 fail f_ <<END, $isuite, $cache;
1340 apt seemed to not to update dgit's cached Release files for %s.
1342 is on a filesystem mounted `noatime'; if so, please use `relatime'.)
1345 confess "apt updated too many Release files (@releasefiles), erk"
1346 unless @releasefiles == 1;
1348 ($aptget_releasefile) = @releasefiles;
1351 sub canonicalise_suite_aptget {
1352 my ($proto,$data) = @_;
1355 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1357 foreach my $name (qw(Codename Suite)) {
1358 my $val = $release->{$name};
1360 printdebug "release file $name: $val\n";
1361 $val =~ m/^$suite_re$/o or fail f_
1362 "Release file (%s) specifies intolerable %s",
1363 $aptget_releasefile, $name;
1364 cfg_apply_map(\$val, 'suite rmap',
1365 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1372 sub archive_query_aptget {
1373 my ($proto,$data) = @_;
1376 ensuredir "$aptget_base/source";
1377 foreach my $old (<$aptget_base/source/*.dsc>) {
1378 unlink $old or die "$old: $!";
1381 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1382 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1383 # avoids apt-get source failing with ambiguous error code
1385 runcmd_ordryrun_local
1386 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1387 aptget_aptget(), qw(--download-only --only-source source), $package;
1389 my @dscs = <$aptget_base/source/*.dsc>;
1390 fail __ "apt-get source did not produce a .dsc" unless @dscs;
1391 fail f_ "apt-get source produced several .dscs (%s)", "@dscs"
1394 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1397 my $uri = "file://". uri_escape $dscs[0];
1398 $uri =~ s{\%2f}{/}gi;
1399 return [ (getfield $pre_dsc, 'Version'), $uri ];
1402 sub file_in_archive_aptget () { return undef; }
1403 sub package_not_wholly_new_aptget () { return undef; }
1405 #---------- `dummyapicat' archive query method ----------
1406 # (untranslated, because this is for testing purposes etc.)
1408 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1409 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1411 sub dummycatapi_run_in_mirror ($@) {
1412 # runs $fn with FIA open onto rune
1413 my ($rune, $argl, $fn) = @_;
1415 my $mirror = access_cfg('mirror');
1416 $mirror =~ s#^file://#/# or die "$mirror ?";
1417 my @cmd = (qw(sh -ec), 'cd "$1"; shift'."\n".$rune,
1418 qw(x), $mirror, @$argl);
1419 debugcmd "-|", @cmd;
1420 open FIA, "-|", @cmd or confess $!;
1422 close FIA or ($!==0 && $?==141) or die failedcmd @cmd;
1426 sub file_in_archive_dummycatapi ($$$) {
1427 my ($proto,$data,$filename) = @_;
1429 dummycatapi_run_in_mirror '
1430 find -name "$1" -print0 |
1432 ', [$filename], sub {
1435 printdebug "| $_\n";
1436 m/^(\w+) (\S+)$/ or die "$_ ?";
1437 push @out, { sha256sum => $1, filename => $2 };
1443 sub package_not_wholly_new_dummycatapi {
1444 my ($proto,$data,$pkg) = @_;
1445 dummycatapi_run_in_mirror "
1446 find -name ${pkg}_*.dsc
1453 #---------- `madison' archive query method ----------
1455 sub archive_query_madison {
1456 return archive_query_prepend_mirror
1457 map { [ @$_[0..1] ] } madison_get_parse(@_);
1460 sub madison_get_parse {
1461 my ($proto,$data) = @_;
1462 die unless $proto eq 'madison';
1463 if (!length $data) {
1464 $data= access_cfg('madison-distro','RETURN-UNDEF');
1465 $data //= access_basedistro();
1467 $rmad{$proto,$data,$package} ||= cmdoutput
1468 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1469 my $rmad = $rmad{$proto,$data,$package};
1472 foreach my $l (split /\n/, $rmad) {
1473 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1474 \s*( [^ \t|]+ )\s* \|
1475 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1476 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1477 $1 eq $package or die "$rmad $package ?";
1484 $component = access_cfg('archive-query-default-component');
1486 $5 eq 'source' or die "$rmad ?";
1487 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1489 return sort { -version_compare($a->[0],$b->[0]); } @out;
1492 sub canonicalise_suite_madison {
1493 # madison canonicalises for us
1494 my @r = madison_get_parse(@_);
1496 "unable to canonicalise suite using package %s".
1497 " which does not appear to exist in suite %s;".
1498 " --existing-package may help",
1503 sub file_in_archive_madison { return undef; }
1504 sub package_not_wholly_new_madison { return undef; }
1506 #---------- `sshpsql' archive query method ----------
1507 # (untranslated, because this is obsolete)
1510 my ($data,$runeinfo,$sql) = @_;
1511 if (!length $data) {
1512 $data= access_someuserhost('sshpsql').':'.
1513 access_cfg('sshpsql-dbname');
1515 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1516 my ($userhost,$dbname) = ($`,$'); #';
1518 my @cmd = (access_cfg_ssh, $userhost,
1519 access_runeinfo("ssh-psql $runeinfo").
1520 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1521 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1523 open P, "-|", @cmd or confess $!;
1526 printdebug(">|$_|\n");
1529 $!=0; $?=0; close P or failedcmd @cmd;
1531 my $nrows = pop @rows;
1532 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1533 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1534 @rows = map { [ split /\|/, $_ ] } @rows;
1535 my $ncols = scalar @{ shift @rows };
1536 die if grep { scalar @$_ != $ncols } @rows;
1540 sub sql_injection_check {
1541 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1544 sub archive_query_sshpsql ($$) {
1545 my ($proto,$data) = @_;
1546 sql_injection_check $isuite, $package;
1547 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1548 SELECT source.version, component.name, files.filename, files.sha256sum
1550 JOIN src_associations ON source.id = src_associations.source
1551 JOIN suite ON suite.id = src_associations.suite
1552 JOIN dsc_files ON dsc_files.source = source.id
1553 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1554 JOIN component ON component.id = files_archive_map.component_id
1555 JOIN files ON files.id = dsc_files.file
1556 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1557 AND source.source='$package'
1558 AND files.filename LIKE '%.dsc';
1560 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1561 my $digester = Digest::SHA->new(256);
1563 my ($vsn,$component,$filename,$sha256sum) = @$_;
1564 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1566 return archive_query_prepend_mirror @rows;
1569 sub canonicalise_suite_sshpsql ($$) {
1570 my ($proto,$data) = @_;
1571 sql_injection_check $isuite;
1572 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1573 SELECT suite.codename
1574 FROM suite where suite_name='$isuite' or codename='$isuite';
1576 @rows = map { $_->[0] } @rows;
1577 fail "unknown suite $isuite" unless @rows;
1578 die "ambiguous $isuite: @rows ?" if @rows>1;
1582 sub file_in_archive_sshpsql ($$$) { return undef; }
1583 sub package_not_wholly_new_sshpsql ($$$) { return undef; }
1585 #---------- `dummycat' archive query method ----------
1586 # (untranslated, because this is for testing purposes etc.)
1588 sub canonicalise_suite_dummycat ($$) {
1589 my ($proto,$data) = @_;
1590 my $dpath = "$data/suite.$isuite";
1591 if (!open C, "<", $dpath) {
1592 $!==ENOENT or die "$dpath: $!";
1593 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1597 chomp or die "$dpath: $!";
1599 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1603 sub archive_query_dummycat ($$) {
1604 my ($proto,$data) = @_;
1605 canonicalise_suite();
1606 my $dpath = "$data/package.$csuite.$package";
1607 if (!open C, "<", $dpath) {
1608 $!==ENOENT or die "$dpath: $!";
1609 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1617 printdebug "dummycat query $csuite $package $dpath | $_\n";
1618 my @row = split /\s+/, $_;
1619 @row==2 or die "$dpath: $_ ?";
1622 C->error and die "$dpath: $!";
1624 return archive_query_prepend_mirror
1625 sort { -version_compare($a->[0],$b->[0]); } @rows;
1628 sub file_in_archive_dummycat () { return undef; }
1629 sub package_not_wholly_new_dummycat () { return undef; }
1631 #---------- tag format handling ----------
1632 # (untranslated, because everything should be new tag format by now)
1634 sub access_cfg_tagformats () {
1635 split /\,/, access_cfg('dgit-tag-format');
1638 sub access_cfg_tagformats_can_splitbrain () {
1639 my %y = map { $_ => 1 } access_cfg_tagformats;
1640 foreach my $needtf (qw(new maint)) {
1641 next if $y{$needtf};
1647 sub need_tagformat ($$) {
1648 my ($fmt, $why) = @_;
1649 fail "need to use tag format $fmt ($why) but also need".
1650 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1651 " - no way to proceed"
1652 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1653 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1656 sub select_tagformat () {
1658 return if $tagformatfn && !$tagformat_want;
1659 die 'bug' if $tagformatfn && $tagformat_want;
1660 # ... $tagformat_want assigned after previous select_tagformat
1662 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1663 printdebug "select_tagformat supported @supported\n";
1665 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1666 printdebug "select_tagformat specified @$tagformat_want\n";
1668 my ($fmt,$why,$override) = @$tagformat_want;
1670 fail "target distro supports tag formats @supported".
1671 " but have to use $fmt ($why)"
1673 or grep { $_ eq $fmt } @supported;
1675 $tagformat_want = undef;
1677 $tagformatfn = ${*::}{"debiantag_$fmt"};
1679 fail "trying to use unknown tag format \`$fmt' ($why) !"
1680 unless $tagformatfn;
1683 #---------- archive query entrypoints and rest of program ----------
1685 sub canonicalise_suite () {
1686 return if defined $csuite;
1687 fail f_ "cannot operate on %s suite", $isuite if $isuite eq 'UNRELEASED';
1688 $csuite = archive_query('canonicalise_suite');
1689 if ($isuite ne $csuite) {
1690 progress f_ "canonical suite name for %s is %s", $isuite, $csuite;
1692 progress f_ "canonical suite name is %s", $csuite;
1696 sub get_archive_dsc () {
1697 canonicalise_suite();
1698 my @vsns = archive_query('archive_query');
1699 foreach my $vinfo (@vsns) {
1700 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1701 $dscurl = $vsn_dscurl;
1702 $dscdata = url_get($dscurl);
1704 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1709 $digester->add($dscdata);
1710 my $got = $digester->hexdigest();
1712 fail f_ "%s has hash %s but archive told us to expect %s",
1713 $dscurl, $got, $digest;
1716 my $fmt = getfield $dsc, 'Format';
1717 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1718 f_ "unsupported source format %s, sorry", $fmt;
1720 $dsc_checked = !!$digester;
1721 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1725 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1728 sub check_for_git ();
1729 sub check_for_git () {
1731 my $how = access_cfg('git-check');
1732 if ($how eq 'ssh-cmd') {
1734 (access_cfg_ssh, access_gituserhost(),
1735 access_runeinfo("git-check $package").
1736 " set -e; cd ".access_cfg('git-path').";".
1737 " if test -d $package.git; then echo 1; else echo 0; fi");
1738 my $r= cmdoutput @cmd;
1739 if (defined $r and $r =~ m/^divert (\w+)$/) {
1741 my ($usedistro,) = access_distros();
1742 # NB that if we are pushing, $usedistro will be $distro/push
1743 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1744 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1745 progress f_ "diverting to %s (using config for %s)",
1746 $divert, $instead_distro;
1747 return check_for_git();
1749 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1751 } elsif ($how eq 'url') {
1752 my $prefix = access_cfg('git-check-url','git-url');
1753 my $suffix = access_cfg('git-check-suffix','git-suffix',
1754 'RETURN-UNDEF') // '.git';
1755 my $url = "$prefix/$package$suffix";
1756 my @cmd = (@curl, qw(-sS -I), $url);
1757 my $result = cmdoutput @cmd;
1758 $result =~ s/^\S+ 200 .*\n\r?\n//;
1759 # curl -sS -I with https_proxy prints
1760 # HTTP/1.0 200 Connection established
1761 $result =~ m/^\S+ (404|200) /s or
1762 fail +(__ "unexpected results from git check query - ").
1763 Dumper($prefix, $result);
1765 if ($code eq '404') {
1767 } elsif ($code eq '200') {
1772 } elsif ($how eq 'true') {
1774 } elsif ($how eq 'false') {
1777 badcfg f_ "unknown git-check \`%s'", $how;
1781 sub create_remote_git_repo () {
1782 my $how = access_cfg('git-create');
1783 if ($how eq 'ssh-cmd') {
1785 (access_cfg_ssh, access_gituserhost(),
1786 access_runeinfo("git-create $package").
1787 "set -e; cd ".access_cfg('git-path').";".
1788 " cp -a _template $package.git");
1789 } elsif ($how eq 'true') {
1792 badcfg f_ "unknown git-create \`%s'", $how;
1796 our ($dsc_hash,$lastpush_mergeinput);
1797 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1801 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1802 $playground = fresh_playground 'dgit/unpack';
1805 sub mktree_in_ud_here () {
1806 playtree_setup $gitcfgs{local};
1809 sub git_write_tree () {
1810 my $tree = cmdoutput @git, qw(write-tree);
1811 $tree =~ m/^\w+$/ or die "$tree ?";
1815 sub git_add_write_tree () {
1816 runcmd @git, qw(add -Af .);
1817 return git_write_tree();
1820 sub remove_stray_gits ($) {
1822 my @gitscmd = qw(find -name .git -prune -print0);
1823 debugcmd "|",@gitscmd;
1824 open GITS, "-|", @gitscmd or confess $!;
1829 print STDERR f_ "%s: warning: removing from %s: %s\n",
1830 $us, $what, (messagequote $_);
1834 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1837 sub mktree_in_ud_from_only_subdir ($;$) {
1838 my ($what,$raw) = @_;
1839 # changes into the subdir
1842 confess "expected one subdir but found @dirs ?" unless @dirs==1;
1843 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1847 remove_stray_gits($what);
1848 mktree_in_ud_here();
1850 my ($format, $fopts) = get_source_format();
1851 if (madformat($format)) {
1856 my $tree=git_add_write_tree();
1857 return ($tree,$dir);
1860 our @files_csum_info_fields =
1861 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1862 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1863 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1865 sub dsc_files_info () {
1866 foreach my $csumi (@files_csum_info_fields) {
1867 my ($fname, $module, $method) = @$csumi;
1868 my $field = $dsc->{$fname};
1869 next unless defined $field;
1870 eval "use $module; 1;" or die $@;
1872 foreach (split /\n/, $field) {
1874 m/^(\w+) (\d+) (\S+)$/ or
1875 fail f_ "could not parse .dsc %s line \`%s'", $fname, $_;
1876 my $digester = eval "$module"."->$method;" or die $@;
1881 Digester => $digester,
1886 fail f_ "missing any supported Checksums-* or Files field in %s",
1887 $dsc->get_option('name');
1891 map { $_->{Filename} } dsc_files_info();
1894 sub files_compare_inputs (@) {
1899 my $showinputs = sub {
1900 return join "; ", map { $_->get_option('name') } @$inputs;
1903 foreach my $in (@$inputs) {
1905 my $in_name = $in->get_option('name');
1907 printdebug "files_compare_inputs $in_name\n";
1909 foreach my $csumi (@files_csum_info_fields) {
1910 my ($fname) = @$csumi;
1911 printdebug "files_compare_inputs $in_name $fname\n";
1913 my $field = $in->{$fname};
1914 next unless defined $field;
1917 foreach (split /\n/, $field) {
1920 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1921 fail "could not parse $in_name $fname line \`$_'";
1923 printdebug "files_compare_inputs $in_name $fname $f\n";
1927 my $re = \ $record{$f}{$fname};
1929 $fchecked{$f}{$in_name} = 1;
1932 "hash or size of %s varies in %s fields (between: %s)",
1933 $f, $fname, $showinputs->();
1938 @files = sort @files;
1939 $expected_files //= \@files;
1940 "@$expected_files" eq "@files" or
1941 fail f_ "file list in %s varies between hash fields!",
1945 fail f_ "%s has no files list field(s)", $in_name;
1947 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1950 grep { keys %$_ == @$inputs-1 } values %fchecked
1951 or fail f_ "no file appears in all file lists (looked in: %s)",
1955 sub is_orig_file_in_dsc ($$) {
1956 my ($f, $dsc_files_info) = @_;
1957 return 0 if @$dsc_files_info <= 1;
1958 # One file means no origs, and the filename doesn't have a "what
1959 # part of dsc" component. (Consider versions ending `.orig'.)
1960 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1964 # This function determines whether a .changes file is source-only from
1965 # the point of view of dak. Thus, it permits *_source.buildinfo
1968 # It does not, however, permit any other buildinfo files. After a
1969 # source-only upload, the buildds will try to upload files like
1970 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
1971 # named like this in their (otherwise) source-only upload, the uploads
1972 # of the buildd can be rejected by dak. Fixing the resultant
1973 # situation can require manual intervention. So we block such
1974 # .buildinfo files when the user tells us to perform a source-only
1975 # upload (such as when using the push-source subcommand with the -C
1976 # option, which calls this function).
1978 # Note, though, that when dgit is told to prepare a source-only
1979 # upload, such as when subcommands like build-source and push-source
1980 # without -C are used, dgit has a more restrictive notion of
1981 # source-only .changes than dak: such uploads will never include
1982 # *_source.buildinfo files. This is because there is no use for such
1983 # files when using a tool like dgit to produce the source package, as
1984 # dgit ensures the source is identical to git HEAD.
1985 sub test_source_only_changes ($) {
1987 foreach my $l (split /\n/, getfield $changes, 'Files') {
1988 $l =~ m/\S+$/ or next;
1989 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
1990 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
1991 print f_ "purportedly source-only changes polluted by %s\n", $&;
1998 sub changes_update_origs_from_dsc ($$$$) {
1999 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
2001 printdebug "checking origs needed ($upstreamvsn)...\n";
2002 $_ = getfield $changes, 'Files';
2003 m/^\w+ \d+ (\S+ \S+) \S+$/m or
2004 fail __ "cannot find section/priority from .changes Files field";
2005 my $placementinfo = $1;
2007 printdebug "checking origs needed placement '$placementinfo'...\n";
2008 foreach my $l (split /\n/, getfield $dsc, 'Files') {
2009 $l =~ m/\S+$/ or next;
2011 printdebug "origs $file | $l\n";
2012 next unless is_orig_file_of_vsn $file, $upstreamvsn;
2013 printdebug "origs $file is_orig\n";
2014 my $have = archive_query('file_in_archive', $file);
2015 if (!defined $have) {
2016 print STDERR __ <<END;
2017 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
2023 printdebug "origs $file \$#\$have=$#$have\n";
2024 foreach my $h (@$have) {
2027 foreach my $csumi (@files_csum_info_fields) {
2028 my ($fname, $module, $method, $archivefield) = @$csumi;
2029 next unless defined $h->{$archivefield};
2030 $_ = $dsc->{$fname};
2031 next unless defined;
2032 m/^(\w+) .* \Q$file\E$/m or
2033 fail f_ ".dsc %s missing entry for %s", $fname, $file;
2034 if ($h->{$archivefield} eq $1) {
2038 "%s: %s (archive) != %s (local .dsc)",
2039 $archivefield, $h->{$archivefield}, $1;
2042 confess "$file ".Dumper($h)." ?!" if $same && @differ;
2046 f_ "archive %s: %s", $h->{filename}, join "; ", @differ
2049 printdebug "origs $file f.same=$found_same".
2050 " #f._differ=$#found_differ\n";
2051 if (@found_differ && !$found_same) {
2053 (f_ "archive contains %s with different checksum", $file),
2056 # Now we edit the changes file to add or remove it
2057 foreach my $csumi (@files_csum_info_fields) {
2058 my ($fname, $module, $method, $archivefield) = @$csumi;
2059 next unless defined $changes->{$fname};
2061 # in archive, delete from .changes if it's there
2062 $changed{$file} = "removed" if
2063 $changes->{$fname} =~ s/\n.* \Q$file\E$(?:)$//m;
2064 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)$/m) {
2065 # not in archive, but it's here in the .changes
2067 my $dsc_data = getfield $dsc, $fname;
2068 $dsc_data =~ m/^(.* \Q$file\E$)$/m or die "$dsc_data $file ?";
2070 $extra =~ s/ \d+ /$&$placementinfo /
2071 or confess "$fname $extra >$dsc_data< ?"
2072 if $fname eq 'Files';
2073 $changes->{$fname} .= "\n". $extra;
2074 $changed{$file} = "added";
2079 foreach my $file (keys %changed) {
2081 "edited .changes for archive .orig contents: %s %s",
2082 $changed{$file}, $file;
2084 my $chtmp = "$changesfile.tmp";
2085 $changes->save($chtmp);
2087 rename $chtmp,$changesfile or die "$changesfile $!";
2089 progress f_ "[new .changes left in %s]", $changesfile;
2092 progress f_ "%s already has appropriate .orig(s) (if any)",
2097 sub make_commit ($) {
2099 return cmdoutput @git, qw(hash-object -w -t commit), $file;
2102 sub clogp_authline ($) {
2104 my $author = getfield $clogp, 'Maintainer';
2105 if ($author =~ m/^[^"\@]+\,/) {
2106 # single entry Maintainer field with unquoted comma
2107 $author = ($& =~ y/,//rd).$'; # strip the comma
2109 # git wants a single author; any remaining commas in $author
2110 # are by now preceded by @ (or "). It seems safer to punt on
2111 # "..." for now rather than attempting to dequote or something.
2112 $author =~ s#,.*##ms unless $author =~ m/"/;
2113 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2114 my $authline = "$author $date";
2115 $authline =~ m/$git_authline_re/o or
2116 fail f_ "unexpected commit author line format \`%s'".
2117 " (was generated from changelog Maintainer field)",
2119 return ($1,$2,$3) if wantarray;
2123 sub vendor_patches_distro ($$) {
2124 my ($checkdistro, $what) = @_;
2125 return unless defined $checkdistro;
2127 my $series = "debian/patches/\L$checkdistro\E.series";
2128 printdebug "checking for vendor-specific $series ($what)\n";
2130 if (!open SERIES, "<", $series) {
2131 confess "$series $!" unless $!==ENOENT;
2138 print STDERR __ <<END;
2140 Unfortunately, this source package uses a feature of dpkg-source where
2141 the same source package unpacks to different source code on different
2142 distros. dgit cannot safely operate on such packages on affected
2143 distros, because the meaning of source packages is not stable.
2145 Please ask the distro/maintainer to remove the distro-specific series
2146 files and use a different technique (if necessary, uploading actually
2147 different packages, if different distros are supposed to have
2151 fail f_ "Found active distro-specific series file for".
2152 " %s (%s): %s, cannot continue",
2153 $checkdistro, $what, $series;
2155 die "$series $!" if SERIES->error;
2159 sub check_for_vendor_patches () {
2160 # This dpkg-source feature doesn't seem to be documented anywhere!
2161 # But it can be found in the changelog (reformatted):
2163 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2164 # Author: Raphael Hertzog <hertzog@debian.org>
2165 # Date: Sun Oct 3 09:36:48 2010 +0200
2167 # dpkg-source: correctly create .pc/.quilt_series with alternate
2170 # If you have debian/patches/ubuntu.series and you were
2171 # unpacking the source package on ubuntu, quilt was still
2172 # directed to debian/patches/series instead of
2173 # debian/patches/ubuntu.series.
2175 # debian/changelog | 3 +++
2176 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2177 # 2 files changed, 6 insertions(+), 1 deletion(-)
2180 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2181 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2182 __ "Dpkg::Vendor \`current vendor'");
2183 vendor_patches_distro(access_basedistro(),
2184 __ "(base) distro being accessed");
2185 vendor_patches_distro(access_nomdistro(),
2186 __ "(nominal) distro being accessed");
2189 sub generate_commits_from_dsc () {
2190 # See big comment in fetch_from_archive, below.
2191 # See also README.dsc-import.
2193 changedir $playground;
2195 my @dfi = dsc_files_info();
2196 foreach my $fi (@dfi) {
2197 my $f = $fi->{Filename};
2198 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2199 my $upper_f = (bpd_abs()."/$f");
2201 printdebug "considering reusing $f: ";
2203 if (link_ltarget "$upper_f,fetch", $f) {
2204 printdebug "linked (using ...,fetch).\n";
2205 } elsif ((printdebug "($!) "),
2207 fail f_ "accessing %s: %s", "$buildproductsdir/$f,fetch", $!;
2208 } elsif (link_ltarget $upper_f, $f) {
2209 printdebug "linked.\n";
2210 } elsif ((printdebug "($!) "),
2212 fail f_ "accessing %s: %s", "$buildproductsdir/$f", $!;
2214 printdebug "absent.\n";
2218 complete_file_from_dsc('.', $fi, \$refetched)
2221 printdebug "considering saving $f: ";
2223 if (link $f, $upper_f) {
2224 printdebug "linked.\n";
2225 } elsif ((printdebug "($!) "),
2227 fail f_ "saving %s: %s", "$buildproductsdir/$f", $!;
2228 } elsif (!$refetched) {
2229 printdebug "no need.\n";
2230 } elsif (link $f, "$upper_f,fetch") {
2231 printdebug "linked (using ...,fetch).\n";
2232 } elsif ((printdebug "($!) "),
2234 fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $!;
2236 printdebug "cannot.\n";
2240 # We unpack and record the orig tarballs first, so that we only
2241 # need disk space for one private copy of the unpacked source.
2242 # But we can't make them into commits until we have the metadata
2243 # from the debian/changelog, so we record the tree objects now and
2244 # make them into commits later.
2246 my $upstreamv = upstreamversion $dsc->{version};
2247 my $orig_f_base = srcfn $upstreamv, '';
2249 foreach my $fi (@dfi) {
2250 # We actually import, and record as a commit, every tarball
2251 # (unless there is only one file, in which case there seems
2254 my $f = $fi->{Filename};
2255 printdebug "import considering $f ";
2256 (printdebug "only one dfi\n"), next if @dfi == 1;
2257 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2258 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2262 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2264 printdebug "Y ", (join ' ', map { $_//"(none)" }
2265 $compr_ext, $orig_f_part
2268 my $input = new IO::File $f, '<' or die "$f $!";
2272 if (defined $compr_ext) {
2274 Dpkg::Compression::compression_guess_from_filename $f;
2275 fail "Dpkg::Compression cannot handle file $f in source package"
2276 if defined $compr_ext && !defined $cname;
2278 new Dpkg::Compression::Process compression => $cname;
2279 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2280 my $compr_fh = new IO::Handle;
2281 my $compr_pid = open $compr_fh, "-|" // confess $!;
2283 open STDIN, "<&", $input or confess $!;
2285 die "dgit (child): exec $compr_cmd[0]: $!\n";
2290 rmtree "_unpack-tar";
2291 mkdir "_unpack-tar" or confess $!;
2292 my @tarcmd = qw(tar -x -f -
2293 --no-same-owner --no-same-permissions
2294 --no-acls --no-xattrs --no-selinux);
2295 my $tar_pid = fork // confess $!;
2297 chdir "_unpack-tar" or confess $!;
2298 open STDIN, "<&", $input or confess $!;
2300 die f_ "dgit (child): exec %s: %s", $tarcmd[0], $!;
2302 $!=0; (waitpid $tar_pid, 0) == $tar_pid or confess $!;
2303 !$? or failedcmd @tarcmd;
2306 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2308 # finally, we have the results in "tarball", but maybe
2309 # with the wrong permissions
2311 runcmd qw(chmod -R +rwX _unpack-tar);
2312 changedir "_unpack-tar";
2313 remove_stray_gits($f);
2314 mktree_in_ud_here();
2316 my ($tree) = git_add_write_tree();
2317 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2318 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2320 printdebug "one subtree $1\n";
2322 printdebug "multiple subtrees\n";
2325 rmtree "_unpack-tar";
2327 my $ent = [ $f, $tree ];
2329 Orig => !!$orig_f_part,
2330 Sort => (!$orig_f_part ? 2 :
2331 $orig_f_part =~ m/-/g ? 1 :
2339 # put any without "_" first (spec is not clear whether files
2340 # are always in the usual order). Tarballs without "_" are
2341 # the main orig or the debian tarball.
2342 $a->{Sort} <=> $b->{Sort} or
2346 my $any_orig = grep { $_->{Orig} } @tartrees;
2348 my $dscfn = "$package.dsc";
2350 my $treeimporthow = 'package';
2352 open D, ">", $dscfn or die "$dscfn: $!";
2353 print D $dscdata or die "$dscfn: $!";
2354 close D or die "$dscfn: $!";
2355 my @cmd = qw(dpkg-source);
2356 push @cmd, '--no-check' if $dsc_checked;
2357 if (madformat $dsc->{format}) {
2358 push @cmd, '--skip-patches';
2359 $treeimporthow = 'unpatched';
2361 push @cmd, qw(-x --), $dscfn;
2364 my ($tree,$dir) = mktree_in_ud_from_only_subdir(__ "source package");
2365 if (madformat $dsc->{format}) {
2366 check_for_vendor_patches();
2370 if (madformat $dsc->{format}) {
2371 my @pcmd = qw(dpkg-source --before-build .);
2372 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2374 $dappliedtree = git_add_write_tree();
2377 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2381 printdebug "import clog search...\n";
2382 parsechangelog_loop \@clogcmd, (__ "package changelog"), sub {
2383 my ($thisstanza, $desc) = @_;
2384 no warnings qw(exiting);
2386 $clogp //= $thisstanza;
2388 printdebug "import clog $thisstanza->{version} $desc...\n";
2390 last if !$any_orig; # we don't need $r1clogp
2392 # We look for the first (most recent) changelog entry whose
2393 # version number is lower than the upstream version of this
2394 # package. Then the last (least recent) previous changelog
2395 # entry is treated as the one which introduced this upstream
2396 # version and used for the synthetic commits for the upstream
2399 # One might think that a more sophisticated algorithm would be
2400 # necessary. But: we do not want to scan the whole changelog
2401 # file. Stopping when we see an earlier version, which
2402 # necessarily then is an earlier upstream version, is the only
2403 # realistic way to do that. Then, either the earliest
2404 # changelog entry we have seen so far is indeed the earliest
2405 # upload of this upstream version; or there are only changelog
2406 # entries relating to later upstream versions (which is not
2407 # possible unless the changelog and .dsc disagree about the
2408 # version). Then it remains to choose between the physically
2409 # last entry in the file, and the one with the lowest version
2410 # number. If these are not the same, we guess that the
2411 # versions were created in a non-monotonic order rather than
2412 # that the changelog entries have been misordered.
2414 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2416 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2417 $r1clogp = $thisstanza;
2419 printdebug "import clog $r1clogp->{version} becomes r1\n";
2422 $clogp or fail __ "package changelog has no entries!";
2424 my $authline = clogp_authline $clogp;
2425 my $changes = getfield $clogp, 'Changes';
2426 $changes =~ s/^\n//; # Changes: \n
2427 my $cversion = getfield $clogp, 'Version';
2430 $r1clogp //= $clogp; # maybe there's only one entry;
2431 my $r1authline = clogp_authline $r1clogp;
2432 # Strictly, r1authline might now be wrong if it's going to be
2433 # unused because !$any_orig. Whatever.
2435 printdebug "import tartrees authline $authline\n";
2436 printdebug "import tartrees r1authline $r1authline\n";
2438 foreach my $tt (@tartrees) {
2439 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2441 my $mbody = f_ "Import %s", $tt->{F};
2442 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2445 committer $r1authline
2449 [dgit import orig $tt->{F}]
2457 [dgit import tarball $package $cversion $tt->{F}]
2462 printdebug "import main commit\n";
2464 open C, ">../commit.tmp" or confess $!;
2465 print C <<END or confess $!;
2468 print C <<END or confess $! foreach @tartrees;
2471 print C <<END or confess $!;
2477 [dgit import $treeimporthow $package $cversion]
2480 close C or confess $!;
2481 my $rawimport_hash = make_commit qw(../commit.tmp);
2483 if (madformat $dsc->{format}) {
2484 printdebug "import apply patches...\n";
2486 # regularise the state of the working tree so that
2487 # the checkout of $rawimport_hash works nicely.
2488 my $dappliedcommit = make_commit_text(<<END);
2495 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2497 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2499 # We need the answers to be reproducible
2500 my @authline = clogp_authline($clogp);
2501 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2502 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2503 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2504 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2505 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2506 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2508 my $path = $ENV{PATH} or die;
2510 # we use ../../gbp-pq-output, which (given that we are in
2511 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2514 foreach my $use_absurd (qw(0 1)) {
2515 runcmd @git, qw(checkout -q unpa);
2516 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2517 local $ENV{PATH} = $path;
2520 progress "warning: $@";
2521 $path = "$absurdity:$path";
2522 progress f_ "%s: trying slow absurd-git-apply...", $us;
2523 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2528 die "forbid absurd git-apply\n" if $use_absurd
2529 && forceing [qw(import-gitapply-no-absurd)];
2530 die "only absurd git-apply!\n" if !$use_absurd
2531 && forceing [qw(import-gitapply-absurd)];
2533 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2534 local $ENV{PATH} = $path if $use_absurd;
2536 my @showcmd = (gbp_pq, qw(import));
2537 my @realcmd = shell_cmd
2538 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2539 debugcmd "+",@realcmd;
2540 if (system @realcmd) {
2541 die f_ "%s failed: %s\n",
2542 +(shellquote @showcmd),
2543 failedcmd_waitstatus();
2546 my $gapplied = git_rev_parse('HEAD');
2547 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2548 $gappliedtree eq $dappliedtree or
2549 fail f_ <<END, $gapplied, $gappliedtree, $dappliedtree;
2550 gbp-pq import and dpkg-source disagree!
2551 gbp-pq import gave commit %s
2552 gbp-pq import gave tree %s
2553 dpkg-source --before-build gave tree %s
2555 $rawimport_hash = $gapplied;
2560 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2565 progress f_ "synthesised git commit from .dsc %s", $cversion;
2567 my $rawimport_mergeinput = {
2568 Commit => $rawimport_hash,
2569 Info => __ "Import of source package",
2571 my @output = ($rawimport_mergeinput);
2573 if ($lastpush_mergeinput) {
2574 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2575 my $oversion = getfield $oldclogp, 'Version';
2577 version_compare($oversion, $cversion);
2579 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2580 { ReverseParents => 1,
2581 Message => (f_ <<END, $package, $cversion, $csuite) });
2582 Record %s (%s) in archive suite %s
2584 } elsif ($vcmp > 0) {
2585 print STDERR f_ <<END, $cversion, $oversion,
2587 Version actually in archive: %s (older)
2588 Last version pushed with dgit: %s (newer or same)
2591 __ $later_warning_msg or confess $!;
2592 @output = $lastpush_mergeinput;
2594 # Same version. Use what's in the server git branch,
2595 # discarding our own import. (This could happen if the
2596 # server automatically imports all packages into git.)
2597 @output = $lastpush_mergeinput;
2605 sub complete_file_from_dsc ($$;$) {
2606 our ($dstdir, $fi, $refetched) = @_;
2607 # Ensures that we have, in $dstdir, the file $fi, with the correct
2608 # contents. (Downloading it from alongside $dscurl if necessary.)
2609 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2610 # and will set $$refetched=1 if it did so (or tried to).
2612 my $f = $fi->{Filename};
2613 my $tf = "$dstdir/$f";
2617 my $checkhash = sub {
2618 open F, "<", "$tf" or die "$tf: $!";
2619 $fi->{Digester}->reset();
2620 $fi->{Digester}->addfile(*F);
2621 F->error and confess $!;
2622 $got = $fi->{Digester}->hexdigest();
2623 return $got eq $fi->{Hash};
2626 if (stat_exists $tf) {
2627 if ($checkhash->()) {
2628 progress f_ "using existing %s", $f;
2632 fail f_ "file %s has hash %s but .dsc demands hash %s".
2633 " (perhaps you should delete this file?)",
2634 $f, $got, $fi->{Hash};
2636 progress f_ "need to fetch correct version of %s", $f;
2637 unlink $tf or die "$tf $!";
2640 printdebug "$tf does not exist, need to fetch\n";
2644 $furl =~ s{/[^/]+$}{};
2646 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2647 die "$f ?" if $f =~ m#/#;
2648 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2649 return 0 if !act_local();
2652 fail f_ "file %s has hash %s but .dsc demands hash %s".
2653 " (got wrong file from archive!)",
2654 $f, $got, $fi->{Hash};
2659 sub ensure_we_have_orig () {
2660 my @dfi = dsc_files_info();
2661 foreach my $fi (@dfi) {
2662 my $f = $fi->{Filename};
2663 next unless is_orig_file_in_dsc($f, \@dfi);
2664 complete_file_from_dsc($buildproductsdir, $fi)
2669 #---------- git fetch ----------
2671 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2672 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2674 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2675 # locally fetched refs because they have unhelpful names and clutter
2676 # up gitk etc. So we track whether we have "used up" head ref (ie,
2677 # whether we have made another local ref which refers to this object).
2679 # (If we deleted them unconditionally, then we might end up
2680 # re-fetching the same git objects each time dgit fetch was run.)
2682 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2683 # in git_fetch_us to fetch the refs in question, and possibly a call
2684 # to lrfetchref_used.
2686 our (%lrfetchrefs_f, %lrfetchrefs_d);
2687 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2689 sub lrfetchref_used ($) {
2690 my ($fullrefname) = @_;
2691 my $objid = $lrfetchrefs_f{$fullrefname};
2692 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2695 sub git_lrfetch_sane {
2696 my ($url, $supplementary, @specs) = @_;
2697 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2698 # at least as regards @specs. Also leave the results in
2699 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2700 # able to clean these up.
2702 # With $supplementary==1, @specs must not contain wildcards
2703 # and we add to our previous fetches (non-atomically).
2705 # This is rather miserable:
2706 # When git fetch --prune is passed a fetchspec ending with a *,
2707 # it does a plausible thing. If there is no * then:
2708 # - it matches subpaths too, even if the supplied refspec
2709 # starts refs, and behaves completely madly if the source
2710 # has refs/refs/something. (See, for example, Debian #NNNN.)
2711 # - if there is no matching remote ref, it bombs out the whole
2713 # We want to fetch a fixed ref, and we don't know in advance
2714 # if it exists, so this is not suitable.
2716 # Our workaround is to use git ls-remote. git ls-remote has its
2717 # own qairks. Notably, it has the absurd multi-tail-matching
2718 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2719 # refs/refs/foo etc.
2721 # Also, we want an idempotent snapshot, but we have to make two
2722 # calls to the remote: one to git ls-remote and to git fetch. The
2723 # solution is use git ls-remote to obtain a target state, and
2724 # git fetch to try to generate it. If we don't manage to generate
2725 # the target state, we try again.
2727 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2729 my $specre = join '|', map {
2732 my $wildcard = $x =~ s/\\\*$/.*/;
2733 die if $wildcard && $supplementary;
2736 printdebug "git_lrfetch_sane specre=$specre\n";
2737 my $wanted_rref = sub {
2739 return m/^(?:$specre)$/;
2742 my $fetch_iteration = 0;
2745 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2746 if (++$fetch_iteration > 10) {
2747 fail __ "too many iterations trying to get sane fetch!";
2750 my @look = map { "refs/$_" } @specs;
2751 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2755 open GITLS, "-|", @lcmd or confess $!;
2757 printdebug "=> ", $_;
2758 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2759 my ($objid,$rrefname) = ($1,$2);
2760 if (!$wanted_rref->($rrefname)) {
2761 print STDERR f_ <<END, "@look", $rrefname;
2762 warning: git ls-remote %s reported %s; this is silly, ignoring it.
2766 $wantr{$rrefname} = $objid;
2769 close GITLS or failedcmd @lcmd;
2771 # OK, now %want is exactly what we want for refs in @specs
2773 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2774 "+refs/$_:".lrfetchrefs."/$_";
2777 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2779 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2780 runcmd_ordryrun_local @fcmd if @fspecs;
2782 if (!$supplementary) {
2783 %lrfetchrefs_f = ();
2787 git_for_each_ref(lrfetchrefs, sub {
2788 my ($objid,$objtype,$lrefname,$reftail) = @_;
2789 $lrfetchrefs_f{$lrefname} = $objid;
2790 $objgot{$objid} = 1;
2793 if ($supplementary) {
2797 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2798 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2799 if (!exists $wantr{$rrefname}) {
2800 if ($wanted_rref->($rrefname)) {
2802 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2805 print STDERR f_ <<END, "@fspecs", $lrefname
2806 warning: git fetch %s created %s; this is silly, deleting it.
2809 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2810 delete $lrfetchrefs_f{$lrefname};
2814 foreach my $rrefname (sort keys %wantr) {
2815 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2816 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2817 my $want = $wantr{$rrefname};
2818 next if $got eq $want;
2819 if (!defined $objgot{$want}) {
2820 fail __ <<END unless act_local();
2821 --dry-run specified but we actually wanted the results of git fetch,
2822 so this is not going to work. Try running dgit fetch first,
2823 or using --damp-run instead of --dry-run.
2825 print STDERR f_ <<END, $lrefname, $want;
2826 warning: git ls-remote suggests we want %s
2827 warning: and it should refer to %s
2828 warning: but git fetch didn't fetch that object to any relevant ref.
2829 warning: This may be due to a race with someone updating the server.
2830 warning: Will try again...
2832 next FETCH_ITERATION;
2835 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2837 runcmd_ordryrun_local @git, qw(update-ref -m),
2838 "dgit fetch git fetch fixup", $lrefname, $want;
2839 $lrfetchrefs_f{$lrefname} = $want;
2844 if (defined $csuite) {
2845 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2846 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2847 my ($objid,$objtype,$lrefname,$reftail) = @_;
2848 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2849 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2853 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2854 Dumper(\%lrfetchrefs_f);
2857 sub git_fetch_us () {
2858 # Want to fetch only what we are going to use, unless
2859 # deliberately-not-ff, in which case we must fetch everything.
2861 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2863 (quiltmode_splitbrain
2864 ? (map { $_->('*',access_nomdistro) }
2865 \&debiantag_new, \&debiantag_maintview)
2866 : debiantags('*',access_nomdistro));
2867 push @specs, server_branch($csuite);
2868 push @specs, $rewritemap;
2869 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2871 my $url = access_giturl();
2872 git_lrfetch_sane $url, 0, @specs;
2875 my @tagpats = debiantags('*',access_nomdistro);
2877 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2878 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2879 printdebug "currently $fullrefname=$objid\n";
2880 $here{$fullrefname} = $objid;
2882 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2883 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2884 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2885 printdebug "offered $lref=$objid\n";
2886 if (!defined $here{$lref}) {
2887 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2888 runcmd_ordryrun_local @upd;
2889 lrfetchref_used $fullrefname;
2890 } elsif ($here{$lref} eq $objid) {
2891 lrfetchref_used $fullrefname;
2893 print STDERR f_ "Not updating %s from %s to %s.\n",
2894 $lref, $here{$lref}, $objid;
2899 #---------- dsc and archive handling ----------
2901 sub mergeinfo_getclogp ($) {
2902 # Ensures thit $mi->{Clogp} exists and returns it
2904 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2907 sub mergeinfo_version ($) {
2908 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2911 sub fetch_from_archive_record_1 ($) {
2913 runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
2914 cmdoutput @git, qw(log -n2), $hash;
2915 # ... gives git a chance to complain if our commit is malformed
2918 sub fetch_from_archive_record_2 ($) {
2920 my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
2924 dryrun_report @upd_cmd;
2928 sub parse_dsc_field_def_dsc_distro () {
2929 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2930 dgit.default.distro);
2933 sub parse_dsc_field ($$) {
2934 my ($dsc, $what) = @_;
2936 foreach my $field (@ourdscfield) {
2937 $f = $dsc->{$field};
2942 progress f_ "%s: NO git hash", $what;
2943 parse_dsc_field_def_dsc_distro();
2944 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2945 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2946 progress f_ "%s: specified git info (%s)", $what, $dsc_distro;
2947 $dsc_hint_tag = [ $dsc_hint_tag ];
2948 } elsif ($f =~ m/^\w+\s*$/) {
2950 parse_dsc_field_def_dsc_distro();
2951 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2953 progress f_ "%s: specified git hash", $what;
2955 fail f_ "%s: invalid Dgit info", $what;
2959 sub resolve_dsc_field_commit ($$) {
2960 my ($already_distro, $already_mapref) = @_;
2962 return unless defined $dsc_hash;
2965 defined $already_mapref &&
2966 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2967 ? $already_mapref : undef;
2971 my ($what, @fetch) = @_;
2973 local $idistro = $dsc_distro;
2974 my $lrf = lrfetchrefs;
2976 if (!$chase_dsc_distro) {
2977 progress f_ "not chasing .dsc distro %s: not fetching %s",
2982 progress f_ ".dsc names distro %s: fetching %s", $dsc_distro, $what;
2984 my $url = access_giturl();
2985 if (!defined $url) {
2986 defined $dsc_hint_url or fail f_ <<END, $dsc_distro;
2987 .dsc Dgit metadata is in context of distro %s
2988 for which we have no configured url and .dsc provides no hint
2991 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2992 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2993 parse_cfg_bool "dsc-url-proto-ok", 'false',
2994 cfg("dgit.dsc-url-proto-ok.$proto",
2995 "dgit.default.dsc-url-proto-ok")
2996 or fail f_ <<END, $dsc_distro, $proto;
2997 .dsc Dgit metadata is in context of distro %s
2998 for which we have no configured url;
2999 .dsc provides hinted url with protocol %s which is unsafe.
3000 (can be overridden by config - consult documentation)
3002 $url = $dsc_hint_url;
3005 git_lrfetch_sane $url, 1, @fetch;
3010 my $rewrite_enable = do {
3011 local $idistro = $dsc_distro;
3012 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
3015 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
3016 if (!defined $mapref) {
3017 my $lrf = $do_fetch->((__ "rewrite map"), $rewritemap) or return;
3018 $mapref = $lrf.'/'.$rewritemap;
3020 my $rewritemapdata = git_cat_file $mapref.':map';
3021 if (defined $rewritemapdata
3022 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
3024 "server's git history rewrite map contains a relevant entry!";
3027 if (defined $dsc_hash) {
3028 progress __ "using rewritten git hash in place of .dsc value";
3030 progress __ "server data says .dsc hash is to be disregarded";
3035 if (!defined git_cat_file $dsc_hash) {
3036 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
3037 my $lrf = $do_fetch->((__ "additional commits"), @tags) &&
3038 defined git_cat_file $dsc_hash
3039 or fail f_ <<END, $dsc_hash;
3040 .dsc Dgit metadata requires commit %s
3041 but we could not obtain that object anywhere.
3043 foreach my $t (@tags) {
3044 my $fullrefname = $lrf.'/'.$t;
3045 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
3046 next unless $lrfetchrefs_f{$fullrefname};
3047 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
3048 lrfetchref_used $fullrefname;
3053 sub fetch_from_archive () {
3054 ensure_setup_existing_tree();
3056 # Ensures that lrref() is what is actually in the archive, one way
3057 # or another, according to us - ie this client's
3058 # appropritaely-updated archive view. Also returns the commit id.
3059 # If there is nothing in the archive, leaves lrref alone and
3060 # returns undef. git_fetch_us must have already been called.
3064 parse_dsc_field($dsc, __ 'last upload to archive');
3065 resolve_dsc_field_commit access_basedistro,
3066 lrfetchrefs."/".$rewritemap
3068 progress __ "no version available from the archive";
3071 # If the archive's .dsc has a Dgit field, there are three
3072 # relevant git commitids we need to choose between and/or merge
3074 # 1. $dsc_hash: the Dgit field from the archive
3075 # 2. $lastpush_hash: the suite branch on the dgit git server
3076 # 3. $lastfetch_hash: our local tracking brach for the suite
3078 # These may all be distinct and need not be in any fast forward
3081 # If the dsc was pushed to this suite, then the server suite
3082 # branch will have been updated; but it might have been pushed to
3083 # a different suite and copied by the archive. Conversely a more
3084 # recent version may have been pushed with dgit but not appeared
3085 # in the archive (yet).
3087 # $lastfetch_hash may be awkward because archive imports
3088 # (particularly, imports of Dgit-less .dscs) are performed only as
3089 # needed on individual clients, so different clients may perform a
3090 # different subset of them - and these imports are only made
3091 # public during push. So $lastfetch_hash may represent a set of
3092 # imports different to a subsequent upload by a different dgit
3095 # Our approach is as follows:
3097 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3098 # descendant of $dsc_hash, then it was pushed by a dgit user who
3099 # had based their work on $dsc_hash, so we should prefer it.
3100 # Otherwise, $dsc_hash was installed into this suite in the
3101 # archive other than by a dgit push, and (necessarily) after the
3102 # last dgit push into that suite (since a dgit push would have
3103 # been descended from the dgit server git branch); thus, in that
3104 # case, we prefer the archive's version (and produce a
3105 # pseudo-merge to overwrite the dgit server git branch).
3107 # (If there is no Dgit field in the archive's .dsc then
3108 # generate_commit_from_dsc uses the version numbers to decide
3109 # whether the suite branch or the archive is newer. If the suite
3110 # branch is newer it ignores the archive's .dsc; otherwise it
3111 # generates an import of the .dsc, and produces a pseudo-merge to
3112 # overwrite the suite branch with the archive contents.)
3114 # The outcome of that part of the algorithm is the `public view',
3115 # and is same for all dgit clients: it does not depend on any
3116 # unpublished history in the local tracking branch.
3118 # As between the public view and the local tracking branch: The
3119 # local tracking branch is only updated by dgit fetch, and
3120 # whenever dgit fetch runs it includes the public view in the
3121 # local tracking branch. Therefore if the public view is not
3122 # descended from the local tracking branch, the local tracking
3123 # branch must contain history which was imported from the archive
3124 # but never pushed; and, its tip is now out of date. So, we make
3125 # a pseudo-merge to overwrite the old imports and stitch the old
3128 # Finally: we do not necessarily reify the public view (as
3129 # described above). This is so that we do not end up stacking two
3130 # pseudo-merges. So what we actually do is figure out the inputs
3131 # to any public view pseudo-merge and put them in @mergeinputs.
3134 # $mergeinputs[]{Commit}
3135 # $mergeinputs[]{Info}
3136 # $mergeinputs[0] is the one whose tree we use
3137 # @mergeinputs is in the order we use in the actual commit)
3140 # $mergeinputs[]{Message} is a commit message to use
3141 # $mergeinputs[]{ReverseParents} if def specifies that parent
3142 # list should be in opposite order
3143 # Such an entry has no Commit or Info. It applies only when found
3144 # in the last entry. (This ugliness is to support making
3145 # identical imports to previous dgit versions.)
3147 my $lastpush_hash = git_get_ref(lrfetchref());
3148 printdebug "previous reference hash=$lastpush_hash\n";
3149 $lastpush_mergeinput = $lastpush_hash && {
3150 Commit => $lastpush_hash,
3151 Info => (__ "dgit suite branch on dgit git server"),
3154 my $lastfetch_hash = git_get_ref(lrref());
3155 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3156 my $lastfetch_mergeinput = $lastfetch_hash && {
3157 Commit => $lastfetch_hash,
3158 Info => (__ "dgit client's archive history view"),
3161 my $dsc_mergeinput = $dsc_hash && {
3162 Commit => $dsc_hash,
3163 Info => (__ "Dgit field in .dsc from archive"),
3167 my $del_lrfetchrefs = sub {
3170 printdebug "del_lrfetchrefs...\n";
3171 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3172 my $objid = $lrfetchrefs_d{$fullrefname};
3173 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3175 $gur ||= new IO::Handle;
3176 open $gur, "|-", qw(git update-ref --stdin) or confess $!;
3178 printf $gur "delete %s %s\n", $fullrefname, $objid;
3181 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3185 if (defined $dsc_hash) {
3186 ensure_we_have_orig();
3187 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3188 @mergeinputs = $dsc_mergeinput
3189 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3190 print STDERR f_ <<END, $dsc_hash, $lastpush_hash,
3192 Git commit in archive is behind the last version allegedly pushed/uploaded.
3193 Commit referred to by archive: %s
3194 Last version pushed with dgit: %s
3197 __ $later_warning_msg or confess $!;
3198 @mergeinputs = ($lastpush_mergeinput);
3200 # Archive has .dsc which is not a descendant of the last dgit
3201 # push. This can happen if the archive moves .dscs about.
3202 # Just follow its lead.
3203 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3204 progress __ "archive .dsc names newer git commit";
3205 @mergeinputs = ($dsc_mergeinput);
3207 progress __ "archive .dsc names other git commit, fixing up";
3208 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3212 @mergeinputs = generate_commits_from_dsc();
3213 # We have just done an import. Now, our import algorithm might
3214 # have been improved. But even so we do not want to generate
3215 # a new different import of the same package. So if the
3216 # version numbers are the same, just use our existing version.
3217 # If the version numbers are different, the archive has changed
3218 # (perhaps, rewound).
3219 if ($lastfetch_mergeinput &&
3220 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3221 (mergeinfo_version $mergeinputs[0]) )) {
3222 @mergeinputs = ($lastfetch_mergeinput);
3224 } elsif ($lastpush_hash) {
3225 # only in git, not in the archive yet
3226 @mergeinputs = ($lastpush_mergeinput);
3227 print STDERR f_ <<END,
3229 Package not found in the archive, but has allegedly been pushed using dgit.
3232 __ $later_warning_msg or confess $!;
3234 printdebug "nothing found!\n";
3235 if (defined $skew_warning_vsn) {
3236 print STDERR f_ <<END, $skew_warning_vsn or confess $!;
3238 Warning: relevant archive skew detected.
3239 Archive allegedly contains %s
3240 But we were not able to obtain any version from the archive or git.
3244 unshift @end, $del_lrfetchrefs;
3248 if ($lastfetch_hash &&
3250 my $h = $_->{Commit};
3251 $h and is_fast_fwd($lastfetch_hash, $h);
3252 # If true, one of the existing parents of this commit
3253 # is a descendant of the $lastfetch_hash, so we'll
3254 # be ff from that automatically.
3258 push @mergeinputs, $lastfetch_mergeinput;
3261 printdebug "fetch mergeinfos:\n";
3262 foreach my $mi (@mergeinputs) {
3264 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3266 printdebug sprintf " ReverseParents=%d Message=%s",
3267 $mi->{ReverseParents}, $mi->{Message};
3271 my $compat_info= pop @mergeinputs
3272 if $mergeinputs[$#mergeinputs]{Message};
3274 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3277 if (@mergeinputs > 1) {
3279 my $tree_commit = $mergeinputs[0]{Commit};
3281 my $tree = get_tree_of_commit $tree_commit;;
3283 # We use the changelog author of the package in question the
3284 # author of this pseudo-merge. This is (roughly) correct if
3285 # this commit is simply representing aa non-dgit upload.
3286 # (Roughly because it does not record sponsorship - but we
3287 # don't have sponsorship info because that's in the .changes,
3288 # which isn't in the archivw.)
3290 # But, it might be that we are representing archive history
3291 # updates (including in-archive copies). These are not really
3292 # the responsibility of the person who created the .dsc, but
3293 # there is no-one whose name we should better use. (The
3294 # author of the .dsc-named commit is clearly worse.)
3296 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3297 my $author = clogp_authline $useclogp;
3298 my $cversion = getfield $useclogp, 'Version';
3300 my $mcf = dgit_privdir()."/mergecommit";
3301 open MC, ">", $mcf or die "$mcf $!";
3302 print MC <<END or confess $!;
3306 my @parents = grep { $_->{Commit} } @mergeinputs;
3307 @parents = reverse @parents if $compat_info->{ReverseParents};
3308 print MC <<END or confess $! foreach @parents;
3312 print MC <<END or confess $!;
3318 if (defined $compat_info->{Message}) {
3319 print MC $compat_info->{Message} or confess $!;
3321 print MC f_ <<END, $package, $cversion, $csuite or confess $!;
3322 Record %s (%s) in archive suite %s
3326 my $message_add_info = sub {
3328 my $mversion = mergeinfo_version $mi;
3329 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3333 $message_add_info->($mergeinputs[0]);
3334 print MC __ <<END or confess $!;
3335 should be treated as descended from
3337 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3340 close MC or confess $!;
3341 $hash = make_commit $mcf;
3343 $hash = $mergeinputs[0]{Commit};
3345 printdebug "fetch hash=$hash\n";
3348 my ($lasth, $what) = @_;
3349 return unless $lasth;
3350 confess "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3353 $chkff->($lastpush_hash, __ 'dgit repo server tip (last push)')
3355 $chkff->($lastfetch_hash, __ 'local tracking tip (last fetch)');
3357 fetch_from_archive_record_1($hash);
3359 if (defined $skew_warning_vsn) {
3360 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3361 my $gotclogp = commit_getclogp($hash);
3362 my $got_vsn = getfield $gotclogp, 'Version';
3363 printdebug "SKEW CHECK GOT $got_vsn\n";
3364 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3365 print STDERR f_ <<END, $skew_warning_vsn, $got_vsn or confess $!;
3367 Warning: archive skew detected. Using the available version:
3368 Archive allegedly contains %s
3369 We were able to obtain only %s
3375 if ($lastfetch_hash ne $hash) {
3376 fetch_from_archive_record_2($hash);
3379 lrfetchref_used lrfetchref();
3381 check_gitattrs($hash, __ "fetched source tree");
3383 unshift @end, $del_lrfetchrefs;
3387 sub set_local_git_config ($$) {
3389 runcmd @git, qw(config), $k, $v;
3392 sub setup_mergechangelogs (;$) {
3394 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3396 my $driver = 'dpkg-mergechangelogs';
3397 my $cb = "merge.$driver";
3398 confess unless defined $maindir;
3399 my $attrs = "$maindir_gitcommon/info/attributes";
3400 ensuredir "$maindir_gitcommon/info";
3402 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3403 if (!open ATTRS, "<", $attrs) {
3404 $!==ENOENT or die "$attrs: $!";
3408 next if m{^debian/changelog\s};
3409 print NATTRS $_, "\n" or confess $!;
3411 ATTRS->error and confess $!;
3414 print NATTRS "debian/changelog merge=$driver\n" or confess $!;
3417 set_local_git_config "$cb.name", __ 'debian/changelog merge driver';
3418 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3420 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3423 sub setup_useremail (;$) {
3425 return unless $always || access_cfg_bool(1, 'setup-useremail');
3428 my ($k, $envvar) = @_;
3429 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3430 return unless defined $v;
3431 set_local_git_config "user.$k", $v;
3434 $setup->('email', 'DEBEMAIL');
3435 $setup->('name', 'DEBFULLNAME');
3438 sub ensure_setup_existing_tree () {
3439 my $k = "remote.$remotename.skipdefaultupdate";
3440 my $c = git_get_config $k;
3441 return if defined $c;
3442 set_local_git_config $k, 'true';
3445 sub open_main_gitattrs () {
3446 confess 'internal error no maindir' unless defined $maindir;
3447 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3449 or die "open $maindir_gitcommon/info/attributes: $!";
3453 our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
3455 sub is_gitattrs_setup () {
3458 # 1: gitattributes set up and should be left alone
3460 # 0: there is a dgit-defuse-attrs but it needs fixing
3461 # undef: there is none
3462 my $gai = open_main_gitattrs();
3463 return 0 unless $gai;
3465 next unless m{$gitattrs_ourmacro_re};
3466 return 1 if m{\s-working-tree-encoding\s};
3467 printdebug "is_gitattrs_setup: found old macro\n";
3470 $gai->error and confess $!;
3471 printdebug "is_gitattrs_setup: found nothing\n";
3475 sub setup_gitattrs (;$) {
3477 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3479 my $already = is_gitattrs_setup();
3482 [attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
3483 not doing further gitattributes setup
3487 my $new = "[attr]dgit-defuse-attrs $negate_harmful_gitattrs";
3488 my $af = "$maindir_gitcommon/info/attributes";
3489 ensuredir "$maindir_gitcommon/info";
3491 open GAO, "> $af.new" or confess $!;
3492 print GAO <<END, __ <<ENDT or confess $! unless defined $already;
3496 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3498 my $gai = open_main_gitattrs();
3501 if (m{$gitattrs_ourmacro_re}) {
3502 die unless defined $already;
3506 print GAO $_, "\n" or confess $!;
3508 $gai->error and confess $!;
3510 close GAO or confess $!;
3511 rename "$af.new", "$af" or fail f_ "install %s: %s", $af, $!;
3514 sub setup_new_tree () {
3515 setup_mergechangelogs();
3520 sub check_gitattrs ($$) {
3521 my ($treeish, $what) = @_;
3523 return if is_gitattrs_setup;
3526 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3528 my $gafl = new IO::File;
3529 open $gafl, "-|", @cmd or confess $!;
3532 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3534 next unless m{(?:^|/)\.gitattributes$};
3536 # oh dear, found one
3537 print STDERR f_ <<END, $what;
3538 dgit: warning: %s contains .gitattributes
3539 dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree.
3544 # tree contains no .gitattributes files
3545 $?=0; $!=0; close $gafl or failedcmd @cmd;
3549 sub multisuite_suite_child ($$$) {
3550 my ($tsuite, $mergeinputs, $fn) = @_;
3551 # in child, sets things up, calls $fn->(), and returns undef
3552 # in parent, returns canonical suite name for $tsuite
3553 my $canonsuitefh = IO::File::new_tmpfile;
3554 my $pid = fork // confess $!;
3558 $us .= " [$isuite]";
3559 $debugprefix .= " ";
3560 progress f_ "fetching %s...", $tsuite;
3561 canonicalise_suite();
3562 print $canonsuitefh $csuite, "\n" or confess $!;
3563 close $canonsuitefh or confess $!;
3567 waitpid $pid,0 == $pid or confess $!;
3568 fail f_ "failed to obtain %s: %s", $tsuite, waitstatusmsg()
3570 seek $canonsuitefh,0,0 or confess $!;
3571 local $csuite = <$canonsuitefh>;
3572 confess $! unless defined $csuite && chomp $csuite;
3574 printdebug "multisuite $tsuite missing\n";
3577 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3578 push @$mergeinputs, {
3585 sub fork_for_multisuite ($) {
3586 my ($before_fetch_merge) = @_;
3587 # if nothing unusual, just returns ''
3590 # returns 0 to caller in child, to do first of the specified suites
3591 # in child, $csuite is not yet set
3593 # returns 1 to caller in parent, to finish up anything needed after
3594 # in parent, $csuite is set to canonicalised portmanteau
3596 my $org_isuite = $isuite;
3597 my @suites = split /\,/, $isuite;
3598 return '' unless @suites > 1;
3599 printdebug "fork_for_multisuite: @suites\n";
3603 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3605 return 0 unless defined $cbasesuite;
3607 fail f_ "package %s missing in (base suite) %s", $package, $cbasesuite
3608 unless @mergeinputs;
3610 my @csuites = ($cbasesuite);
3612 $before_fetch_merge->();
3614 foreach my $tsuite (@suites[1..$#suites]) {
3615 $tsuite =~ s/^-/$cbasesuite-/;
3616 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3623 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3624 push @csuites, $csubsuite;
3627 foreach my $mi (@mergeinputs) {
3628 my $ref = git_get_ref $mi->{Ref};
3629 die "$mi->{Ref} ?" unless length $ref;
3630 $mi->{Commit} = $ref;
3633 $csuite = join ",", @csuites;
3635 my $previous = git_get_ref lrref;
3637 unshift @mergeinputs, {
3638 Commit => $previous,
3639 Info => (__ "local combined tracking branch"),
3641 "archive seems to have rewound: local tracking branch is ahead!"),
3645 foreach my $ix (0..$#mergeinputs) {
3646 $mergeinputs[$ix]{Index} = $ix;
3649 @mergeinputs = sort {
3650 -version_compare(mergeinfo_version $a,
3651 mergeinfo_version $b) # highest version first
3653 $a->{Index} <=> $b->{Index}; # earliest in spec first
3659 foreach my $mi (@mergeinputs) {
3660 printdebug "multisuite merge check $mi->{Info}\n";
3661 foreach my $previous (@needed) {
3662 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3663 printdebug "multisuite merge un-needed $previous->{Info}\n";
3667 printdebug "multisuite merge this-needed\n";
3668 $mi->{Character} = '+';
3671 $needed[0]{Character} = '*';
3673 my $output = $needed[0]{Commit};
3676 printdebug "multisuite merge nontrivial\n";
3677 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3679 my $commit = "tree $tree\n";
3680 my $msg = f_ "Combine archive branches %s [dgit]\n\n".
3681 "Input branches:\n",
3684 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3685 printdebug "multisuite merge include $mi->{Info}\n";
3686 $mi->{Character} //= ' ';
3687 $commit .= "parent $mi->{Commit}\n";
3688 $msg .= sprintf " %s %-25s %s\n",
3690 (mergeinfo_version $mi),
3693 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3694 $msg .= __ "\nKey\n".
3695 " * marks the highest version branch, which choose to use\n".
3696 " + marks each branch which was not already an ancestor\n\n";
3698 "[dgit multi-suite $csuite]\n";
3700 "author $authline\n".
3701 "committer $authline\n\n";
3702 $output = make_commit_text $commit.$msg;
3703 printdebug "multisuite merge generated $output\n";
3706 fetch_from_archive_record_1($output);
3707 fetch_from_archive_record_2($output);
3709 progress f_ "calculated combined tracking suite %s", $csuite;
3714 sub clone_set_head () {
3715 open H, "> .git/HEAD" or confess $!;
3716 print H "ref: ".lref()."\n" or confess $!;
3717 close H or confess $!;
3719 sub clone_finish ($) {
3721 runcmd @git, qw(reset --hard), lrref();
3722 runcmd qw(bash -ec), <<'END';
3724 git ls-tree -r --name-only -z HEAD | \
3725 xargs -0r touch -h -r . --
3727 printdone f_ "ready for work in %s", $dstdir;
3731 # in multisuite, returns twice!
3732 # once in parent after first suite fetched,
3733 # and then again in child after everything is finished
3735 badusage __ "dry run makes no sense with clone" unless act_local();
3737 my $multi_fetched = fork_for_multisuite(sub {
3738 printdebug "multi clone before fetch merge\n";
3742 if ($multi_fetched) {
3743 printdebug "multi clone after fetch merge\n";
3745 clone_finish($dstdir);
3748 printdebug "clone main body\n";
3750 canonicalise_suite();
3751 my $hasgit = check_for_git();
3752 mkdir $dstdir or fail f_ "create \`%s': %s", $dstdir, $!;
3754 runcmd @git, qw(init -q);
3758 my $giturl = access_giturl(1);
3759 if (defined $giturl) {
3760 runcmd @git, qw(remote add), 'origin', $giturl;
3763 progress __ "fetching existing git history";
3765 runcmd_ordryrun_local @git, qw(fetch origin);
3767 progress __ "starting new git history";
3769 fetch_from_archive() or no_such_package;
3770 my $vcsgiturl = $dsc->{'Vcs-Git'};
3771 if (length $vcsgiturl) {
3772 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3773 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3775 clone_finish($dstdir);
3779 canonicalise_suite();
3780 if (check_for_git()) {
3783 fetch_from_archive() or no_such_package();
3785 my $vcsgiturl = $dsc && $dsc->{'Vcs-Git'};
3786 if (length $vcsgiturl and
3787 (grep { $csuite eq $_ }
3789 cfg 'dgit.vcs-git.suites')) {
3790 my $current = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
3791 if (defined $current && $current ne $vcsgiturl) {
3792 print STDERR f_ <<END, $csuite;
3793 FYI: Vcs-Git in %s has different url to your vcs-git remote.
3794 Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?
3798 printdone f_ "fetched into %s", lrref();
3802 my $multi_fetched = fork_for_multisuite(sub { });
3803 fetch_one() unless $multi_fetched; # parent
3804 finish 0 if $multi_fetched eq '0'; # child
3809 runcmd_ordryrun_local @git, qw(merge -m),
3810 (f_ "Merge from %s [dgit]", $csuite),
3812 printdone f_ "fetched to %s and merged into HEAD", lrref();
3815 sub check_not_dirty () {
3816 foreach my $f (qw(local-options local-patch-header)) {
3817 if (stat_exists "debian/source/$f") {
3818 fail f_ "git tree contains debian/source/%s", $f;
3822 return if $includedirty;
3824 git_check_unmodified();
3827 sub commit_admin ($) {
3830 runcmd_ordryrun_local @git, qw(commit -m), $m;
3833 sub quiltify_nofix_bail ($$) {
3834 my ($headinfo, $xinfo) = @_;
3835 if ($quilt_mode eq 'nofix') {
3837 "quilt fixup required but quilt mode is \`nofix'\n".
3838 "HEAD commit%s differs from tree implied by debian/patches%s",
3843 sub commit_quilty_patch () {
3844 my $output = cmdoutput @git, qw(status --ignored --porcelain);
3846 foreach my $l (split /\n/, $output) {
3847 next unless $l =~ m/\S/;
3848 if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
3852 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3854 progress __ "nothing quilty to commit, ok.";
3857 quiltify_nofix_bail "", __ " (wanted to commit patch update)";
3858 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3859 runcmd_ordryrun_local @git, qw(add -f), @adds;
3860 commit_admin +(__ <<ENDT).<<END
3861 Commit Debian 3.0 (quilt) metadata
3864 [dgit ($our_version) quilt-fixup]
3868 sub get_source_format () {
3870 if (open F, "debian/source/options") {
3874 s/\s+$//; # ignore missing final newline
3876 my ($k, $v) = ($`, $'); #');
3877 $v =~ s/^"(.*)"$/$1/;
3883 F->error and confess $!;
3886 confess $! unless $!==&ENOENT;
3889 if (!open F, "debian/source/format") {
3890 confess $! unless $!==&ENOENT;
3894 F->error and confess $!;
3896 return ($_, \%options);
3899 sub madformat_wantfixup ($) {
3901 return 0 unless $format eq '3.0 (quilt)';
3902 our $quilt_mode_warned;
3903 if ($quilt_mode eq 'nocheck') {
3904 progress f_ "Not doing any fixup of \`%s'".
3905 " due to ----no-quilt-fixup or --quilt=nocheck", $format
3906 unless $quilt_mode_warned++;
3909 progress f_ "Format \`%s', need to check/update patch stack", $format
3910 unless $quilt_mode_warned++;
3914 sub maybe_split_brain_save ($$$) {
3915 my ($headref, $dgitview, $msg) = @_;
3916 # => message fragment "$saved" describing disposition of $dgitview
3917 # (used inside parens, in the English texts)
3918 my $save = $internal_object_save{'dgit-view'};
3919 return f_ "commit id %s", $dgitview unless defined $save;
3920 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
3922 "dgit --dgit-view-save $msg HEAD=$headref",
3925 return f_ "and left in %s", $save;
3928 # An "infopair" is a tuple [ $thing, $what ]
3929 # (often $thing is a commit hash; $what is a description)
3931 sub infopair_cond_equal ($$) {
3933 $x->[0] eq $y->[0] or fail <<END;
3934 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3938 sub infopair_lrf_tag_lookup ($$) {
3939 my ($tagnames, $what) = @_;
3940 # $tagname may be an array ref
3941 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3942 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3943 foreach my $tagname (@tagnames) {
3944 my $lrefname = lrfetchrefs."/tags/$tagname";
3945 my $tagobj = $lrfetchrefs_f{$lrefname};
3946 next unless defined $tagobj;
3947 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3948 return [ git_rev_parse($tagobj), $what ];
3950 fail @tagnames==1 ? (f_ <<END, $what, "@tagnames")
3951 Wanted tag %s (%s) on dgit server, but not found
3953 : (f_ <<END, $what, "@tagnames");
3954 Wanted tag %s (one of: %s) on dgit server, but not found
3958 sub infopair_cond_ff ($$) {
3959 my ($anc,$desc) = @_;
3960 is_fast_fwd($anc->[0], $desc->[0]) or
3961 fail f_ <<END, $anc->[1], $anc->[0], $desc->[1], $desc->[0];
3962 %s (%s) .. %s (%s) is not fast forward
3966 sub pseudomerge_version_check ($$) {
3967 my ($clogp, $archive_hash) = @_;
3969 my $arch_clogp = commit_getclogp $archive_hash;
3970 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3971 __ 'version currently in archive' ];
3972 if (defined $overwrite_version) {
3973 if (length $overwrite_version) {
3974 infopair_cond_equal([ $overwrite_version,
3975 '--overwrite= version' ],
3978 my $v = $i_arch_v->[0];
3980 "Checking package changelog for archive version %s ...", $v;
3983 my @xa = ("-f$v", "-t$v");
3984 my $vclogp = parsechangelog @xa;
3987 [ (getfield $vclogp, $fn),
3988 (f_ "%s field from dpkg-parsechangelog %s",
3991 my $cv = $gf->('Version');
3992 infopair_cond_equal($i_arch_v, $cv);
3993 $cd = $gf->('Distribution');
3996 $@ =~ s/^dgit: //gm;
3998 f_ "Perhaps debian/changelog does not mention %s ?", $v;
4000 fail f_ <<END, $cd->[1], $cd->[0], $v
4002 Your tree seems to based on earlier (not uploaded) %s.
4004 if $cd->[0] =~ m/UNRELEASED/;
4008 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
4012 sub pseudomerge_make_commit ($$$$ $$) {
4013 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
4014 $msg_cmd, $msg_msg) = @_;
4015 progress f_ "Declaring that HEAD inciudes all changes in %s...",
4018 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
4019 my $authline = clogp_authline $clogp;
4023 !defined $overwrite_version ? ""
4024 : !length $overwrite_version ? " --overwrite"
4025 : " --overwrite=".$overwrite_version;
4027 # Contributing parent is the first parent - that makes
4028 # git rev-list --first-parent DTRT.
4029 my $pmf = dgit_privdir()."/pseudomerge";
4030 open MC, ">", $pmf or die "$pmf $!";
4031 print MC <<END or confess $!;
4034 parent $archive_hash
4042 close MC or confess $!;
4044 return make_commit($pmf);
4047 sub splitbrain_pseudomerge ($$$$) {
4048 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
4049 # => $merged_dgitview
4050 printdebug "splitbrain_pseudomerge...\n";
4052 # We: debian/PREVIOUS HEAD($maintview)
4053 # expect: o ----------------- o
4056 # a/d/PREVIOUS $dgitview
4059 # we do: `------------------ o
4063 return $dgitview unless defined $archive_hash;
4064 return $dgitview if deliberately_not_fast_forward();
4066 printdebug "splitbrain_pseudomerge...\n";
4068 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4070 if (!defined $overwrite_version) {
4071 progress __ "Checking that HEAD inciudes all changes in archive...";
4074 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
4076 if (defined $overwrite_version) {
4078 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
4079 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14,
4080 __ "maintainer view tag");
4081 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
4082 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, __ "dgit view tag");
4083 my $i_archive = [ $archive_hash, __ "current archive contents" ];
4085 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
4087 infopair_cond_equal($i_dgit, $i_archive);
4088 infopair_cond_ff($i_dep14, $i_dgit);
4089 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
4092 $@ =~ s/^\n//; chomp $@;
4093 print STDERR <<END.(__ <<ENDT);
4096 | Not fast forward; maybe --overwrite is needed ? Please see dgit(1).
4101 my $arch_v = $i_arch_v->[0];
4102 my $r = pseudomerge_make_commit
4103 $clogp, $dgitview, $archive_hash, $i_arch_v,
4104 "dgit --quilt=$quilt_mode",
4105 (defined $overwrite_version
4106 ? f_ "Declare fast forward from %s\n", $arch_v
4107 : f_ "Make fast forward from %s\n", $arch_v);
4109 maybe_split_brain_save $maintview, $r, "pseudomerge";
4111 progress f_ "Made pseudo-merge of %s into dgit view.", $arch_v;
4115 sub plain_overwrite_pseudomerge ($$$) {
4116 my ($clogp, $head, $archive_hash) = @_;
4118 printdebug "plain_overwrite_pseudomerge...";
4120 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4122 return $head if is_fast_fwd $archive_hash, $head;
4124 my $m = f_ "Declare fast forward from %s", $i_arch_v->[0];
4126 my $r = pseudomerge_make_commit
4127 $clogp, $head, $archive_hash, $i_arch_v,
4130 runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
4132 progress f_ "Make pseudo-merge of %s into your HEAD.", $i_arch_v->[0];
4136 sub push_parse_changelog ($) {
4139 my $clogp = Dpkg::Control::Hash->new();
4140 $clogp->load($clogpfn) or die;
4142 my $clogpackage = getfield $clogp, 'Source';
4143 $package //= $clogpackage;
4144 fail f_ "-p specified %s but changelog specified %s",
4145 $package, $clogpackage
4146 unless $package eq $clogpackage;
4147 my $cversion = getfield $clogp, 'Version';
4149 if (!$we_are_initiator) {
4150 # rpush initiator can't do this because it doesn't have $isuite yet
4151 my $tag = debiantag($cversion, access_nomdistro);
4152 runcmd @git, qw(check-ref-format), $tag;
4155 my $dscfn = dscfn($cversion);
4157 return ($clogp, $cversion, $dscfn);
4160 sub push_parse_dsc ($$$) {
4161 my ($dscfn,$dscfnwhat, $cversion) = @_;
4162 $dsc = parsecontrol($dscfn,$dscfnwhat);
4163 my $dversion = getfield $dsc, 'Version';
4164 my $dscpackage = getfield $dsc, 'Source';
4165 ($dscpackage eq $package && $dversion eq $cversion) or
4166 fail f_ "%s is for %s %s but debian/changelog is for %s %s",
4167 $dscfn, $dscpackage, $dversion,
4168 $package, $cversion;
4171 sub push_tagwants ($$$$) {
4172 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4175 TagFn => \&debiantag,
4180 if (defined $maintviewhead) {
4182 TagFn => \&debiantag_maintview,
4183 Objid => $maintviewhead,
4184 TfSuffix => '-maintview',
4187 } elsif ($dodep14tag eq 'no' ? 0
4188 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4189 : $dodep14tag eq 'always'
4190 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4191 --dep14tag-always (or equivalent in config) means server must support
4192 both "new" and "maint" tag formats, but config says it doesn't.
4194 : die "$dodep14tag ?") {
4196 TagFn => \&debiantag_maintview,
4198 TfSuffix => '-dgit',
4202 foreach my $tw (@tagwants) {
4203 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4204 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4206 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4210 sub push_mktags ($$ $$ $) {
4212 $changesfile,$changesfilewhat,
4215 die unless $tagwants->[0]{View} eq 'dgit';
4217 my $declaredistro = access_nomdistro();
4218 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4219 $dsc->{$ourdscfield[0]} = join " ",
4220 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4222 $dsc->save("$dscfn.tmp") or confess $!;
4224 my $changes = parsecontrol($changesfile,$changesfilewhat);
4225 foreach my $field (qw(Source Distribution Version)) {
4226 $changes->{$field} eq $clogp->{$field} or
4227 fail f_ "changes field %s \`%s' does not match changelog \`%s'",
4228 $field, $changes->{$field}, $clogp->{$field};
4231 my $cversion = getfield $clogp, 'Version';
4232 my $clogsuite = getfield $clogp, 'Distribution';
4234 # We make the git tag by hand because (a) that makes it easier
4235 # to control the "tagger" (b) we can do remote signing
4236 my $authline = clogp_authline $clogp;
4237 my $delibs = join(" ", "",@deliberatelies);
4241 my $tfn = $tw->{Tfn};
4242 my $head = $tw->{Objid};
4243 my $tag = $tw->{Tag};
4245 open TO, '>', $tfn->('.tmp') or confess $!;
4246 print TO <<END or confess $!;
4253 if ($tw->{View} eq 'dgit') {
4254 print TO f_ <<ENDT, $package, $cversion, $clogsuite, $csuite
4255 %s release %s for %s (%s) [dgit]
4258 print TO <<END or confess $!;
4259 [dgit distro=$declaredistro$delibs]
4261 foreach my $ref (sort keys %previously) {
4262 print TO <<END or confess $!;
4263 [dgit previously:$ref=$previously{$ref}]
4266 } elsif ($tw->{View} eq 'maint') {
4267 print TO f_ <<END, $package, $cversion, $clogsuite, $csuite,
4268 %s release %s for %s (%s)
4269 (maintainer view tag generated by dgit --quilt=%s)
4274 confess Dumper($tw)."?";
4277 close TO or confess $!;
4279 my $tagobjfn = $tfn->('.tmp');
4281 if (!defined $keyid) {
4282 $keyid = access_cfg('keyid','RETURN-UNDEF');
4284 if (!defined $keyid) {
4285 $keyid = getfield $clogp, 'Maintainer';
4287 unlink $tfn->('.tmp.asc') or $!==&ENOENT or confess $!;
4288 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4289 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4290 push @sign_cmd, $tfn->('.tmp');
4291 runcmd_ordryrun @sign_cmd;
4293 $tagobjfn = $tfn->('.signed.tmp');
4294 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4295 $tfn->('.tmp'), $tfn->('.tmp.asc');
4301 my @r = map { $mktag->($_); } @$tagwants;
4305 sub sign_changes ($) {
4306 my ($changesfile) = @_;
4308 my @debsign_cmd = @debsign;
4309 push @debsign_cmd, "-k$keyid" if defined $keyid;
4310 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4311 push @debsign_cmd, $changesfile;
4312 runcmd_ordryrun @debsign_cmd;
4317 printdebug "actually entering push\n";
4319 supplementary_message(__ <<'END');
4320 Push failed, while checking state of the archive.
4321 You can retry the push, after fixing the problem, if you like.
4323 if (check_for_git()) {
4326 my $archive_hash = fetch_from_archive();
4327 if (!$archive_hash) {
4329 fail __ "package appears to be new in this suite;".
4330 " if this is intentional, use --new";
4333 supplementary_message(__ <<'END');
4334 Push failed, while preparing your push.
4335 You can retry the push, after fixing the problem, if you like.
4338 need_tagformat 'new', "quilt mode $quilt_mode"
4339 if quiltmode_splitbrain;
4343 access_giturl(); # check that success is vaguely likely
4344 rpush_handle_protovsn_bothends() if $we_are_initiator;
4347 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4348 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4350 responder_send_file('parsed-changelog', $clogpfn);
4352 my ($clogp, $cversion, $dscfn) =
4353 push_parse_changelog("$clogpfn");
4355 my $dscpath = "$buildproductsdir/$dscfn";
4356 stat_exists $dscpath or
4357 fail f_ "looked for .dsc %s, but %s; maybe you forgot to build",
4360 responder_send_file('dsc', $dscpath);
4362 push_parse_dsc($dscpath, $dscfn, $cversion);
4364 my $format = getfield $dsc, 'Format';
4365 printdebug "format $format\n";
4367 my $symref = git_get_symref();
4368 my $actualhead = git_rev_parse('HEAD');
4370 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4371 if (quiltmode_splitbrain()) {
4372 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $actualhead);
4373 fail f_ <<END, $ffq_prev, $quilt_mode;
4374 Branch is managed by git-debrebase (%s
4375 exists), but quilt mode (%s) implies a split view.
4376 Pass the right --quilt option or adjust your git config.
4377 Or, maybe, run git-debrebase forget-was-ever-debrebase.
4380 runcmd_ordryrun_local @git_debrebase, 'stitch';
4381 $actualhead = git_rev_parse('HEAD');
4384 my $dgithead = $actualhead;
4385 my $maintviewhead = undef;
4387 my $upstreamversion = upstreamversion $clogp->{Version};
4389 if (madformat_wantfixup($format)) {
4390 # user might have not used dgit build, so maybe do this now:
4391 if (quiltmode_splitbrain()) {
4392 changedir $playground;
4393 quilt_make_fake_dsc($upstreamversion);
4395 ($dgithead, $cachekey) =
4396 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4397 $dgithead or fail f_
4398 "--quilt=%s but no cached dgit view:
4399 perhaps HEAD changed since dgit build[-source] ?",
4402 $dgithead = splitbrain_pseudomerge($clogp,
4403 $actualhead, $dgithead,
4405 $maintviewhead = $actualhead;
4407 prep_ud(); # so _only_subdir() works, below
4409 commit_quilty_patch();
4413 if (defined $overwrite_version && !defined $maintviewhead
4415 $dgithead = plain_overwrite_pseudomerge($clogp,
4423 if ($archive_hash) {
4424 if (is_fast_fwd($archive_hash, $dgithead)) {
4426 } elsif (deliberately_not_fast_forward) {
4429 fail __ "dgit push: HEAD is not a descendant".
4430 " of the archive's version.\n".
4431 "To overwrite the archive's contents,".
4432 " pass --overwrite[=VERSION].\n".
4433 "To rewind history, if permitted by the archive,".
4434 " use --deliberately-not-fast-forward.";
4438 changedir $playground;
4439 progress f_ "checking that %s corresponds to HEAD", $dscfn;
4440 runcmd qw(dpkg-source -x --),
4441 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4442 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4443 check_for_vendor_patches() if madformat($dsc->{format});
4445 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4446 debugcmd "+",@diffcmd;
4448 my $r = system @diffcmd;
4451 my $referent = $split_brain ? $dgithead : 'HEAD';
4452 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4455 my $raw = cmdoutput @git,
4456 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4458 foreach (split /\0/, $raw) {
4459 if (defined $changed) {
4460 push @mode_changes, "$changed: $_\n" if $changed;
4463 } elsif (m/^:0+ 0+ /) {
4465 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4466 $changed = "Mode change from $1 to $2"
4471 if (@mode_changes) {
4472 fail +(f_ <<ENDT, $dscfn).<<END
4473 HEAD specifies a different tree to %s:
4477 .(join '', @mode_changes)
4478 .(f_ <<ENDT, $tree, $referent);
4479 There is a problem with your source tree (see dgit(7) for some hints).
4480 To see a full diff, run git diff %s %s
4484 fail +(f_ <<ENDT, $dscfn).<<END.(f_ <<ENDT, $tree, $referent);
4485 HEAD specifies a different tree to %s:
4489 Perhaps you forgot to build. Or perhaps there is a problem with your
4490 source tree (see dgit(7) for some hints). To see a full diff, run
4497 if (!$changesfile) {
4498 my $pat = changespat $cversion;
4499 my @cs = glob "$buildproductsdir/$pat";
4500 fail f_ "failed to find unique changes file".
4501 " (looked for %s in %s);".
4502 " perhaps you need to use dgit -C",
4503 $pat, $buildproductsdir
4505 ($changesfile) = @cs;
4507 $changesfile = "$buildproductsdir/$changesfile";
4510 # Check that changes and .dsc agree enough
4511 $changesfile =~ m{[^/]*$};
4512 my $changes = parsecontrol($changesfile,$&);
4513 files_compare_inputs($dsc, $changes)
4514 unless forceing [qw(dsc-changes-mismatch)];
4516 # Check whether this is a source only upload
4517 my $hasdebs = $changes->{Files} =~ m{\.deb$}m;
4518 my $sourceonlypolicy = access_cfg 'source-only-uploads';
4519 if ($sourceonlypolicy eq 'ok') {
4520 } elsif ($sourceonlypolicy eq 'always') {
4521 forceable_fail [qw(uploading-binaries)],
4522 __ "uploading binaries, although distroy policy is source only"
4524 } elsif ($sourceonlypolicy eq 'never') {
4525 forceable_fail [qw(uploading-source-only)],
4526 __ "source-only upload, although distroy policy requires .debs"
4528 } elsif ($sourceonlypolicy eq 'not-wholly-new') {
4529 forceable_fail [qw(uploading-source-only)],
4530 f_ "source-only upload, even though package is entirely NEW\n".
4531 "(this is contrary to policy in %s)",
4535 && !(archive_query('package_not_wholly_new', $package) // 1);
4537 badcfg f_ "unknown source-only-uploads policy \`%s'",
4541 # Perhaps adjust .dsc to contain right set of origs
4542 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4544 unless forceing [qw(changes-origs-exactly)];
4546 # Checks complete, we're going to try and go ahead:
4548 responder_send_file('changes',$changesfile);
4549 responder_send_command("param head $dgithead");
4550 responder_send_command("param csuite $csuite");
4551 responder_send_command("param isuite $isuite");
4552 responder_send_command("param tagformat $tagformat");
4553 if (defined $maintviewhead) {
4554 confess "internal error (protovsn=$protovsn)"
4555 if defined $protovsn and $protovsn < 4;
4556 responder_send_command("param maint-view $maintviewhead");
4559 # Perhaps send buildinfo(s) for signing
4560 my $changes_files = getfield $changes, 'Files';
4561 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4562 foreach my $bi (@buildinfos) {
4563 responder_send_command("param buildinfo-filename $bi");
4564 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4567 if (deliberately_not_fast_forward) {
4568 git_for_each_ref(lrfetchrefs, sub {
4569 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4570 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4571 responder_send_command("previously $rrefname=$objid");
4572 $previously{$rrefname} = $objid;
4576 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4577 dgit_privdir()."/tag");
4580 supplementary_message(__ <<'END');
4581 Push failed, while signing the tag.
4582 You can retry the push, after fixing the problem, if you like.
4584 # If we manage to sign but fail to record it anywhere, it's fine.
4585 if ($we_are_responder) {
4586 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4587 responder_receive_files('signed-tag', @tagobjfns);
4589 @tagobjfns = push_mktags($clogp,$dscpath,
4590 $changesfile,$changesfile,
4593 supplementary_message(__ <<'END');
4594 Push failed, *after* signing the tag.
4595 If you want to try again, you should use a new version number.
4598 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4600 foreach my $tw (@tagwants) {
4601 my $tag = $tw->{Tag};
4602 my $tagobjfn = $tw->{TagObjFn};
4604 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4605 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4606 runcmd_ordryrun_local
4607 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4610 supplementary_message(__ <<'END');
4611 Push failed, while updating the remote git repository - see messages above.
4612 If you want to try again, you should use a new version number.
4614 if (!check_for_git()) {
4615 create_remote_git_repo();
4618 my @pushrefs = $forceflag.$dgithead.":".rrref();
4619 foreach my $tw (@tagwants) {
4620 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4623 runcmd_ordryrun @git,
4624 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4625 runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
4627 supplementary_message(__ <<'END');
4628 Push failed, while obtaining signatures on the .changes and .dsc.
4629 If it was just that the signature failed, you may try again by using
4630 debsign by hand to sign the changes file (see the command dgit tried,
4631 above), and then dput that changes file to complete the upload.
4632 If you need to change the package, you must use a new version number.
4634 if ($we_are_responder) {
4635 my $dryrunsuffix = act_local() ? "" : ".tmp";
4636 my @rfiles = ($dscpath, $changesfile);
4637 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4638 responder_receive_files('signed-dsc-changes',
4639 map { "$_$dryrunsuffix" } @rfiles);
4642 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4644 progress f_ "[new .dsc left in %s.tmp]", $dscpath;
4646 sign_changes $changesfile;
4649 supplementary_message(f_ <<END, $changesfile);
4650 Push failed, while uploading package(s) to the archive server.
4651 You can retry the upload of exactly these same files with dput of:
4653 If that .changes file is broken, you will need to use a new version
4654 number for your next attempt at the upload.
4656 my $host = access_cfg('upload-host','RETURN-UNDEF');
4657 my @hostarg = defined($host) ? ($host,) : ();
4658 runcmd_ordryrun @dput, @hostarg, $changesfile;
4659 printdone f_ "pushed and uploaded %s", $cversion;
4661 supplementary_message('');
4662 responder_send_command("complete");
4666 not_necessarily_a_tree();
4671 badusage __ "-p is not allowed with clone; specify as argument instead"
4672 if defined $package;
4675 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4676 ($package,$isuite) = @ARGV;
4677 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4678 ($package,$dstdir) = @ARGV;
4679 } elsif (@ARGV==3) {
4680 ($package,$isuite,$dstdir) = @ARGV;
4682 badusage __ "incorrect arguments to dgit clone";
4686 $dstdir ||= "$package";
4687 if (stat_exists $dstdir) {
4688 fail f_ "%s already exists", $dstdir;
4692 if ($rmonerror && !$dryrun_level) {
4693 $cwd_remove= getcwd();
4695 return unless defined $cwd_remove;
4696 if (!chdir "$cwd_remove") {
4697 return if $!==&ENOENT;
4698 confess "chdir $cwd_remove: $!";
4700 printdebug "clone rmonerror removing $dstdir\n";
4702 rmtree($dstdir) or fail f_ "remove %s: %s\n", $dstdir, $!;
4703 } elsif (grep { $! == $_ }
4704 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4706 print STDERR f_ "check whether to remove %s: %s\n",
4713 $cwd_remove = undef;
4716 sub branchsuite () {
4717 my $branch = git_get_symref();
4718 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4725 sub package_from_d_control () {
4726 if (!defined $package) {
4727 my $sourcep = parsecontrol('debian/control','debian/control');
4728 $package = getfield $sourcep, 'Source';
4732 sub fetchpullargs () {
4733 package_from_d_control();
4735 $isuite = branchsuite();
4737 my $clogp = parsechangelog();
4738 my $clogsuite = getfield $clogp, 'Distribution';
4739 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4741 } elsif (@ARGV==1) {
4744 badusage __ "incorrect arguments to dgit fetch or dgit pull";
4758 if (quiltmode_splitbrain()) {
4759 my ($format, $fopts) = get_source_format();
4760 madformat($format) and fail f_ <<END, $quilt_mode
4761 dgit pull not yet supported in split view mode (--quilt=%s)
4769 package_from_d_control();
4770 @ARGV==1 or badusage __ "dgit checkout needs a suite argument";
4774 foreach my $canon (qw(0 1)) {
4779 canonicalise_suite();
4781 if (length git_get_ref lref()) {
4782 # local branch already exists, yay
4785 if (!length git_get_ref lrref()) {
4793 runcmd (@git, qw(update-ref), lref(), lrref(), '');
4796 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
4797 "dgit checkout $isuite";
4798 runcmd (@git, qw(checkout), lbranch());
4801 sub cmd_update_vcs_git () {
4803 if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
4804 ($specsuite,) = split /\;/, cfg 'dgit.vcs-git.suites';
4806 ($specsuite) = (@ARGV);
4811 if ($ARGV[0] eq '-') {
4813 } elsif ($ARGV[0] eq '-') {
4818 package_from_d_control();
4820 if ($specsuite eq '.') {
4821 $ctrl = parsecontrol 'debian/control', 'debian/control';
4823 $isuite = $specsuite;
4827 my $url = getfield $ctrl, 'Vcs-Git';
4830 my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
4831 if (!defined $orgurl) {
4832 print STDERR f_ "setting up vcs-git: %s\n", $url;
4833 @cmd = (@git, qw(remote add vcs-git), $url);
4834 } elsif ($orgurl eq $url) {
4835 print STDERR f_ "vcs git already configured: %s\n", $url;
4837 print STDERR f_ "changing vcs-git url to: %s\n", $url;
4838 @cmd = (@git, qw(remote set-url vcs-git), $url);
4840 runcmd_ordryrun_local @cmd;
4842 print f_ "fetching (%s)\n", "@ARGV";
4843 runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
4849 build_or_push_prep_early();
4854 } elsif (@ARGV==1) {
4855 ($specsuite) = (@ARGV);
4857 badusage f_ "incorrect arguments to dgit %s", $subcommand;
4860 local ($package) = $existing_package; # this is a hack
4861 canonicalise_suite();
4863 canonicalise_suite();
4865 if (defined $specsuite &&
4866 $specsuite ne $isuite &&
4867 $specsuite ne $csuite) {
4868 fail f_ "dgit %s: changelog specifies %s (%s)".
4869 " but command line specifies %s",
4870 $subcommand, $isuite, $csuite, $specsuite;
4879 #---------- remote commands' implementation ----------
4881 sub pre_remote_push_build_host {
4882 my ($nrargs) = shift @ARGV;
4883 my (@rargs) = @ARGV[0..$nrargs-1];
4884 @ARGV = @ARGV[$nrargs..$#ARGV];
4886 my ($dir,$vsnwant) = @rargs;
4887 # vsnwant is a comma-separated list; we report which we have
4888 # chosen in our ready response (so other end can tell if they
4891 $we_are_responder = 1;
4892 $us .= " (build host)";
4894 open PI, "<&STDIN" or confess $!;
4895 open STDIN, "/dev/null" or confess $!;
4896 open PO, ">&STDOUT" or confess $!;
4898 open STDOUT, ">&STDERR" or confess $!;
4902 ($protovsn) = grep {
4903 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4904 } @rpushprotovsn_support;
4906 fail f_ "build host has dgit rpush protocol versions %s".
4907 " but invocation host has %s",
4908 (join ",", @rpushprotovsn_support), $vsnwant
4909 unless defined $protovsn;
4913 sub cmd_remote_push_build_host {
4914 responder_send_command("dgit-remote-push-ready $protovsn");
4918 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4919 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4920 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4921 # a good error message)
4923 sub rpush_handle_protovsn_bothends () {
4924 if ($protovsn < 4) {
4925 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4934 my $report = i_child_report();
4935 if (defined $report) {
4936 printdebug "($report)\n";
4937 } elsif ($i_child_pid) {
4938 printdebug "(killing build host child $i_child_pid)\n";
4939 kill 15, $i_child_pid;
4941 if (defined $i_tmp && !defined $initiator_tempdir) {
4943 eval { rmtree $i_tmp; };
4948 return unless forkcheck_mainprocess();
4953 my ($base,$selector,@args) = @_;
4954 $selector =~ s/\-/_/g;
4955 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4959 not_necessarily_a_tree();
4964 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4972 push @rargs, join ",", @rpushprotovsn_support;
4975 push @rdgit, @ropts;
4976 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4978 my @cmd = (@ssh, $host, shellquote @rdgit);
4981 $we_are_initiator=1;
4983 if (defined $initiator_tempdir) {
4984 rmtree $initiator_tempdir;
4985 mkdir $initiator_tempdir, 0700
4986 or fail f_ "create %s: %s", $initiator_tempdir, $!;
4987 $i_tmp = $initiator_tempdir;
4991 $i_child_pid = open2(\*RO, \*RI, @cmd);
4993 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4994 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4995 $supplementary_message = '' unless $protovsn >= 3;
4998 my ($icmd,$iargs) = initiator_expect {
4999 m/^(\S+)(?: (.*))?$/;
5002 i_method "i_resp", $icmd, $iargs;
5006 sub i_resp_progress ($) {
5008 my $msg = protocol_read_bytes \*RO, $rhs;
5012 sub i_resp_supplementary_message ($) {
5014 $supplementary_message = protocol_read_bytes \*RO, $rhs;
5017 sub i_resp_complete {
5018 my $pid = $i_child_pid;
5019 $i_child_pid = undef; # prevents killing some other process with same pid
5020 printdebug "waiting for build host child $pid...\n";
5021 my $got = waitpid $pid, 0;
5022 confess $! unless $got == $pid;
5023 fail f_ "build host child failed: %s", waitstatusmsg() if $?;
5026 printdebug __ "all done\n";
5030 sub i_resp_file ($) {
5032 my $localname = i_method "i_localname", $keyword;
5033 my $localpath = "$i_tmp/$localname";
5034 stat_exists $localpath and
5035 badproto \*RO, f_ "file %s (%s) twice", $keyword, $localpath;
5036 protocol_receive_file \*RO, $localpath;
5037 i_method "i_file", $keyword;
5042 sub i_resp_param ($) {
5043 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, __ "bad param spec";
5047 sub i_resp_previously ($) {
5048 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
5049 or badproto \*RO, __ "bad previously spec";
5050 my $r = system qw(git check-ref-format), $1;
5051 confess "bad previously ref spec ($r)" if $r;
5052 $previously{$1} = $2;
5057 sub i_resp_want ($) {
5059 die "$keyword ?" if $i_wanted{$keyword}++;
5061 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
5062 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
5063 die unless $isuite =~ m/^$suite_re$/;
5066 rpush_handle_protovsn_bothends();
5068 fail f_ "rpush negotiated protocol version %s".
5069 " which does not support quilt mode %s",
5070 $protovsn, $quilt_mode
5071 if quiltmode_splitbrain;
5073 my @localpaths = i_method "i_want", $keyword;
5074 printdebug "[[ $keyword @localpaths\n";
5075 foreach my $localpath (@localpaths) {
5076 protocol_send_file \*RI, $localpath;
5078 print RI "files-end\n" or confess $!;
5081 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
5083 sub i_localname_parsed_changelog {
5084 return "remote-changelog.822";
5086 sub i_file_parsed_changelog {
5087 ($i_clogp, $i_version, $i_dscfn) =
5088 push_parse_changelog "$i_tmp/remote-changelog.822";
5089 die if $i_dscfn =~ m#/|^\W#;
5092 sub i_localname_dsc {
5093 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5098 sub i_localname_buildinfo ($) {
5099 my $bi = $i_param{'buildinfo-filename'};
5100 defined $bi or badproto \*RO, "buildinfo before filename";
5101 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
5102 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
5103 or badproto \*RO, "improper buildinfo filename";
5106 sub i_file_buildinfo {
5107 my $bi = $i_param{'buildinfo-filename'};
5108 my $bd = parsecontrol "$i_tmp/$bi", $bi;
5109 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
5110 if (!forceing [qw(buildinfo-changes-mismatch)]) {
5111 files_compare_inputs($bd, $ch);
5112 (getfield $bd, $_) eq (getfield $ch, $_) or
5113 fail f_ "buildinfo mismatch in field %s", $_
5114 foreach qw(Source Version);
5115 !defined $bd->{$_} or
5116 fail f_ "buildinfo contains forbidden field %s", $_
5117 foreach qw(Changes Changed-by Distribution);
5119 push @i_buildinfos, $bi;
5120 delete $i_param{'buildinfo-filename'};
5123 sub i_localname_changes {
5124 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5125 $i_changesfn = $i_dscfn;
5126 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
5127 return $i_changesfn;
5129 sub i_file_changes { }
5131 sub i_want_signed_tag {
5132 printdebug Dumper(\%i_param, $i_dscfn);
5133 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
5134 && defined $i_param{'csuite'}
5135 or badproto \*RO, "premature desire for signed-tag";
5136 my $head = $i_param{'head'};
5137 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
5139 my $maintview = $i_param{'maint-view'};
5140 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
5143 if ($protovsn >= 4) {
5144 my $p = $i_param{'tagformat'} // '<undef>';
5146 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
5149 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
5151 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
5153 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
5156 push_mktags $i_clogp, $i_dscfn,
5157 $i_changesfn, (__ 'remote changes file'),
5161 sub i_want_signed_dsc_changes {
5162 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
5163 sign_changes $i_changesfn;
5164 return ($i_dscfn, $i_changesfn, @i_buildinfos);
5167 #---------- building etc. ----------
5173 #----- `3.0 (quilt)' handling -----
5175 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
5177 sub quiltify_dpkg_commit ($$$;$) {
5178 my ($patchname,$author,$msg, $xinfo) = @_;
5181 mkpath '.git/dgit'; # we are in playtree
5182 my $descfn = ".git/dgit/quilt-description.tmp";
5183 open O, '>', $descfn or confess "$descfn: $!";
5184 $msg =~ s/\n+/\n\n/;
5185 print O <<END or confess $!;
5187 ${xinfo}Subject: $msg
5191 close O or confess $!;
5194 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
5195 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
5196 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
5197 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
5201 sub quiltify_trees_differ ($$;$$$) {
5202 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
5203 # returns true iff the two tree objects differ other than in debian/
5204 # with $finegrained,
5205 # returns bitmask 01 - differ in upstream files except .gitignore
5206 # 02 - differ in .gitignore
5207 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
5208 # is set for each modified .gitignore filename $fn
5209 # if $unrepres is defined, array ref to which is appeneded
5210 # a list of unrepresentable changes (removals of upstream files
5213 my @cmd = (@git, qw(diff-tree -z --no-renames));
5214 push @cmd, qw(--name-only) unless $unrepres;
5215 push @cmd, qw(-r) if $finegrained || $unrepres;
5217 my $diffs= cmdoutput @cmd;
5220 foreach my $f (split /\0/, $diffs) {
5221 if ($unrepres && !@lmodes) {
5222 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
5225 my ($oldmode,$newmode) = @lmodes;
5228 next if $f =~ m#^debian(?:/.*)?$#s;
5232 die __ "not a plain file or symlink\n"
5233 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5234 $oldmode =~ m/^(?:10|12)\d{4}$/;
5235 if ($oldmode =~ m/[^0]/ &&
5236 $newmode =~ m/[^0]/) {
5237 # both old and new files exist
5238 die __ "mode or type changed\n" if $oldmode ne $newmode;
5239 die __ "modified symlink\n" unless $newmode =~ m/^10/;
5240 } elsif ($oldmode =~ m/[^0]/) {
5242 die __ "deletion of symlink\n"
5243 unless $oldmode =~ m/^10/;
5246 die __ "creation with non-default mode\n"
5247 unless $newmode =~ m/^100644$/ or
5248 $newmode =~ m/^120000$/;
5252 local $/="\n"; chomp $@;
5253 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5257 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5258 $r |= $isignore ? 02 : 01;
5259 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5261 printdebug "quiltify_trees_differ $x $y => $r\n";
5265 sub quiltify_tree_sentinelfiles ($) {
5266 # lists the `sentinel' files present in the tree
5268 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5269 qw(-- debian/rules debian/control);
5274 sub quiltify_splitbrain_needed () {
5275 if (!$split_brain) {
5276 progress __ "dgit view: changes are required...";
5277 runcmd @git, qw(checkout -q -b dgit-view);
5282 sub quiltify_splitbrain ($$$$$$$) {
5283 my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
5284 $editedignores, $cachekey) = @_;
5285 my $gitignore_special = 1;
5286 if ($quilt_mode !~ m/gbp|dpm/) {
5287 # treat .gitignore just like any other upstream file
5288 $diffbits = { %$diffbits };
5289 $_ = !!$_ foreach values %$diffbits;
5290 $gitignore_special = 0;
5292 # We would like any commits we generate to be reproducible
5293 my @authline = clogp_authline($clogp);
5294 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5295 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5296 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5297 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5298 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5299 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5301 my $fulldiffhint = sub {
5303 my $cmd = "git diff $x $y -- :/ ':!debian'";
5304 $cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special;
5305 return f_ "\nFor full diff showing the problem(s), type:\n %s\n",
5309 if ($quilt_mode =~ m/gbp|unapplied/ &&
5310 ($diffbits->{O2H} & 01)) {
5312 "--quilt=%s specified, implying patches-unapplied git tree\n".
5313 " but git tree differs from orig in upstream files.",
5315 $msg .= $fulldiffhint->($unapplied, 'HEAD');
5316 if (!stat_exists "debian/patches") {
5318 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5322 if ($quilt_mode =~ m/dpm/ &&
5323 ($diffbits->{H2A} & 01)) {
5324 fail +(f_ <<END, $quilt_mode). $fulldiffhint->($oldtiptree,'HEAD');
5325 --quilt=%s specified, implying patches-applied git tree
5326 but git tree differs from result of applying debian/patches to upstream
5329 if ($quilt_mode =~ m/gbp|unapplied/ &&
5330 ($diffbits->{O2A} & 01)) { # some patches
5331 quiltify_splitbrain_needed();
5332 progress __ "dgit view: creating patches-applied version using gbp pq";
5333 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5334 # gbp pq import creates a fresh branch; push back to dgit-view
5335 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5336 runcmd @git, qw(checkout -q dgit-view);
5338 if ($quilt_mode =~ m/gbp|dpm/ &&
5339 ($diffbits->{O2A} & 02)) {
5340 fail f_ <<END, $quilt_mode;
5341 --quilt=%s specified, implying that HEAD is for use with a
5342 tool which does not create patches for changes to upstream
5343 .gitignores: but, such patches exist in debian/patches.
5346 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5347 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5348 quiltify_splitbrain_needed();
5350 "dgit view: creating patch to represent .gitignore changes";
5351 ensuredir "debian/patches";
5352 my $gipatch = "debian/patches/auto-gitignore";
5353 open GIPATCH, ">>", "$gipatch" or confess "$gipatch: $!";
5354 stat GIPATCH or confess "$gipatch: $!";
5355 fail f_ "%s already exists; but want to create it".
5356 " to record .gitignore changes",
5359 print GIPATCH +(__ <<END).<<ENDU or die "$gipatch: $!";
5360 Subject: Update .gitignore from Debian packaging branch
5362 The Debian packaging git branch contains these updates to the upstream
5363 .gitignore file(s). This patch is autogenerated, to provide these
5364 updates to users of the official Debian archive view of the package.
5367 [dgit ($our_version) update-gitignore]
5370 close GIPATCH or die "$gipatch: $!";
5371 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5372 $unapplied, $headref, "--", sort keys %$editedignores;
5373 open SERIES, "+>>", "debian/patches/series" or confess $!;
5374 defined seek SERIES, -1, 2 or $!==EINVAL or confess $!;
5376 defined read SERIES, $newline, 1 or confess $!;
5377 print SERIES "\n" or confess $! unless $newline eq "\n";
5378 print SERIES "auto-gitignore\n" or confess $!;
5379 close SERIES or die $!;
5380 runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
5381 commit_admin +(__ <<END).<<ENDU
5382 Commit patch to update .gitignore
5385 [dgit ($our_version) update-gitignore-quilt-fixup]
5389 my $dgitview = git_rev_parse 'HEAD';
5392 reflog_cache_insert "refs/$splitbraincache", $cachekey, $dgitview;
5394 changedir "$playground/work";
5396 my $saved = maybe_split_brain_save $headref, $dgitview, __ "converted";
5397 progress f_ "dgit view: created (%s)", $saved;
5400 sub quiltify ($$$$) {
5401 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5403 # Quilt patchification algorithm
5405 # We search backwards through the history of the main tree's HEAD
5406 # (T) looking for a start commit S whose tree object is identical
5407 # to to the patch tip tree (ie the tree corresponding to the
5408 # current dpkg-committed patch series). For these purposes
5409 # `identical' disregards anything in debian/ - this wrinkle is
5410 # necessary because dpkg-source treates debian/ specially.
5412 # We can only traverse edges where at most one of the ancestors'
5413 # trees differs (in changes outside in debian/). And we cannot
5414 # handle edges which change .pc/ or debian/patches. To avoid
5415 # going down a rathole we avoid traversing edges which introduce
5416 # debian/rules or debian/control. And we set a limit on the
5417 # number of edges we are willing to look at.
5419 # If we succeed, we walk forwards again. For each traversed edge
5420 # PC (with P parent, C child) (starting with P=S and ending with
5421 # C=T) to we do this:
5423 # - dpkg-source --commit with a patch name and message derived from C
5424 # After traversing PT, we git commit the changes which
5425 # should be contained within debian/patches.
5427 # The search for the path S..T is breadth-first. We maintain a
5428 # todo list containing search nodes. A search node identifies a
5429 # commit, and looks something like this:
5431 # Commit => $git_commit_id,
5432 # Child => $c, # or undef if P=T
5433 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5434 # Nontrivial => true iff $p..$c has relevant changes
5441 my %considered; # saves being exponential on some weird graphs
5443 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5446 my ($search,$whynot) = @_;
5447 printdebug " search NOT $search->{Commit} $whynot\n";
5448 $search->{Whynot} = $whynot;
5449 push @nots, $search;
5450 no warnings qw(exiting);
5459 my $c = shift @todo;
5460 next if $considered{$c->{Commit}}++;
5462 $not->($c, __ "maximum search space exceeded") if --$max_work <= 0;
5464 printdebug "quiltify investigate $c->{Commit}\n";
5467 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5468 printdebug " search finished hooray!\n";
5473 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5474 if ($quilt_mode eq 'smash') {
5475 printdebug " search quitting smash\n";
5479 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5480 $not->($c, f_ "has %s not %s", $c_sentinels, $t_sentinels)
5481 if $c_sentinels ne $t_sentinels;
5483 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5484 $commitdata =~ m/\n\n/;
5486 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5487 @parents = map { { Commit => $_, Child => $c } } @parents;
5489 $not->($c, __ "root commit") if !@parents;
5491 foreach my $p (@parents) {
5492 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5494 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5495 $not->($c, f_ "merge (%s nontrivial parents)", $ndiffers)
5498 foreach my $p (@parents) {
5499 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5501 my @cmd= (@git, qw(diff-tree -r --name-only),
5502 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5503 my $patchstackchange = cmdoutput @cmd;
5504 if (length $patchstackchange) {
5505 $patchstackchange =~ s/\n/,/g;
5506 $not->($p, f_ "changed %s", $patchstackchange);
5509 printdebug " search queue P=$p->{Commit} ",
5510 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5516 printdebug "quiltify want to smash\n";
5519 my $x = $_[0]{Commit};
5520 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5523 if ($quilt_mode eq 'linear') {
5525 "\n%s: error: quilt fixup cannot be linear. Stopped at:\n",
5527 my $all_gdr = !!@nots;
5528 foreach my $notp (@nots) {
5529 my $c = $notp->{Child};
5530 my $cprange = $abbrev->($notp);
5531 $cprange .= "..".$abbrev->($c) if $c;
5532 print STDERR f_ "%s: %s: %s\n",
5533 $us, $cprange, $notp->{Whynot};
5534 $all_gdr &&= $notp->{Child} &&
5535 (git_cat_file $notp->{Child}{Commit}, 'commit')
5536 =~ m{^\[git-debrebase(?! split[: ]).*\]$}m;
5540 [ grep { $_->[0] ne 'quilt-mode' } @$failsuggestion ]
5542 print STDERR "$us: $_->[1]\n" foreach @$failsuggestion;
5544 "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n";
5545 } elsif ($quilt_mode eq 'smash') {
5546 } elsif ($quilt_mode eq 'auto') {
5547 progress __ "quilt fixup cannot be linear, smashing...";
5549 confess "$quilt_mode ?";
5552 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5553 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5555 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5557 quiltify_dpkg_commit "auto-$version-$target-$time",
5558 (getfield $clogp, 'Maintainer'),
5559 (f_ "Automatically generated patch (%s)\n".
5560 "Last (up to) %s git changes, FYI:\n\n",
5561 $clogp->{Version}, $ncommits).
5566 progress __ "quiltify linearisation planning successful, executing...";
5568 for (my $p = $sref_S;
5569 my $c = $p->{Child};
5571 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5572 next unless $p->{Nontrivial};
5574 my $cc = $c->{Commit};
5576 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5577 $commitdata =~ m/\n\n/ or die "$c ?";
5580 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5583 my $commitdate = cmdoutput
5584 @git, qw(log -n1 --pretty=format:%aD), $cc;
5586 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5588 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5595 my $gbp_check_suitable = sub {
5600 die __ "contains unexpected slashes\n" if m{//} || m{/$};
5601 die __ "contains leading punctuation\n" if m{^\W} || m{/\W};
5602 die __ "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5603 die __ "is series file\n" if m{$series_filename_re}o;
5604 die __ "too long\n" if length > 200;
5606 return $_ unless $@;
5608 "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s",
5613 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5615 (\S+) \s* \n //ixm) {
5616 $patchname = $gbp_check_suitable->($1, 'Name');
5618 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5620 (\S+) \s* \n //ixm) {
5621 $patchdir = $gbp_check_suitable->($1, 'Topic');
5626 if (!defined $patchname) {
5627 $patchname = $title;
5628 $patchname =~ s/[.:]$//;
5631 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5632 my $translitname = $converter->convert($patchname);
5633 die unless defined $translitname;
5634 $patchname = $translitname;
5637 +(f_ "dgit: patch title transliteration error: %s", $@)
5639 $patchname =~ y/ A-Z/-a-z/;
5640 $patchname =~ y/-a-z0-9_.+=~//cd;
5641 $patchname =~ s/^\W/x-$&/;
5642 $patchname = substr($patchname,0,40);
5643 $patchname .= ".patch";
5645 if (!defined $patchdir) {
5648 if (length $patchdir) {
5649 $patchname = "$patchdir/$patchname";
5651 if ($patchname =~ m{^(.*)/}) {
5652 mkpath "debian/patches/$1";
5657 stat "debian/patches/$patchname$index";
5659 $!==ENOENT or confess "$patchname$index $!";
5661 runcmd @git, qw(checkout -q), $cc;
5663 # We use the tip's changelog so that dpkg-source doesn't
5664 # produce complaining messages from dpkg-parsechangelog. None
5665 # of the information dpkg-source gets from the changelog is
5666 # actually relevant - it gets put into the original message
5667 # which dpkg-source provides our stunt editor, and then
5669 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5671 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5672 "Date: $commitdate\n".
5673 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5675 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5678 runcmd @git, qw(checkout -q master);
5681 sub build_maybe_quilt_fixup () {
5682 my ($format,$fopts) = get_source_format;
5683 return unless madformat_wantfixup $format;
5686 check_for_vendor_patches();
5688 if (quiltmode_splitbrain) {
5689 fail <<END unless access_cfg_tagformats_can_splitbrain;
5690 quilt mode $quilt_mode requires split view so server needs to support
5691 both "new" and "maint" tag formats, but config says it doesn't.
5695 my $clogp = parsechangelog();
5696 my $headref = git_rev_parse('HEAD');
5697 my $symref = git_get_symref();
5699 if ($quilt_mode eq 'linear'
5700 && !$fopts->{'single-debian-patch'}
5701 && branch_is_gdr($headref)) {
5702 # This is much faster. It also makes patches that gdr
5703 # likes better for future updates without laundering.
5705 # However, it can fail in some casses where we would
5706 # succeed: if there are existing patches, which correspond
5707 # to a prefix of the branch, but are not in gbp/gdr
5708 # format, gdr will fail (exiting status 7), but we might
5709 # be able to figure out where to start linearising. That
5710 # will be slower so hopefully there's not much to do.
5711 my @cmd = (@git_debrebase,
5712 qw(--noop-ok -funclean-mixed -funclean-ordering
5713 make-patches --quiet-would-amend));
5714 # We tolerate soe snags that gdr wouldn't, by default.
5718 failedcmd @cmd if system @cmd and $?!=7*256;
5722 $headref = git_rev_parse('HEAD');
5726 changedir $playground;
5728 my $upstreamversion = upstreamversion $version;
5730 if ($fopts->{'single-debian-patch'}) {
5731 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5733 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5737 runcmd_ordryrun_local
5738 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5741 sub unpack_playtree_mkwork ($) {
5744 mkdir "work" or confess $!;
5746 mktree_in_ud_here();
5747 runcmd @git, qw(reset -q --hard), $headref;
5750 sub unpack_playtree_linkorigs ($$) {
5751 my ($upstreamversion, $fn) = @_;
5752 # calls $fn->($leafname);
5754 my $bpd_abs = bpd_abs();
5755 opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!";
5756 while ($!=0, defined(my $b = readdir QFD)) {
5757 my $f = bpd_abs()."/".$b;
5759 local ($debuglevel) = $debuglevel-1;
5760 printdebug "QF linkorigs $b, $f ?\n";
5762 next unless is_orig_file_of_vsn $b, $upstreamversion;
5763 printdebug "QF linkorigs $b, $f Y\n";
5764 link_ltarget $f, $b or die "$b $!";
5767 die "$buildproductsdir: $!" if $!;
5771 sub quilt_fixup_delete_pc () {
5772 runcmd @git, qw(rm -rqf .pc);
5773 commit_admin +(__ <<END).<<ENDU
5774 Commit removal of .pc (quilt series tracking data)
5777 [dgit ($our_version) upgrade quilt-remove-pc]
5781 sub quilt_fixup_singlepatch ($$$) {
5782 my ($clogp, $headref, $upstreamversion) = @_;
5784 progress __ "starting quiltify (single-debian-patch)";
5786 # dpkg-source --commit generates new patches even if
5787 # single-debian-patch is in debian/source/options. In order to
5788 # get it to generate debian/patches/debian-changes, it is
5789 # necessary to build the source package.
5791 unpack_playtree_linkorigs($upstreamversion, sub { });
5792 unpack_playtree_mkwork($headref);
5794 rmtree("debian/patches");
5796 runcmd @dpkgsource, qw(-b .);
5798 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5799 rename srcfn("$upstreamversion", "/debian/patches"),
5800 "work/debian/patches";
5803 commit_quilty_patch();
5806 sub quilt_make_fake_dsc ($) {
5807 my ($upstreamversion) = @_;
5809 my $fakeversion="$upstreamversion-~~DGITFAKE";
5811 my $fakedsc=new IO::File 'fake.dsc', '>' or confess $!;
5812 print $fakedsc <<END or confess $!;
5815 Version: $fakeversion
5819 my $dscaddfile=sub {
5822 my $md = new Digest::MD5;
5824 my $fh = new IO::File $b, '<' or die "$b $!";
5825 stat $fh or confess $!;
5829 print $fakedsc " ".$md->hexdigest." $size $b\n" or confess $!;
5832 unpack_playtree_linkorigs($upstreamversion, $dscaddfile);
5834 my @files=qw(debian/source/format debian/rules
5835 debian/control debian/changelog);
5836 foreach my $maybe (qw(debian/patches debian/source/options
5837 debian/tests/control)) {
5838 next unless stat_exists "$maindir/$maybe";
5839 push @files, $maybe;
5842 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5843 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5845 $dscaddfile->($debtar);
5846 close $fakedsc or confess $!;
5849 sub quilt_fakedsc2unapplied ($$) {
5850 my ($headref, $upstreamversion) = @_;
5851 # must be run in the playground
5852 # quilt_make_fake_dsc must have been called
5855 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5857 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5858 rename $fakexdir, "fake" or die "$fakexdir $!";
5862 remove_stray_gits(__ "source package");
5863 mktree_in_ud_here();
5867 rmtree 'debian'; # git checkout commitish paths does not delete!
5868 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5869 my $unapplied=git_add_write_tree();
5870 printdebug "fake orig tree object $unapplied\n";
5874 sub quilt_check_splitbrain_cache ($$) {
5875 my ($headref, $upstreamversion) = @_;
5876 # Called only if we are in (potentially) split brain mode.
5877 # Called in playground.
5878 # Computes the cache key and looks in the cache.
5879 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5881 my $splitbrain_cachekey;
5884 "dgit: split brain (separate dgit view) may be needed (--quilt=%s).",
5886 # we look in the reflog of dgit-intern/quilt-cache
5887 # we look for an entry whose message is the key for the cache lookup
5888 my @cachekey = (qw(dgit), $our_version);
5889 push @cachekey, $upstreamversion;
5890 push @cachekey, $quilt_mode;
5891 push @cachekey, $headref;
5893 push @cachekey, hashfile('fake.dsc');
5895 my $srcshash = Digest::SHA->new(256);
5896 my %sfs = ( %INC, '$0(dgit)' => $0 );
5897 foreach my $sfk (sort keys %sfs) {
5898 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5899 $srcshash->add($sfk," ");
5900 $srcshash->add(hashfile($sfs{$sfk}));
5901 $srcshash->add("\n");
5903 push @cachekey, $srcshash->hexdigest();
5904 $splitbrain_cachekey = "@cachekey";
5906 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5908 my $cachehit = reflog_cache_lookup
5909 "refs/$splitbraincache", $splitbrain_cachekey;
5912 unpack_playtree_mkwork($headref);
5913 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5914 if ($cachehit ne $headref) {
5915 progress f_ "dgit view: found cached (%s)", $saved;
5916 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5918 return ($cachehit, $splitbrain_cachekey);
5920 progress __ "dgit view: found cached, no changes required";
5921 return ($headref, $splitbrain_cachekey);
5924 printdebug "splitbrain cache miss\n";
5925 return (undef, $splitbrain_cachekey);
5928 sub quilt_fixup_multipatch ($$$) {
5929 my ($clogp, $headref, $upstreamversion) = @_;
5931 progress f_ "examining quilt state (multiple patches, %s mode)",
5935 # - honour any existing .pc in case it has any strangeness
5936 # - determine the git commit corresponding to the tip of
5937 # the patch stack (if there is one)
5938 # - if there is such a git commit, convert each subsequent
5939 # git commit into a quilt patch with dpkg-source --commit
5940 # - otherwise convert all the differences in the tree into
5941 # a single git commit
5945 # Our git tree doesn't necessarily contain .pc. (Some versions of
5946 # dgit would include the .pc in the git tree.) If there isn't
5947 # one, we need to generate one by unpacking the patches that we
5950 # We first look for a .pc in the git tree. If there is one, we
5951 # will use it. (This is not the normal case.)
5953 # Otherwise need to regenerate .pc so that dpkg-source --commit
5954 # can work. We do this as follows:
5955 # 1. Collect all relevant .orig from parent directory
5956 # 2. Generate a debian.tar.gz out of
5957 # debian/{patches,rules,source/format,source/options}
5958 # 3. Generate a fake .dsc containing just these fields:
5959 # Format Source Version Files
5960 # 4. Extract the fake .dsc
5961 # Now the fake .dsc has a .pc directory.
5962 # (In fact we do this in every case, because in future we will
5963 # want to search for a good base commit for generating patches.)
5965 # Then we can actually do the dpkg-source --commit
5966 # 1. Make a new working tree with the same object
5967 # store as our main tree and check out the main
5969 # 2. Copy .pc from the fake's extraction, if necessary
5970 # 3. Run dpkg-source --commit
5971 # 4. If the result has changes to debian/, then
5972 # - git add them them
5973 # - git add .pc if we had a .pc in-tree
5975 # 5. If we had a .pc in-tree, delete it, and git commit
5976 # 6. Back in the main tree, fast forward to the new HEAD
5978 # Another situation we may have to cope with is gbp-style
5979 # patches-unapplied trees.
5981 # We would want to detect these, so we know to escape into
5982 # quilt_fixup_gbp. However, this is in general not possible.
5983 # Consider a package with a one patch which the dgit user reverts
5984 # (with git revert or the moral equivalent).
5986 # That is indistinguishable in contents from a patches-unapplied
5987 # tree. And looking at the history to distinguish them is not
5988 # useful because the user might have made a confusing-looking git
5989 # history structure (which ought to produce an error if dgit can't
5990 # cope, not a silent reintroduction of an unwanted patch).
5992 # So gbp users will have to pass an option. But we can usually
5993 # detect their failure to do so: if the tree is not a clean
5994 # patches-applied tree, quilt linearisation fails, but the tree
5995 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5996 # they want --quilt=unapplied.
5998 # To help detect this, when we are extracting the fake dsc, we
5999 # first extract it with --skip-patches, and then apply the patches
6000 # afterwards with dpkg-source --before-build. That lets us save a
6001 # tree object corresponding to .origs.
6003 my $splitbrain_cachekey;
6005 quilt_make_fake_dsc($upstreamversion);
6007 if (quiltmode_splitbrain()) {
6009 ($cachehit, $splitbrain_cachekey) =
6010 quilt_check_splitbrain_cache($headref, $upstreamversion);
6011 return if $cachehit;
6013 my $unapplied=quilt_fakedsc2unapplied($headref, $upstreamversion);
6017 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
6019 if (system @bbcmd) {
6020 failedcmd @bbcmd if $? < 0;
6022 failed to apply your git tree's patch stack (from debian/patches/) to
6023 the corresponding upstream tarball(s). Your source tree and .orig
6024 are probably too inconsistent. dgit can only fix up certain kinds of
6025 anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).
6031 unpack_playtree_mkwork($headref);
6034 if (stat_exists ".pc") {
6036 progress __ "Tree already contains .pc - will use it then delete it.";
6039 rename '../fake/.pc','.pc' or confess $!;
6042 changedir '../fake';
6044 my $oldtiptree=git_add_write_tree();
6045 printdebug "fake o+d/p tree object $unapplied\n";
6046 changedir '../work';
6049 # We calculate some guesswork now about what kind of tree this might
6050 # be. This is mostly for error reporting.
6056 # O = orig, without patches applied
6057 # A = "applied", ie orig with H's debian/patches applied
6058 O2H => quiltify_trees_differ($unapplied,$headref, 1,
6059 \%editedignores, \@unrepres),
6060 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
6061 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
6065 foreach my $b (qw(01 02)) {
6066 foreach my $v (qw(O2H O2A H2A)) {
6067 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
6070 printdebug "differences \@dl @dl.\n";
6073 "%s: base trees orig=%.20s o+d/p=%.20s",
6074 $us, $unapplied, $oldtiptree;
6076 "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
6077 "%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
6078 $us, $dl[0], $dl[1], $dl[3], $dl[4],
6079 $us, $dl[2], $dl[5];
6082 print STDERR f_ "dgit: cannot represent change: %s: %s\n",
6085 forceable_fail [qw(unrepresentable)], __ <<END;
6086 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
6091 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
6092 push @failsuggestion, [ 'unapplied', __
6093 "This might be a patches-unapplied branch." ];
6094 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
6095 push @failsuggestion, [ 'applied', __
6096 "This might be a patches-applied branch." ];
6098 push @failsuggestion, [ 'quilt-mode', __
6099 "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" ];
6101 push @failsuggestion, [ 'gitattrs', __
6102 "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." ]
6103 if stat_exists '.gitattributes';
6105 push @failsuggestion, [ 'origs', __
6106 "Maybe orig tarball(s) are not identical to git representation?" ];
6108 if (quiltmode_splitbrain()) {
6109 quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,
6110 $diffbits, \%editedignores,
6111 $splitbrain_cachekey);
6115 progress f_ "starting quiltify (multiple patches, %s mode)", $quilt_mode;
6116 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
6118 if (!open P, '>>', ".pc/applied-patches") {
6119 $!==&ENOENT or confess $!;
6124 commit_quilty_patch();
6126 if ($mustdeletepc) {
6127 quilt_fixup_delete_pc();
6131 sub quilt_fixup_editor () {
6132 my $descfn = $ENV{$fakeeditorenv};
6133 my $editing = $ARGV[$#ARGV];
6134 open I1, '<', $descfn or confess "$descfn: $!";
6135 open I2, '<', $editing or confess "$editing: $!";
6136 unlink $editing or confess "$editing: $!";
6137 open O, '>', $editing or confess "$editing: $!";
6138 while (<I1>) { print O or confess $!; } I1->error and confess $!;
6141 $copying ||= m/^\-\-\- /;
6142 next unless $copying;
6143 print O or confess $!;
6145 I2->error and confess $!;
6150 sub maybe_apply_patches_dirtily () {
6151 return unless $quilt_mode =~ m/gbp|unapplied/;
6152 print STDERR __ <<END or confess $!;
6154 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
6155 dgit: Have to apply the patches - making the tree dirty.
6156 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
6159 $patches_applied_dirtily = 01;
6160 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
6161 runcmd qw(dpkg-source --before-build .);
6164 sub maybe_unapply_patches_again () {
6165 progress __ "dgit: Unapplying patches again to tidy up the tree."
6166 if $patches_applied_dirtily;
6167 runcmd qw(dpkg-source --after-build .)
6168 if $patches_applied_dirtily & 01;
6170 if $patches_applied_dirtily & 02;
6171 $patches_applied_dirtily = 0;
6174 #----- other building -----
6176 our $clean_using_builder;
6177 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
6178 # clean the tree before building (perhaps invoked indirectly by
6179 # whatever we are using to run the build), rather than separately
6180 # and explicitly by us.
6183 return if $clean_using_builder;
6184 if ($cleanmode eq 'dpkg-source') {
6185 maybe_apply_patches_dirtily();
6186 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
6187 } elsif ($cleanmode eq 'dpkg-source-d') {
6188 maybe_apply_patches_dirtily();
6189 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
6190 } elsif ($cleanmode eq 'git') {
6191 runcmd_ordryrun_local @git, qw(clean -xdf);
6192 } elsif ($cleanmode eq 'git-ff') {
6193 runcmd_ordryrun_local @git, qw(clean -xdff);
6194 } elsif ($cleanmode eq 'check') {
6195 my $leftovers = cmdoutput @git, qw(clean -xdn);
6196 if (length $leftovers) {
6197 print STDERR $leftovers, "\n" or confess $!;
6199 "tree contains uncommitted files and --clean=check specified";
6201 } elsif ($cleanmode eq 'none') {
6208 badusage __ "clean takes no additional arguments" if @ARGV;
6211 maybe_unapply_patches_again();
6214 # return values from massage_dbp_args are one or both of these flags
6215 sub WANTSRC_SOURCE () { 01; } # caller should build source (separately)
6216 sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
6218 sub build_or_push_prep_early () {
6219 our $build_or_push_prep_early_done //= 0;
6220 return if $build_or_push_prep_early_done++;
6221 badusage f_ "-p is not allowed with dgit %s", $subcommand
6222 if defined $package;
6223 my $clogp = parsechangelog();
6224 $isuite = getfield $clogp, 'Distribution';
6225 $package = getfield $clogp, 'Source';
6226 $version = getfield $clogp, 'Version';
6227 $dscfn = dscfn($version);
6230 sub build_prep_early () {
6231 build_or_push_prep_early();
6236 sub build_prep ($) {
6239 # clean the tree if we're trying to include dirty changes in the
6240 # source package, or we are running the builder in $maindir
6241 clean_tree() if $includedirty || ($wantsrc & WANTSRC_BUILDER);
6242 build_maybe_quilt_fixup();
6244 my $pat = changespat $version;
6245 foreach my $f (glob "$buildproductsdir/$pat") {
6248 fail f_ "remove old changes file %s: %s", $f, $!;
6250 progress f_ "would remove %s", $f;
6256 sub changesopts_initial () {
6257 my @opts =@changesopts[1..$#changesopts];
6260 sub changesopts_version () {
6261 if (!defined $changes_since_version) {
6264 @vsns = archive_query('archive_query');
6265 my @quirk = access_quirk();
6266 if ($quirk[0] eq 'backports') {
6267 local $isuite = $quirk[2];
6269 canonicalise_suite();
6270 push @vsns, archive_query('archive_query');
6276 "archive query failed (queried because --since-version not specified)";
6279 @vsns = map { $_->[0] } @vsns;
6280 @vsns = sort { -version_compare($a, $b) } @vsns;
6281 $changes_since_version = $vsns[0];
6282 progress f_ "changelog will contain changes since %s", $vsns[0];
6284 $changes_since_version = '_';
6285 progress __ "package seems new, not specifying -v<version>";
6288 if ($changes_since_version ne '_') {
6289 return ("-v$changes_since_version");
6295 sub changesopts () {
6296 return (changesopts_initial(), changesopts_version());
6299 sub massage_dbp_args ($;$) {
6300 my ($cmd,$xargs) = @_;
6301 # Since we split the source build out so we can do strange things
6302 # to it, massage the arguments to dpkg-buildpackage so that the
6303 # main build doessn't build source (or add an argument to stop it
6304 # building source by default).
6305 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6306 # -nc has the side effect of specifying -b if nothing else specified
6307 # and some combinations of -S, -b, et al, are errors, rather than
6308 # later simply overriding earlie. So we need to:
6309 # - search the command line for these options
6310 # - pick the last one
6311 # - perhaps add our own as a default
6312 # - perhaps adjust it to the corresponding non-source-building version
6314 foreach my $l ($cmd, $xargs) {
6316 @$l = grep { !(m/^-[SgGFABb]$|^--build=/s and $dmode=$_) } @$l;
6319 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6320 my $r = WANTSRC_BUILDER;
6321 printdebug "massage split $dmode.\n";
6322 if ($dmode =~ s/^--build=//) {
6324 my @d = split /,/, $dmode;
6325 $r |= WANTSRC_SOURCE if grep { s/^full$/binary/ } @d;
6326 $r |= WANTSRC_SOURCE if grep { s/^source$// } @d;
6327 $r |= WANTSRC_BUILDER if grep { m/./ } @d;
6328 fail __ "Wanted to build nothing!" unless $r;
6329 $dmode = '--build='. join ',', grep m/./, @d;
6332 $dmode =~ m/[S]/ ? WANTSRC_SOURCE :
6333 $dmode =~ y/gGF/ABb/ ? WANTSRC_SOURCE | WANTSRC_BUILDER :
6334 $dmode =~ m/[ABb]/ ? WANTSRC_BUILDER :
6337 printdebug "massage done $r $dmode.\n";
6339 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6345 my $wasdir = must_getcwd();
6346 changedir $buildproductsdir;
6351 # this sub must run with CWD=$buildproductsdir (eg in in_bpd)
6352 sub postbuild_mergechanges ($) {
6353 my ($msg_if_onlyone) = @_;
6354 # If there is only one .changes file, fail with $msg_if_onlyone,
6355 # or if that is undef, be a no-op.
6356 # Returns the changes file to report to the user.
6357 my $pat = changespat $version;
6358 my @changesfiles = grep { !m/_multi\.changes/ } glob $pat;
6359 @changesfiles = sort {
6360 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6364 if (@changesfiles==1) {
6365 fail +(f_ <<END, "@changesfiles").$msg_if_onlyone
6366 only one changes file from build (%s)
6368 if defined $msg_if_onlyone;
6369 $result = $changesfiles[0];
6370 } elsif (@changesfiles==2) {
6371 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6372 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6373 fail f_ "%s found in binaries changes file %s", $l, $binchanges
6376 runcmd_ordryrun_local @mergechanges, @changesfiles;
6377 my $multichanges = changespat $version,'multi';
6379 stat_exists $multichanges or fail f_
6380 "%s unexpectedly not created by build", $multichanges;
6381 foreach my $cf (glob $pat) {
6382 next if $cf eq $multichanges;
6383 rename "$cf", "$cf.inmulti" or fail f_
6384 "install new changes %s\{,.inmulti}: %s", $cf, $!;
6387 $result = $multichanges;
6389 fail f_ "wrong number of different changes files (%s)",
6392 printdone f_ "build successful, results in %s\n", $result
6396 sub midbuild_checkchanges () {
6397 my $pat = changespat $version;
6398 return if $rmchanges;
6399 my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
6401 $_ ne changespat $version,'source' and
6402 $_ ne changespat $version,'multi'
6404 fail +(f_ <<END, $pat, "@unwanted")
6405 changes files other than source matching %s already present; building would result in ambiguity about the intended results.
6406 Suggest you delete %s.
6411 sub midbuild_checkchanges_vanilla ($) {
6413 midbuild_checkchanges() if $wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER);
6416 sub postbuild_mergechanges_vanilla ($) {
6418 if ($wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER)) {
6420 postbuild_mergechanges(undef);
6423 printdone __ "build successful\n";
6429 $buildproductsdir eq '..' or print STDERR +(f_ <<END, $us, $us);
6430 %s: warning: build-products-dir set, but not supported by dpkg-buildpackage
6431 %s: warning: build-products-dir will be ignored; files will go to ..
6433 $buildproductsdir = '..';
6434 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6435 my $wantsrc = massage_dbp_args \@dbp;
6436 build_prep($wantsrc);
6437 if ($wantsrc & WANTSRC_SOURCE) {
6439 midbuild_checkchanges_vanilla $wantsrc;
6441 if ($wantsrc & WANTSRC_BUILDER) {
6442 push @dbp, changesopts_version();
6443 maybe_apply_patches_dirtily();
6444 runcmd_ordryrun_local @dbp;
6446 maybe_unapply_patches_again();
6447 postbuild_mergechanges_vanilla $wantsrc;
6451 $quilt_mode //= 'gbp';
6457 # gbp can make .origs out of thin air. In my tests it does this
6458 # even for a 1.0 format package, with no origs present. So I
6459 # guess it keys off just the version number. We don't know
6460 # exactly what .origs ought to exist, but let's assume that we
6461 # should run gbp if: the version has an upstream part and the main
6463 my $upstreamversion = upstreamversion $version;
6464 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6465 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "$bpd_glob/$origfnpat");
6467 if ($gbp_make_orig) {
6469 $cleanmode = 'none'; # don't do it again
6472 my @dbp = @dpkgbuildpackage;
6474 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6476 if (!length $gbp_build[0]) {
6477 if (length executable_on_path('git-buildpackage')) {
6478 $gbp_build[0] = qw(git-buildpackage);
6480 $gbp_build[0] = 'gbp buildpackage';
6483 my @cmd = opts_opt_multi_cmd [], @gbp_build;
6485 push @cmd, (qw(-us -uc --git-no-sign-tags),
6486 "--git-builder=".(shellquote @dbp));
6488 if ($gbp_make_orig) {
6489 my $priv = dgit_privdir();
6490 my $ok = "$priv/origs-gen-ok";
6491 unlink $ok or $!==&ENOENT or confess $!;
6492 my @origs_cmd = @cmd;
6493 push @origs_cmd, qw(--git-cleaner=true);
6494 push @origs_cmd, "--git-prebuild=".
6495 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6496 push @origs_cmd, @ARGV;
6498 debugcmd @origs_cmd;
6500 do { local $!; stat_exists $ok; }
6501 or failedcmd @origs_cmd;
6503 dryrun_report @origs_cmd;
6507 build_prep($wantsrc);
6508 if ($wantsrc & WANTSRC_SOURCE) {
6510 midbuild_checkchanges_vanilla $wantsrc;
6512 if (!$clean_using_builder) {
6513 push @cmd, '--git-cleaner=true';
6516 maybe_unapply_patches_again();
6517 if ($wantsrc & WANTSRC_BUILDER) {
6518 push @cmd, changesopts();
6519 runcmd_ordryrun_local @cmd, @ARGV;
6521 postbuild_mergechanges_vanilla $wantsrc;
6523 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6525 sub building_source_in_playtree {
6526 # If $includedirty, we have to build the source package from the
6527 # working tree, not a playtree, so that uncommitted changes are
6528 # included (copying or hardlinking them into the playtree could
6531 # Note that if we are building a source package in split brain
6532 # mode we do not support including uncommitted changes, because
6533 # that makes quilt fixup too hard. I.e. ($split_brain && (dgit is
6534 # building a source package)) => !$includedirty
6535 return !$includedirty;
6539 $sourcechanges = changespat $version,'source';
6541 unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
6542 or fail f_ "remove %s: %s", $sourcechanges, $!;
6544 my @cmd = (@dpkgsource, qw(-b --));
6546 if (building_source_in_playtree()) {
6548 my $headref = git_rev_parse('HEAD');
6549 # If we are in split brain, there is already a playtree with
6550 # the thing we should package into a .dsc (thanks to quilt
6551 # fixup). If not, make a playtree
6552 prep_ud() unless $split_brain;
6553 changedir $playground;
6554 unless ($split_brain) {
6555 my $upstreamversion = upstreamversion $version;
6556 unpack_playtree_linkorigs($upstreamversion, sub { });
6557 unpack_playtree_mkwork($headref);
6561 $leafdir = basename $maindir;
6564 runcmd_ordryrun_local @cmd, $leafdir;
6567 runcmd_ordryrun_local qw(sh -ec),
6568 'exec >../$1; shift; exec "$@"','x', $sourcechanges,
6569 @dpkggenchanges, qw(-S), changesopts();
6572 printdebug "moving $dscfn, $sourcechanges, etc. to ".bpd_abs()."\n";
6573 $dsc = parsecontrol($dscfn, "source package");
6577 printdebug " renaming ($why) $l\n";
6578 rename "$l", bpd_abs()."/$l"
6579 or fail f_ "put in place new built file (%s): %s", $l, $!;
6581 foreach my $l (split /\n/, getfield $dsc, 'Files') {
6582 $l =~ m/\S+$/ or next;
6585 $mv->('dsc', $dscfn);
6586 $mv->('changes', $sourcechanges);
6591 sub cmd_build_source {
6592 badusage __ "build-source takes no additional arguments" if @ARGV;
6593 build_prep(WANTSRC_SOURCE);
6595 maybe_unapply_patches_again();
6596 printdone f_ "source built, results in %s and %s",
6597 $dscfn, $sourcechanges;
6600 sub cmd_push_source {
6603 "dgit push-source: --include-dirty/--ignore-dirty does not make".
6604 "sense with push-source!"
6606 build_maybe_quilt_fixup();
6608 my $changes = parsecontrol("$buildproductsdir/$changesfile",
6609 __ "source changes file");
6610 unless (test_source_only_changes($changes)) {
6611 fail __ "user-specified changes file is not source-only";
6614 # Building a source package is very fast, so just do it
6616 confess "er, patches are applied dirtily but shouldn't be.."
6617 if $patches_applied_dirtily;
6618 $changesfile = $sourcechanges;
6623 sub binary_builder {
6624 my ($bbuilder, $pbmc_msg, @args) = @_;
6625 build_prep(WANTSRC_SOURCE);
6627 midbuild_checkchanges();
6630 stat_exists $dscfn or fail f_
6631 "%s (in build products dir): %s", $dscfn, $!;
6632 stat_exists $sourcechanges or fail f_
6633 "%s (in build products dir): %s", $sourcechanges, $!;
6635 runcmd_ordryrun_local @$bbuilder, @args;
6637 maybe_unapply_patches_again();
6639 postbuild_mergechanges($pbmc_msg);
6645 binary_builder(\@sbuild, (__ <<END), qw(-d), $isuite, @ARGV, $dscfn);
6646 perhaps you need to pass -A ? (sbuild's default is to build only
6647 arch-specific binaries; dgit 1.4 used to override that.)
6652 my ($pbuilder) = @_;
6654 # @ARGV is allowed to contain only things that should be passed to
6655 # pbuilder under debbuildopts; just massage those
6656 my $wantsrc = massage_dbp_args \@ARGV;
6658 "you asked for a builder but your debbuildopts didn't ask for".
6659 " any binaries -- is this really what you meant?"
6660 unless $wantsrc & WANTSRC_BUILDER;
6662 "we must build a .dsc to pass to the builder but your debbuiltopts".
6663 " forbids the building of a source package; cannot continue"
6664 unless $wantsrc & WANTSRC_SOURCE;
6665 # We do not want to include the verb "build" in @pbuilder because
6666 # the user can customise @pbuilder and they shouldn't be required
6667 # to include "build" in their customised value. However, if the
6668 # user passes any additional args to pbuilder using the dgit
6669 # option --pbuilder:foo, such args need to come after the "build"
6670 # verb. opts_opt_multi_cmd does all of that.
6671 binary_builder([opts_opt_multi_cmd ["build"], @$pbuilder], undef,
6672 qw(--debbuildopts), "@ARGV", qw(--distribution), $isuite,
6677 pbuilder(\@pbuilder);
6680 sub cmd_cowbuilder {
6681 pbuilder(\@cowbuilder);
6684 sub cmd_quilt_fixup {
6685 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6688 build_maybe_quilt_fixup();
6691 sub cmd_print_unapplied_treeish {
6692 badusage __ "incorrect arguments to dgit print-unapplied-treeish"
6694 my $headref = git_rev_parse('HEAD');
6695 my $clogp = commit_getclogp $headref;
6696 $package = getfield $clogp, 'Source';
6697 $version = getfield $clogp, 'Version';
6698 $isuite = getfield $clogp, 'Distribution';
6699 $csuite = $isuite; # we want this to be offline!
6703 changedir $playground;
6704 my $uv = upstreamversion $version;
6705 quilt_make_fake_dsc($uv);
6706 my $u = quilt_fakedsc2unapplied($headref, $uv);
6707 print $u, "\n" or confess $!;
6710 sub import_dsc_result {
6711 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6712 my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
6714 check_gitattrs($newhash, __ "source tree");
6716 progress f_ "dgit: import-dsc: %s", $what_msg;
6719 sub cmd_import_dsc {
6723 last unless $ARGV[0] =~ m/^-/;
6726 if (m/^--require-valid-signature$/) {
6729 badusage f_ "unknown dgit import-dsc sub-option \`%s'", $_;
6733 badusage __ "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
6735 my ($dscfn, $dstbranch) = @ARGV;
6737 badusage __ "dry run makes no sense with import-dsc"
6740 my $force = $dstbranch =~ s/^\+// ? +1 :
6741 $dstbranch =~ s/^\.\.// ? -1 :
6743 my $info = $force ? " $&" : '';
6744 $info = "$dscfn$info";
6746 my $specbranch = $dstbranch;
6747 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6748 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6750 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6751 my $chead = cmdoutput_errok @symcmd;
6752 defined $chead or $?==256 or failedcmd @symcmd;
6754 fail f_ "%s is checked out - will not update it", $dstbranch
6755 if defined $chead and $chead eq $dstbranch;
6757 my $oldhash = git_get_ref $dstbranch;
6759 open D, "<", $dscfn or fail f_ "open import .dsc (%s): %s", $dscfn, $!;
6760 $dscdata = do { local $/ = undef; <D>; };
6761 D->error and fail f_ "read %s: %s", $dscfn, $!;
6764 # we don't normally need this so import it here
6765 use Dpkg::Source::Package;
6766 my $dp = new Dpkg::Source::Package filename => $dscfn,
6767 require_valid_signature => $needsig;
6769 local $SIG{__WARN__} = sub {
6771 return unless $needsig;
6772 fail __ "import-dsc signature check failed";
6774 if (!$dp->is_signed()) {
6775 warn f_ "%s: warning: importing unsigned .dsc\n", $us;
6777 my $r = $dp->check_signature();
6778 confess "->check_signature => $r" if $needsig && $r;
6784 $package = getfield $dsc, 'Source';
6786 parse_dsc_field($dsc, __ "Dgit metadata in .dsc")
6787 unless forceing [qw(import-dsc-with-dgit-field)];
6788 parse_dsc_field_def_dsc_distro();
6790 $isuite = 'DGIT-IMPORT-DSC';
6791 $idistro //= $dsc_distro;
6795 if (defined $dsc_hash) {
6797 "dgit: import-dsc of .dsc with Dgit field, using git hash";
6798 resolve_dsc_field_commit undef, undef;
6800 if (defined $dsc_hash) {
6801 my @cmd = (qw(sh -ec),
6802 "echo $dsc_hash | git cat-file --batch-check");
6803 my $objgot = cmdoutput @cmd;
6804 if ($objgot =~ m#^\w+ missing\b#) {
6805 fail f_ <<END, $dsc_hash
6806 .dsc contains Dgit field referring to object %s
6807 Your git tree does not have that object. Try `git fetch' from a
6808 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6811 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6813 progress __ "Not fast forward, forced update.";
6815 fail f_ "Not fast forward to %s", $dsc_hash;
6818 import_dsc_result $dstbranch, $dsc_hash,
6819 "dgit import-dsc (Dgit): $info",
6820 f_ "updated git ref %s", $dstbranch;
6824 fail f_ <<END, $dstbranch, $specbranch, $specbranch
6825 Branch %s already exists
6826 Specify ..%s for a pseudo-merge, binding in existing history
6827 Specify +%s to overwrite, discarding existing history
6829 if $oldhash && !$force;
6831 my @dfi = dsc_files_info();
6832 foreach my $fi (@dfi) {
6833 my $f = $fi->{Filename};
6834 my $here = "$buildproductsdir/$f";
6837 fail f_ "lstat %s works but stat gives %s !", $here, $!;
6839 fail f_ "stat %s: %s", $here, $! unless $! == ENOENT;
6841 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6843 } elsif ($dscfn =~ m#^/#) {
6847 "cannot import %s which seems to be inside working tree!",
6850 $there =~ s#/+[^/]+$## or fail f_
6851 "import %s requires ../%s, but it does not exist",
6854 my $test = $there =~ m{^/} ? $there : "../$there";
6855 stat $test or fail "import $dscfn requires $test, but: $!";
6856 symlink $there, $here or fail "symlink $there to $here: $!";
6857 progress "made symlink $here -> $there";
6858 # print STDERR Dumper($fi);
6860 my @mergeinputs = generate_commits_from_dsc();
6861 die unless @mergeinputs == 1;
6863 my $newhash = $mergeinputs[0]{Commit};
6867 progress "Import, forced update - synthetic orphan git history.";
6868 } elsif ($force < 0) {
6869 progress "Import, merging.";
6870 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6871 my $version = getfield $dsc, 'Version';
6872 my $clogp = commit_getclogp $newhash;
6873 my $authline = clogp_authline $clogp;
6874 $newhash = make_commit_text <<END;
6881 Merge $package ($version) import into $dstbranch
6884 die; # caught earlier
6888 import_dsc_result $dstbranch, $newhash,
6889 "dgit import-dsc: $info",
6890 "results are in in git ref $dstbranch";
6893 sub pre_archive_api_query () {
6894 not_necessarily_a_tree();
6896 sub cmd_archive_api_query {
6897 badusage "need only 1 subpath argument" unless @ARGV==1;
6898 my ($subpath) = @ARGV;
6899 local $isuite = 'DGIT-API-QUERY-CMD';
6900 my @cmd = archive_api_query_cmd($subpath);
6903 exec @cmd or fail "exec curl: $!\n";
6906 sub repos_server_url () {
6907 $package = '_dgit-repos-server';
6908 local $access_forpush = 1;
6909 local $isuite = 'DGIT-REPOS-SERVER';
6910 my $url = access_giturl();
6913 sub pre_clone_dgit_repos_server () {
6914 not_necessarily_a_tree();
6916 sub cmd_clone_dgit_repos_server {
6917 badusage "need destination argument" unless @ARGV==1;
6918 my ($destdir) = @ARGV;
6919 my $url = repos_server_url();
6920 my @cmd = (@git, qw(clone), $url, $destdir);
6922 exec @cmd or fail "exec git clone: $!\n";
6925 sub pre_print_dgit_repos_server_source_url () {
6926 not_necessarily_a_tree();
6928 sub cmd_print_dgit_repos_server_source_url {
6929 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6931 my $url = repos_server_url();
6932 print $url, "\n" or confess $!;
6935 sub pre_print_dpkg_source_ignores {
6936 not_necessarily_a_tree();
6938 sub cmd_print_dpkg_source_ignores {
6939 badusage "no arguments allowed to dgit print-dpkg-source-ignores"
6941 print "@dpkg_source_ignores\n" or confess $!;
6944 sub cmd_setup_mergechangelogs {
6945 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6946 local $isuite = 'DGIT-SETUP-TREE';
6947 setup_mergechangelogs(1);
6950 sub cmd_setup_useremail {
6951 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6952 local $isuite = 'DGIT-SETUP-TREE';
6956 sub cmd_setup_gitattributes {
6957 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6958 local $isuite = 'DGIT-SETUP-TREE';
6962 sub cmd_setup_new_tree {
6963 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6964 local $isuite = 'DGIT-SETUP-TREE';
6968 #---------- argument parsing and main program ----------
6971 print "dgit version $our_version\n" or confess $!;
6975 our (%valopts_long, %valopts_short);
6976 our (%funcopts_long);
6978 our (@modeopt_cfgs);
6980 sub defvalopt ($$$$) {
6981 my ($long,$short,$val_re,$how) = @_;
6982 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6983 $valopts_long{$long} = $oi;
6984 $valopts_short{$short} = $oi;
6985 # $how subref should:
6986 # do whatever assignemnt or thing it likes with $_[0]
6987 # if the option should not be passed on to remote, @rvalopts=()
6988 # or $how can be a scalar ref, meaning simply assign the value
6991 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6992 defvalopt '--distro', '-d', '.+', \$idistro;
6993 defvalopt '', '-k', '.+', \$keyid;
6994 defvalopt '--existing-package','', '.*', \$existing_package;
6995 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6996 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6997 defvalopt '--package', '-p', $package_re, \$package;
6998 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
7000 defvalopt '', '-C', '.+', sub {
7001 ($changesfile) = (@_);
7002 if ($changesfile =~ s#^(.*)/##) {
7003 $buildproductsdir = $1;
7007 defvalopt '--initiator-tempdir','','.*', sub {
7008 ($initiator_tempdir) = (@_);
7009 $initiator_tempdir =~ m#^/# or
7010 badusage "--initiator-tempdir must be used specify an".
7011 " absolute, not relative, directory."
7014 sub defoptmodes ($@) {
7015 my ($varref, $cfgkey, $default, %optmap) = @_;
7017 while (my ($opt,$val) = each %optmap) {
7018 $funcopts_long{$opt} = sub { $$varref = $val; };
7019 $permit{$val} = $val;
7021 push @modeopt_cfgs, {
7024 Default => $default,
7029 defoptmodes \$dodep14tag, qw( dep14tag want
7032 --always-dep14tag always );
7037 if (defined $ENV{'DGIT_SSH'}) {
7038 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
7039 } elsif (defined $ENV{'GIT_SSH'}) {
7040 @ssh = ($ENV{'GIT_SSH'});
7048 if (!defined $val) {
7049 badusage "$what needs a value" unless @ARGV;
7051 push @rvalopts, $val;
7053 badusage "bad value \`$val' for $what" unless
7054 $val =~ m/^$oi->{Re}$(?!\n)/s;
7055 my $how = $oi->{How};
7056 if (ref($how) eq 'SCALAR') {
7061 push @ropts, @rvalopts;
7065 last unless $ARGV[0] =~ m/^-/;
7069 if (m/^--dry-run$/) {
7072 } elsif (m/^--damp-run$/) {
7075 } elsif (m/^--no-sign$/) {
7078 } elsif (m/^--help$/) {
7080 } elsif (m/^--version$/) {
7082 } elsif (m/^--new$/) {
7085 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
7086 ($om = $opts_opt_map{$1}) &&
7090 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
7091 !$opts_opt_cmdonly{$1} &&
7092 ($om = $opts_opt_map{$1})) {
7095 } elsif (m/^--(gbp|dpm)$/s) {
7096 push @ropts, "--quilt=$1";
7098 } elsif (m/^--(?:ignore|include)-dirty$/s) {
7101 } elsif (m/^--no-quilt-fixup$/s) {
7103 $quilt_mode = 'nocheck';
7104 } elsif (m/^--no-rm-on-error$/s) {
7107 } elsif (m/^--no-chase-dsc-distro$/s) {
7109 $chase_dsc_distro = 0;
7110 } elsif (m/^--overwrite$/s) {
7112 $overwrite_version = '';
7113 } elsif (m/^--overwrite=(.+)$/s) {
7115 $overwrite_version = $1;
7116 } elsif (m/^--delayed=(\d+)$/s) {
7119 } elsif (my ($k,$v) =
7120 m/^--save-(dgit-view)=(.+)$/s ||
7121 m/^--(dgit-view)-save=(.+)$/s
7124 $v =~ s#^(?!refs/)#refs/heads/#;
7125 $internal_object_save{$k} = $v;
7126 } elsif (m/^--(no-)?rm-old-changes$/s) {
7129 } elsif (m/^--deliberately-($deliberately_re)$/s) {
7131 push @deliberatelies, $&;
7132 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
7136 } elsif (m/^--force-/) {
7138 "$us: warning: ignoring unknown force option $_\n";
7140 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
7141 # undocumented, for testing
7143 $tagformat_want = [ $1, 'command line', 1 ];
7144 # 1 menas overrides distro configuration
7145 } elsif (m/^--config-lookup-explode=(.+)$/s) {
7146 # undocumented, for testing
7148 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
7149 # ^ it's supposed to be an array ref
7150 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
7151 $val = $2 ? $' : undef; #';
7152 $valopt->($oi->{Long});
7153 } elsif ($funcopts_long{$_}) {
7155 $funcopts_long{$_}();
7157 badusage "unknown long option \`$_'";
7164 } elsif (s/^-L/-/) {
7167 } elsif (s/^-h/-/) {
7169 } elsif (s/^-D/-/) {
7173 } elsif (s/^-N/-/) {
7178 push @changesopts, $_;
7180 } elsif (s/^-wn$//s) {
7182 $cleanmode = 'none';
7183 } elsif (s/^-wg$//s) {
7186 } elsif (s/^-wgf$//s) {
7188 $cleanmode = 'git-ff';
7189 } elsif (s/^-wd$//s) {
7191 $cleanmode = 'dpkg-source';
7192 } elsif (s/^-wdd$//s) {
7194 $cleanmode = 'dpkg-source-d';
7195 } elsif (s/^-wc$//s) {
7197 $cleanmode = 'check';
7198 } elsif (s/^-c([^=]*)\=(.*)$//s) {
7199 push @git, '-c', $&;
7200 $gitcfgs{cmdline}{$1} = [ $2 ];
7201 } elsif (s/^-c([^=]+)$//s) {
7202 push @git, '-c', $&;
7203 $gitcfgs{cmdline}{$1} = [ 'true' ];
7204 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
7206 $val = undef unless length $val;
7207 $valopt->($oi->{Short});
7210 badusage "unknown short option \`$_'";
7217 sub check_env_sanity () {
7218 my $blocked = new POSIX::SigSet;
7219 sigprocmask SIG_UNBLOCK, $blocked, $blocked or confess $!;
7222 foreach my $name (qw(PIPE CHLD)) {
7223 my $signame = "SIG$name";
7224 my $signum = eval "POSIX::$signame" // die;
7225 die "$signame is set to something other than SIG_DFL\n"
7226 if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT';
7227 $blocked->ismember($signum) and
7228 die "$signame is blocked\n";
7234 On entry to dgit, $@
7235 This is a bug produced by something in in your execution environment.
7241 sub parseopts_late_defaults () {
7242 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
7243 if defined $idistro;
7244 $isuite //= cfg('dgit.default.default-suite');
7246 foreach my $k (keys %opts_opt_map) {
7247 my $om = $opts_opt_map{$k};
7249 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
7251 badcfg "cannot set command for $k"
7252 unless length $om->[0];
7256 foreach my $c (access_cfg_cfgs("opts-$k")) {
7258 map { $_ ? @$_ : () }
7259 map { $gitcfgs{$_}{$c} }
7260 reverse @gitcfgsources;
7261 printdebug "CL $c ", (join " ", map { shellquote } @vl),
7262 "\n" if $debuglevel >= 4;
7264 badcfg "cannot configure options for $k"
7265 if $opts_opt_cmdonly{$k};
7266 my $insertpos = $opts_cfg_insertpos{$k};
7267 @$om = ( @$om[0..$insertpos-1],
7269 @$om[$insertpos..$#$om] );
7273 if (!defined $rmchanges) {
7274 local $access_forpush;
7275 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
7278 if (!defined $quilt_mode) {
7279 local $access_forpush;
7280 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
7281 // access_cfg('quilt-mode', 'RETURN-UNDEF')
7283 $quilt_mode =~ m/^($quilt_modes_re)$/
7284 or badcfg "unknown quilt-mode \`$quilt_mode'";
7288 foreach my $moc (@modeopt_cfgs) {
7289 local $access_forpush;
7290 my $vr = $moc->{Var};
7291 next if defined $$vr;
7292 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
7293 my $v = $moc->{Vals}{$$vr};
7294 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
7298 fail __ "dgit: --include-dirty is not supported in split view quilt mode"
7299 if $split_brain && $includedirty;
7301 if (!defined $cleanmode) {
7302 local $access_forpush;
7303 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
7304 $cleanmode //= 'dpkg-source';
7306 badcfg "unknown clean-mode \`$cleanmode'" unless
7307 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
7310 $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
7311 $buildproductsdir //= '..';
7312 $bpd_glob = $buildproductsdir;
7313 $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
7316 setlocale(LC_MESSAGES, "");
7319 if ($ENV{$fakeeditorenv}) {
7321 quilt_fixup_editor();
7327 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
7328 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
7329 if $dryrun_level == 1;
7331 print STDERR __ $helpmsg or confess $!;
7334 $cmd = $subcommand = shift @ARGV;
7337 my $pre_fn = ${*::}{"pre_$cmd"};
7338 $pre_fn->() if $pre_fn;
7340 record_maindir if $invoked_in_git_tree;
7343 my $fn = ${*::}{"cmd_$cmd"};
7344 $fn or badusage "unknown operation $cmd";