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 = qr{(?: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";
383 printdebug "branch_is_gdr $walk origin\n";
386 if ($get_patches->($walk) ne $tip_patches) {
387 # Our parent added, removed, or edited patches, and wasn't
388 # a gdr make-patches commit. gdr make-patches probably
389 # won't do that well, then.
390 # (gdr classification of parent: AddPatches or ?)
391 printdebug "branch_is_gdr $walk ?-patches NO\n";
394 if ($tip_patches eq '' and
395 !defined git_cat_file "$walk:debian") {
396 # (gdr classification of parent: BreakwaterStart
397 printdebug "branch_is_gdr $walk unmarked BreakwaterStart YES\n";
400 # (gdr classification: Upstream Packaging Mixed Changelog)
401 printdebug "branch_is_gdr $walk plain\n"
407 #---------- remote protocol support, common ----------
409 # remote push initiator/responder protocol:
410 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
411 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
412 # < dgit-remote-push-ready <actual-proto-vsn>
419 # > supplementary-message NBYTES # $protovsn >= 3
424 # > file parsed-changelog
425 # [indicates that output of dpkg-parsechangelog follows]
426 # > data-block NBYTES
427 # > [NBYTES bytes of data (no newline)]
428 # [maybe some more blocks]
437 # > param head DGIT-VIEW-HEAD
438 # > param csuite SUITE
439 # > param tagformat old|new
440 # > param maint-view MAINT-VIEW-HEAD
442 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
443 # > file buildinfo # for buildinfos to sign
445 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
446 # # goes into tag, for replay prevention
449 # [indicates that signed tag is wanted]
450 # < data-block NBYTES
451 # < [NBYTES bytes of data (no newline)]
452 # [maybe some more blocks]
456 # > want signed-dsc-changes
457 # < data-block NBYTES [transfer of signed dsc]
459 # < data-block NBYTES [transfer of signed changes]
461 # < data-block NBYTES [transfer of each signed buildinfo
462 # [etc] same number and order as "file buildinfo"]
470 sub i_child_report () {
471 # Sees if our child has died, and reap it if so. Returns a string
472 # describing how it died if it failed, or undef otherwise.
473 return undef unless $i_child_pid;
474 my $got = waitpid $i_child_pid, WNOHANG;
475 return undef if $got <= 0;
476 die unless $got == $i_child_pid;
477 $i_child_pid = undef;
478 return undef unless $?;
479 return f_ "build host child %s", waitstatusmsg();
484 fail f_ "connection lost: %s", $! if $fh->error;
485 fail f_ "protocol violation; %s not expected", $m;
488 sub badproto_badread ($$) {
490 fail f_ "connection lost: %s", $! if $!;
491 my $report = i_child_report();
492 fail $report if defined $report;
493 badproto $fh, f_ "eof (reading %s)", $wh;
496 sub protocol_expect (&$) {
497 my ($match, $fh) = @_;
500 defined && chomp or badproto_badread $fh, __ "protocol message";
508 badproto $fh, f_ "\`%s'", $_;
511 sub protocol_send_file ($$) {
512 my ($fh, $ourfn) = @_;
513 open PF, "<", $ourfn or die "$ourfn: $!";
516 my $got = read PF, $d, 65536;
517 die "$ourfn: $!" unless defined $got;
519 print $fh "data-block ".length($d)."\n" or confess $!;
520 print $fh $d or confess $!;
522 PF->error and die "$ourfn $!";
523 print $fh "data-end\n" or confess $!;
527 sub protocol_read_bytes ($$) {
528 my ($fh, $nbytes) = @_;
529 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, __ "bad byte count";
531 my $got = read $fh, $d, $nbytes;
532 $got==$nbytes or badproto_badread $fh, __ "data block";
536 sub protocol_receive_file ($$) {
537 my ($fh, $ourfn) = @_;
538 printdebug "() $ourfn\n";
539 open PF, ">", $ourfn or die "$ourfn: $!";
541 my ($y,$l) = protocol_expect {
542 m/^data-block (.*)$/ ? (1,$1) :
543 m/^data-end$/ ? (0,) :
547 my $d = protocol_read_bytes $fh, $l;
548 print PF $d or confess $!;
550 close PF or confess $!;
553 #---------- remote protocol support, responder ----------
555 sub responder_send_command ($) {
557 return unless $we_are_responder;
558 # called even without $we_are_responder
559 printdebug ">> $command\n";
560 print PO $command, "\n" or confess $!;
563 sub responder_send_file ($$) {
564 my ($keyword, $ourfn) = @_;
565 return unless $we_are_responder;
566 printdebug "]] $keyword $ourfn\n";
567 responder_send_command "file $keyword";
568 protocol_send_file \*PO, $ourfn;
571 sub responder_receive_files ($@) {
572 my ($keyword, @ourfns) = @_;
573 die unless $we_are_responder;
574 printdebug "[[ $keyword @ourfns\n";
575 responder_send_command "want $keyword";
576 foreach my $fn (@ourfns) {
577 protocol_receive_file \*PI, $fn;
580 protocol_expect { m/^files-end$/ } \*PI;
583 #---------- remote protocol support, initiator ----------
585 sub initiator_expect (&) {
587 protocol_expect { &$match } \*RO;
590 #---------- end remote code ----------
593 if ($we_are_responder) {
595 responder_send_command "progress ".length($m) or confess $!;
596 print PO $m or confess $!;
606 $ua = LWP::UserAgent->new();
610 progress "downloading $what...";
611 my $r = $ua->get(@_) or confess $!;
612 return undef if $r->code == 404;
613 $r->is_success or fail f_ "failed to fetch %s: %s",
614 $what, $r->status_line;
615 return $r->decoded_content(charset => 'none');
618 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
620 sub act_local () { return $dryrun_level <= 1; }
621 sub act_scary () { return !$dryrun_level; }
624 if (!$dryrun_level) {
625 progress f_ "%s ok: %s", $us, "@_";
627 progress f_ "would be ok: %s (but dry run only)", "@_";
632 printcmd(\*STDERR,$debugprefix."#",@_);
635 sub runcmd_ordryrun {
643 sub runcmd_ordryrun_local {
651 our $helpmsg = i_ <<END;
653 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
654 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
655 dgit [dgit-opts] build [dpkg-buildpackage-opts]
656 dgit [dgit-opts] sbuild [sbuild-opts]
657 dgit [dgit-opts] pbuilder|cowbuilder [debbuildopts]
658 dgit [dgit-opts] push [dgit-opts] [suite]
659 dgit [dgit-opts] push-source [dgit-opts] [suite]
660 dgit [dgit-opts] rpush build-host:build-dir ...
661 important dgit options:
662 -k<keyid> sign tag and package with <keyid> instead of default
663 --dry-run -n do not change anything, but go through the motions
664 --damp-run -L like --dry-run but make local changes, without signing
665 --new -N allow introducing a new package
666 --debug -D increase debug level
667 -c<name>=<value> set git config option (used directly by dgit too)
670 our $later_warning_msg = i_ <<END;
671 Perhaps the upload is stuck in incoming. Using the version from git.
675 print STDERR f_ "%s: %s\n%s", $us, "@_", __ $helpmsg or confess $!;
680 @ARGV or badusage __ "too few arguments";
681 return scalar shift @ARGV;
685 not_necessarily_a_tree();
688 print __ $helpmsg or confess $!;
692 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
694 our %defcfg = ('dgit.default.distro' => 'debian',
695 'dgit.default.default-suite' => 'unstable',
696 'dgit.default.old-dsc-distro' => 'debian',
697 'dgit-suite.*-security.distro' => 'debian-security',
698 'dgit.default.username' => '',
699 'dgit.default.archive-query-default-component' => 'main',
700 'dgit.default.ssh' => 'ssh',
701 'dgit.default.archive-query' => 'madison:',
702 'dgit.default.sshpsql-dbname' => 'service=projectb',
703 'dgit.default.aptget-components' => 'main',
704 'dgit.default.dgit-tag-format' => 'new,old,maint',
705 'dgit.default.source-only-uploads' => 'ok',
706 'dgit.dsc-url-proto-ok.http' => 'true',
707 'dgit.dsc-url-proto-ok.https' => 'true',
708 'dgit.dsc-url-proto-ok.git' => 'true',
709 'dgit.vcs-git.suites', => 'sid', # ;-separated
710 'dgit.default.dsc-url-proto-ok' => 'false',
711 # old means "repo server accepts pushes with old dgit tags"
712 # new means "repo server accepts pushes with new dgit tags"
713 # maint means "repo server accepts split brain pushes"
714 # hist means "repo server may have old pushes without new tag"
715 # ("hist" is implied by "old")
716 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
717 'dgit-distro.debian.git-check' => 'url',
718 'dgit-distro.debian.git-check-suffix' => '/info/refs',
719 'dgit-distro.debian.new-private-pushers' => 't',
720 'dgit-distro.debian.source-only-uploads' => 'not-wholly-new',
721 'dgit-distro.debian/push.git-url' => '',
722 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
723 'dgit-distro.debian/push.git-user-force' => 'dgit',
724 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
725 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
726 'dgit-distro.debian/push.git-create' => 'true',
727 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
728 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
729 # 'dgit-distro.debian.archive-query-tls-key',
730 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
731 # ^ this does not work because curl is broken nowadays
732 # Fixing #790093 properly will involve providing providing the key
733 # in some pacagke and maybe updating these paths.
735 # 'dgit-distro.debian.archive-query-tls-curl-args',
736 # '--ca-path=/etc/ssl/ca-debian',
737 # ^ this is a workaround but works (only) on DSA-administered machines
738 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
739 'dgit-distro.debian.git-url-suffix' => '',
740 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
741 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
742 'dgit-distro.debian-security.archive-query' => 'aptget:',
743 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
744 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
745 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
746 'dgit-distro.debian-security.nominal-distro' => 'debian',
747 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
748 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
749 'dgit-distro.ubuntu.git-check' => 'false',
750 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
751 'dgit-distro.test-dummy.ssh' => "$td/ssh",
752 'dgit-distro.test-dummy.username' => "alice",
753 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
754 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
755 'dgit-distro.test-dummy.git-url' => "$td/git",
756 'dgit-distro.test-dummy.git-host' => "git",
757 'dgit-distro.test-dummy.git-path' => "$td/git",
758 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
759 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
760 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
761 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
765 our @gitcfgsources = qw(cmdline local global system);
766 our $invoked_in_git_tree = 1;
768 sub git_slurp_config () {
769 # This algoritm is a bit subtle, but this is needed so that for
770 # options which we want to be single-valued, we allow the
771 # different config sources to override properly. See #835858.
772 foreach my $src (@gitcfgsources) {
773 next if $src eq 'cmdline';
774 # we do this ourselves since git doesn't handle it
776 $gitcfgs{$src} = git_slurp_config_src $src;
780 sub git_get_config ($) {
782 foreach my $src (@gitcfgsources) {
783 my $l = $gitcfgs{$src}{$c};
784 confess "internal error ($l $c)" if $l && !ref $l;
785 printdebug"C $c ".(defined $l ?
786 join " ", map { messagequote "'$_'" } @$l :
791 f_ "multiple values for %s (in %s git config)", $c, $src
793 $l->[0] =~ m/\n/ and badcfg f_
794 "value for config option %s (in %s git config) contains newline(s)!",
803 return undef if $c =~ /RETURN-UNDEF/;
804 printdebug "C? $c\n" if $debuglevel >= 5;
805 my $v = git_get_config($c);
806 return $v if defined $v;
807 my $dv = $defcfg{$c};
809 printdebug "CD $c $dv\n" if $debuglevel >= 4;
814 "need value for one of: %s\n".
815 "%s: distro or suite appears not to be (properly) supported",
819 sub not_necessarily_a_tree () {
820 # needs to be called from pre_*
821 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
822 $invoked_in_git_tree = 0;
825 sub access_basedistro__noalias () {
826 if (defined $idistro) {
829 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
830 return $def if defined $def;
831 foreach my $src (@gitcfgsources, 'internal') {
832 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
834 foreach my $k (keys %$kl) {
835 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
837 next unless match_glob $dpat, $isuite;
841 return cfg("dgit.default.distro");
845 sub access_basedistro () {
846 my $noalias = access_basedistro__noalias();
847 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
848 return $canon // $noalias;
851 sub access_nomdistro () {
852 my $base = access_basedistro();
853 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
854 $r =~ m/^$distro_re$/ or badcfg
855 f_ "bad syntax for (nominal) distro \`%s' (does not match %s)",
856 $r, "/^$distro_re$/";
860 sub access_quirk () {
861 # returns (quirk name, distro to use instead or undef, quirk-specific info)
862 my $basedistro = access_basedistro();
863 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
865 if (defined $backports_quirk) {
866 my $re = $backports_quirk;
867 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
869 $re =~ s/\%/([-0-9a-z_]+)/
870 or $re =~ m/[()]/ or badcfg __ "backports-quirk needs \% or ( )";
871 if ($isuite =~ m/^$re$/) {
872 return ('backports',"$basedistro-backports",$1);
875 return ('none',undef);
880 sub parse_cfg_bool ($$$) {
881 my ($what,$def,$v) = @_;
884 $v =~ m/^[ty1]/ ? 1 :
885 $v =~ m/^[fn0]/ ? 0 :
886 badcfg f_ "%s needs t (true, y, 1) or f (false, n, 0) not \`%s'",
890 sub access_forpush_config () {
891 my $d = access_basedistro();
895 parse_cfg_bool('new-private-pushers', 0,
896 cfg("dgit-distro.$d.new-private-pushers",
899 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
902 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
903 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
904 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
906 "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
909 sub access_forpush () {
910 $access_forpush //= access_forpush_config();
911 return $access_forpush;
915 confess +(__ 'internal error').' '.Dumper($access_forpush)," ?" if
916 defined $access_forpush and !$access_forpush;
917 badcfg __ "pushing but distro is configured readonly"
918 if access_forpush_config() eq '0';
920 $supplementary_message = __ <<'END' unless $we_are_responder;
921 Push failed, before we got started.
922 You can retry the push, after fixing the problem, if you like.
924 parseopts_late_defaults();
928 parseopts_late_defaults();
931 sub supplementary_message ($) {
933 if (!$we_are_responder) {
934 $supplementary_message = $msg;
936 } elsif ($protovsn >= 3) {
937 responder_send_command "supplementary-message ".length($msg)
939 print PO $msg or confess $!;
943 sub access_distros () {
944 # Returns list of distros to try, in order
947 # 0. `instead of' distro name(s) we have been pointed to
948 # 1. the access_quirk distro, if any
949 # 2a. the user's specified distro, or failing that } basedistro
950 # 2b. the distro calculated from the suite }
951 my @l = access_basedistro();
953 my (undef,$quirkdistro) = access_quirk();
954 unshift @l, $quirkdistro;
955 unshift @l, $instead_distro;
956 @l = grep { defined } @l;
958 push @l, access_nomdistro();
960 if (access_forpush()) {
961 @l = map { ("$_/push", $_) } @l;
966 sub access_cfg_cfgs (@) {
969 # The nesting of these loops determines the search order. We put
970 # the key loop on the outside so that we search all the distros
971 # for each key, before going on to the next key. That means that
972 # if access_cfg is called with a more specific, and then a less
973 # specific, key, an earlier distro can override the less specific
974 # without necessarily overriding any more specific keys. (If the
975 # distro wants to override the more specific keys it can simply do
976 # so; whereas if we did the loop the other way around, it would be
977 # impossible to for an earlier distro to override a less specific
978 # key but not the more specific ones without restating the unknown
979 # values of the more specific keys.
982 # We have to deal with RETURN-UNDEF specially, so that we don't
983 # terminate the search prematurely.
985 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
988 foreach my $d (access_distros()) {
989 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
991 push @cfgs, map { "dgit.default.$_" } @realkeys;
998 my (@cfgs) = access_cfg_cfgs(@keys);
999 my $value = cfg(@cfgs);
1003 sub access_cfg_bool ($$) {
1004 my ($def, @keys) = @_;
1005 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
1008 sub string_to_ssh ($) {
1010 if ($spec =~ m/\s/) {
1011 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
1017 sub access_cfg_ssh () {
1018 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
1019 if (!defined $gitssh) {
1022 return string_to_ssh $gitssh;
1026 sub access_runeinfo ($) {
1028 return ": dgit ".access_basedistro()." $info ;";
1031 sub access_someuserhost ($) {
1033 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
1034 defined($user) && length($user) or
1035 $user = access_cfg("$some-user",'username');
1036 my $host = access_cfg("$some-host");
1037 return length($user) ? "$user\@$host" : $host;
1040 sub access_gituserhost () {
1041 return access_someuserhost('git');
1044 sub access_giturl (;$) {
1045 my ($optional) = @_;
1046 my $url = access_cfg('git-url','RETURN-UNDEF');
1049 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
1050 return undef unless defined $proto;
1053 access_gituserhost().
1054 access_cfg('git-path');
1056 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
1059 return "$url/$package$suffix";
1062 sub commit_getclogp ($) {
1063 # Returns the parsed changelog hashref for a particular commit
1065 our %commit_getclogp_memo;
1066 my $memo = $commit_getclogp_memo{$objid};
1067 return $memo if $memo;
1069 my $mclog = dgit_privdir()."clog";
1070 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1071 "$objid:debian/changelog";
1072 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1075 sub parse_dscdata () {
1076 my $dscfh = new IO::File \$dscdata, '<' or confess $!;
1077 printdebug Dumper($dscdata) if $debuglevel>1;
1078 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1079 printdebug Dumper($dsc) if $debuglevel>1;
1084 sub archive_query ($;@) {
1085 my ($method) = shift @_;
1086 fail __ "this operation does not support multiple comma-separated suites"
1088 my $query = access_cfg('archive-query','RETURN-UNDEF');
1089 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1092 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1095 sub archive_query_prepend_mirror {
1096 my $m = access_cfg('mirror');
1097 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1100 sub pool_dsc_subpath ($$) {
1101 my ($vsn,$component) = @_; # $package is implict arg
1102 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1103 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1106 sub cfg_apply_map ($$$) {
1107 my ($varref, $what, $mapspec) = @_;
1108 return unless $mapspec;
1110 printdebug "config $what EVAL{ $mapspec; }\n";
1112 eval "package Dgit::Config; $mapspec;";
1117 #---------- `ftpmasterapi' archive query method (nascent) ----------
1119 sub archive_api_query_cmd ($) {
1121 my @cmd = (@curl, qw(-sS));
1122 my $url = access_cfg('archive-query-url');
1123 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1125 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1126 foreach my $key (split /\:/, $keys) {
1127 $key =~ s/\%HOST\%/$host/g;
1129 fail "for $url: stat $key: $!" unless $!==ENOENT;
1132 fail f_ "config requested specific TLS key but do not know".
1133 " how to get curl to use exactly that EE key (%s)",
1135 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1136 # # Sadly the above line does not work because of changes
1137 # # to gnutls. The real fix for #790093 may involve
1138 # # new curl options.
1141 # Fixing #790093 properly will involve providing a value
1142 # for this on clients.
1143 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1144 push @cmd, split / /, $kargs if defined $kargs;
1146 push @cmd, $url.$subpath;
1150 sub api_query ($$;$) {
1152 my ($data, $subpath, $ok404) = @_;
1153 badcfg __ "ftpmasterapi archive query method takes no data part"
1155 my @cmd = archive_api_query_cmd($subpath);
1156 my $url = $cmd[$#cmd];
1157 push @cmd, qw(-w %{http_code});
1158 my $json = cmdoutput @cmd;
1159 unless ($json =~ s/\d+\d+\d$//) {
1160 failedcmd_report_cmd undef, @cmd;
1161 fail __ "curl failed to print 3-digit HTTP code";
1164 return undef if $code eq '404' && $ok404;
1165 fail f_ "fetch of %s gave HTTP code %s", $url, $code
1166 unless $url =~ m#^file://# or $code =~ m/^2/;
1167 return decode_json($json);
1170 sub canonicalise_suite_ftpmasterapi {
1171 my ($proto,$data) = @_;
1172 my $suites = api_query($data, 'suites');
1174 foreach my $entry (@$suites) {
1176 my $v = $entry->{$_};
1177 defined $v && $v eq $isuite;
1178 } qw(codename name);
1179 push @matched, $entry;
1181 fail f_ "unknown suite %s, maybe -d would help", $isuite
1185 @matched==1 or die f_ "multiple matches for suite %s\n", $isuite;
1186 $cn = "$matched[0]{codename}";
1187 defined $cn or die f_ "suite %s info has no codename\n", $isuite;
1188 $cn =~ m/^$suite_re$/
1189 or die f_ "suite %s maps to bad codename\n", $isuite;
1191 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper(\@matched)
1196 sub archive_query_ftpmasterapi {
1197 my ($proto,$data) = @_;
1198 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1200 my $digester = Digest::SHA->new(256);
1201 foreach my $entry (@$info) {
1203 my $vsn = "$entry->{version}";
1204 my ($ok,$msg) = version_check $vsn;
1205 die f_ "bad version: %s\n", $msg unless $ok;
1206 my $component = "$entry->{component}";
1207 $component =~ m/^$component_re$/ or die __ "bad component";
1208 my $filename = "$entry->{filename}";
1209 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1210 or die __ "bad filename";
1211 my $sha256sum = "$entry->{sha256sum}";
1212 $sha256sum =~ m/^[0-9a-f]+$/ or die __ "bad sha256sum";
1213 push @rows, [ $vsn, "/pool/$component/$filename",
1214 $digester, $sha256sum ];
1216 die +(__ "bad ftpmaster api response: ")."$@\n".Dumper($entry)
1219 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1220 return archive_query_prepend_mirror @rows;
1223 sub file_in_archive_ftpmasterapi {
1224 my ($proto,$data,$filename) = @_;
1225 my $pat = $filename;
1228 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1229 my $info = api_query($data, "file_in_archive/$pat", 1);
1232 sub package_not_wholly_new_ftpmasterapi {
1233 my ($proto,$data,$pkg) = @_;
1234 my $info = api_query($data,"madison?package=${pkg}&f=json");
1238 #---------- `aptget' archive query method ----------
1241 our $aptget_releasefile;
1242 our $aptget_configpath;
1244 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1245 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1247 sub aptget_cache_clean {
1248 runcmd_ordryrun_local qw(sh -ec),
1249 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1253 sub aptget_lock_acquire () {
1254 my $lockfile = "$aptget_base/lock";
1255 open APTGET_LOCK, '>', $lockfile or confess "open $lockfile: $!";
1256 flock APTGET_LOCK, LOCK_EX or confess "lock $lockfile: $!";
1259 sub aptget_prep ($) {
1261 return if defined $aptget_base;
1263 badcfg __ "aptget archive query method takes no data part"
1266 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1269 ensuredir "$cache/dgit";
1271 access_cfg('aptget-cachekey','RETURN-UNDEF')
1272 // access_nomdistro();
1274 $aptget_base = "$cache/dgit/aptget";
1275 ensuredir $aptget_base;
1277 my $quoted_base = $aptget_base;
1278 confess "$quoted_base contains bad chars, cannot continue"
1279 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1281 ensuredir $aptget_base;
1283 aptget_lock_acquire();
1285 aptget_cache_clean();
1287 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1288 my $sourceslist = "source.list#$cachekey";
1290 my $aptsuites = $isuite;
1291 cfg_apply_map(\$aptsuites, 'suite map',
1292 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1294 open SRCS, ">", "$aptget_base/$sourceslist" or confess $!;
1295 printf SRCS "deb-src %s %s %s\n",
1296 access_cfg('mirror'),
1298 access_cfg('aptget-components')
1301 ensuredir "$aptget_base/cache";
1302 ensuredir "$aptget_base/lists";
1304 open CONF, ">", $aptget_configpath or confess $!;
1306 Debug::NoLocking "true";
1307 APT::Get::List-Cleanup "false";
1308 #clear APT::Update::Post-Invoke-Success;
1309 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1310 Dir::State::Lists "$quoted_base/lists";
1311 Dir::Etc::preferences "$quoted_base/preferences";
1312 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1313 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1316 foreach my $key (qw(
1319 Dir::Cache::Archives
1320 Dir::Etc::SourceParts
1321 Dir::Etc::preferencesparts
1323 ensuredir "$aptget_base/$key";
1324 print CONF "$key \"$quoted_base/$key\";\n" or confess $!;
1327 my $oldatime = (time // confess $!) - 1;
1328 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1329 next unless stat_exists $oldlist;
1330 my ($mtime) = (stat _)[9];
1331 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1334 runcmd_ordryrun_local aptget_aptget(), qw(update);
1337 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1338 next unless stat_exists $oldlist;
1339 my ($atime) = (stat _)[8];
1340 next if $atime == $oldatime;
1341 push @releasefiles, $oldlist;
1343 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1344 @releasefiles = @inreleasefiles if @inreleasefiles;
1345 if (!@releasefiles) {
1346 fail f_ <<END, $isuite, $cache;
1347 apt seemed to not to update dgit's cached Release files for %s.
1349 is on a filesystem mounted `noatime'; if so, please use `relatime'.)
1352 confess "apt updated too many Release files (@releasefiles), erk"
1353 unless @releasefiles == 1;
1355 ($aptget_releasefile) = @releasefiles;
1358 sub canonicalise_suite_aptget {
1359 my ($proto,$data) = @_;
1362 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1364 foreach my $name (qw(Codename Suite)) {
1365 my $val = $release->{$name};
1367 printdebug "release file $name: $val\n";
1368 $val =~ m/^$suite_re$/o or fail f_
1369 "Release file (%s) specifies intolerable %s",
1370 $aptget_releasefile, $name;
1371 cfg_apply_map(\$val, 'suite rmap',
1372 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1379 sub archive_query_aptget {
1380 my ($proto,$data) = @_;
1383 ensuredir "$aptget_base/source";
1384 foreach my $old (<$aptget_base/source/*.dsc>) {
1385 unlink $old or die "$old: $!";
1388 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1389 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1390 # avoids apt-get source failing with ambiguous error code
1392 runcmd_ordryrun_local
1393 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1394 aptget_aptget(), qw(--download-only --only-source source), $package;
1396 my @dscs = <$aptget_base/source/*.dsc>;
1397 fail __ "apt-get source did not produce a .dsc" unless @dscs;
1398 fail f_ "apt-get source produced several .dscs (%s)", "@dscs"
1401 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1404 my $uri = "file://". uri_escape $dscs[0];
1405 $uri =~ s{\%2f}{/}gi;
1406 return [ (getfield $pre_dsc, 'Version'), $uri ];
1409 sub file_in_archive_aptget () { return undef; }
1410 sub package_not_wholly_new_aptget () { return undef; }
1412 #---------- `dummyapicat' archive query method ----------
1413 # (untranslated, because this is for testing purposes etc.)
1415 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1416 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1418 sub dummycatapi_run_in_mirror ($@) {
1419 # runs $fn with FIA open onto rune
1420 my ($rune, $argl, $fn) = @_;
1422 my $mirror = access_cfg('mirror');
1423 $mirror =~ s#^file://#/# or die "$mirror ?";
1424 my @cmd = (qw(sh -ec), 'cd "$1"; shift'."\n".$rune,
1425 qw(x), $mirror, @$argl);
1426 debugcmd "-|", @cmd;
1427 open FIA, "-|", @cmd or confess $!;
1429 close FIA or ($!==0 && $?==141) or die failedcmd @cmd;
1433 sub file_in_archive_dummycatapi ($$$) {
1434 my ($proto,$data,$filename) = @_;
1436 dummycatapi_run_in_mirror '
1437 find -name "$1" -print0 |
1439 ', [$filename], sub {
1442 printdebug "| $_\n";
1443 m/^(\w+) (\S+)$/ or die "$_ ?";
1444 push @out, { sha256sum => $1, filename => $2 };
1450 sub package_not_wholly_new_dummycatapi {
1451 my ($proto,$data,$pkg) = @_;
1452 dummycatapi_run_in_mirror "
1453 find -name ${pkg}_*.dsc
1460 #---------- `madison' archive query method ----------
1462 sub archive_query_madison {
1463 return archive_query_prepend_mirror
1464 map { [ @$_[0..1] ] } madison_get_parse(@_);
1467 sub madison_get_parse {
1468 my ($proto,$data) = @_;
1469 die unless $proto eq 'madison';
1470 if (!length $data) {
1471 $data= access_cfg('madison-distro','RETURN-UNDEF');
1472 $data //= access_basedistro();
1474 $rmad{$proto,$data,$package} ||= cmdoutput
1475 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1476 my $rmad = $rmad{$proto,$data,$package};
1479 foreach my $l (split /\n/, $rmad) {
1480 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1481 \s*( [^ \t|]+ )\s* \|
1482 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1483 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1484 $1 eq $package or die "$rmad $package ?";
1491 $component = access_cfg('archive-query-default-component');
1493 $5 eq 'source' or die "$rmad ?";
1494 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1496 return sort { -version_compare($a->[0],$b->[0]); } @out;
1499 sub canonicalise_suite_madison {
1500 # madison canonicalises for us
1501 my @r = madison_get_parse(@_);
1503 "unable to canonicalise suite using package %s".
1504 " which does not appear to exist in suite %s;".
1505 " --existing-package may help",
1510 sub file_in_archive_madison { return undef; }
1511 sub package_not_wholly_new_madison { return undef; }
1513 #---------- `sshpsql' archive query method ----------
1514 # (untranslated, because this is obsolete)
1517 my ($data,$runeinfo,$sql) = @_;
1518 if (!length $data) {
1519 $data= access_someuserhost('sshpsql').':'.
1520 access_cfg('sshpsql-dbname');
1522 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1523 my ($userhost,$dbname) = ($`,$'); #';
1525 my @cmd = (access_cfg_ssh, $userhost,
1526 access_runeinfo("ssh-psql $runeinfo").
1527 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1528 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1530 open P, "-|", @cmd or confess $!;
1533 printdebug(">|$_|\n");
1536 $!=0; $?=0; close P or failedcmd @cmd;
1538 my $nrows = pop @rows;
1539 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1540 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1541 @rows = map { [ split /\|/, $_ ] } @rows;
1542 my $ncols = scalar @{ shift @rows };
1543 die if grep { scalar @$_ != $ncols } @rows;
1547 sub sql_injection_check {
1548 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1551 sub archive_query_sshpsql ($$) {
1552 my ($proto,$data) = @_;
1553 sql_injection_check $isuite, $package;
1554 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1555 SELECT source.version, component.name, files.filename, files.sha256sum
1557 JOIN src_associations ON source.id = src_associations.source
1558 JOIN suite ON suite.id = src_associations.suite
1559 JOIN dsc_files ON dsc_files.source = source.id
1560 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1561 JOIN component ON component.id = files_archive_map.component_id
1562 JOIN files ON files.id = dsc_files.file
1563 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1564 AND source.source='$package'
1565 AND files.filename LIKE '%.dsc';
1567 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1568 my $digester = Digest::SHA->new(256);
1570 my ($vsn,$component,$filename,$sha256sum) = @$_;
1571 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1573 return archive_query_prepend_mirror @rows;
1576 sub canonicalise_suite_sshpsql ($$) {
1577 my ($proto,$data) = @_;
1578 sql_injection_check $isuite;
1579 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1580 SELECT suite.codename
1581 FROM suite where suite_name='$isuite' or codename='$isuite';
1583 @rows = map { $_->[0] } @rows;
1584 fail "unknown suite $isuite" unless @rows;
1585 die "ambiguous $isuite: @rows ?" if @rows>1;
1589 sub file_in_archive_sshpsql ($$$) { return undef; }
1590 sub package_not_wholly_new_sshpsql ($$$) { return undef; }
1592 #---------- `dummycat' archive query method ----------
1593 # (untranslated, because this is for testing purposes etc.)
1595 sub canonicalise_suite_dummycat ($$) {
1596 my ($proto,$data) = @_;
1597 my $dpath = "$data/suite.$isuite";
1598 if (!open C, "<", $dpath) {
1599 $!==ENOENT or die "$dpath: $!";
1600 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1604 chomp or die "$dpath: $!";
1606 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1610 sub archive_query_dummycat ($$) {
1611 my ($proto,$data) = @_;
1612 canonicalise_suite();
1613 my $dpath = "$data/package.$csuite.$package";
1614 if (!open C, "<", $dpath) {
1615 $!==ENOENT or die "$dpath: $!";
1616 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1624 printdebug "dummycat query $csuite $package $dpath | $_\n";
1625 my @row = split /\s+/, $_;
1626 @row==2 or die "$dpath: $_ ?";
1629 C->error and die "$dpath: $!";
1631 return archive_query_prepend_mirror
1632 sort { -version_compare($a->[0],$b->[0]); } @rows;
1635 sub file_in_archive_dummycat () { return undef; }
1636 sub package_not_wholly_new_dummycat () { return undef; }
1638 #---------- tag format handling ----------
1639 # (untranslated, because everything should be new tag format by now)
1641 sub access_cfg_tagformats () {
1642 split /\,/, access_cfg('dgit-tag-format');
1645 sub access_cfg_tagformats_can_splitbrain () {
1646 my %y = map { $_ => 1 } access_cfg_tagformats;
1647 foreach my $needtf (qw(new maint)) {
1648 next if $y{$needtf};
1654 sub need_tagformat ($$) {
1655 my ($fmt, $why) = @_;
1656 fail "need to use tag format $fmt ($why) but also need".
1657 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1658 " - no way to proceed"
1659 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1660 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1663 sub select_tagformat () {
1665 return if $tagformatfn && !$tagformat_want;
1666 die 'bug' if $tagformatfn && $tagformat_want;
1667 # ... $tagformat_want assigned after previous select_tagformat
1669 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1670 printdebug "select_tagformat supported @supported\n";
1672 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1673 printdebug "select_tagformat specified @$tagformat_want\n";
1675 my ($fmt,$why,$override) = @$tagformat_want;
1677 fail "target distro supports tag formats @supported".
1678 " but have to use $fmt ($why)"
1680 or grep { $_ eq $fmt } @supported;
1682 $tagformat_want = undef;
1684 $tagformatfn = ${*::}{"debiantag_$fmt"};
1686 fail "trying to use unknown tag format \`$fmt' ($why) !"
1687 unless $tagformatfn;
1690 #---------- archive query entrypoints and rest of program ----------
1692 sub canonicalise_suite () {
1693 return if defined $csuite;
1694 fail f_ "cannot operate on %s suite", $isuite if $isuite eq 'UNRELEASED';
1695 $csuite = archive_query('canonicalise_suite');
1696 if ($isuite ne $csuite) {
1697 progress f_ "canonical suite name for %s is %s", $isuite, $csuite;
1699 progress f_ "canonical suite name is %s", $csuite;
1703 sub get_archive_dsc () {
1704 canonicalise_suite();
1705 my @vsns = archive_query('archive_query');
1706 foreach my $vinfo (@vsns) {
1707 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1708 $dscurl = $vsn_dscurl;
1709 $dscdata = url_get($dscurl);
1711 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1716 $digester->add($dscdata);
1717 my $got = $digester->hexdigest();
1719 fail f_ "%s has hash %s but archive told us to expect %s",
1720 $dscurl, $got, $digest;
1723 my $fmt = getfield $dsc, 'Format';
1724 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1725 f_ "unsupported source format %s, sorry", $fmt;
1727 $dsc_checked = !!$digester;
1728 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1732 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1735 sub check_for_git ();
1736 sub check_for_git () {
1738 my $how = access_cfg('git-check');
1739 if ($how eq 'ssh-cmd') {
1741 (access_cfg_ssh, access_gituserhost(),
1742 access_runeinfo("git-check $package").
1743 " set -e; cd ".access_cfg('git-path').";".
1744 " if test -d $package.git; then echo 1; else echo 0; fi");
1745 my $r= cmdoutput @cmd;
1746 if (defined $r and $r =~ m/^divert (\w+)$/) {
1748 my ($usedistro,) = access_distros();
1749 # NB that if we are pushing, $usedistro will be $distro/push
1750 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1751 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1752 progress f_ "diverting to %s (using config for %s)",
1753 $divert, $instead_distro;
1754 return check_for_git();
1756 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1758 } elsif ($how eq 'url') {
1759 my $prefix = access_cfg('git-check-url','git-url');
1760 my $suffix = access_cfg('git-check-suffix','git-suffix',
1761 'RETURN-UNDEF') // '.git';
1762 my $url = "$prefix/$package$suffix";
1763 my @cmd = (@curl, qw(-sS -I), $url);
1764 my $result = cmdoutput @cmd;
1765 $result =~ s/^\S+ 200 .*\n\r?\n//;
1766 # curl -sS -I with https_proxy prints
1767 # HTTP/1.0 200 Connection established
1768 $result =~ m/^\S+ (404|200) /s or
1769 fail +(__ "unexpected results from git check query - ").
1770 Dumper($prefix, $result);
1772 if ($code eq '404') {
1774 } elsif ($code eq '200') {
1779 } elsif ($how eq 'true') {
1781 } elsif ($how eq 'false') {
1784 badcfg f_ "unknown git-check \`%s'", $how;
1788 sub create_remote_git_repo () {
1789 my $how = access_cfg('git-create');
1790 if ($how eq 'ssh-cmd') {
1792 (access_cfg_ssh, access_gituserhost(),
1793 access_runeinfo("git-create $package").
1794 "set -e; cd ".access_cfg('git-path').";".
1795 " cp -a _template $package.git");
1796 } elsif ($how eq 'true') {
1799 badcfg f_ "unknown git-create \`%s'", $how;
1803 our ($dsc_hash,$lastpush_mergeinput);
1804 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1808 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1809 $playground = fresh_playground 'dgit/unpack';
1812 sub mktree_in_ud_here () {
1813 playtree_setup $gitcfgs{local};
1816 sub git_write_tree () {
1817 my $tree = cmdoutput @git, qw(write-tree);
1818 $tree =~ m/^\w+$/ or die "$tree ?";
1822 sub git_add_write_tree () {
1823 runcmd @git, qw(add -Af .);
1824 return git_write_tree();
1827 sub remove_stray_gits ($) {
1829 my @gitscmd = qw(find -name .git -prune -print0);
1830 debugcmd "|",@gitscmd;
1831 open GITS, "-|", @gitscmd or confess $!;
1836 print STDERR f_ "%s: warning: removing from %s: %s\n",
1837 $us, $what, (messagequote $_);
1841 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1844 sub mktree_in_ud_from_only_subdir ($;$) {
1845 my ($what,$raw) = @_;
1846 # changes into the subdir
1849 confess "expected one subdir but found @dirs ?" unless @dirs==1;
1850 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1854 remove_stray_gits($what);
1855 mktree_in_ud_here();
1857 my ($format, $fopts) = get_source_format();
1858 if (madformat($format)) {
1863 my $tree=git_add_write_tree();
1864 return ($tree,$dir);
1867 our @files_csum_info_fields =
1868 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1869 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1870 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1872 sub dsc_files_info () {
1873 foreach my $csumi (@files_csum_info_fields) {
1874 my ($fname, $module, $method) = @$csumi;
1875 my $field = $dsc->{$fname};
1876 next unless defined $field;
1877 eval "use $module; 1;" or die $@;
1879 foreach (split /\n/, $field) {
1881 m/^(\w+) (\d+) (\S+)$/ or
1882 fail f_ "could not parse .dsc %s line \`%s'", $fname, $_;
1883 my $digester = eval "$module"."->$method;" or die $@;
1888 Digester => $digester,
1893 fail f_ "missing any supported Checksums-* or Files field in %s",
1894 $dsc->get_option('name');
1898 map { $_->{Filename} } dsc_files_info();
1901 sub files_compare_inputs (@) {
1906 my $showinputs = sub {
1907 return join "; ", map { $_->get_option('name') } @$inputs;
1910 foreach my $in (@$inputs) {
1912 my $in_name = $in->get_option('name');
1914 printdebug "files_compare_inputs $in_name\n";
1916 foreach my $csumi (@files_csum_info_fields) {
1917 my ($fname) = @$csumi;
1918 printdebug "files_compare_inputs $in_name $fname\n";
1920 my $field = $in->{$fname};
1921 next unless defined $field;
1924 foreach (split /\n/, $field) {
1927 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1928 fail "could not parse $in_name $fname line \`$_'";
1930 printdebug "files_compare_inputs $in_name $fname $f\n";
1934 my $re = \ $record{$f}{$fname};
1936 $fchecked{$f}{$in_name} = 1;
1939 "hash or size of %s varies in %s fields (between: %s)",
1940 $f, $fname, $showinputs->();
1945 @files = sort @files;
1946 $expected_files //= \@files;
1947 "@$expected_files" eq "@files" or
1948 fail f_ "file list in %s varies between hash fields!",
1952 fail f_ "%s has no files list field(s)", $in_name;
1954 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1957 grep { keys %$_ == @$inputs-1 } values %fchecked
1958 or fail f_ "no file appears in all file lists (looked in: %s)",
1962 sub is_orig_file_in_dsc ($$) {
1963 my ($f, $dsc_files_info) = @_;
1964 return 0 if @$dsc_files_info <= 1;
1965 # One file means no origs, and the filename doesn't have a "what
1966 # part of dsc" component. (Consider versions ending `.orig'.)
1967 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1971 # This function determines whether a .changes file is source-only from
1972 # the point of view of dak. Thus, it permits *_source.buildinfo
1975 # It does not, however, permit any other buildinfo files. After a
1976 # source-only upload, the buildds will try to upload files like
1977 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
1978 # named like this in their (otherwise) source-only upload, the uploads
1979 # of the buildd can be rejected by dak. Fixing the resultant
1980 # situation can require manual intervention. So we block such
1981 # .buildinfo files when the user tells us to perform a source-only
1982 # upload (such as when using the push-source subcommand with the -C
1983 # option, which calls this function).
1985 # Note, though, that when dgit is told to prepare a source-only
1986 # upload, such as when subcommands like build-source and push-source
1987 # without -C are used, dgit has a more restrictive notion of
1988 # source-only .changes than dak: such uploads will never include
1989 # *_source.buildinfo files. This is because there is no use for such
1990 # files when using a tool like dgit to produce the source package, as
1991 # dgit ensures the source is identical to git HEAD.
1992 sub test_source_only_changes ($) {
1994 foreach my $l (split /\n/, getfield $changes, 'Files') {
1995 $l =~ m/\S+$/ or next;
1996 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
1997 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
1998 print f_ "purportedly source-only changes polluted by %s\n", $&;
2005 sub changes_update_origs_from_dsc ($$$$) {
2006 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
2008 printdebug "checking origs needed ($upstreamvsn)...\n";
2009 $_ = getfield $changes, 'Files';
2010 m/^\w+ \d+ (\S+ \S+) \S+$/m or
2011 fail __ "cannot find section/priority from .changes Files field";
2012 my $placementinfo = $1;
2014 printdebug "checking origs needed placement '$placementinfo'...\n";
2015 foreach my $l (split /\n/, getfield $dsc, 'Files') {
2016 $l =~ m/\S+$/ or next;
2018 printdebug "origs $file | $l\n";
2019 next unless is_orig_file_of_vsn $file, $upstreamvsn;
2020 printdebug "origs $file is_orig\n";
2021 my $have = archive_query('file_in_archive', $file);
2022 if (!defined $have) {
2023 print STDERR __ <<END;
2024 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
2030 printdebug "origs $file \$#\$have=$#$have\n";
2031 foreach my $h (@$have) {
2034 foreach my $csumi (@files_csum_info_fields) {
2035 my ($fname, $module, $method, $archivefield) = @$csumi;
2036 next unless defined $h->{$archivefield};
2037 $_ = $dsc->{$fname};
2038 next unless defined;
2039 m/^(\w+) .* \Q$file\E$/m or
2040 fail f_ ".dsc %s missing entry for %s", $fname, $file;
2041 if ($h->{$archivefield} eq $1) {
2045 "%s: %s (archive) != %s (local .dsc)",
2046 $archivefield, $h->{$archivefield}, $1;
2049 confess "$file ".Dumper($h)." ?!" if $same && @differ;
2053 f_ "archive %s: %s", $h->{filename}, join "; ", @differ
2056 printdebug "origs $file f.same=$found_same".
2057 " #f._differ=$#found_differ\n";
2058 if (@found_differ && !$found_same) {
2060 (f_ "archive contains %s with different checksum", $file),
2063 # Now we edit the changes file to add or remove it
2064 foreach my $csumi (@files_csum_info_fields) {
2065 my ($fname, $module, $method, $archivefield) = @$csumi;
2066 next unless defined $changes->{$fname};
2068 # in archive, delete from .changes if it's there
2069 $changed{$file} = "removed" if
2070 $changes->{$fname} =~ s/\n.* \Q$file\E$(?:)$//m;
2071 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)$/m) {
2072 # not in archive, but it's here in the .changes
2074 my $dsc_data = getfield $dsc, $fname;
2075 $dsc_data =~ m/^(.* \Q$file\E$)$/m or die "$dsc_data $file ?";
2077 $extra =~ s/ \d+ /$&$placementinfo /
2078 or confess "$fname $extra >$dsc_data< ?"
2079 if $fname eq 'Files';
2080 $changes->{$fname} .= "\n". $extra;
2081 $changed{$file} = "added";
2086 foreach my $file (keys %changed) {
2088 "edited .changes for archive .orig contents: %s %s",
2089 $changed{$file}, $file;
2091 my $chtmp = "$changesfile.tmp";
2092 $changes->save($chtmp);
2094 rename $chtmp,$changesfile or die "$changesfile $!";
2096 progress f_ "[new .changes left in %s]", $changesfile;
2099 progress f_ "%s already has appropriate .orig(s) (if any)",
2104 sub make_commit ($) {
2106 return cmdoutput @git, qw(hash-object -w -t commit), $file;
2109 sub clogp_authline ($) {
2111 my $author = getfield $clogp, 'Maintainer';
2112 if ($author =~ m/^[^"\@]+\,/) {
2113 # single entry Maintainer field with unquoted comma
2114 $author = ($& =~ y/,//rd).$'; # strip the comma
2116 # git wants a single author; any remaining commas in $author
2117 # are by now preceded by @ (or "). It seems safer to punt on
2118 # "..." for now rather than attempting to dequote or something.
2119 $author =~ s#,.*##ms unless $author =~ m/"/;
2120 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2121 my $authline = "$author $date";
2122 $authline =~ m/$git_authline_re/o or
2123 fail f_ "unexpected commit author line format \`%s'".
2124 " (was generated from changelog Maintainer field)",
2126 return ($1,$2,$3) if wantarray;
2130 sub vendor_patches_distro ($$) {
2131 my ($checkdistro, $what) = @_;
2132 return unless defined $checkdistro;
2134 my $series = "debian/patches/\L$checkdistro\E.series";
2135 printdebug "checking for vendor-specific $series ($what)\n";
2137 if (!open SERIES, "<", $series) {
2138 confess "$series $!" unless $!==ENOENT;
2145 print STDERR __ <<END;
2147 Unfortunately, this source package uses a feature of dpkg-source where
2148 the same source package unpacks to different source code on different
2149 distros. dgit cannot safely operate on such packages on affected
2150 distros, because the meaning of source packages is not stable.
2152 Please ask the distro/maintainer to remove the distro-specific series
2153 files and use a different technique (if necessary, uploading actually
2154 different packages, if different distros are supposed to have
2158 fail f_ "Found active distro-specific series file for".
2159 " %s (%s): %s, cannot continue",
2160 $checkdistro, $what, $series;
2162 die "$series $!" if SERIES->error;
2166 sub check_for_vendor_patches () {
2167 # This dpkg-source feature doesn't seem to be documented anywhere!
2168 # But it can be found in the changelog (reformatted):
2170 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2171 # Author: Raphael Hertzog <hertzog@debian.org>
2172 # Date: Sun Oct 3 09:36:48 2010 +0200
2174 # dpkg-source: correctly create .pc/.quilt_series with alternate
2177 # If you have debian/patches/ubuntu.series and you were
2178 # unpacking the source package on ubuntu, quilt was still
2179 # directed to debian/patches/series instead of
2180 # debian/patches/ubuntu.series.
2182 # debian/changelog | 3 +++
2183 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2184 # 2 files changed, 6 insertions(+), 1 deletion(-)
2187 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2188 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2189 __ "Dpkg::Vendor \`current vendor'");
2190 vendor_patches_distro(access_basedistro(),
2191 __ "(base) distro being accessed");
2192 vendor_patches_distro(access_nomdistro(),
2193 __ "(nominal) distro being accessed");
2196 sub generate_commits_from_dsc () {
2197 # See big comment in fetch_from_archive, below.
2198 # See also README.dsc-import.
2200 changedir $playground;
2202 my @dfi = dsc_files_info();
2203 foreach my $fi (@dfi) {
2204 my $f = $fi->{Filename};
2205 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2206 my $upper_f = (bpd_abs()."/$f");
2208 printdebug "considering reusing $f: ";
2210 if (link_ltarget "$upper_f,fetch", $f) {
2211 printdebug "linked (using ...,fetch).\n";
2212 } elsif ((printdebug "($!) "),
2214 fail f_ "accessing %s: %s", "$buildproductsdir/$f,fetch", $!;
2215 } elsif (link_ltarget $upper_f, $f) {
2216 printdebug "linked.\n";
2217 } elsif ((printdebug "($!) "),
2219 fail f_ "accessing %s: %s", "$buildproductsdir/$f", $!;
2221 printdebug "absent.\n";
2225 complete_file_from_dsc('.', $fi, \$refetched)
2228 printdebug "considering saving $f: ";
2230 if (rename_link_xf 1, $f, $upper_f) {
2231 printdebug "linked.\n";
2232 } elsif ((printdebug "($@) "),
2234 fail f_ "saving %s: %s", "$buildproductsdir/$f", $@;
2235 } elsif (!$refetched) {
2236 printdebug "no need.\n";
2237 } elsif (rename_link_xf 1, $f, "$upper_f,fetch") {
2238 printdebug "linked (using ...,fetch).\n";
2239 } elsif ((printdebug "($@) "),
2241 fail f_ "saving %s: %s", "$buildproductsdir/$f,fetch", $@;
2243 printdebug "cannot.\n";
2247 # We unpack and record the orig tarballs first, so that we only
2248 # need disk space for one private copy of the unpacked source.
2249 # But we can't make them into commits until we have the metadata
2250 # from the debian/changelog, so we record the tree objects now and
2251 # make them into commits later.
2253 my $upstreamv = upstreamversion $dsc->{version};
2254 my $orig_f_base = srcfn $upstreamv, '';
2256 foreach my $fi (@dfi) {
2257 # We actually import, and record as a commit, every tarball
2258 # (unless there is only one file, in which case there seems
2261 my $f = $fi->{Filename};
2262 printdebug "import considering $f ";
2263 (printdebug "only one dfi\n"), next if @dfi == 1;
2264 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2265 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2269 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2271 printdebug "Y ", (join ' ', map { $_//"(none)" }
2272 $compr_ext, $orig_f_part
2275 my $input = new IO::File $f, '<' or die "$f $!";
2279 if (defined $compr_ext) {
2281 Dpkg::Compression::compression_guess_from_filename $f;
2282 fail "Dpkg::Compression cannot handle file $f in source package"
2283 if defined $compr_ext && !defined $cname;
2285 new Dpkg::Compression::Process compression => $cname;
2286 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2287 my $compr_fh = new IO::Handle;
2288 my $compr_pid = open $compr_fh, "-|" // confess $!;
2290 open STDIN, "<&", $input or confess $!;
2292 die "dgit (child): exec $compr_cmd[0]: $!\n";
2297 rmtree "_unpack-tar";
2298 mkdir "_unpack-tar" or confess $!;
2299 my @tarcmd = qw(tar -x -f -
2300 --no-same-owner --no-same-permissions
2301 --no-acls --no-xattrs --no-selinux);
2302 my $tar_pid = fork // confess $!;
2304 chdir "_unpack-tar" or confess $!;
2305 open STDIN, "<&", $input or confess $!;
2307 die f_ "dgit (child): exec %s: %s", $tarcmd[0], $!;
2309 $!=0; (waitpid $tar_pid, 0) == $tar_pid or confess $!;
2310 !$? or failedcmd @tarcmd;
2313 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2315 # finally, we have the results in "tarball", but maybe
2316 # with the wrong permissions
2318 runcmd qw(chmod -R +rwX _unpack-tar);
2319 changedir "_unpack-tar";
2320 remove_stray_gits($f);
2321 mktree_in_ud_here();
2323 my ($tree) = git_add_write_tree();
2324 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2325 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2327 printdebug "one subtree $1\n";
2329 printdebug "multiple subtrees\n";
2332 rmtree "_unpack-tar";
2334 my $ent = [ $f, $tree ];
2336 Orig => !!$orig_f_part,
2337 Sort => (!$orig_f_part ? 2 :
2338 $orig_f_part =~ m/-/g ? 1 :
2346 # put any without "_" first (spec is not clear whether files
2347 # are always in the usual order). Tarballs without "_" are
2348 # the main orig or the debian tarball.
2349 $a->{Sort} <=> $b->{Sort} or
2353 my $any_orig = grep { $_->{Orig} } @tartrees;
2355 my $dscfn = "$package.dsc";
2357 my $treeimporthow = 'package';
2359 open D, ">", $dscfn or die "$dscfn: $!";
2360 print D $dscdata or die "$dscfn: $!";
2361 close D or die "$dscfn: $!";
2362 my @cmd = qw(dpkg-source);
2363 push @cmd, '--no-check' if $dsc_checked;
2364 if (madformat $dsc->{format}) {
2365 push @cmd, '--skip-patches';
2366 $treeimporthow = 'unpatched';
2368 push @cmd, qw(-x --), $dscfn;
2371 my ($tree,$dir) = mktree_in_ud_from_only_subdir(__ "source package");
2372 if (madformat $dsc->{format}) {
2373 check_for_vendor_patches();
2377 if (madformat $dsc->{format}) {
2378 my @pcmd = qw(dpkg-source --before-build .);
2379 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2381 $dappliedtree = git_add_write_tree();
2384 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2388 printdebug "import clog search...\n";
2389 parsechangelog_loop \@clogcmd, (__ "package changelog"), sub {
2390 my ($thisstanza, $desc) = @_;
2391 no warnings qw(exiting);
2393 $clogp //= $thisstanza;
2395 printdebug "import clog $thisstanza->{version} $desc...\n";
2397 last if !$any_orig; # we don't need $r1clogp
2399 # We look for the first (most recent) changelog entry whose
2400 # version number is lower than the upstream version of this
2401 # package. Then the last (least recent) previous changelog
2402 # entry is treated as the one which introduced this upstream
2403 # version and used for the synthetic commits for the upstream
2406 # One might think that a more sophisticated algorithm would be
2407 # necessary. But: we do not want to scan the whole changelog
2408 # file. Stopping when we see an earlier version, which
2409 # necessarily then is an earlier upstream version, is the only
2410 # realistic way to do that. Then, either the earliest
2411 # changelog entry we have seen so far is indeed the earliest
2412 # upload of this upstream version; or there are only changelog
2413 # entries relating to later upstream versions (which is not
2414 # possible unless the changelog and .dsc disagree about the
2415 # version). Then it remains to choose between the physically
2416 # last entry in the file, and the one with the lowest version
2417 # number. If these are not the same, we guess that the
2418 # versions were created in a non-monotonic order rather than
2419 # that the changelog entries have been misordered.
2421 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2423 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2424 $r1clogp = $thisstanza;
2426 printdebug "import clog $r1clogp->{version} becomes r1\n";
2429 $clogp or fail __ "package changelog has no entries!";
2431 my $authline = clogp_authline $clogp;
2432 my $changes = getfield $clogp, 'Changes';
2433 $changes =~ s/^\n//; # Changes: \n
2434 my $cversion = getfield $clogp, 'Version';
2437 $r1clogp //= $clogp; # maybe there's only one entry;
2438 my $r1authline = clogp_authline $r1clogp;
2439 # Strictly, r1authline might now be wrong if it's going to be
2440 # unused because !$any_orig. Whatever.
2442 printdebug "import tartrees authline $authline\n";
2443 printdebug "import tartrees r1authline $r1authline\n";
2445 foreach my $tt (@tartrees) {
2446 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2448 my $mbody = f_ "Import %s", $tt->{F};
2449 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2452 committer $r1authline
2456 [dgit import orig $tt->{F}]
2464 [dgit import tarball $package $cversion $tt->{F}]
2469 printdebug "import main commit\n";
2471 open C, ">../commit.tmp" or confess $!;
2472 print C <<END or confess $!;
2475 print C <<END or confess $! foreach @tartrees;
2478 print C <<END or confess $!;
2484 [dgit import $treeimporthow $package $cversion]
2487 close C or confess $!;
2488 my $rawimport_hash = make_commit qw(../commit.tmp);
2490 if (madformat $dsc->{format}) {
2491 printdebug "import apply patches...\n";
2493 # regularise the state of the working tree so that
2494 # the checkout of $rawimport_hash works nicely.
2495 my $dappliedcommit = make_commit_text(<<END);
2502 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2504 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2506 # We need the answers to be reproducible
2507 my @authline = clogp_authline($clogp);
2508 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2509 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2510 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2511 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2512 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2513 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2515 my $path = $ENV{PATH} or die;
2517 # we use ../../gbp-pq-output, which (given that we are in
2518 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2521 foreach my $use_absurd (qw(0 1)) {
2522 runcmd @git, qw(checkout -q unpa);
2523 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2524 local $ENV{PATH} = $path;
2527 progress "warning: $@";
2528 $path = "$absurdity:$path";
2529 progress f_ "%s: trying slow absurd-git-apply...", $us;
2530 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2535 die "forbid absurd git-apply\n" if $use_absurd
2536 && forceing [qw(import-gitapply-no-absurd)];
2537 die "only absurd git-apply!\n" if !$use_absurd
2538 && forceing [qw(import-gitapply-absurd)];
2540 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2541 local $ENV{PATH} = $path if $use_absurd;
2543 my @showcmd = (gbp_pq, qw(import));
2544 my @realcmd = shell_cmd
2545 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2546 debugcmd "+",@realcmd;
2547 if (system @realcmd) {
2548 die f_ "%s failed: %s\n",
2549 +(shellquote @showcmd),
2550 failedcmd_waitstatus();
2553 my $gapplied = git_rev_parse('HEAD');
2554 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2555 $gappliedtree eq $dappliedtree or
2556 fail f_ <<END, $gapplied, $gappliedtree, $dappliedtree;
2557 gbp-pq import and dpkg-source disagree!
2558 gbp-pq import gave commit %s
2559 gbp-pq import gave tree %s
2560 dpkg-source --before-build gave tree %s
2562 $rawimport_hash = $gapplied;
2567 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2572 progress f_ "synthesised git commit from .dsc %s", $cversion;
2574 my $rawimport_mergeinput = {
2575 Commit => $rawimport_hash,
2576 Info => __ "Import of source package",
2578 my @output = ($rawimport_mergeinput);
2580 if ($lastpush_mergeinput) {
2581 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2582 my $oversion = getfield $oldclogp, 'Version';
2584 version_compare($oversion, $cversion);
2586 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2587 { ReverseParents => 1,
2588 Message => (f_ <<END, $package, $cversion, $csuite) });
2589 Record %s (%s) in archive suite %s
2591 } elsif ($vcmp > 0) {
2592 print STDERR f_ <<END, $cversion, $oversion,
2594 Version actually in archive: %s (older)
2595 Last version pushed with dgit: %s (newer or same)
2598 __ $later_warning_msg or confess $!;
2599 @output = $lastpush_mergeinput;
2601 # Same version. Use what's in the server git branch,
2602 # discarding our own import. (This could happen if the
2603 # server automatically imports all packages into git.)
2604 @output = $lastpush_mergeinput;
2612 sub complete_file_from_dsc ($$;$) {
2613 our ($dstdir, $fi, $refetched) = @_;
2614 # Ensures that we have, in $dstdir, the file $fi, with the correct
2615 # contents. (Downloading it from alongside $dscurl if necessary.)
2616 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2617 # and will set $$refetched=1 if it did so (or tried to).
2619 my $f = $fi->{Filename};
2620 my $tf = "$dstdir/$f";
2624 my $checkhash = sub {
2625 open F, "<", "$tf" or die "$tf: $!";
2626 $fi->{Digester}->reset();
2627 $fi->{Digester}->addfile(*F);
2628 F->error and confess $!;
2629 $got = $fi->{Digester}->hexdigest();
2630 return $got eq $fi->{Hash};
2633 if (stat_exists $tf) {
2634 if ($checkhash->()) {
2635 progress f_ "using existing %s", $f;
2639 fail f_ "file %s has hash %s but .dsc demands hash %s".
2640 " (perhaps you should delete this file?)",
2641 $f, $got, $fi->{Hash};
2643 progress f_ "need to fetch correct version of %s", $f;
2644 unlink $tf or die "$tf $!";
2647 printdebug "$tf does not exist, need to fetch\n";
2651 $furl =~ s{/[^/]+$}{};
2653 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2654 die "$f ?" if $f =~ m#/#;
2655 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2656 return 0 if !act_local();
2659 fail f_ "file %s has hash %s but .dsc demands hash %s".
2660 " (got wrong file from archive!)",
2661 $f, $got, $fi->{Hash};
2666 sub ensure_we_have_orig () {
2667 my @dfi = dsc_files_info();
2668 foreach my $fi (@dfi) {
2669 my $f = $fi->{Filename};
2670 next unless is_orig_file_in_dsc($f, \@dfi);
2671 complete_file_from_dsc($buildproductsdir, $fi)
2676 #---------- git fetch ----------
2678 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2679 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2681 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2682 # locally fetched refs because they have unhelpful names and clutter
2683 # up gitk etc. So we track whether we have "used up" head ref (ie,
2684 # whether we have made another local ref which refers to this object).
2686 # (If we deleted them unconditionally, then we might end up
2687 # re-fetching the same git objects each time dgit fetch was run.)
2689 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2690 # in git_fetch_us to fetch the refs in question, and possibly a call
2691 # to lrfetchref_used.
2693 our (%lrfetchrefs_f, %lrfetchrefs_d);
2694 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2696 sub lrfetchref_used ($) {
2697 my ($fullrefname) = @_;
2698 my $objid = $lrfetchrefs_f{$fullrefname};
2699 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2702 sub git_lrfetch_sane {
2703 my ($url, $supplementary, @specs) = @_;
2704 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2705 # at least as regards @specs. Also leave the results in
2706 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2707 # able to clean these up.
2709 # With $supplementary==1, @specs must not contain wildcards
2710 # and we add to our previous fetches (non-atomically).
2712 # This is rather miserable:
2713 # When git fetch --prune is passed a fetchspec ending with a *,
2714 # it does a plausible thing. If there is no * then:
2715 # - it matches subpaths too, even if the supplied refspec
2716 # starts refs, and behaves completely madly if the source
2717 # has refs/refs/something. (See, for example, Debian #NNNN.)
2718 # - if there is no matching remote ref, it bombs out the whole
2720 # We want to fetch a fixed ref, and we don't know in advance
2721 # if it exists, so this is not suitable.
2723 # Our workaround is to use git ls-remote. git ls-remote has its
2724 # own qairks. Notably, it has the absurd multi-tail-matching
2725 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2726 # refs/refs/foo etc.
2728 # Also, we want an idempotent snapshot, but we have to make two
2729 # calls to the remote: one to git ls-remote and to git fetch. The
2730 # solution is use git ls-remote to obtain a target state, and
2731 # git fetch to try to generate it. If we don't manage to generate
2732 # the target state, we try again.
2734 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2736 my $specre = join '|', map {
2739 my $wildcard = $x =~ s/\\\*$/.*/;
2740 die if $wildcard && $supplementary;
2743 printdebug "git_lrfetch_sane specre=$specre\n";
2744 my $wanted_rref = sub {
2746 return m/^(?:$specre)$/;
2749 my $fetch_iteration = 0;
2752 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2753 if (++$fetch_iteration > 10) {
2754 fail __ "too many iterations trying to get sane fetch!";
2757 my @look = map { "refs/$_" } @specs;
2758 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2762 open GITLS, "-|", @lcmd or confess $!;
2764 printdebug "=> ", $_;
2765 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2766 my ($objid,$rrefname) = ($1,$2);
2767 if (!$wanted_rref->($rrefname)) {
2768 print STDERR f_ <<END, "@look", $rrefname;
2769 warning: git ls-remote %s reported %s; this is silly, ignoring it.
2773 $wantr{$rrefname} = $objid;
2776 close GITLS or failedcmd @lcmd;
2778 # OK, now %want is exactly what we want for refs in @specs
2780 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2781 "+refs/$_:".lrfetchrefs."/$_";
2784 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2786 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2787 runcmd_ordryrun_local @fcmd if @fspecs;
2789 if (!$supplementary) {
2790 %lrfetchrefs_f = ();
2794 git_for_each_ref(lrfetchrefs, sub {
2795 my ($objid,$objtype,$lrefname,$reftail) = @_;
2796 $lrfetchrefs_f{$lrefname} = $objid;
2797 $objgot{$objid} = 1;
2800 if ($supplementary) {
2804 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2805 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2806 if (!exists $wantr{$rrefname}) {
2807 if ($wanted_rref->($rrefname)) {
2809 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2812 print STDERR f_ <<END, "@fspecs", $lrefname
2813 warning: git fetch %s created %s; this is silly, deleting it.
2816 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2817 delete $lrfetchrefs_f{$lrefname};
2821 foreach my $rrefname (sort keys %wantr) {
2822 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2823 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2824 my $want = $wantr{$rrefname};
2825 next if $got eq $want;
2826 if (!defined $objgot{$want}) {
2827 fail __ <<END unless act_local();
2828 --dry-run specified but we actually wanted the results of git fetch,
2829 so this is not going to work. Try running dgit fetch first,
2830 or using --damp-run instead of --dry-run.
2832 print STDERR f_ <<END, $lrefname, $want;
2833 warning: git ls-remote suggests we want %s
2834 warning: and it should refer to %s
2835 warning: but git fetch didn't fetch that object to any relevant ref.
2836 warning: This may be due to a race with someone updating the server.
2837 warning: Will try again...
2839 next FETCH_ITERATION;
2842 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2844 runcmd_ordryrun_local @git, qw(update-ref -m),
2845 "dgit fetch git fetch fixup", $lrefname, $want;
2846 $lrfetchrefs_f{$lrefname} = $want;
2851 if (defined $csuite) {
2852 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2853 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2854 my ($objid,$objtype,$lrefname,$reftail) = @_;
2855 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2856 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2860 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2861 Dumper(\%lrfetchrefs_f);
2864 sub git_fetch_us () {
2865 # Want to fetch only what we are going to use, unless
2866 # deliberately-not-ff, in which case we must fetch everything.
2868 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2870 (quiltmode_splitbrain
2871 ? (map { $_->('*',access_nomdistro) }
2872 \&debiantag_new, \&debiantag_maintview)
2873 : debiantags('*',access_nomdistro));
2874 push @specs, server_branch($csuite);
2875 push @specs, $rewritemap;
2876 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2878 my $url = access_giturl();
2879 git_lrfetch_sane $url, 0, @specs;
2882 my @tagpats = debiantags('*',access_nomdistro);
2884 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2885 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2886 printdebug "currently $fullrefname=$objid\n";
2887 $here{$fullrefname} = $objid;
2889 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2890 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2891 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2892 printdebug "offered $lref=$objid\n";
2893 if (!defined $here{$lref}) {
2894 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2895 runcmd_ordryrun_local @upd;
2896 lrfetchref_used $fullrefname;
2897 } elsif ($here{$lref} eq $objid) {
2898 lrfetchref_used $fullrefname;
2900 print STDERR f_ "Not updating %s from %s to %s.\n",
2901 $lref, $here{$lref}, $objid;
2906 #---------- dsc and archive handling ----------
2908 sub mergeinfo_getclogp ($) {
2909 # Ensures thit $mi->{Clogp} exists and returns it
2911 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2914 sub mergeinfo_version ($) {
2915 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2918 sub fetch_from_archive_record_1 ($) {
2920 runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
2921 cmdoutput @git, qw(log -n2), $hash;
2922 # ... gives git a chance to complain if our commit is malformed
2925 sub fetch_from_archive_record_2 ($) {
2927 my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
2931 dryrun_report @upd_cmd;
2935 sub parse_dsc_field_def_dsc_distro () {
2936 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2937 dgit.default.distro);
2940 sub parse_dsc_field ($$) {
2941 my ($dsc, $what) = @_;
2943 foreach my $field (@ourdscfield) {
2944 $f = $dsc->{$field};
2949 progress f_ "%s: NO git hash", $what;
2950 parse_dsc_field_def_dsc_distro();
2951 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2952 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2953 progress f_ "%s: specified git info (%s)", $what, $dsc_distro;
2954 $dsc_hint_tag = [ $dsc_hint_tag ];
2955 } elsif ($f =~ m/^\w+\s*$/) {
2957 parse_dsc_field_def_dsc_distro();
2958 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2960 progress f_ "%s: specified git hash", $what;
2962 fail f_ "%s: invalid Dgit info", $what;
2966 sub resolve_dsc_field_commit ($$) {
2967 my ($already_distro, $already_mapref) = @_;
2969 return unless defined $dsc_hash;
2972 defined $already_mapref &&
2973 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2974 ? $already_mapref : undef;
2978 my ($what, @fetch) = @_;
2980 local $idistro = $dsc_distro;
2981 my $lrf = lrfetchrefs;
2983 if (!$chase_dsc_distro) {
2984 progress f_ "not chasing .dsc distro %s: not fetching %s",
2989 progress f_ ".dsc names distro %s: fetching %s", $dsc_distro, $what;
2991 my $url = access_giturl();
2992 if (!defined $url) {
2993 defined $dsc_hint_url or fail f_ <<END, $dsc_distro;
2994 .dsc Dgit metadata is in context of distro %s
2995 for which we have no configured url and .dsc provides no hint
2998 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2999 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
3000 parse_cfg_bool "dsc-url-proto-ok", 'false',
3001 cfg("dgit.dsc-url-proto-ok.$proto",
3002 "dgit.default.dsc-url-proto-ok")
3003 or fail f_ <<END, $dsc_distro, $proto;
3004 .dsc Dgit metadata is in context of distro %s
3005 for which we have no configured url;
3006 .dsc provides hinted url with protocol %s which is unsafe.
3007 (can be overridden by config - consult documentation)
3009 $url = $dsc_hint_url;
3012 git_lrfetch_sane $url, 1, @fetch;
3017 my $rewrite_enable = do {
3018 local $idistro = $dsc_distro;
3019 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
3022 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
3023 if (!defined $mapref) {
3024 my $lrf = $do_fetch->((__ "rewrite map"), $rewritemap) or return;
3025 $mapref = $lrf.'/'.$rewritemap;
3027 my $rewritemapdata = git_cat_file $mapref.':map';
3028 if (defined $rewritemapdata
3029 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
3031 "server's git history rewrite map contains a relevant entry!";
3034 if (defined $dsc_hash) {
3035 progress __ "using rewritten git hash in place of .dsc value";
3037 progress __ "server data says .dsc hash is to be disregarded";
3042 if (!defined git_cat_file $dsc_hash) {
3043 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
3044 my $lrf = $do_fetch->((__ "additional commits"), @tags) &&
3045 defined git_cat_file $dsc_hash
3046 or fail f_ <<END, $dsc_hash;
3047 .dsc Dgit metadata requires commit %s
3048 but we could not obtain that object anywhere.
3050 foreach my $t (@tags) {
3051 my $fullrefname = $lrf.'/'.$t;
3052 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
3053 next unless $lrfetchrefs_f{$fullrefname};
3054 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
3055 lrfetchref_used $fullrefname;
3060 sub fetch_from_archive () {
3061 ensure_setup_existing_tree();
3063 # Ensures that lrref() is what is actually in the archive, one way
3064 # or another, according to us - ie this client's
3065 # appropritaely-updated archive view. Also returns the commit id.
3066 # If there is nothing in the archive, leaves lrref alone and
3067 # returns undef. git_fetch_us must have already been called.
3071 parse_dsc_field($dsc, __ 'last upload to archive');
3072 resolve_dsc_field_commit access_basedistro,
3073 lrfetchrefs."/".$rewritemap
3075 progress __ "no version available from the archive";
3078 # If the archive's .dsc has a Dgit field, there are three
3079 # relevant git commitids we need to choose between and/or merge
3081 # 1. $dsc_hash: the Dgit field from the archive
3082 # 2. $lastpush_hash: the suite branch on the dgit git server
3083 # 3. $lastfetch_hash: our local tracking brach for the suite
3085 # These may all be distinct and need not be in any fast forward
3088 # If the dsc was pushed to this suite, then the server suite
3089 # branch will have been updated; but it might have been pushed to
3090 # a different suite and copied by the archive. Conversely a more
3091 # recent version may have been pushed with dgit but not appeared
3092 # in the archive (yet).
3094 # $lastfetch_hash may be awkward because archive imports
3095 # (particularly, imports of Dgit-less .dscs) are performed only as
3096 # needed on individual clients, so different clients may perform a
3097 # different subset of them - and these imports are only made
3098 # public during push. So $lastfetch_hash may represent a set of
3099 # imports different to a subsequent upload by a different dgit
3102 # Our approach is as follows:
3104 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3105 # descendant of $dsc_hash, then it was pushed by a dgit user who
3106 # had based their work on $dsc_hash, so we should prefer it.
3107 # Otherwise, $dsc_hash was installed into this suite in the
3108 # archive other than by a dgit push, and (necessarily) after the
3109 # last dgit push into that suite (since a dgit push would have
3110 # been descended from the dgit server git branch); thus, in that
3111 # case, we prefer the archive's version (and produce a
3112 # pseudo-merge to overwrite the dgit server git branch).
3114 # (If there is no Dgit field in the archive's .dsc then
3115 # generate_commit_from_dsc uses the version numbers to decide
3116 # whether the suite branch or the archive is newer. If the suite
3117 # branch is newer it ignores the archive's .dsc; otherwise it
3118 # generates an import of the .dsc, and produces a pseudo-merge to
3119 # overwrite the suite branch with the archive contents.)
3121 # The outcome of that part of the algorithm is the `public view',
3122 # and is same for all dgit clients: it does not depend on any
3123 # unpublished history in the local tracking branch.
3125 # As between the public view and the local tracking branch: The
3126 # local tracking branch is only updated by dgit fetch, and
3127 # whenever dgit fetch runs it includes the public view in the
3128 # local tracking branch. Therefore if the public view is not
3129 # descended from the local tracking branch, the local tracking
3130 # branch must contain history which was imported from the archive
3131 # but never pushed; and, its tip is now out of date. So, we make
3132 # a pseudo-merge to overwrite the old imports and stitch the old
3135 # Finally: we do not necessarily reify the public view (as
3136 # described above). This is so that we do not end up stacking two
3137 # pseudo-merges. So what we actually do is figure out the inputs
3138 # to any public view pseudo-merge and put them in @mergeinputs.
3141 # $mergeinputs[]{Commit}
3142 # $mergeinputs[]{Info}
3143 # $mergeinputs[0] is the one whose tree we use
3144 # @mergeinputs is in the order we use in the actual commit)
3147 # $mergeinputs[]{Message} is a commit message to use
3148 # $mergeinputs[]{ReverseParents} if def specifies that parent
3149 # list should be in opposite order
3150 # Such an entry has no Commit or Info. It applies only when found
3151 # in the last entry. (This ugliness is to support making
3152 # identical imports to previous dgit versions.)
3154 my $lastpush_hash = git_get_ref(lrfetchref());
3155 printdebug "previous reference hash=$lastpush_hash\n";
3156 $lastpush_mergeinput = $lastpush_hash && {
3157 Commit => $lastpush_hash,
3158 Info => (__ "dgit suite branch on dgit git server"),
3161 my $lastfetch_hash = git_get_ref(lrref());
3162 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3163 my $lastfetch_mergeinput = $lastfetch_hash && {
3164 Commit => $lastfetch_hash,
3165 Info => (__ "dgit client's archive history view"),
3168 my $dsc_mergeinput = $dsc_hash && {
3169 Commit => $dsc_hash,
3170 Info => (__ "Dgit field in .dsc from archive"),
3174 my $del_lrfetchrefs = sub {
3177 printdebug "del_lrfetchrefs...\n";
3178 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3179 my $objid = $lrfetchrefs_d{$fullrefname};
3180 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3182 $gur ||= new IO::Handle;
3183 open $gur, "|-", qw(git update-ref --stdin) or confess $!;
3185 printf $gur "delete %s %s\n", $fullrefname, $objid;
3188 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3192 if (defined $dsc_hash) {
3193 ensure_we_have_orig();
3194 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3195 @mergeinputs = $dsc_mergeinput
3196 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3197 print STDERR f_ <<END, $dsc_hash, $lastpush_hash,
3199 Git commit in archive is behind the last version allegedly pushed/uploaded.
3200 Commit referred to by archive: %s
3201 Last version pushed with dgit: %s
3204 __ $later_warning_msg or confess $!;
3205 @mergeinputs = ($lastpush_mergeinput);
3207 # Archive has .dsc which is not a descendant of the last dgit
3208 # push. This can happen if the archive moves .dscs about.
3209 # Just follow its lead.
3210 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3211 progress __ "archive .dsc names newer git commit";
3212 @mergeinputs = ($dsc_mergeinput);
3214 progress __ "archive .dsc names other git commit, fixing up";
3215 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3219 @mergeinputs = generate_commits_from_dsc();
3220 # We have just done an import. Now, our import algorithm might
3221 # have been improved. But even so we do not want to generate
3222 # a new different import of the same package. So if the
3223 # version numbers are the same, just use our existing version.
3224 # If the version numbers are different, the archive has changed
3225 # (perhaps, rewound).
3226 if ($lastfetch_mergeinput &&
3227 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3228 (mergeinfo_version $mergeinputs[0]) )) {
3229 @mergeinputs = ($lastfetch_mergeinput);
3231 } elsif ($lastpush_hash) {
3232 # only in git, not in the archive yet
3233 @mergeinputs = ($lastpush_mergeinput);
3234 print STDERR f_ <<END,
3236 Package not found in the archive, but has allegedly been pushed using dgit.
3239 __ $later_warning_msg or confess $!;
3241 printdebug "nothing found!\n";
3242 if (defined $skew_warning_vsn) {
3243 print STDERR f_ <<END, $skew_warning_vsn or confess $!;
3245 Warning: relevant archive skew detected.
3246 Archive allegedly contains %s
3247 But we were not able to obtain any version from the archive or git.
3251 unshift @end, $del_lrfetchrefs;
3255 if ($lastfetch_hash &&
3257 my $h = $_->{Commit};
3258 $h and is_fast_fwd($lastfetch_hash, $h);
3259 # If true, one of the existing parents of this commit
3260 # is a descendant of the $lastfetch_hash, so we'll
3261 # be ff from that automatically.
3265 push @mergeinputs, $lastfetch_mergeinput;
3268 printdebug "fetch mergeinfos:\n";
3269 foreach my $mi (@mergeinputs) {
3271 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3273 printdebug sprintf " ReverseParents=%d Message=%s",
3274 $mi->{ReverseParents}, $mi->{Message};
3278 my $compat_info= pop @mergeinputs
3279 if $mergeinputs[$#mergeinputs]{Message};
3281 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3284 if (@mergeinputs > 1) {
3286 my $tree_commit = $mergeinputs[0]{Commit};
3288 my $tree = get_tree_of_commit $tree_commit;;
3290 # We use the changelog author of the package in question the
3291 # author of this pseudo-merge. This is (roughly) correct if
3292 # this commit is simply representing aa non-dgit upload.
3293 # (Roughly because it does not record sponsorship - but we
3294 # don't have sponsorship info because that's in the .changes,
3295 # which isn't in the archivw.)
3297 # But, it might be that we are representing archive history
3298 # updates (including in-archive copies). These are not really
3299 # the responsibility of the person who created the .dsc, but
3300 # there is no-one whose name we should better use. (The
3301 # author of the .dsc-named commit is clearly worse.)
3303 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3304 my $author = clogp_authline $useclogp;
3305 my $cversion = getfield $useclogp, 'Version';
3307 my $mcf = dgit_privdir()."/mergecommit";
3308 open MC, ">", $mcf or die "$mcf $!";
3309 print MC <<END or confess $!;
3313 my @parents = grep { $_->{Commit} } @mergeinputs;
3314 @parents = reverse @parents if $compat_info->{ReverseParents};
3315 print MC <<END or confess $! foreach @parents;
3319 print MC <<END or confess $!;
3325 if (defined $compat_info->{Message}) {
3326 print MC $compat_info->{Message} or confess $!;
3328 print MC f_ <<END, $package, $cversion, $csuite or confess $!;
3329 Record %s (%s) in archive suite %s
3333 my $message_add_info = sub {
3335 my $mversion = mergeinfo_version $mi;
3336 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3340 $message_add_info->($mergeinputs[0]);
3341 print MC __ <<END or confess $!;
3342 should be treated as descended from
3344 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3347 close MC or confess $!;
3348 $hash = make_commit $mcf;
3350 $hash = $mergeinputs[0]{Commit};
3352 printdebug "fetch hash=$hash\n";
3355 my ($lasth, $what) = @_;
3356 return unless $lasth;
3357 confess "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3360 $chkff->($lastpush_hash, __ 'dgit repo server tip (last push)')
3362 $chkff->($lastfetch_hash, __ 'local tracking tip (last fetch)');
3364 fetch_from_archive_record_1($hash);
3366 if (defined $skew_warning_vsn) {
3367 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3368 my $gotclogp = commit_getclogp($hash);
3369 my $got_vsn = getfield $gotclogp, 'Version';
3370 printdebug "SKEW CHECK GOT $got_vsn\n";
3371 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3372 print STDERR f_ <<END, $skew_warning_vsn, $got_vsn or confess $!;
3374 Warning: archive skew detected. Using the available version:
3375 Archive allegedly contains %s
3376 We were able to obtain only %s
3382 if ($lastfetch_hash ne $hash) {
3383 fetch_from_archive_record_2($hash);
3386 lrfetchref_used lrfetchref();
3388 check_gitattrs($hash, __ "fetched source tree");
3390 unshift @end, $del_lrfetchrefs;
3394 sub set_local_git_config ($$) {
3396 runcmd @git, qw(config), $k, $v;
3399 sub setup_mergechangelogs (;$) {
3401 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3403 my $driver = 'dpkg-mergechangelogs';
3404 my $cb = "merge.$driver";
3405 confess unless defined $maindir;
3406 my $attrs = "$maindir_gitcommon/info/attributes";
3407 ensuredir "$maindir_gitcommon/info";
3409 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3410 if (!open ATTRS, "<", $attrs) {
3411 $!==ENOENT or die "$attrs: $!";
3415 next if m{^debian/changelog\s};
3416 print NATTRS $_, "\n" or confess $!;
3418 ATTRS->error and confess $!;
3421 print NATTRS "debian/changelog merge=$driver\n" or confess $!;
3424 set_local_git_config "$cb.name", __ 'debian/changelog merge driver';
3425 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3427 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3430 sub setup_useremail (;$) {
3432 return unless $always || access_cfg_bool(1, 'setup-useremail');
3435 my ($k, $envvar) = @_;
3436 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3437 return unless defined $v;
3438 set_local_git_config "user.$k", $v;
3441 $setup->('email', 'DEBEMAIL');
3442 $setup->('name', 'DEBFULLNAME');
3445 sub ensure_setup_existing_tree () {
3446 my $k = "remote.$remotename.skipdefaultupdate";
3447 my $c = git_get_config $k;
3448 return if defined $c;
3449 set_local_git_config $k, 'true';
3452 sub open_main_gitattrs () {
3453 confess 'internal error no maindir' unless defined $maindir;
3454 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3456 or die "open $maindir_gitcommon/info/attributes: $!";
3460 our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
3462 sub is_gitattrs_setup () {
3465 # 1: gitattributes set up and should be left alone
3467 # 0: there is a dgit-defuse-attrs but it needs fixing
3468 # undef: there is none
3469 my $gai = open_main_gitattrs();
3470 return 0 unless $gai;
3472 next unless m{$gitattrs_ourmacro_re};
3473 return 1 if m{\s-working-tree-encoding\s};
3474 printdebug "is_gitattrs_setup: found old macro\n";
3477 $gai->error and confess $!;
3478 printdebug "is_gitattrs_setup: found nothing\n";
3482 sub setup_gitattrs (;$) {
3484 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3486 my $already = is_gitattrs_setup();
3489 [attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
3490 not doing further gitattributes setup
3494 my $new = "[attr]dgit-defuse-attrs $negate_harmful_gitattrs";
3495 my $af = "$maindir_gitcommon/info/attributes";
3496 ensuredir "$maindir_gitcommon/info";
3498 open GAO, "> $af.new" or confess $!;
3499 print GAO <<END, __ <<ENDT or confess $! unless defined $already;
3503 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3505 my $gai = open_main_gitattrs();
3508 if (m{$gitattrs_ourmacro_re}) {
3509 die unless defined $already;
3513 print GAO $_, "\n" or confess $!;
3515 $gai->error and confess $!;
3517 close GAO or confess $!;
3518 rename "$af.new", "$af" or fail f_ "install %s: %s", $af, $!;
3521 sub setup_new_tree () {
3522 setup_mergechangelogs();
3527 sub check_gitattrs ($$) {
3528 my ($treeish, $what) = @_;
3530 return if is_gitattrs_setup;
3533 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3535 my $gafl = new IO::File;
3536 open $gafl, "-|", @cmd or confess $!;
3539 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3541 next unless m{(?:^|/)\.gitattributes$};
3543 # oh dear, found one
3544 print STDERR f_ <<END, $what;
3545 dgit: warning: %s contains .gitattributes
3546 dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree.
3551 # tree contains no .gitattributes files
3552 $?=0; $!=0; close $gafl or failedcmd @cmd;
3556 sub multisuite_suite_child ($$$) {
3557 my ($tsuite, $mergeinputs, $fn) = @_;
3558 # in child, sets things up, calls $fn->(), and returns undef
3559 # in parent, returns canonical suite name for $tsuite
3560 my $canonsuitefh = IO::File::new_tmpfile;
3561 my $pid = fork // confess $!;
3565 $us .= " [$isuite]";
3566 $debugprefix .= " ";
3567 progress f_ "fetching %s...", $tsuite;
3568 canonicalise_suite();
3569 print $canonsuitefh $csuite, "\n" or confess $!;
3570 close $canonsuitefh or confess $!;
3574 waitpid $pid,0 == $pid or confess $!;
3575 fail f_ "failed to obtain %s: %s", $tsuite, waitstatusmsg()
3577 seek $canonsuitefh,0,0 or confess $!;
3578 local $csuite = <$canonsuitefh>;
3579 confess $! unless defined $csuite && chomp $csuite;
3581 printdebug "multisuite $tsuite missing\n";
3584 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3585 push @$mergeinputs, {
3592 sub fork_for_multisuite ($) {
3593 my ($before_fetch_merge) = @_;
3594 # if nothing unusual, just returns ''
3597 # returns 0 to caller in child, to do first of the specified suites
3598 # in child, $csuite is not yet set
3600 # returns 1 to caller in parent, to finish up anything needed after
3601 # in parent, $csuite is set to canonicalised portmanteau
3603 my $org_isuite = $isuite;
3604 my @suites = split /\,/, $isuite;
3605 return '' unless @suites > 1;
3606 printdebug "fork_for_multisuite: @suites\n";
3610 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3612 return 0 unless defined $cbasesuite;
3614 fail f_ "package %s missing in (base suite) %s", $package, $cbasesuite
3615 unless @mergeinputs;
3617 my @csuites = ($cbasesuite);
3619 $before_fetch_merge->();
3621 foreach my $tsuite (@suites[1..$#suites]) {
3622 $tsuite =~ s/^-/$cbasesuite-/;
3623 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3630 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3631 push @csuites, $csubsuite;
3634 foreach my $mi (@mergeinputs) {
3635 my $ref = git_get_ref $mi->{Ref};
3636 die "$mi->{Ref} ?" unless length $ref;
3637 $mi->{Commit} = $ref;
3640 $csuite = join ",", @csuites;
3642 my $previous = git_get_ref lrref;
3644 unshift @mergeinputs, {
3645 Commit => $previous,
3646 Info => (__ "local combined tracking branch"),
3648 "archive seems to have rewound: local tracking branch is ahead!"),
3652 foreach my $ix (0..$#mergeinputs) {
3653 $mergeinputs[$ix]{Index} = $ix;
3656 @mergeinputs = sort {
3657 -version_compare(mergeinfo_version $a,
3658 mergeinfo_version $b) # highest version first
3660 $a->{Index} <=> $b->{Index}; # earliest in spec first
3666 foreach my $mi (@mergeinputs) {
3667 printdebug "multisuite merge check $mi->{Info}\n";
3668 foreach my $previous (@needed) {
3669 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3670 printdebug "multisuite merge un-needed $previous->{Info}\n";
3674 printdebug "multisuite merge this-needed\n";
3675 $mi->{Character} = '+';
3678 $needed[0]{Character} = '*';
3680 my $output = $needed[0]{Commit};
3683 printdebug "multisuite merge nontrivial\n";
3684 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3686 my $commit = "tree $tree\n";
3687 my $msg = f_ "Combine archive branches %s [dgit]\n\n".
3688 "Input branches:\n",
3691 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3692 printdebug "multisuite merge include $mi->{Info}\n";
3693 $mi->{Character} //= ' ';
3694 $commit .= "parent $mi->{Commit}\n";
3695 $msg .= sprintf " %s %-25s %s\n",
3697 (mergeinfo_version $mi),
3700 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3701 $msg .= __ "\nKey\n".
3702 " * marks the highest version branch, which choose to use\n".
3703 " + marks each branch which was not already an ancestor\n\n";
3705 "[dgit multi-suite $csuite]\n";
3707 "author $authline\n".
3708 "committer $authline\n\n";
3709 $output = make_commit_text $commit.$msg;
3710 printdebug "multisuite merge generated $output\n";
3713 fetch_from_archive_record_1($output);
3714 fetch_from_archive_record_2($output);
3716 progress f_ "calculated combined tracking suite %s", $csuite;
3721 sub clone_set_head () {
3722 open H, "> .git/HEAD" or confess $!;
3723 print H "ref: ".lref()."\n" or confess $!;
3724 close H or confess $!;
3726 sub clone_finish ($) {
3728 runcmd @git, qw(reset --hard), lrref();
3729 runcmd qw(bash -ec), <<'END';
3731 git ls-tree -r --name-only -z HEAD | \
3732 xargs -0r touch -h -r . --
3734 printdone f_ "ready for work in %s", $dstdir;
3738 # in multisuite, returns twice!
3739 # once in parent after first suite fetched,
3740 # and then again in child after everything is finished
3742 badusage __ "dry run makes no sense with clone" unless act_local();
3744 my $multi_fetched = fork_for_multisuite(sub {
3745 printdebug "multi clone before fetch merge\n";
3749 if ($multi_fetched) {
3750 printdebug "multi clone after fetch merge\n";
3752 clone_finish($dstdir);
3755 printdebug "clone main body\n";
3757 canonicalise_suite();
3758 my $hasgit = check_for_git();
3759 mkdir $dstdir or fail f_ "create \`%s': %s", $dstdir, $!;
3761 runcmd @git, qw(init -q);
3765 my $giturl = access_giturl(1);
3766 if (defined $giturl) {
3767 runcmd @git, qw(remote add), 'origin', $giturl;
3770 progress __ "fetching existing git history";
3772 runcmd_ordryrun_local @git, qw(fetch origin);
3774 progress __ "starting new git history";
3776 fetch_from_archive() or no_such_package;
3777 my $vcsgiturl = $dsc->{'Vcs-Git'};
3778 if (length $vcsgiturl) {
3779 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3780 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3782 clone_finish($dstdir);
3786 canonicalise_suite();
3787 if (check_for_git()) {
3790 fetch_from_archive() or no_such_package();
3792 my $vcsgiturl = $dsc && $dsc->{'Vcs-Git'};
3793 if (length $vcsgiturl and
3794 (grep { $csuite eq $_ }
3796 cfg 'dgit.vcs-git.suites')) {
3797 my $current = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
3798 if (defined $current && $current ne $vcsgiturl) {
3799 print STDERR f_ <<END, $csuite;
3800 FYI: Vcs-Git in %s has different url to your vcs-git remote.
3801 Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?
3805 printdone f_ "fetched into %s", lrref();
3809 my $multi_fetched = fork_for_multisuite(sub { });
3810 fetch_one() unless $multi_fetched; # parent
3811 finish 0 if $multi_fetched eq '0'; # child
3816 runcmd_ordryrun_local @git, qw(merge -m),
3817 (f_ "Merge from %s [dgit]", $csuite),
3819 printdone f_ "fetched to %s and merged into HEAD", lrref();
3822 sub check_not_dirty () {
3823 my @forbid = qw(local-options local-patch-header);
3824 @forbid = map { "debian/source/$_" } @forbid;
3825 foreach my $f (@forbid) {
3826 if (stat_exists $f) {
3827 fail f_ "git tree contains %s", $f;
3831 my @cmd = (@git, qw(status -uall --ignored --porcelain));
3832 push @cmd, qw(debian/source/format debian/source/options);
3835 my $bad = cmdoutput @cmd;
3838 "you have uncommitted changes to critical files, cannot continue:\n").
3842 return if $includedirty;
3844 git_check_unmodified();
3847 sub commit_admin ($) {
3850 runcmd_ordryrun_local @git, qw(commit -m), $m;
3853 sub quiltify_nofix_bail ($$) {
3854 my ($headinfo, $xinfo) = @_;
3855 if ($quilt_mode eq 'nofix') {
3857 "quilt fixup required but quilt mode is \`nofix'\n".
3858 "HEAD commit%s differs from tree implied by debian/patches%s",
3863 sub commit_quilty_patch () {
3864 my $output = cmdoutput @git, qw(status --ignored --porcelain);
3866 foreach my $l (split /\n/, $output) {
3867 next unless $l =~ m/\S/;
3868 if ($l =~ m{^(?:[?!][?!]| [MADRC]) (.pc|debian/patches)}) {
3872 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3874 progress __ "nothing quilty to commit, ok.";
3877 quiltify_nofix_bail "", __ " (wanted to commit patch update)";
3878 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3879 runcmd_ordryrun_local @git, qw(add -f), @adds;
3880 commit_admin +(__ <<ENDT).<<END
3881 Commit Debian 3.0 (quilt) metadata
3884 [dgit ($our_version) quilt-fixup]
3888 sub get_source_format () {
3890 if (open F, "debian/source/options") {
3894 s/\s+$//; # ignore missing final newline
3896 my ($k, $v) = ($`, $'); #');
3897 $v =~ s/^"(.*)"$/$1/;
3903 F->error and confess $!;
3906 confess $! unless $!==&ENOENT;
3909 if (!open F, "debian/source/format") {
3910 confess $! unless $!==&ENOENT;
3914 F->error and confess $!;
3916 return ($_, \%options);
3919 sub madformat_wantfixup ($) {
3921 return 0 unless $format eq '3.0 (quilt)';
3922 our $quilt_mode_warned;
3923 if ($quilt_mode eq 'nocheck') {
3924 progress f_ "Not doing any fixup of \`%s'".
3925 " due to ----no-quilt-fixup or --quilt=nocheck", $format
3926 unless $quilt_mode_warned++;
3929 progress f_ "Format \`%s', need to check/update patch stack", $format
3930 unless $quilt_mode_warned++;
3934 sub maybe_split_brain_save ($$$) {
3935 my ($headref, $dgitview, $msg) = @_;
3936 # => message fragment "$saved" describing disposition of $dgitview
3937 # (used inside parens, in the English texts)
3938 my $save = $internal_object_save{'dgit-view'};
3939 return f_ "commit id %s", $dgitview unless defined $save;
3940 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
3942 "dgit --dgit-view-save $msg HEAD=$headref",
3945 return f_ "and left in %s", $save;
3948 # An "infopair" is a tuple [ $thing, $what ]
3949 # (often $thing is a commit hash; $what is a description)
3951 sub infopair_cond_equal ($$) {
3953 $x->[0] eq $y->[0] or fail <<END;
3954 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3958 sub infopair_lrf_tag_lookup ($$) {
3959 my ($tagnames, $what) = @_;
3960 # $tagname may be an array ref
3961 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3962 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3963 foreach my $tagname (@tagnames) {
3964 my $lrefname = lrfetchrefs."/tags/$tagname";
3965 my $tagobj = $lrfetchrefs_f{$lrefname};
3966 next unless defined $tagobj;
3967 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3968 return [ git_rev_parse($tagobj), $what ];
3970 fail @tagnames==1 ? (f_ <<END, $what, "@tagnames")
3971 Wanted tag %s (%s) on dgit server, but not found
3973 : (f_ <<END, $what, "@tagnames");
3974 Wanted tag %s (one of: %s) on dgit server, but not found
3978 sub infopair_cond_ff ($$) {
3979 my ($anc,$desc) = @_;
3980 is_fast_fwd($anc->[0], $desc->[0]) or
3981 fail f_ <<END, $anc->[1], $anc->[0], $desc->[1], $desc->[0];
3982 %s (%s) .. %s (%s) is not fast forward
3986 sub pseudomerge_version_check ($$) {
3987 my ($clogp, $archive_hash) = @_;
3989 my $arch_clogp = commit_getclogp $archive_hash;
3990 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3991 __ 'version currently in archive' ];
3992 if (defined $overwrite_version) {
3993 if (length $overwrite_version) {
3994 infopair_cond_equal([ $overwrite_version,
3995 '--overwrite= version' ],
3998 my $v = $i_arch_v->[0];
4000 "Checking package changelog for archive version %s ...", $v;
4003 my @xa = ("-f$v", "-t$v");
4004 my $vclogp = parsechangelog @xa;
4007 [ (getfield $vclogp, $fn),
4008 (f_ "%s field from dpkg-parsechangelog %s",
4011 my $cv = $gf->('Version');
4012 infopair_cond_equal($i_arch_v, $cv);
4013 $cd = $gf->('Distribution');
4016 $@ =~ s/^dgit: //gm;
4018 f_ "Perhaps debian/changelog does not mention %s ?", $v;
4020 fail f_ <<END, $cd->[1], $cd->[0], $v
4022 Your tree seems to based on earlier (not uploaded) %s.
4024 if $cd->[0] =~ m/UNRELEASED/;
4028 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
4032 sub pseudomerge_make_commit ($$$$ $$) {
4033 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
4034 $msg_cmd, $msg_msg) = @_;
4035 progress f_ "Declaring that HEAD includes all changes in %s...",
4038 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
4039 my $authline = clogp_authline $clogp;
4043 !defined $overwrite_version ? ""
4044 : !length $overwrite_version ? " --overwrite"
4045 : " --overwrite=".$overwrite_version;
4047 # Contributing parent is the first parent - that makes
4048 # git rev-list --first-parent DTRT.
4049 my $pmf = dgit_privdir()."/pseudomerge";
4050 open MC, ">", $pmf or die "$pmf $!";
4051 print MC <<END or confess $!;
4054 parent $archive_hash
4062 close MC or confess $!;
4064 return make_commit($pmf);
4067 sub splitbrain_pseudomerge ($$$$) {
4068 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
4069 # => $merged_dgitview
4070 printdebug "splitbrain_pseudomerge...\n";
4072 # We: debian/PREVIOUS HEAD($maintview)
4073 # expect: o ----------------- o
4076 # a/d/PREVIOUS $dgitview
4079 # we do: `------------------ o
4083 return $dgitview unless defined $archive_hash;
4084 return $dgitview if deliberately_not_fast_forward();
4086 printdebug "splitbrain_pseudomerge...\n";
4088 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4090 if (!defined $overwrite_version) {
4091 progress __ "Checking that HEAD includes all changes in archive...";
4094 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
4096 if (defined $overwrite_version) {
4098 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
4099 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14,
4100 __ "maintainer view tag");
4101 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
4102 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, __ "dgit view tag");
4103 my $i_archive = [ $archive_hash, __ "current archive contents" ];
4105 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
4107 infopair_cond_equal($i_dgit, $i_archive);
4108 infopair_cond_ff($i_dep14, $i_dgit);
4109 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
4112 $@ =~ s/^\n//; chomp $@;
4113 print STDERR <<END.(__ <<ENDT);
4116 | Not fast forward; maybe --overwrite is needed ? Please see dgit(1).
4121 my $arch_v = $i_arch_v->[0];
4122 my $r = pseudomerge_make_commit
4123 $clogp, $dgitview, $archive_hash, $i_arch_v,
4124 "dgit --quilt=$quilt_mode",
4125 (defined $overwrite_version
4126 ? f_ "Declare fast forward from %s\n", $arch_v
4127 : f_ "Make fast forward from %s\n", $arch_v);
4129 maybe_split_brain_save $maintview, $r, "pseudomerge";
4131 progress f_ "Made pseudo-merge of %s into dgit view.", $arch_v;
4135 sub plain_overwrite_pseudomerge ($$$) {
4136 my ($clogp, $head, $archive_hash) = @_;
4138 printdebug "plain_overwrite_pseudomerge...";
4140 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4142 return $head if is_fast_fwd $archive_hash, $head;
4144 my $m = f_ "Declare fast forward from %s", $i_arch_v->[0];
4146 my $r = pseudomerge_make_commit
4147 $clogp, $head, $archive_hash, $i_arch_v,
4150 runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
4152 progress f_ "Make pseudo-merge of %s into your HEAD.", $i_arch_v->[0];
4156 sub push_parse_changelog ($) {
4159 my $clogp = Dpkg::Control::Hash->new();
4160 $clogp->load($clogpfn) or die;
4162 my $clogpackage = getfield $clogp, 'Source';
4163 $package //= $clogpackage;
4164 fail f_ "-p specified %s but changelog specified %s",
4165 $package, $clogpackage
4166 unless $package eq $clogpackage;
4167 my $cversion = getfield $clogp, 'Version';
4169 if (!$we_are_initiator) {
4170 # rpush initiator can't do this because it doesn't have $isuite yet
4171 my $tag = debiantag($cversion, access_nomdistro);
4172 runcmd @git, qw(check-ref-format), $tag;
4175 my $dscfn = dscfn($cversion);
4177 return ($clogp, $cversion, $dscfn);
4180 sub push_parse_dsc ($$$) {
4181 my ($dscfn,$dscfnwhat, $cversion) = @_;
4182 $dsc = parsecontrol($dscfn,$dscfnwhat);
4183 my $dversion = getfield $dsc, 'Version';
4184 my $dscpackage = getfield $dsc, 'Source';
4185 ($dscpackage eq $package && $dversion eq $cversion) or
4186 fail f_ "%s is for %s %s but debian/changelog is for %s %s",
4187 $dscfn, $dscpackage, $dversion,
4188 $package, $cversion;
4191 sub push_tagwants ($$$$) {
4192 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4195 TagFn => \&debiantag,
4200 if (defined $maintviewhead) {
4202 TagFn => \&debiantag_maintview,
4203 Objid => $maintviewhead,
4204 TfSuffix => '-maintview',
4207 } elsif ($dodep14tag eq 'no' ? 0
4208 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4209 : $dodep14tag eq 'always'
4210 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4211 --dep14tag-always (or equivalent in config) means server must support
4212 both "new" and "maint" tag formats, but config says it doesn't.
4214 : die "$dodep14tag ?") {
4216 TagFn => \&debiantag_maintview,
4218 TfSuffix => '-dgit',
4222 foreach my $tw (@tagwants) {
4223 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4224 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4226 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4230 sub push_mktags ($$ $$ $) {
4232 $changesfile,$changesfilewhat,
4235 die unless $tagwants->[0]{View} eq 'dgit';
4237 my $declaredistro = access_nomdistro();
4238 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4239 $dsc->{$ourdscfield[0]} = join " ",
4240 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4242 $dsc->save("$dscfn.tmp") or confess $!;
4244 my $changes = parsecontrol($changesfile,$changesfilewhat);
4245 foreach my $field (qw(Source Distribution Version)) {
4246 $changes->{$field} eq $clogp->{$field} or
4247 fail f_ "changes field %s \`%s' does not match changelog \`%s'",
4248 $field, $changes->{$field}, $clogp->{$field};
4251 my $cversion = getfield $clogp, 'Version';
4252 my $clogsuite = getfield $clogp, 'Distribution';
4254 # We make the git tag by hand because (a) that makes it easier
4255 # to control the "tagger" (b) we can do remote signing
4256 my $authline = clogp_authline $clogp;
4257 my $delibs = join(" ", "",@deliberatelies);
4261 my $tfn = $tw->{Tfn};
4262 my $head = $tw->{Objid};
4263 my $tag = $tw->{Tag};
4265 open TO, '>', $tfn->('.tmp') or confess $!;
4266 print TO <<END or confess $!;
4273 if ($tw->{View} eq 'dgit') {
4274 print TO f_ <<ENDT, $package, $cversion, $clogsuite, $csuite
4275 %s release %s for %s (%s) [dgit]
4278 print TO <<END or confess $!;
4279 [dgit distro=$declaredistro$delibs]
4281 foreach my $ref (sort keys %previously) {
4282 print TO <<END or confess $!;
4283 [dgit previously:$ref=$previously{$ref}]
4286 } elsif ($tw->{View} eq 'maint') {
4287 print TO f_ <<END, $package, $cversion, $clogsuite, $csuite,
4288 %s release %s for %s (%s)
4289 (maintainer view tag generated by dgit --quilt=%s)
4294 confess Dumper($tw)."?";
4297 close TO or confess $!;
4299 my $tagobjfn = $tfn->('.tmp');
4301 if (!defined $keyid) {
4302 $keyid = access_cfg('keyid','RETURN-UNDEF');
4304 if (!defined $keyid) {
4305 $keyid = getfield $clogp, 'Maintainer';
4307 unlink $tfn->('.tmp.asc') or $!==&ENOENT or confess $!;
4308 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4309 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4310 push @sign_cmd, $tfn->('.tmp');
4311 runcmd_ordryrun @sign_cmd;
4313 $tagobjfn = $tfn->('.signed.tmp');
4314 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4315 $tfn->('.tmp'), $tfn->('.tmp.asc');
4321 my @r = map { $mktag->($_); } @$tagwants;
4325 sub sign_changes ($) {
4326 my ($changesfile) = @_;
4328 my @debsign_cmd = @debsign;
4329 push @debsign_cmd, "-k$keyid" if defined $keyid;
4330 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4331 push @debsign_cmd, $changesfile;
4332 runcmd_ordryrun @debsign_cmd;
4337 printdebug "actually entering push\n";
4339 supplementary_message(__ <<'END');
4340 Push failed, while checking state of the archive.
4341 You can retry the push, after fixing the problem, if you like.
4343 if (check_for_git()) {
4346 my $archive_hash = fetch_from_archive();
4347 if (!$archive_hash) {
4349 fail __ "package appears to be new in this suite;".
4350 " if this is intentional, use --new";
4353 supplementary_message(__ <<'END');
4354 Push failed, while preparing your push.
4355 You can retry the push, after fixing the problem, if you like.
4358 need_tagformat 'new', "quilt mode $quilt_mode"
4359 if quiltmode_splitbrain;
4363 access_giturl(); # check that success is vaguely likely
4364 rpush_handle_protovsn_bothends() if $we_are_initiator;
4367 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4368 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4370 responder_send_file('parsed-changelog', $clogpfn);
4372 my ($clogp, $cversion, $dscfn) =
4373 push_parse_changelog("$clogpfn");
4375 my $dscpath = "$buildproductsdir/$dscfn";
4376 stat_exists $dscpath or
4377 fail f_ "looked for .dsc %s, but %s; maybe you forgot to build",
4380 responder_send_file('dsc', $dscpath);
4382 push_parse_dsc($dscpath, $dscfn, $cversion);
4384 my $format = getfield $dsc, 'Format';
4385 printdebug "format $format\n";
4387 my $symref = git_get_symref();
4388 my $actualhead = git_rev_parse('HEAD');
4390 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4391 if (quiltmode_splitbrain()) {
4392 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $actualhead);
4393 fail f_ <<END, $ffq_prev, $quilt_mode;
4394 Branch is managed by git-debrebase (%s
4395 exists), but quilt mode (%s) implies a split view.
4396 Pass the right --quilt option or adjust your git config.
4397 Or, maybe, run git-debrebase forget-was-ever-debrebase.
4400 runcmd_ordryrun_local @git_debrebase, 'stitch';
4401 $actualhead = git_rev_parse('HEAD');
4404 my $dgithead = $actualhead;
4405 my $maintviewhead = undef;
4407 my $upstreamversion = upstreamversion $clogp->{Version};
4409 if (madformat_wantfixup($format)) {
4410 # user might have not used dgit build, so maybe do this now:
4411 if (quiltmode_splitbrain()) {
4412 changedir $playground;
4413 quilt_make_fake_dsc($upstreamversion);
4415 ($dgithead, $cachekey) =
4416 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4417 $dgithead or fail f_
4418 "--quilt=%s but no cached dgit view:
4419 perhaps HEAD changed since dgit build[-source] ?",
4422 $dgithead = splitbrain_pseudomerge($clogp,
4423 $actualhead, $dgithead,
4425 $maintviewhead = $actualhead;
4427 prep_ud(); # so _only_subdir() works, below
4429 commit_quilty_patch();
4433 if (defined $overwrite_version && !defined $maintviewhead
4435 $dgithead = plain_overwrite_pseudomerge($clogp,
4443 if ($archive_hash) {
4444 if (is_fast_fwd($archive_hash, $dgithead)) {
4446 } elsif (deliberately_not_fast_forward) {
4449 fail __ "dgit push: HEAD is not a descendant".
4450 " of the archive's version.\n".
4451 "To overwrite the archive's contents,".
4452 " pass --overwrite[=VERSION].\n".
4453 "To rewind history, if permitted by the archive,".
4454 " use --deliberately-not-fast-forward.";
4458 changedir $playground;
4459 progress f_ "checking that %s corresponds to HEAD", $dscfn;
4460 runcmd qw(dpkg-source -x --),
4461 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4462 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4463 check_for_vendor_patches() if madformat($dsc->{format});
4465 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4466 debugcmd "+",@diffcmd;
4468 my $r = system @diffcmd;
4471 my $referent = $split_brain ? $dgithead : 'HEAD';
4472 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4475 my $raw = cmdoutput @git,
4476 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4478 foreach (split /\0/, $raw) {
4479 if (defined $changed) {
4480 push @mode_changes, "$changed: $_\n" if $changed;
4483 } elsif (m/^:0+ 0+ /) {
4485 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4486 $changed = "Mode change from $1 to $2"
4491 if (@mode_changes) {
4492 fail +(f_ <<ENDT, $dscfn).<<END
4493 HEAD specifies a different tree to %s:
4497 .(join '', @mode_changes)
4498 .(f_ <<ENDT, $tree, $referent);
4499 There is a problem with your source tree (see dgit(7) for some hints).
4500 To see a full diff, run git diff %s %s
4504 fail +(f_ <<ENDT, $dscfn).<<END.(f_ <<ENDT, $tree, $referent);
4505 HEAD specifies a different tree to %s:
4509 Perhaps you forgot to build. Or perhaps there is a problem with your
4510 source tree (see dgit(7) for some hints). To see a full diff, run
4517 if (!$changesfile) {
4518 my $pat = changespat $cversion;
4519 my @cs = glob "$buildproductsdir/$pat";
4520 fail f_ "failed to find unique changes file".
4521 " (looked for %s in %s);".
4522 " perhaps you need to use dgit -C",
4523 $pat, $buildproductsdir
4525 ($changesfile) = @cs;
4527 $changesfile = "$buildproductsdir/$changesfile";
4530 # Check that changes and .dsc agree enough
4531 $changesfile =~ m{[^/]*$};
4532 my $changes = parsecontrol($changesfile,$&);
4533 files_compare_inputs($dsc, $changes)
4534 unless forceing [qw(dsc-changes-mismatch)];
4536 # Check whether this is a source only upload
4537 my $hasdebs = $changes->{Files} =~ m{\.deb$}m;
4538 my $sourceonlypolicy = access_cfg 'source-only-uploads';
4539 if ($sourceonlypolicy eq 'ok') {
4540 } elsif ($sourceonlypolicy eq 'always') {
4541 forceable_fail [qw(uploading-binaries)],
4542 __ "uploading binaries, although distro policy is source only"
4544 } elsif ($sourceonlypolicy eq 'never') {
4545 forceable_fail [qw(uploading-source-only)],
4546 __ "source-only upload, although distro policy requires .debs"
4548 } elsif ($sourceonlypolicy eq 'not-wholly-new') {
4549 forceable_fail [qw(uploading-source-only)],
4550 f_ "source-only upload, even though package is entirely NEW\n".
4551 "(this is contrary to policy in %s)",
4555 && !(archive_query('package_not_wholly_new', $package) // 1);
4557 badcfg f_ "unknown source-only-uploads policy \`%s'",
4561 # Perhaps adjust .dsc to contain right set of origs
4562 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4564 unless forceing [qw(changes-origs-exactly)];
4566 # Checks complete, we're going to try and go ahead:
4568 responder_send_file('changes',$changesfile);
4569 responder_send_command("param head $dgithead");
4570 responder_send_command("param csuite $csuite");
4571 responder_send_command("param isuite $isuite");
4572 responder_send_command("param tagformat $tagformat");
4573 if (defined $maintviewhead) {
4574 confess "internal error (protovsn=$protovsn)"
4575 if defined $protovsn and $protovsn < 4;
4576 responder_send_command("param maint-view $maintviewhead");
4579 # Perhaps send buildinfo(s) for signing
4580 my $changes_files = getfield $changes, 'Files';
4581 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4582 foreach my $bi (@buildinfos) {
4583 responder_send_command("param buildinfo-filename $bi");
4584 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4587 if (deliberately_not_fast_forward) {
4588 git_for_each_ref(lrfetchrefs, sub {
4589 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4590 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4591 responder_send_command("previously $rrefname=$objid");
4592 $previously{$rrefname} = $objid;
4596 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4597 dgit_privdir()."/tag");
4600 supplementary_message(__ <<'END');
4601 Push failed, while signing the tag.
4602 You can retry the push, after fixing the problem, if you like.
4604 # If we manage to sign but fail to record it anywhere, it's fine.
4605 if ($we_are_responder) {
4606 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4607 responder_receive_files('signed-tag', @tagobjfns);
4609 @tagobjfns = push_mktags($clogp,$dscpath,
4610 $changesfile,$changesfile,
4613 supplementary_message(__ <<'END');
4614 Push failed, *after* signing the tag.
4615 If you want to try again, you should use a new version number.
4618 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4620 foreach my $tw (@tagwants) {
4621 my $tag = $tw->{Tag};
4622 my $tagobjfn = $tw->{TagObjFn};
4624 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4625 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4626 runcmd_ordryrun_local
4627 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4630 supplementary_message(__ <<'END');
4631 Push failed, while updating the remote git repository - see messages above.
4632 If you want to try again, you should use a new version number.
4634 if (!check_for_git()) {
4635 create_remote_git_repo();
4638 my @pushrefs = $forceflag.$dgithead.":".rrref();
4639 foreach my $tw (@tagwants) {
4640 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4643 runcmd_ordryrun @git,
4644 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4645 runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
4647 supplementary_message(__ <<'END');
4648 Push failed, while obtaining signatures on the .changes and .dsc.
4649 If it was just that the signature failed, you may try again by using
4650 debsign by hand to sign the changes file (see the command dgit tried,
4651 above), and then dput that changes file to complete the upload.
4652 If you need to change the package, you must use a new version number.
4654 if ($we_are_responder) {
4655 my $dryrunsuffix = act_local() ? "" : ".tmp";
4656 my @rfiles = ($dscpath, $changesfile);
4657 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4658 responder_receive_files('signed-dsc-changes',
4659 map { "$_$dryrunsuffix" } @rfiles);
4662 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4664 progress f_ "[new .dsc left in %s.tmp]", $dscpath;
4666 sign_changes $changesfile;
4669 supplementary_message(f_ <<END, $changesfile);
4670 Push failed, while uploading package(s) to the archive server.
4671 You can retry the upload of exactly these same files with dput of:
4673 If that .changes file is broken, you will need to use a new version
4674 number for your next attempt at the upload.
4676 my $host = access_cfg('upload-host','RETURN-UNDEF');
4677 my @hostarg = defined($host) ? ($host,) : ();
4678 runcmd_ordryrun @dput, @hostarg, $changesfile;
4679 printdone f_ "pushed and uploaded %s", $cversion;
4681 supplementary_message('');
4682 responder_send_command("complete");
4686 not_necessarily_a_tree();
4691 badusage __ "-p is not allowed with clone; specify as argument instead"
4692 if defined $package;
4695 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4696 ($package,$isuite) = @ARGV;
4697 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4698 ($package,$dstdir) = @ARGV;
4699 } elsif (@ARGV==3) {
4700 ($package,$isuite,$dstdir) = @ARGV;
4702 badusage __ "incorrect arguments to dgit clone";
4706 $dstdir ||= "$package";
4707 if (stat_exists $dstdir) {
4708 fail f_ "%s already exists", $dstdir;
4712 if ($rmonerror && !$dryrun_level) {
4713 $cwd_remove= getcwd();
4715 return unless defined $cwd_remove;
4716 if (!chdir "$cwd_remove") {
4717 return if $!==&ENOENT;
4718 confess "chdir $cwd_remove: $!";
4720 printdebug "clone rmonerror removing $dstdir\n";
4722 rmtree($dstdir) or fail f_ "remove %s: %s\n", $dstdir, $!;
4723 } elsif (grep { $! == $_ }
4724 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4726 print STDERR f_ "check whether to remove %s: %s\n",
4733 $cwd_remove = undef;
4736 sub branchsuite () {
4737 my $branch = git_get_symref();
4738 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4745 sub package_from_d_control () {
4746 if (!defined $package) {
4747 my $sourcep = parsecontrol('debian/control','debian/control');
4748 $package = getfield $sourcep, 'Source';
4752 sub fetchpullargs () {
4753 package_from_d_control();
4755 $isuite = branchsuite();
4757 my $clogp = parsechangelog();
4758 my $clogsuite = getfield $clogp, 'Distribution';
4759 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4761 } elsif (@ARGV==1) {
4764 badusage __ "incorrect arguments to dgit fetch or dgit pull";
4778 if (quiltmode_splitbrain()) {
4779 my ($format, $fopts) = get_source_format();
4780 madformat($format) and fail f_ <<END, $quilt_mode
4781 dgit pull not yet supported in split view mode (--quilt=%s)
4789 package_from_d_control();
4790 @ARGV==1 or badusage __ "dgit checkout needs a suite argument";
4794 foreach my $canon (qw(0 1)) {
4799 canonicalise_suite();
4801 if (length git_get_ref lref()) {
4802 # local branch already exists, yay
4805 if (!length git_get_ref lrref()) {
4813 runcmd (@git, qw(update-ref), lref(), lrref(), '');
4816 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
4817 "dgit checkout $isuite";
4818 runcmd (@git, qw(checkout), lbranch());
4821 sub cmd_update_vcs_git () {
4823 if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
4824 ($specsuite,) = split /\;/, cfg 'dgit.vcs-git.suites';
4826 ($specsuite) = (@ARGV);
4831 if ($ARGV[0] eq '-') {
4833 } elsif ($ARGV[0] eq '-') {
4838 package_from_d_control();
4840 if ($specsuite eq '.') {
4841 $ctrl = parsecontrol 'debian/control', 'debian/control';
4843 $isuite = $specsuite;
4847 my $url = getfield $ctrl, 'Vcs-Git';
4850 my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
4851 if (!defined $orgurl) {
4852 print STDERR f_ "setting up vcs-git: %s\n", $url;
4853 @cmd = (@git, qw(remote add vcs-git), $url);
4854 } elsif ($orgurl eq $url) {
4855 print STDERR f_ "vcs git already configured: %s\n", $url;
4857 print STDERR f_ "changing vcs-git url to: %s\n", $url;
4858 @cmd = (@git, qw(remote set-url vcs-git), $url);
4860 runcmd_ordryrun_local @cmd;
4862 print f_ "fetching (%s)\n", "@ARGV";
4863 runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
4869 build_or_push_prep_early();
4874 } elsif (@ARGV==1) {
4875 ($specsuite) = (@ARGV);
4877 badusage f_ "incorrect arguments to dgit %s", $subcommand;
4880 local ($package) = $existing_package; # this is a hack
4881 canonicalise_suite();
4883 canonicalise_suite();
4885 if (defined $specsuite &&
4886 $specsuite ne $isuite &&
4887 $specsuite ne $csuite) {
4888 fail f_ "dgit %s: changelog specifies %s (%s)".
4889 " but command line specifies %s",
4890 $subcommand, $isuite, $csuite, $specsuite;
4899 #---------- remote commands' implementation ----------
4901 sub pre_remote_push_build_host {
4902 my ($nrargs) = shift @ARGV;
4903 my (@rargs) = @ARGV[0..$nrargs-1];
4904 @ARGV = @ARGV[$nrargs..$#ARGV];
4906 my ($dir,$vsnwant) = @rargs;
4907 # vsnwant is a comma-separated list; we report which we have
4908 # chosen in our ready response (so other end can tell if they
4911 $we_are_responder = 1;
4912 $us .= " (build host)";
4914 open PI, "<&STDIN" or confess $!;
4915 open STDIN, "/dev/null" or confess $!;
4916 open PO, ">&STDOUT" or confess $!;
4918 open STDOUT, ">&STDERR" or confess $!;
4922 ($protovsn) = grep {
4923 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4924 } @rpushprotovsn_support;
4926 fail f_ "build host has dgit rpush protocol versions %s".
4927 " but invocation host has %s",
4928 (join ",", @rpushprotovsn_support), $vsnwant
4929 unless defined $protovsn;
4933 sub cmd_remote_push_build_host {
4934 responder_send_command("dgit-remote-push-ready $protovsn");
4938 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4939 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4940 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4941 # a good error message)
4943 sub rpush_handle_protovsn_bothends () {
4944 if ($protovsn < 4) {
4945 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4954 my $report = i_child_report();
4955 if (defined $report) {
4956 printdebug "($report)\n";
4957 } elsif ($i_child_pid) {
4958 printdebug "(killing build host child $i_child_pid)\n";
4959 kill 15, $i_child_pid;
4961 if (defined $i_tmp && !defined $initiator_tempdir) {
4963 eval { rmtree $i_tmp; };
4968 return unless forkcheck_mainprocess();
4973 my ($base,$selector,@args) = @_;
4974 $selector =~ s/\-/_/g;
4975 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4979 not_necessarily_a_tree();
4984 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4992 push @rargs, join ",", @rpushprotovsn_support;
4995 push @rdgit, @ropts;
4996 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4998 my @cmd = (@ssh, $host, shellquote @rdgit);
5001 $we_are_initiator=1;
5003 if (defined $initiator_tempdir) {
5004 rmtree $initiator_tempdir;
5005 mkdir $initiator_tempdir, 0700
5006 or fail f_ "create %s: %s", $initiator_tempdir, $!;
5007 $i_tmp = $initiator_tempdir;
5011 $i_child_pid = open2(\*RO, \*RI, @cmd);
5013 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
5014 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
5015 $supplementary_message = '' unless $protovsn >= 3;
5018 my ($icmd,$iargs) = initiator_expect {
5019 m/^(\S+)(?: (.*))?$/;
5022 i_method "i_resp", $icmd, $iargs;
5026 sub i_resp_progress ($) {
5028 my $msg = protocol_read_bytes \*RO, $rhs;
5032 sub i_resp_supplementary_message ($) {
5034 $supplementary_message = protocol_read_bytes \*RO, $rhs;
5037 sub i_resp_complete {
5038 my $pid = $i_child_pid;
5039 $i_child_pid = undef; # prevents killing some other process with same pid
5040 printdebug "waiting for build host child $pid...\n";
5041 my $got = waitpid $pid, 0;
5042 confess $! unless $got == $pid;
5043 fail f_ "build host child failed: %s", waitstatusmsg() if $?;
5046 printdebug __ "all done\n";
5050 sub i_resp_file ($) {
5052 my $localname = i_method "i_localname", $keyword;
5053 my $localpath = "$i_tmp/$localname";
5054 stat_exists $localpath and
5055 badproto \*RO, f_ "file %s (%s) twice", $keyword, $localpath;
5056 protocol_receive_file \*RO, $localpath;
5057 i_method "i_file", $keyword;
5062 sub i_resp_param ($) {
5063 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, __ "bad param spec";
5067 sub i_resp_previously ($) {
5068 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
5069 or badproto \*RO, __ "bad previously spec";
5070 my $r = system qw(git check-ref-format), $1;
5071 confess "bad previously ref spec ($r)" if $r;
5072 $previously{$1} = $2;
5077 sub i_resp_want ($) {
5079 die "$keyword ?" if $i_wanted{$keyword}++;
5081 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
5082 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
5083 die unless $isuite =~ m/^$suite_re$/;
5086 rpush_handle_protovsn_bothends();
5088 fail f_ "rpush negotiated protocol version %s".
5089 " which does not support quilt mode %s",
5090 $protovsn, $quilt_mode
5091 if quiltmode_splitbrain;
5093 my @localpaths = i_method "i_want", $keyword;
5094 printdebug "[[ $keyword @localpaths\n";
5095 foreach my $localpath (@localpaths) {
5096 protocol_send_file \*RI, $localpath;
5098 print RI "files-end\n" or confess $!;
5101 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
5103 sub i_localname_parsed_changelog {
5104 return "remote-changelog.822";
5106 sub i_file_parsed_changelog {
5107 ($i_clogp, $i_version, $i_dscfn) =
5108 push_parse_changelog "$i_tmp/remote-changelog.822";
5109 die if $i_dscfn =~ m#/|^\W#;
5112 sub i_localname_dsc {
5113 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5118 sub i_localname_buildinfo ($) {
5119 my $bi = $i_param{'buildinfo-filename'};
5120 defined $bi or badproto \*RO, "buildinfo before filename";
5121 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
5122 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
5123 or badproto \*RO, "improper buildinfo filename";
5126 sub i_file_buildinfo {
5127 my $bi = $i_param{'buildinfo-filename'};
5128 my $bd = parsecontrol "$i_tmp/$bi", $bi;
5129 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
5130 if (!forceing [qw(buildinfo-changes-mismatch)]) {
5131 files_compare_inputs($bd, $ch);
5132 (getfield $bd, $_) eq (getfield $ch, $_) or
5133 fail f_ "buildinfo mismatch in field %s", $_
5134 foreach qw(Source Version);
5135 !defined $bd->{$_} or
5136 fail f_ "buildinfo contains forbidden field %s", $_
5137 foreach qw(Changes Changed-by Distribution);
5139 push @i_buildinfos, $bi;
5140 delete $i_param{'buildinfo-filename'};
5143 sub i_localname_changes {
5144 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
5145 $i_changesfn = $i_dscfn;
5146 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
5147 return $i_changesfn;
5149 sub i_file_changes { }
5151 sub i_want_signed_tag {
5152 printdebug Dumper(\%i_param, $i_dscfn);
5153 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
5154 && defined $i_param{'csuite'}
5155 or badproto \*RO, "premature desire for signed-tag";
5156 my $head = $i_param{'head'};
5157 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
5159 my $maintview = $i_param{'maint-view'};
5160 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
5163 if ($protovsn >= 4) {
5164 my $p = $i_param{'tagformat'} // '<undef>';
5166 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
5169 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
5171 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
5173 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
5176 push_mktags $i_clogp, $i_dscfn,
5177 $i_changesfn, (__ 'remote changes file'),
5181 sub i_want_signed_dsc_changes {
5182 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
5183 sign_changes $i_changesfn;
5184 return ($i_dscfn, $i_changesfn, @i_buildinfos);
5187 #---------- building etc. ----------
5193 #----- `3.0 (quilt)' handling -----
5195 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
5197 sub quiltify_dpkg_commit ($$$;$) {
5198 my ($patchname,$author,$msg, $xinfo) = @_;
5201 mkpath '.git/dgit'; # we are in playtree
5202 my $descfn = ".git/dgit/quilt-description.tmp";
5203 open O, '>', $descfn or confess "$descfn: $!";
5204 $msg =~ s/\n+/\n\n/;
5205 print O <<END or confess $!;
5207 ${xinfo}Subject: $msg
5211 close O or confess $!;
5214 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
5215 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
5216 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
5217 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
5221 sub quiltify_trees_differ ($$;$$$) {
5222 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
5223 # returns true iff the two tree objects differ other than in debian/
5224 # with $finegrained,
5225 # returns bitmask 01 - differ in upstream files except .gitignore
5226 # 02 - differ in .gitignore
5227 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
5228 # is set for each modified .gitignore filename $fn
5229 # if $unrepres is defined, array ref to which is appeneded
5230 # a list of unrepresentable changes (removals of upstream files
5233 my @cmd = (@git, qw(diff-tree -z --no-renames));
5234 push @cmd, qw(--name-only) unless $unrepres;
5235 push @cmd, qw(-r) if $finegrained || $unrepres;
5237 my $diffs= cmdoutput @cmd;
5240 foreach my $f (split /\0/, $diffs) {
5241 if ($unrepres && !@lmodes) {
5242 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
5245 my ($oldmode,$newmode) = @lmodes;
5248 next if $f =~ m#^debian(?:/.*)?$#s;
5252 die __ "not a plain file or symlink\n"
5253 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5254 $oldmode =~ m/^(?:10|12)\d{4}$/;
5255 if ($oldmode =~ m/[^0]/ &&
5256 $newmode =~ m/[^0]/) {
5257 # both old and new files exist
5258 die __ "mode or type changed\n" if $oldmode ne $newmode;
5259 die __ "modified symlink\n" unless $newmode =~ m/^10/;
5260 } elsif ($oldmode =~ m/[^0]/) {
5262 die __ "deletion of symlink\n"
5263 unless $oldmode =~ m/^10/;
5266 die __ "creation with non-default mode\n"
5267 unless $newmode =~ m/^100644$/ or
5268 $newmode =~ m/^120000$/;
5272 local $/="\n"; chomp $@;
5273 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5277 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5278 $r |= $isignore ? 02 : 01;
5279 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5281 printdebug "quiltify_trees_differ $x $y => $r\n";
5285 sub quiltify_tree_sentinelfiles ($) {
5286 # lists the `sentinel' files present in the tree
5288 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5289 qw(-- debian/rules debian/control);
5294 sub quiltify_splitbrain_needed () {
5295 if (!$split_brain) {
5296 progress __ "dgit view: changes are required...";
5297 runcmd @git, qw(checkout -q -b dgit-view);
5302 sub quiltify_splitbrain ($$$$$$$) {
5303 my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
5304 $editedignores, $cachekey) = @_;
5305 my $gitignore_special = 1;
5306 if ($quilt_mode !~ m/gbp|dpm/) {
5307 # treat .gitignore just like any other upstream file
5308 $diffbits = { %$diffbits };
5309 $_ = !!$_ foreach values %$diffbits;
5310 $gitignore_special = 0;
5312 # We would like any commits we generate to be reproducible
5313 my @authline = clogp_authline($clogp);
5314 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5315 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5316 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5317 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5318 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5319 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5321 my $fulldiffhint = sub {
5323 my $cmd = "git diff $x $y -- :/ ':!debian'";
5324 $cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special;
5325 return f_ "\nFor full diff showing the problem(s), type:\n %s\n",
5329 if ($quilt_mode =~ m/gbp|unapplied/ &&
5330 ($diffbits->{O2H} & 01)) {
5332 "--quilt=%s specified, implying patches-unapplied git tree\n".
5333 " but git tree differs from orig in upstream files.",
5335 $msg .= $fulldiffhint->($unapplied, 'HEAD');
5336 if (!stat_exists "debian/patches") {
5338 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5342 if ($quilt_mode =~ m/dpm/ &&
5343 ($diffbits->{H2A} & 01)) {
5344 fail +(f_ <<END, $quilt_mode). $fulldiffhint->($oldtiptree,'HEAD');
5345 --quilt=%s specified, implying patches-applied git tree
5346 but git tree differs from result of applying debian/patches to upstream
5349 if ($quilt_mode =~ m/gbp|unapplied/ &&
5350 ($diffbits->{O2A} & 01)) { # some patches
5351 quiltify_splitbrain_needed();
5352 progress __ "dgit view: creating patches-applied version using gbp pq";
5353 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5354 # gbp pq import creates a fresh branch; push back to dgit-view
5355 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5356 runcmd @git, qw(checkout -q dgit-view);
5358 if ($quilt_mode =~ m/gbp|dpm/ &&
5359 ($diffbits->{O2A} & 02)) {
5360 fail f_ <<END, $quilt_mode;
5361 --quilt=%s specified, implying that HEAD is for use with a
5362 tool which does not create patches for changes to upstream
5363 .gitignores: but, such patches exist in debian/patches.
5366 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5367 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5368 quiltify_splitbrain_needed();
5370 "dgit view: creating patch to represent .gitignore changes";
5371 ensuredir "debian/patches";
5372 my $gipatch = "debian/patches/auto-gitignore";
5373 open GIPATCH, ">>", "$gipatch" or confess "$gipatch: $!";
5374 stat GIPATCH or confess "$gipatch: $!";
5375 fail f_ "%s already exists; but want to create it".
5376 " to record .gitignore changes",
5379 print GIPATCH +(__ <<END).<<ENDU or die "$gipatch: $!";
5380 Subject: Update .gitignore from Debian packaging branch
5382 The Debian packaging git branch contains these updates to the upstream
5383 .gitignore file(s). This patch is autogenerated, to provide these
5384 updates to users of the official Debian archive view of the package.
5387 [dgit ($our_version) update-gitignore]
5390 close GIPATCH or die "$gipatch: $!";
5391 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5392 $unapplied, $headref, "--", sort keys %$editedignores;
5393 open SERIES, "+>>", "debian/patches/series" or confess $!;
5394 defined seek SERIES, -1, 2 or $!==EINVAL or confess $!;
5396 defined read SERIES, $newline, 1 or confess $!;
5397 print SERIES "\n" or confess $! unless $newline eq "\n";
5398 print SERIES "auto-gitignore\n" or confess $!;
5399 close SERIES or die $!;
5400 runcmd @git, qw(add -f -- debian/patches/series), $gipatch;
5401 commit_admin +(__ <<END).<<ENDU
5402 Commit patch to update .gitignore
5405 [dgit ($our_version) update-gitignore-quilt-fixup]
5409 my $dgitview = git_rev_parse 'HEAD';
5412 reflog_cache_insert "refs/$splitbraincache", $cachekey, $dgitview;
5414 changedir "$playground/work";
5416 my $saved = maybe_split_brain_save $headref, $dgitview, __ "converted";
5417 progress f_ "dgit view: created (%s)", $saved;
5420 sub quiltify ($$$$) {
5421 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5423 # Quilt patchification algorithm
5425 # We search backwards through the history of the main tree's HEAD
5426 # (T) looking for a start commit S whose tree object is identical
5427 # to to the patch tip tree (ie the tree corresponding to the
5428 # current dpkg-committed patch series). For these purposes
5429 # `identical' disregards anything in debian/ - this wrinkle is
5430 # necessary because dpkg-source treates debian/ specially.
5432 # We can only traverse edges where at most one of the ancestors'
5433 # trees differs (in changes outside in debian/). And we cannot
5434 # handle edges which change .pc/ or debian/patches. To avoid
5435 # going down a rathole we avoid traversing edges which introduce
5436 # debian/rules or debian/control. And we set a limit on the
5437 # number of edges we are willing to look at.
5439 # If we succeed, we walk forwards again. For each traversed edge
5440 # PC (with P parent, C child) (starting with P=S and ending with
5441 # C=T) to we do this:
5443 # - dpkg-source --commit with a patch name and message derived from C
5444 # After traversing PT, we git commit the changes which
5445 # should be contained within debian/patches.
5447 # The search for the path S..T is breadth-first. We maintain a
5448 # todo list containing search nodes. A search node identifies a
5449 # commit, and looks something like this:
5451 # Commit => $git_commit_id,
5452 # Child => $c, # or undef if P=T
5453 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5454 # Nontrivial => true iff $p..$c has relevant changes
5461 my %considered; # saves being exponential on some weird graphs
5463 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5466 my ($search,$whynot) = @_;
5467 printdebug " search NOT $search->{Commit} $whynot\n";
5468 $search->{Whynot} = $whynot;
5469 push @nots, $search;
5470 no warnings qw(exiting);
5479 my $c = shift @todo;
5480 next if $considered{$c->{Commit}}++;
5482 $not->($c, __ "maximum search space exceeded") if --$max_work <= 0;
5484 printdebug "quiltify investigate $c->{Commit}\n";
5487 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5488 printdebug " search finished hooray!\n";
5493 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5494 if ($quilt_mode eq 'smash') {
5495 printdebug " search quitting smash\n";
5499 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5500 $not->($c, f_ "has %s not %s", $c_sentinels, $t_sentinels)
5501 if $c_sentinels ne $t_sentinels;
5503 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5504 $commitdata =~ m/\n\n/;
5506 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5507 @parents = map { { Commit => $_, Child => $c } } @parents;
5509 $not->($c, __ "root commit") if !@parents;
5511 foreach my $p (@parents) {
5512 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5514 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5515 $not->($c, f_ "merge (%s nontrivial parents)", $ndiffers)
5518 foreach my $p (@parents) {
5519 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5521 my @cmd= (@git, qw(diff-tree -r --name-only),
5522 $p->{Commit},$c->{Commit},
5523 qw(-- debian/patches .pc debian/source/format));
5524 my $patchstackchange = cmdoutput @cmd;
5525 if (length $patchstackchange) {
5526 $patchstackchange =~ s/\n/,/g;
5527 $not->($p, f_ "changed %s", $patchstackchange);
5530 printdebug " search queue P=$p->{Commit} ",
5531 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5537 printdebug "quiltify want to smash\n";
5540 my $x = $_[0]{Commit};
5541 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5544 if ($quilt_mode eq 'linear') {
5546 "\n%s: error: quilt fixup cannot be linear. Stopped at:\n",
5548 my $all_gdr = !!@nots;
5549 foreach my $notp (@nots) {
5550 my $c = $notp->{Child};
5551 my $cprange = $abbrev->($notp);
5552 $cprange .= "..".$abbrev->($c) if $c;
5553 print STDERR f_ "%s: %s: %s\n",
5554 $us, $cprange, $notp->{Whynot};
5555 $all_gdr &&= $notp->{Child} &&
5556 (git_cat_file $notp->{Child}{Commit}, 'commit')
5557 =~ m{^\[git-debrebase(?! split[: ]).*\]$}m;
5561 [ grep { $_->[0] ne 'quilt-mode' } @$failsuggestion ]
5563 print STDERR "$us: $_->[1]\n" foreach @$failsuggestion;
5565 "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n";
5566 } elsif ($quilt_mode eq 'smash') {
5567 } elsif ($quilt_mode eq 'auto') {
5568 progress __ "quilt fixup cannot be linear, smashing...";
5570 confess "$quilt_mode ?";
5573 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5574 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5576 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5578 quiltify_dpkg_commit "auto-$version-$target-$time",
5579 (getfield $clogp, 'Maintainer'),
5580 (f_ "Automatically generated patch (%s)\n".
5581 "Last (up to) %s git changes, FYI:\n\n",
5582 $clogp->{Version}, $ncommits).
5587 progress __ "quiltify linearisation planning successful, executing...";
5589 for (my $p = $sref_S;
5590 my $c = $p->{Child};
5592 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5593 next unless $p->{Nontrivial};
5595 my $cc = $c->{Commit};
5597 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5598 $commitdata =~ m/\n\n/ or die "$c ?";
5601 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5604 my $commitdate = cmdoutput
5605 @git, qw(log -n1 --pretty=format:%aD), $cc;
5607 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5609 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5616 my $gbp_check_suitable = sub {
5621 die __ "contains unexpected slashes\n" if m{//} || m{/$};
5622 die __ "contains leading punctuation\n" if m{^\W} || m{/\W};
5623 die __ "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5624 die __ "is series file\n" if m{$series_filename_re}o;
5625 die __ "too long\n" if length > 200;
5627 return $_ unless $@;
5629 "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s",
5634 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5636 (\S+) \s* \n //ixm) {
5637 $patchname = $gbp_check_suitable->($1, 'Name');
5639 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5641 (\S+) \s* \n //ixm) {
5642 $patchdir = $gbp_check_suitable->($1, 'Topic');
5647 if (!defined $patchname) {
5648 $patchname = $title;
5649 $patchname =~ s/[.:]$//;
5652 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5653 my $translitname = $converter->convert($patchname);
5654 die unless defined $translitname;
5655 $patchname = $translitname;
5658 +(f_ "dgit: patch title transliteration error: %s", $@)
5660 $patchname =~ y/ A-Z/-a-z/;
5661 $patchname =~ y/-a-z0-9_.+=~//cd;
5662 $patchname =~ s/^\W/x-$&/;
5663 $patchname = substr($patchname,0,40);
5664 $patchname .= ".patch";
5666 if (!defined $patchdir) {
5669 if (length $patchdir) {
5670 $patchname = "$patchdir/$patchname";
5672 if ($patchname =~ m{^(.*)/}) {
5673 mkpath "debian/patches/$1";
5678 stat "debian/patches/$patchname$index";
5680 $!==ENOENT or confess "$patchname$index $!";
5682 runcmd @git, qw(checkout -q), $cc;
5684 # We use the tip's changelog so that dpkg-source doesn't
5685 # produce complaining messages from dpkg-parsechangelog. None
5686 # of the information dpkg-source gets from the changelog is
5687 # actually relevant - it gets put into the original message
5688 # which dpkg-source provides our stunt editor, and then
5690 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5692 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5693 "Date: $commitdate\n".
5694 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5696 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5699 runcmd @git, qw(checkout -q master);
5702 sub build_maybe_quilt_fixup () {
5703 my ($format,$fopts) = get_source_format;
5704 return unless madformat_wantfixup $format;
5707 check_for_vendor_patches();
5709 if (quiltmode_splitbrain) {
5710 fail <<END unless access_cfg_tagformats_can_splitbrain;
5711 quilt mode $quilt_mode requires split view so server needs to support
5712 both "new" and "maint" tag formats, but config says it doesn't.
5716 my $clogp = parsechangelog();
5717 my $headref = git_rev_parse('HEAD');
5718 my $symref = git_get_symref();
5720 if ($quilt_mode eq 'linear'
5721 && !$fopts->{'single-debian-patch'}
5722 && branch_is_gdr($headref)) {
5723 # This is much faster. It also makes patches that gdr
5724 # likes better for future updates without laundering.
5726 # However, it can fail in some casses where we would
5727 # succeed: if there are existing patches, which correspond
5728 # to a prefix of the branch, but are not in gbp/gdr
5729 # format, gdr will fail (exiting status 7), but we might
5730 # be able to figure out where to start linearising. That
5731 # will be slower so hopefully there's not much to do.
5732 my @cmd = (@git_debrebase,
5733 qw(--noop-ok -funclean-mixed -funclean-ordering
5734 make-patches --quiet-would-amend));
5735 # We tolerate soe snags that gdr wouldn't, by default.
5741 and not ($? == 7*256 or
5742 $? == -1 && $!==ENOENT);
5746 $headref = git_rev_parse('HEAD');
5750 changedir $playground;
5752 my $upstreamversion = upstreamversion $version;
5754 if ($fopts->{'single-debian-patch'}) {
5755 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5757 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5761 runcmd_ordryrun_local
5762 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5765 sub unpack_playtree_mkwork ($) {
5768 mkdir "work" or confess $!;
5770 mktree_in_ud_here();
5771 runcmd @git, qw(reset -q --hard), $headref;
5774 sub unpack_playtree_linkorigs ($$) {
5775 my ($upstreamversion, $fn) = @_;
5776 # calls $fn->($leafname);
5778 my $bpd_abs = bpd_abs();
5779 opendir QFD, $bpd_abs or fail "buildproductsdir: $bpd_abs: $!";
5780 while ($!=0, defined(my $b = readdir QFD)) {
5781 my $f = bpd_abs()."/".$b;
5783 local ($debuglevel) = $debuglevel-1;
5784 printdebug "QF linkorigs $b, $f ?\n";
5786 next unless is_orig_file_of_vsn $b, $upstreamversion;
5787 printdebug "QF linkorigs $b, $f Y\n";
5788 link_ltarget $f, $b or die "$b $!";
5791 die "$buildproductsdir: $!" if $!;
5795 sub quilt_fixup_delete_pc () {
5796 runcmd @git, qw(rm -rqf .pc);
5797 commit_admin +(__ <<END).<<ENDU
5798 Commit removal of .pc (quilt series tracking data)
5801 [dgit ($our_version) upgrade quilt-remove-pc]
5805 sub quilt_fixup_singlepatch ($$$) {
5806 my ($clogp, $headref, $upstreamversion) = @_;
5808 progress __ "starting quiltify (single-debian-patch)";
5810 # dpkg-source --commit generates new patches even if
5811 # single-debian-patch is in debian/source/options. In order to
5812 # get it to generate debian/patches/debian-changes, it is
5813 # necessary to build the source package.
5815 unpack_playtree_linkorigs($upstreamversion, sub { });
5816 unpack_playtree_mkwork($headref);
5818 rmtree("debian/patches");
5820 runcmd @dpkgsource, qw(-b .);
5822 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5823 rename srcfn("$upstreamversion", "/debian/patches"),
5824 "work/debian/patches"
5826 or confess "install d/patches: $!";
5829 commit_quilty_patch();
5832 sub quilt_make_fake_dsc ($) {
5833 my ($upstreamversion) = @_;
5835 my $fakeversion="$upstreamversion-~~DGITFAKE";
5837 my $fakedsc=new IO::File 'fake.dsc', '>' or confess $!;
5838 print $fakedsc <<END or confess $!;
5841 Version: $fakeversion
5845 my $dscaddfile=sub {
5848 my $md = new Digest::MD5;
5850 my $fh = new IO::File $b, '<' or die "$b $!";
5851 stat $fh or confess $!;
5855 print $fakedsc " ".$md->hexdigest." $size $b\n" or confess $!;
5858 unpack_playtree_linkorigs($upstreamversion, $dscaddfile);
5860 my @files=qw(debian/source/format debian/rules
5861 debian/control debian/changelog);
5862 foreach my $maybe (qw(debian/patches debian/source/options
5863 debian/tests/control)) {
5864 next unless stat_exists "$maindir/$maybe";
5865 push @files, $maybe;
5868 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5869 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5871 $dscaddfile->($debtar);
5872 close $fakedsc or confess $!;
5875 sub quilt_fakedsc2unapplied ($$) {
5876 my ($headref, $upstreamversion) = @_;
5877 # must be run in the playground
5878 # quilt_make_fake_dsc must have been called
5881 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5883 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5884 rename $fakexdir, "fake" or die "$fakexdir $!";
5888 remove_stray_gits(__ "source package");
5889 mktree_in_ud_here();
5893 rmtree 'debian'; # git checkout commitish paths does not delete!
5894 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5895 my $unapplied=git_add_write_tree();
5896 printdebug "fake orig tree object $unapplied\n";
5900 sub quilt_check_splitbrain_cache ($$) {
5901 my ($headref, $upstreamversion) = @_;
5902 # Called only if we are in (potentially) split brain mode.
5903 # Called in playground.
5904 # Computes the cache key and looks in the cache.
5905 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5907 my $splitbrain_cachekey;
5910 "dgit: split brain (separate dgit view) may be needed (--quilt=%s).",
5912 # we look in the reflog of dgit-intern/quilt-cache
5913 # we look for an entry whose message is the key for the cache lookup
5914 my @cachekey = (qw(dgit), $our_version);
5915 push @cachekey, $upstreamversion;
5916 push @cachekey, $quilt_mode;
5917 push @cachekey, $headref;
5919 push @cachekey, hashfile('fake.dsc');
5921 my $srcshash = Digest::SHA->new(256);
5922 my %sfs = ( %INC, '$0(dgit)' => $0 );
5923 foreach my $sfk (sort keys %sfs) {
5924 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5925 $srcshash->add($sfk," ");
5926 $srcshash->add(hashfile($sfs{$sfk}));
5927 $srcshash->add("\n");
5929 push @cachekey, $srcshash->hexdigest();
5930 $splitbrain_cachekey = "@cachekey";
5932 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5934 my $cachehit = reflog_cache_lookup
5935 "refs/$splitbraincache", $splitbrain_cachekey;
5938 unpack_playtree_mkwork($headref);
5939 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5940 if ($cachehit ne $headref) {
5941 progress f_ "dgit view: found cached (%s)", $saved;
5942 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5944 return ($cachehit, $splitbrain_cachekey);
5946 progress __ "dgit view: found cached, no changes required";
5947 return ($headref, $splitbrain_cachekey);
5950 printdebug "splitbrain cache miss\n";
5951 return (undef, $splitbrain_cachekey);
5954 sub quilt_fixup_multipatch ($$$) {
5955 my ($clogp, $headref, $upstreamversion) = @_;
5957 progress f_ "examining quilt state (multiple patches, %s mode)",
5961 # - honour any existing .pc in case it has any strangeness
5962 # - determine the git commit corresponding to the tip of
5963 # the patch stack (if there is one)
5964 # - if there is such a git commit, convert each subsequent
5965 # git commit into a quilt patch with dpkg-source --commit
5966 # - otherwise convert all the differences in the tree into
5967 # a single git commit
5971 # Our git tree doesn't necessarily contain .pc. (Some versions of
5972 # dgit would include the .pc in the git tree.) If there isn't
5973 # one, we need to generate one by unpacking the patches that we
5976 # We first look for a .pc in the git tree. If there is one, we
5977 # will use it. (This is not the normal case.)
5979 # Otherwise need to regenerate .pc so that dpkg-source --commit
5980 # can work. We do this as follows:
5981 # 1. Collect all relevant .orig from parent directory
5982 # 2. Generate a debian.tar.gz out of
5983 # debian/{patches,rules,source/format,source/options}
5984 # 3. Generate a fake .dsc containing just these fields:
5985 # Format Source Version Files
5986 # 4. Extract the fake .dsc
5987 # Now the fake .dsc has a .pc directory.
5988 # (In fact we do this in every case, because in future we will
5989 # want to search for a good base commit for generating patches.)
5991 # Then we can actually do the dpkg-source --commit
5992 # 1. Make a new working tree with the same object
5993 # store as our main tree and check out the main
5995 # 2. Copy .pc from the fake's extraction, if necessary
5996 # 3. Run dpkg-source --commit
5997 # 4. If the result has changes to debian/, then
5998 # - git add them them
5999 # - git add .pc if we had a .pc in-tree
6001 # 5. If we had a .pc in-tree, delete it, and git commit
6002 # 6. Back in the main tree, fast forward to the new HEAD
6004 # Another situation we may have to cope with is gbp-style
6005 # patches-unapplied trees.
6007 # We would want to detect these, so we know to escape into
6008 # quilt_fixup_gbp. However, this is in general not possible.
6009 # Consider a package with a one patch which the dgit user reverts
6010 # (with git revert or the moral equivalent).
6012 # That is indistinguishable in contents from a patches-unapplied
6013 # tree. And looking at the history to distinguish them is not
6014 # useful because the user might have made a confusing-looking git
6015 # history structure (which ought to produce an error if dgit can't
6016 # cope, not a silent reintroduction of an unwanted patch).
6018 # So gbp users will have to pass an option. But we can usually
6019 # detect their failure to do so: if the tree is not a clean
6020 # patches-applied tree, quilt linearisation fails, but the tree
6021 # _is_ a clean patches-unapplied tree, we can suggest that maybe
6022 # they want --quilt=unapplied.
6024 # To help detect this, when we are extracting the fake dsc, we
6025 # first extract it with --skip-patches, and then apply the patches
6026 # afterwards with dpkg-source --before-build. That lets us save a
6027 # tree object corresponding to .origs.
6029 my $splitbrain_cachekey;
6031 quilt_make_fake_dsc($upstreamversion);
6033 if (quiltmode_splitbrain()) {
6035 ($cachehit, $splitbrain_cachekey) =
6036 quilt_check_splitbrain_cache($headref, $upstreamversion);
6037 return if $cachehit;
6039 my $unapplied=quilt_fakedsc2unapplied($headref, $upstreamversion);
6043 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
6045 if (system @bbcmd) {
6046 failedcmd @bbcmd if $? < 0;
6048 failed to apply your git tree's patch stack (from debian/patches/) to
6049 the corresponding upstream tarball(s). Your source tree and .orig
6050 are probably too inconsistent. dgit can only fix up certain kinds of
6051 anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).
6057 unpack_playtree_mkwork($headref);
6060 if (stat_exists ".pc") {
6062 progress __ "Tree already contains .pc - will use it then delete it.";
6065 rename '../fake/.pc','.pc' or confess $!;
6068 changedir '../fake';
6070 my $oldtiptree=git_add_write_tree();
6071 printdebug "fake o+d/p tree object $unapplied\n";
6072 changedir '../work';
6075 # We calculate some guesswork now about what kind of tree this might
6076 # be. This is mostly for error reporting.
6082 # O = orig, without patches applied
6083 # A = "applied", ie orig with H's debian/patches applied
6084 O2H => quiltify_trees_differ($unapplied,$headref, 1,
6085 \%editedignores, \@unrepres),
6086 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
6087 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
6091 foreach my $b (qw(01 02)) {
6092 foreach my $v (qw(O2H O2A H2A)) {
6093 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
6096 printdebug "differences \@dl @dl.\n";
6099 "%s: base trees orig=%.20s o+d/p=%.20s",
6100 $us, $unapplied, $oldtiptree;
6102 "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
6103 "%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
6104 $us, $dl[0], $dl[1], $dl[3], $dl[4],
6105 $us, $dl[2], $dl[5];
6108 print STDERR f_ "dgit: cannot represent change: %s: %s\n",
6111 forceable_fail [qw(unrepresentable)], __ <<END;
6112 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
6117 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
6118 push @failsuggestion, [ 'unapplied', __
6119 "This might be a patches-unapplied branch." ];
6120 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
6121 push @failsuggestion, [ 'applied', __
6122 "This might be a patches-applied branch." ];
6124 push @failsuggestion, [ 'quilt-mode', __
6125 "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" ];
6127 push @failsuggestion, [ 'gitattrs', __
6128 "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." ]
6129 if stat_exists '.gitattributes';
6131 push @failsuggestion, [ 'origs', __
6132 "Maybe orig tarball(s) are not identical to git representation?" ];
6134 if (quiltmode_splitbrain()) {
6135 quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,
6136 $diffbits, \%editedignores,
6137 $splitbrain_cachekey);
6141 progress f_ "starting quiltify (multiple patches, %s mode)", $quilt_mode;
6142 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
6144 if (!open P, '>>', ".pc/applied-patches") {
6145 $!==&ENOENT or confess $!;
6150 commit_quilty_patch();
6152 if ($mustdeletepc) {
6153 quilt_fixup_delete_pc();
6157 sub quilt_fixup_editor () {
6158 my $descfn = $ENV{$fakeeditorenv};
6159 my $editing = $ARGV[$#ARGV];
6160 open I1, '<', $descfn or confess "$descfn: $!";
6161 open I2, '<', $editing or confess "$editing: $!";
6162 unlink $editing or confess "$editing: $!";
6163 open O, '>', $editing or confess "$editing: $!";
6164 while (<I1>) { print O or confess $!; } I1->error and confess $!;
6167 $copying ||= m/^\-\-\- /;
6168 next unless $copying;
6169 print O or confess $!;
6171 I2->error and confess $!;
6176 sub maybe_apply_patches_dirtily () {
6177 return unless $quilt_mode =~ m/gbp|unapplied/;
6178 print STDERR __ <<END or confess $!;
6180 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
6181 dgit: Have to apply the patches - making the tree dirty.
6182 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
6185 $patches_applied_dirtily = 01;
6186 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
6187 runcmd qw(dpkg-source --before-build .);
6190 sub maybe_unapply_patches_again () {
6191 progress __ "dgit: Unapplying patches again to tidy up the tree."
6192 if $patches_applied_dirtily;
6193 runcmd qw(dpkg-source --after-build .)
6194 if $patches_applied_dirtily & 01;
6196 if $patches_applied_dirtily & 02;
6197 $patches_applied_dirtily = 0;
6200 #----- other building -----
6202 sub clean_tree_check () {
6203 # Not yet fully implemented.
6204 # This function needs to not care about modified but tracked files.
6205 # That was done by check_not_dirty, and by now we may have run
6206 # the rules clean target which might modify tracked files (!)
6207 if ($cleanmode =~ m{^check}) {
6208 my @cmd = (@git, qw(clean -dn));
6210 my $leftovers = cmdoutput @cmd;
6211 if (length $leftovers) {
6212 print STDERR $leftovers, "\n" or confess $!;
6214 "tree contains uncommitted files and --clean=check specified";
6220 # We always clean the tree ourselves, rather than leave it to the
6221 # builder (dpkg-source, or soemthing which calls dpkg-source).
6222 if ($cleanmode =~ m{^dpkg-source}) {
6223 my @cmd = @dpkgbuildpackage;
6224 push @cmd, qw(-d) if $cleanmode =~ m{^dpkg-source-d};
6225 push @cmd, qw(-T clean);
6226 maybe_apply_patches_dirtily();
6227 runcmd_ordryrun_local @cmd;
6228 } elsif ($cleanmode eq 'git') {
6229 runcmd_ordryrun_local @git, qw(clean -xdf);
6230 } elsif ($cleanmode eq 'git-ff') {
6231 runcmd_ordryrun_local @git, qw(clean -xdff);
6232 } elsif ($cleanmode =~ m{^check}) {
6234 } elsif ($cleanmode eq 'none') {
6241 badusage __ "clean takes no additional arguments" if @ARGV;
6244 maybe_unapply_patches_again();
6247 # return values from massage_dbp_args are one or both of these flags
6248 sub WANTSRC_SOURCE () { 01; } # caller should build source (separately)
6249 sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
6251 sub build_or_push_prep_early () {
6252 our $build_or_push_prep_early_done //= 0;
6253 return if $build_or_push_prep_early_done++;
6254 badusage f_ "-p is not allowed with dgit %s", $subcommand
6255 if defined $package;
6256 my $clogp = parsechangelog();
6257 $isuite = getfield $clogp, 'Distribution';
6258 $package = getfield $clogp, 'Source';
6259 $version = getfield $clogp, 'Version';
6260 $dscfn = dscfn($version);
6263 sub build_prep_early () {
6264 build_or_push_prep_early();
6269 sub build_prep ($) {
6272 if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)) {
6273 # Clean the tree because we're going to use the contents of
6274 # $maindir. (We trying to include dirty changes in the source
6275 # package, or we are running the builder in $maindir.)
6278 # We don't actually need to do anything in $maindir, but we
6279 # should do some kind of cleanliness check because (i) the
6280 # user may have forgotten a `git add', and (ii) if the user
6281 # said -wc we should still do the check.
6284 build_maybe_quilt_fixup();
6286 my $pat = changespat $version;
6287 foreach my $f (glob "$buildproductsdir/$pat") {
6290 fail f_ "remove old changes file %s: %s", $f, $!;
6292 progress f_ "would remove %s", $f;
6298 sub changesopts_initial () {
6299 my @opts =@changesopts[1..$#changesopts];
6302 sub changesopts_version () {
6303 if (!defined $changes_since_version) {
6306 @vsns = archive_query('archive_query');
6307 my @quirk = access_quirk();
6308 if ($quirk[0] eq 'backports') {
6309 local $isuite = $quirk[2];
6311 canonicalise_suite();
6312 push @vsns, archive_query('archive_query');
6318 "archive query failed (queried because --since-version not specified)";
6321 @vsns = map { $_->[0] } @vsns;
6322 @vsns = sort { -version_compare($a, $b) } @vsns;
6323 $changes_since_version = $vsns[0];
6324 progress f_ "changelog will contain changes since %s", $vsns[0];
6326 $changes_since_version = '_';
6327 progress __ "package seems new, not specifying -v<version>";
6330 if ($changes_since_version ne '_') {
6331 return ("-v$changes_since_version");
6337 sub changesopts () {
6338 return (changesopts_initial(), changesopts_version());
6341 sub massage_dbp_args ($;$) {
6342 my ($cmd,$xargs) = @_;
6343 # Since we split the source build out so we can do strange things
6344 # to it, massage the arguments to dpkg-buildpackage so that the
6345 # main build doessn't build source (or add an argument to stop it
6346 # building source by default).
6347 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6348 # -nc has the side effect of specifying -b if nothing else specified
6349 # and some combinations of -S, -b, et al, are errors, rather than
6350 # later simply overriding earlie. So we need to:
6351 # - search the command line for these options
6352 # - pick the last one
6353 # - perhaps add our own as a default
6354 # - perhaps adjust it to the corresponding non-source-building version
6356 foreach my $l ($cmd, $xargs) {
6358 @$l = grep { !(m/^-[SgGFABb]$|^--build=/s and $dmode=$_) } @$l;
6361 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6362 my $r = WANTSRC_BUILDER;
6363 printdebug "massage split $dmode.\n";
6364 if ($dmode =~ s/^--build=//) {
6366 my @d = split /,/, $dmode;
6367 $r |= WANTSRC_SOURCE if grep { s/^full$/binary/ } @d;
6368 $r |= WANTSRC_SOURCE if grep { s/^source$// } @d;
6369 $r |= WANTSRC_BUILDER if grep { m/./ } @d;
6370 fail __ "Wanted to build nothing!" unless $r;
6371 $dmode = '--build='. join ',', grep m/./, @d;
6374 $dmode =~ m/[S]/ ? WANTSRC_SOURCE :
6375 $dmode =~ y/gGF/ABb/ ? WANTSRC_SOURCE | WANTSRC_BUILDER :
6376 $dmode =~ m/[ABb]/ ? WANTSRC_BUILDER :
6379 printdebug "massage done $r $dmode.\n";
6381 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6387 my $wasdir = must_getcwd();
6388 changedir $buildproductsdir;
6393 # this sub must run with CWD=$buildproductsdir (eg in in_bpd)
6394 sub postbuild_mergechanges ($) {
6395 my ($msg_if_onlyone) = @_;
6396 # If there is only one .changes file, fail with $msg_if_onlyone,
6397 # or if that is undef, be a no-op.
6398 # Returns the changes file to report to the user.
6399 my $pat = changespat $version;
6400 my @changesfiles = grep { !m/_multi\.changes/ } glob $pat;
6401 @changesfiles = sort {
6402 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6406 if (@changesfiles==1) {
6407 fail +(f_ <<END, "@changesfiles").$msg_if_onlyone
6408 only one changes file from build (%s)
6410 if defined $msg_if_onlyone;
6411 $result = $changesfiles[0];
6412 } elsif (@changesfiles==2) {
6413 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6414 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6415 fail f_ "%s found in binaries changes file %s", $l, $binchanges
6418 runcmd_ordryrun_local @mergechanges, @changesfiles;
6419 my $multichanges = changespat $version,'multi';
6421 stat_exists $multichanges or fail f_
6422 "%s unexpectedly not created by build", $multichanges;
6423 foreach my $cf (glob $pat) {
6424 next if $cf eq $multichanges;
6425 rename "$cf", "$cf.inmulti" or fail f_
6426 "install new changes %s\{,.inmulti}: %s", $cf, $!;
6429 $result = $multichanges;
6431 fail f_ "wrong number of different changes files (%s)",
6434 printdone f_ "build successful, results in %s\n", $result
6438 sub midbuild_checkchanges () {
6439 my $pat = changespat $version;
6440 return if $rmchanges;
6441 my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
6443 $_ ne changespat $version,'source' and
6444 $_ ne changespat $version,'multi'
6446 fail +(f_ <<END, $pat, "@unwanted")
6447 changes files other than source matching %s already present; building would result in ambiguity about the intended results.
6448 Suggest you delete %s.
6453 sub midbuild_checkchanges_vanilla ($) {
6455 midbuild_checkchanges() if $wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER);
6458 sub postbuild_mergechanges_vanilla ($) {
6460 if ($wantsrc == (WANTSRC_SOURCE|WANTSRC_BUILDER)) {
6462 postbuild_mergechanges(undef);
6465 printdone __ "build successful\n";
6471 $buildproductsdir eq '..' or print STDERR +(f_ <<END, $us, $us);
6472 %s: warning: build-products-dir set, but not supported by dpkg-buildpackage
6473 %s: warning: build-products-dir will be ignored; files will go to ..
6475 $buildproductsdir = '..';
6476 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6477 my $wantsrc = massage_dbp_args \@dbp;
6478 build_prep($wantsrc);
6479 if ($wantsrc & WANTSRC_SOURCE) {
6481 midbuild_checkchanges_vanilla $wantsrc;
6483 if ($wantsrc & WANTSRC_BUILDER) {
6484 push @dbp, changesopts_version();
6485 maybe_apply_patches_dirtily();
6486 runcmd_ordryrun_local @dbp;
6488 maybe_unapply_patches_again();
6489 postbuild_mergechanges_vanilla $wantsrc;
6493 $quilt_mode //= 'gbp';
6499 # gbp can make .origs out of thin air. In my tests it does this
6500 # even for a 1.0 format package, with no origs present. So I
6501 # guess it keys off just the version number. We don't know
6502 # exactly what .origs ought to exist, but let's assume that we
6503 # should run gbp if: the version has an upstream part and the main
6505 my $upstreamversion = upstreamversion $version;
6506 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6507 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "$bpd_glob/$origfnpat");
6509 if ($gbp_make_orig) {
6511 $cleanmode = 'none'; # don't do it again
6514 my @dbp = @dpkgbuildpackage;
6516 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6518 if (!length $gbp_build[0]) {
6519 if (length executable_on_path('git-buildpackage')) {
6520 $gbp_build[0] = qw(git-buildpackage);
6522 $gbp_build[0] = 'gbp buildpackage';
6525 my @cmd = opts_opt_multi_cmd [], @gbp_build;
6527 push @cmd, (qw(-us -uc --git-no-sign-tags),
6528 "--git-builder=".(shellquote @dbp));
6530 if ($gbp_make_orig) {
6531 my $priv = dgit_privdir();
6532 my $ok = "$priv/origs-gen-ok";
6533 unlink $ok or $!==&ENOENT or confess $!;
6534 my @origs_cmd = @cmd;
6535 push @origs_cmd, qw(--git-cleaner=true);
6536 push @origs_cmd, "--git-prebuild=".
6537 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6538 push @origs_cmd, @ARGV;
6540 debugcmd @origs_cmd;
6542 do { local $!; stat_exists $ok; }
6543 or failedcmd @origs_cmd;
6545 dryrun_report @origs_cmd;
6549 build_prep($wantsrc);
6550 if ($wantsrc & WANTSRC_SOURCE) {
6552 midbuild_checkchanges_vanilla $wantsrc;
6554 push @cmd, '--git-cleaner=true';
6556 maybe_unapply_patches_again();
6557 if ($wantsrc & WANTSRC_BUILDER) {
6558 push @cmd, changesopts();
6559 runcmd_ordryrun_local @cmd, @ARGV;
6561 postbuild_mergechanges_vanilla $wantsrc;
6563 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6565 sub building_source_in_playtree {
6566 # If $includedirty, we have to build the source package from the
6567 # working tree, not a playtree, so that uncommitted changes are
6568 # included (copying or hardlinking them into the playtree could
6571 # Note that if we are building a source package in split brain
6572 # mode we do not support including uncommitted changes, because
6573 # that makes quilt fixup too hard. I.e. ($split_brain && (dgit is
6574 # building a source package)) => !$includedirty
6575 return !$includedirty;
6579 $sourcechanges = changespat $version,'source';
6581 unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
6582 or fail f_ "remove %s: %s", $sourcechanges, $!;
6584 my @cmd = (@dpkgsource, qw(-b --));
6586 if (building_source_in_playtree()) {
6588 my $headref = git_rev_parse('HEAD');
6589 # If we are in split brain, there is already a playtree with
6590 # the thing we should package into a .dsc (thanks to quilt
6591 # fixup). If not, make a playtree
6592 prep_ud() unless $split_brain;
6593 changedir $playground;
6594 unless ($split_brain) {
6595 my $upstreamversion = upstreamversion $version;
6596 unpack_playtree_linkorigs($upstreamversion, sub { });
6597 unpack_playtree_mkwork($headref);
6601 $leafdir = basename $maindir;
6603 if ($buildproductsdir ne '..') {
6604 # Well, we are going to run dpkg-source -b which consumes
6605 # origs from .. and generates output there. To make this
6606 # work when the bpd is not .. , we would have to (i) link
6607 # origs from bpd to .. , (ii) check for files that
6608 # dpkg-source -b would/might overwrite, and afterwards
6609 # (iii) move all the outputs back to the bpd (iv) except
6610 # for the origs which should be deleted from .. if they
6611 # weren't there beforehand. And if there is an error and
6612 # we don't run to completion we would necessarily leave a
6613 # mess. This is too much. The real way to fix this
6614 # is for dpkg-source to have bpd support.
6615 confess unless $includedirty;
6617 "--include-dirty not supported with --build-products-dir, sorry";
6622 runcmd_ordryrun_local @cmd, $leafdir;
6625 runcmd_ordryrun_local qw(sh -ec),
6626 'exec >../$1; shift; exec "$@"','x', $sourcechanges,
6627 @dpkggenchanges, qw(-S), changesopts();
6630 printdebug "moving $dscfn, $sourcechanges, etc. to ".bpd_abs()."\n";
6631 $dsc = parsecontrol($dscfn, "source package");
6635 printdebug " renaming ($why) $l\n";
6636 rename_link_xf 0, "$l", bpd_abs()."/$l"
6637 or fail f_ "put in place new built file (%s): %s", $l, $@;
6639 foreach my $l (split /\n/, getfield $dsc, 'Files') {
6640 $l =~ m/\S+$/ or next;
6643 $mv->('dsc', $dscfn);
6644 $mv->('changes', $sourcechanges);
6649 sub cmd_build_source {
6650 badusage __ "build-source takes no additional arguments" if @ARGV;
6651 build_prep(WANTSRC_SOURCE);
6653 maybe_unapply_patches_again();
6654 printdone f_ "source built, results in %s and %s",
6655 $dscfn, $sourcechanges;
6658 sub cmd_push_source {
6661 "dgit push-source: --include-dirty/--ignore-dirty does not make".
6662 "sense with push-source!"
6664 build_maybe_quilt_fixup();
6666 my $changes = parsecontrol("$buildproductsdir/$changesfile",
6667 __ "source changes file");
6668 unless (test_source_only_changes($changes)) {
6669 fail __ "user-specified changes file is not source-only";
6672 # Building a source package is very fast, so just do it
6674 confess "er, patches are applied dirtily but shouldn't be.."
6675 if $patches_applied_dirtily;
6676 $changesfile = $sourcechanges;
6681 sub binary_builder {
6682 my ($bbuilder, $pbmc_msg, @args) = @_;
6683 build_prep(WANTSRC_SOURCE);
6685 midbuild_checkchanges();
6688 stat_exists $dscfn or fail f_
6689 "%s (in build products dir): %s", $dscfn, $!;
6690 stat_exists $sourcechanges or fail f_
6691 "%s (in build products dir): %s", $sourcechanges, $!;
6693 runcmd_ordryrun_local @$bbuilder, @args;
6695 maybe_unapply_patches_again();
6697 postbuild_mergechanges($pbmc_msg);
6703 binary_builder(\@sbuild, (__ <<END), qw(-d), $isuite, @ARGV, $dscfn);
6704 perhaps you need to pass -A ? (sbuild's default is to build only
6705 arch-specific binaries; dgit 1.4 used to override that.)
6710 my ($pbuilder) = @_;
6712 # @ARGV is allowed to contain only things that should be passed to
6713 # pbuilder under debbuildopts; just massage those
6714 my $wantsrc = massage_dbp_args \@ARGV;
6716 "you asked for a builder but your debbuildopts didn't ask for".
6717 " any binaries -- is this really what you meant?"
6718 unless $wantsrc & WANTSRC_BUILDER;
6720 "we must build a .dsc to pass to the builder but your debbuiltopts".
6721 " forbids the building of a source package; cannot continue"
6722 unless $wantsrc & WANTSRC_SOURCE;
6723 # We do not want to include the verb "build" in @pbuilder because
6724 # the user can customise @pbuilder and they shouldn't be required
6725 # to include "build" in their customised value. However, if the
6726 # user passes any additional args to pbuilder using the dgit
6727 # option --pbuilder:foo, such args need to come after the "build"
6728 # verb. opts_opt_multi_cmd does all of that.
6729 binary_builder([opts_opt_multi_cmd ["build"], @$pbuilder], undef,
6730 qw(--debbuildopts), "@ARGV", qw(--distribution), $isuite,
6735 pbuilder(\@pbuilder);
6738 sub cmd_cowbuilder {
6739 pbuilder(\@cowbuilder);
6742 sub cmd_quilt_fixup {
6743 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6746 build_maybe_quilt_fixup();
6749 sub cmd_print_unapplied_treeish {
6750 badusage __ "incorrect arguments to dgit print-unapplied-treeish"
6752 my $headref = git_rev_parse('HEAD');
6753 my $clogp = commit_getclogp $headref;
6754 $package = getfield $clogp, 'Source';
6755 $version = getfield $clogp, 'Version';
6756 $isuite = getfield $clogp, 'Distribution';
6757 $csuite = $isuite; # we want this to be offline!
6761 changedir $playground;
6762 my $uv = upstreamversion $version;
6763 quilt_make_fake_dsc($uv);
6764 my $u = quilt_fakedsc2unapplied($headref, $uv);
6765 print $u, "\n" or confess $!;
6768 sub import_dsc_result {
6769 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6770 my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
6772 check_gitattrs($newhash, __ "source tree");
6774 progress f_ "dgit: import-dsc: %s", $what_msg;
6777 sub cmd_import_dsc {
6781 last unless $ARGV[0] =~ m/^-/;
6784 if (m/^--require-valid-signature$/) {
6787 badusage f_ "unknown dgit import-dsc sub-option \`%s'", $_;
6791 badusage __ "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
6793 my ($dscfn, $dstbranch) = @ARGV;
6795 badusage __ "dry run makes no sense with import-dsc"
6798 my $force = $dstbranch =~ s/^\+// ? +1 :
6799 $dstbranch =~ s/^\.\.// ? -1 :
6801 my $info = $force ? " $&" : '';
6802 $info = "$dscfn$info";
6804 my $specbranch = $dstbranch;
6805 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6806 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6808 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6809 my $chead = cmdoutput_errok @symcmd;
6810 defined $chead or $?==256 or failedcmd @symcmd;
6812 fail f_ "%s is checked out - will not update it", $dstbranch
6813 if defined $chead and $chead eq $dstbranch;
6815 my $oldhash = git_get_ref $dstbranch;
6817 open D, "<", $dscfn or fail f_ "open import .dsc (%s): %s", $dscfn, $!;
6818 $dscdata = do { local $/ = undef; <D>; };
6819 D->error and fail f_ "read %s: %s", $dscfn, $!;
6822 # we don't normally need this so import it here
6823 use Dpkg::Source::Package;
6824 my $dp = new Dpkg::Source::Package filename => $dscfn,
6825 require_valid_signature => $needsig;
6827 local $SIG{__WARN__} = sub {
6829 return unless $needsig;
6830 fail __ "import-dsc signature check failed";
6832 if (!$dp->is_signed()) {
6833 warn f_ "%s: warning: importing unsigned .dsc\n", $us;
6835 my $r = $dp->check_signature();
6836 confess "->check_signature => $r" if $needsig && $r;
6842 $package = getfield $dsc, 'Source';
6844 parse_dsc_field($dsc, __ "Dgit metadata in .dsc")
6845 unless forceing [qw(import-dsc-with-dgit-field)];
6846 parse_dsc_field_def_dsc_distro();
6848 $isuite = 'DGIT-IMPORT-DSC';
6849 $idistro //= $dsc_distro;
6853 if (defined $dsc_hash) {
6855 "dgit: import-dsc of .dsc with Dgit field, using git hash";
6856 resolve_dsc_field_commit undef, undef;
6858 if (defined $dsc_hash) {
6859 my @cmd = (qw(sh -ec),
6860 "echo $dsc_hash | git cat-file --batch-check");
6861 my $objgot = cmdoutput @cmd;
6862 if ($objgot =~ m#^\w+ missing\b#) {
6863 fail f_ <<END, $dsc_hash
6864 .dsc contains Dgit field referring to object %s
6865 Your git tree does not have that object. Try `git fetch' from a
6866 plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.
6869 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6871 progress __ "Not fast forward, forced update.";
6873 fail f_ "Not fast forward to %s", $dsc_hash;
6876 import_dsc_result $dstbranch, $dsc_hash,
6877 "dgit import-dsc (Dgit): $info",
6878 f_ "updated git ref %s", $dstbranch;
6882 fail f_ <<END, $dstbranch, $specbranch, $specbranch
6883 Branch %s already exists
6884 Specify ..%s for a pseudo-merge, binding in existing history
6885 Specify +%s to overwrite, discarding existing history
6887 if $oldhash && !$force;
6889 my @dfi = dsc_files_info();
6890 foreach my $fi (@dfi) {
6891 my $f = $fi->{Filename};
6892 my $here = "$buildproductsdir/$f";
6895 fail f_ "lstat %s works but stat gives %s !", $here, $!;
6897 fail f_ "stat %s: %s", $here, $! unless $! == ENOENT;
6899 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6901 } elsif ($dscfn =~ m#^/#) {
6905 "cannot import %s which seems to be inside working tree!",
6908 $there =~ s#/+[^/]+$## or fail f_
6909 "import %s requires .../%s, but it does not exist",
6912 my $test = $there =~ m{^/} ? $there : "../$there";
6913 stat $test or fail f_
6914 "import %s requires %s, but: %s", $dscfn, $test, $!;
6915 symlink $there, $here or fail f_
6916 "symlink %s to %s: %s", $there, $here, $!;
6917 progress f_ "made symlink %s -> %s", $here, $there;
6918 # print STDERR Dumper($fi);
6920 my @mergeinputs = generate_commits_from_dsc();
6921 die unless @mergeinputs == 1;
6923 my $newhash = $mergeinputs[0]{Commit};
6928 "Import, forced update - synthetic orphan git history.";
6929 } elsif ($force < 0) {
6930 progress __ "Import, merging.";
6931 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6932 my $version = getfield $dsc, 'Version';
6933 my $clogp = commit_getclogp $newhash;
6934 my $authline = clogp_authline $clogp;
6935 $newhash = make_commit_text <<ENDU
6943 .(f_ <<END, $package, $version, $dstbranch);
6944 Merge %s (%s) import into %s
6947 die; # caught earlier
6951 import_dsc_result $dstbranch, $newhash,
6952 "dgit import-dsc: $info",
6953 f_ "results are in git ref %s", $dstbranch;
6956 sub pre_archive_api_query () {
6957 not_necessarily_a_tree();
6959 sub cmd_archive_api_query {
6960 badusage __ "need only 1 subpath argument" unless @ARGV==1;
6961 my ($subpath) = @ARGV;
6962 local $isuite = 'DGIT-API-QUERY-CMD';
6963 my @cmd = archive_api_query_cmd($subpath);
6966 exec @cmd or fail f_ "exec curl: %s\n", $!;
6969 sub repos_server_url () {
6970 $package = '_dgit-repos-server';
6971 local $access_forpush = 1;
6972 local $isuite = 'DGIT-REPOS-SERVER';
6973 my $url = access_giturl();
6976 sub pre_clone_dgit_repos_server () {
6977 not_necessarily_a_tree();
6979 sub cmd_clone_dgit_repos_server {
6980 badusage __ "need destination argument" unless @ARGV==1;
6981 my ($destdir) = @ARGV;
6982 my $url = repos_server_url();
6983 my @cmd = (@git, qw(clone), $url, $destdir);
6985 exec @cmd or fail f_ "exec git clone: %s\n", $!;
6988 sub pre_print_dgit_repos_server_source_url () {
6989 not_necessarily_a_tree();
6991 sub cmd_print_dgit_repos_server_source_url {
6993 "no arguments allowed to dgit print-dgit-repos-server-source-url"
6995 my $url = repos_server_url();
6996 print $url, "\n" or confess $!;
6999 sub pre_print_dpkg_source_ignores {
7000 not_necessarily_a_tree();
7002 sub cmd_print_dpkg_source_ignores {
7004 "no arguments allowed to dgit print-dpkg-source-ignores"
7006 print "@dpkg_source_ignores\n" or confess $!;
7009 sub cmd_setup_mergechangelogs {
7010 badusage __ "no arguments allowed to dgit setup-mergechangelogs"
7012 local $isuite = 'DGIT-SETUP-TREE';
7013 setup_mergechangelogs(1);
7016 sub cmd_setup_useremail {
7017 badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
7018 local $isuite = 'DGIT-SETUP-TREE';
7022 sub cmd_setup_gitattributes {
7023 badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
7024 local $isuite = 'DGIT-SETUP-TREE';
7028 sub cmd_setup_new_tree {
7029 badusage __ "no arguments allowed to dgit setup-tree" if @ARGV;
7030 local $isuite = 'DGIT-SETUP-TREE';
7034 #---------- argument parsing and main program ----------
7037 print "dgit version $our_version\n" or confess $!;
7041 our (%valopts_long, %valopts_short);
7042 our (%funcopts_long);
7044 our (@modeopt_cfgs);
7046 sub defvalopt ($$$$) {
7047 my ($long,$short,$val_re,$how) = @_;
7048 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
7049 $valopts_long{$long} = $oi;
7050 $valopts_short{$short} = $oi;
7051 # $how subref should:
7052 # do whatever assignemnt or thing it likes with $_[0]
7053 # if the option should not be passed on to remote, @rvalopts=()
7054 # or $how can be a scalar ref, meaning simply assign the value
7057 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
7058 defvalopt '--distro', '-d', '.+', \$idistro;
7059 defvalopt '', '-k', '.+', \$keyid;
7060 defvalopt '--existing-package','', '.*', \$existing_package;
7061 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
7062 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
7063 defvalopt '--package', '-p', $package_re, \$package;
7064 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
7066 defvalopt '', '-C', '.+', sub {
7067 ($changesfile) = (@_);
7068 if ($changesfile =~ s#^(.*)/##) {
7069 $buildproductsdir = $1;
7073 defvalopt '--initiator-tempdir','','.*', sub {
7074 ($initiator_tempdir) = (@_);
7075 $initiator_tempdir =~ m#^/# or
7076 badusage __ "--initiator-tempdir must be used specify an".
7077 " absolute, not relative, directory."
7080 sub defoptmodes ($@) {
7081 my ($varref, $cfgkey, $default, %optmap) = @_;
7083 while (my ($opt,$val) = each %optmap) {
7084 $funcopts_long{$opt} = sub { $$varref = $val; };
7085 $permit{$val} = $val;
7087 push @modeopt_cfgs, {
7090 Default => $default,
7095 defoptmodes \$dodep14tag, qw( dep14tag want
7098 --always-dep14tag always );
7103 if (defined $ENV{'DGIT_SSH'}) {
7104 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
7105 } elsif (defined $ENV{'GIT_SSH'}) {
7106 @ssh = ($ENV{'GIT_SSH'});
7114 if (!defined $val) {
7115 badusage f_ "%s needs a value", $what unless @ARGV;
7117 push @rvalopts, $val;
7119 badusage f_ "bad value \`%s' for %s", $val, $what unless
7120 $val =~ m/^$oi->{Re}$(?!\n)/s;
7121 my $how = $oi->{How};
7122 if (ref($how) eq 'SCALAR') {
7127 push @ropts, @rvalopts;
7131 last unless $ARGV[0] =~ m/^-/;
7135 if (m/^--dry-run$/) {
7138 } elsif (m/^--damp-run$/) {
7141 } elsif (m/^--no-sign$/) {
7144 } elsif (m/^--help$/) {
7146 } elsif (m/^--version$/) {
7148 } elsif (m/^--new$/) {
7151 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
7152 ($om = $opts_opt_map{$1}) &&
7156 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
7157 !$opts_opt_cmdonly{$1} &&
7158 ($om = $opts_opt_map{$1})) {
7161 } elsif (m/^--(gbp|dpm)$/s) {
7162 push @ropts, "--quilt=$1";
7164 } elsif (m/^--(?:ignore|include)-dirty$/s) {
7167 } elsif (m/^--no-quilt-fixup$/s) {
7169 $quilt_mode = 'nocheck';
7170 } elsif (m/^--no-rm-on-error$/s) {
7173 } elsif (m/^--no-chase-dsc-distro$/s) {
7175 $chase_dsc_distro = 0;
7176 } elsif (m/^--overwrite$/s) {
7178 $overwrite_version = '';
7179 } elsif (m/^--overwrite=(.+)$/s) {
7181 $overwrite_version = $1;
7182 } elsif (m/^--delayed=(\d+)$/s) {
7185 } elsif (my ($k,$v) =
7186 m/^--save-(dgit-view)=(.+)$/s ||
7187 m/^--(dgit-view)-save=(.+)$/s
7190 $v =~ s#^(?!refs/)#refs/heads/#;
7191 $internal_object_save{$k} = $v;
7192 } elsif (m/^--(no-)?rm-old-changes$/s) {
7195 } elsif (m/^--deliberately-($deliberately_re)$/s) {
7197 push @deliberatelies, $&;
7198 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
7202 } elsif (m/^--force-/) {
7204 f_ "%s: warning: ignoring unknown force option %s\n",
7207 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
7208 # undocumented, for testing
7210 $tagformat_want = [ $1, 'command line', 1 ];
7211 # 1 menas overrides distro configuration
7212 } elsif (m/^--config-lookup-explode=(.+)$/s) {
7213 # undocumented, for testing
7215 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
7216 # ^ it's supposed to be an array ref
7217 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
7218 $val = $2 ? $' : undef; #';
7219 $valopt->($oi->{Long});
7220 } elsif ($funcopts_long{$_}) {
7222 $funcopts_long{$_}();
7224 badusage f_ "unknown long option \`%s'", $_;
7231 } elsif (s/^-L/-/) {
7234 } elsif (s/^-h/-/) {
7236 } elsif (s/^-D/-/) {
7240 } elsif (s/^-N/-/) {
7245 push @changesopts, $_;
7247 } elsif (s/^-wn$//s) {
7249 $cleanmode = 'none';
7250 } elsif (s/^-wg$//s) {
7253 } elsif (s/^-wgf$//s) {
7255 $cleanmode = 'git-ff';
7256 } elsif (s/^-wd$//s) {
7258 $cleanmode = 'dpkg-source';
7259 } elsif (s/^-wdd$//s) {
7261 $cleanmode = 'dpkg-source-d';
7262 } elsif (s/^-wc$//s) {
7264 $cleanmode = 'check';
7265 } elsif (s/^-c([^=]*)\=(.*)$//s) {
7266 push @git, '-c', $&;
7267 $gitcfgs{cmdline}{$1} = [ $2 ];
7268 } elsif (s/^-c([^=]+)$//s) {
7269 push @git, '-c', $&;
7270 $gitcfgs{cmdline}{$1} = [ 'true' ];
7271 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
7273 $val = undef unless length $val;
7274 $valopt->($oi->{Short});
7277 badusage f_ "unknown short option \`%s'", $_;
7284 sub check_env_sanity () {
7285 my $blocked = new POSIX::SigSet;
7286 sigprocmask SIG_UNBLOCK, $blocked, $blocked or confess $!;
7289 foreach my $name (qw(PIPE CHLD)) {
7290 my $signame = "SIG$name";
7291 my $signum = eval "POSIX::$signame" // die;
7292 die f_ "%s is set to something other than SIG_DFL\n",
7294 if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT';
7295 $blocked->ismember($signum) and
7296 die f_ "%s is blocked\n", $signame;
7302 On entry to dgit, %s
7303 This is a bug produced by something in your execution environment.
7309 sub parseopts_late_defaults () {
7310 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
7311 if defined $idistro;
7312 $isuite //= cfg('dgit.default.default-suite');
7314 foreach my $k (keys %opts_opt_map) {
7315 my $om = $opts_opt_map{$k};
7317 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
7319 badcfg f_ "cannot set command for %s", $k
7320 unless length $om->[0];
7324 foreach my $c (access_cfg_cfgs("opts-$k")) {
7326 map { $_ ? @$_ : () }
7327 map { $gitcfgs{$_}{$c} }
7328 reverse @gitcfgsources;
7329 printdebug "CL $c ", (join " ", map { shellquote } @vl),
7330 "\n" if $debuglevel >= 4;
7332 badcfg f_ "cannot configure options for %s", $k
7333 if $opts_opt_cmdonly{$k};
7334 my $insertpos = $opts_cfg_insertpos{$k};
7335 @$om = ( @$om[0..$insertpos-1],
7337 @$om[$insertpos..$#$om] );
7341 if (!defined $rmchanges) {
7342 local $access_forpush;
7343 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
7346 if (!defined $quilt_mode) {
7347 local $access_forpush;
7348 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
7349 // access_cfg('quilt-mode', 'RETURN-UNDEF')
7351 $quilt_mode =~ m/^($quilt_modes_re)$/
7352 or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
7356 foreach my $moc (@modeopt_cfgs) {
7357 local $access_forpush;
7358 my $vr = $moc->{Var};
7359 next if defined $$vr;
7360 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
7361 my $v = $moc->{Vals}{$$vr};
7362 badcfg f_ "unknown %s setting \`%s'", $moc->{Key}, $$vr
7367 fail __ "dgit: --include-dirty is not supported in split view quilt mode"
7368 if $split_brain && $includedirty;
7370 if (!defined $cleanmode) {
7371 local $access_forpush;
7372 $cleanmode = access_cfg('clean-mode-newer', 'RETURN-UNDEF');
7373 $cleanmode = undef if $cleanmode && $cleanmode !~ m/^$cleanmode_re$/;
7375 $cleanmode //= access_cfg('clean-mode', 'RETURN-UNDEF');
7376 $cleanmode //= 'dpkg-source';
7378 badcfg f_ "unknown clean-mode \`%s'", $cleanmode unless
7379 $cleanmode =~ m/$cleanmode_re/;
7382 $buildproductsdir //= access_cfg('build-products-dir', 'RETURN-UNDEF');
7383 $buildproductsdir //= '..';
7384 $bpd_glob = $buildproductsdir;
7385 $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
7388 setlocale(LC_MESSAGES, "");
7391 if ($ENV{$fakeeditorenv}) {
7393 quilt_fixup_editor();
7399 print STDERR __ "DRY RUN ONLY\n" if $dryrun_level > 1;
7400 print STDERR __ "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
7401 if $dryrun_level == 1;
7403 print STDERR __ $helpmsg or confess $!;
7406 $cmd = $subcommand = shift @ARGV;
7409 my $pre_fn = ${*::}{"pre_$cmd"};
7410 $pre_fn->() if $pre_fn;
7412 if ($invoked_in_git_tree) {
7413 changedir_git_toplevel();
7418 my $fn = ${*::}{"cmd_$cmd"};
7419 $fn or badusage f_ "unknown operation %s", $cmd;