3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2017 Ian Jackson
6 # Copyright (C)2017 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;
26 use Debian::Dgit qw(:DEFAULT :playground);
32 use Dpkg::Control::Hash;
34 use File::Temp qw(tempdir);
37 use Dpkg::Compression;
38 use Dpkg::Compression::Process;
43 use List::MoreUtils qw(pairwise);
44 use Text::Glob qw(match_glob);
45 use Fcntl qw(:DEFAULT :flock);
50 our $our_version = 'UNRELEASED'; ###substituted###
51 our $absurdity = undef; ###substituted###
53 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
64 our $dryrun_level = 0;
66 our $buildproductsdir = '..';
72 our $existing_package = 'dpkg';
74 our $changes_since_version;
76 our $overwrite_version; # undef: not specified; '': check changelog
78 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
80 our $split_brain_save;
81 our $we_are_responder;
82 our $we_are_initiator;
83 our $initiator_tempdir;
84 our $patches_applied_dirtily = 00;
88 our $chase_dsc_distro=1;
90 our %forceopts = map { $_=>0 }
91 qw(unrepresentable unsupported-source-format
92 dsc-changes-mismatch changes-origs-exactly
93 import-gitapply-absurd
94 import-gitapply-no-absurd
95 import-dsc-with-dgit-field);
97 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
99 our $suite_re = '[-+.0-9a-z]+';
100 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
101 our $orig_f_comp_re = qr{orig(?:-$extra_orig_namepart_re)?};
102 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
103 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
105 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
106 our $splitbraincache = 'dgit-intern/quilt-cache';
107 our $rewritemap = 'dgit-rewrite/map';
109 our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
111 our (@git) = qw(git);
112 our (@dget) = qw(dget);
113 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
114 our (@dput) = qw(dput);
115 our (@debsign) = qw(debsign);
116 our (@gpg) = qw(gpg);
117 our (@sbuild) = qw(sbuild);
119 our (@dgit) = qw(dgit);
120 our (@git_debrebase) = qw(git-debrebase);
121 our (@aptget) = qw(apt-get);
122 our (@aptcache) = qw(apt-cache);
123 our (@dpkgbuildpackage) = (qw(dpkg-buildpackage), @dpkg_source_ignores);
124 our (@dpkgsource) = (qw(dpkg-source), @dpkg_source_ignores);
125 our (@dpkggenchanges) = qw(dpkg-genchanges);
126 our (@mergechanges) = qw(mergechanges -f);
127 our (@gbp_build) = ('');
128 our (@gbp_pq) = ('gbp pq');
129 our (@changesopts) = ('');
131 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
134 'debsign' => \@debsign,
136 'sbuild' => \@sbuild,
140 'git-debrebase' => \@git_debrebase,
141 'apt-get' => \@aptget,
142 'apt-cache' => \@aptcache,
143 'dpkg-source' => \@dpkgsource,
144 'dpkg-buildpackage' => \@dpkgbuildpackage,
145 'dpkg-genchanges' => \@dpkggenchanges,
146 'gbp-build' => \@gbp_build,
147 'gbp-pq' => \@gbp_pq,
148 'ch' => \@changesopts,
149 'mergechanges' => \@mergechanges);
151 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
152 our %opts_cfg_insertpos = map {
154 scalar @{ $opts_opt_map{$_} }
155 } keys %opts_opt_map;
157 sub parseopts_late_defaults();
158 sub setup_gitattrs(;$);
159 sub check_gitattrs($$);
166 our $supplementary_message = '';
167 our $need_split_build_invocation = 0;
168 our $split_brain = 0;
172 return unless forkcheck_mainprocess();
173 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
176 our $remotename = 'dgit';
177 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
181 if (!defined $absurdity) {
183 $absurdity =~ s{/[^/]+$}{/absurd} or die;
187 my ($v,$distro) = @_;
188 return $tagformatfn->($v, $distro);
191 sub debiantag_maintview ($$) {
192 my ($v,$distro) = @_;
193 return "$distro/".dep14_version_mangle $v;
196 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
198 sub lbranch () { return "$branchprefix/$csuite"; }
199 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
200 sub lref () { return "refs/heads/".lbranch(); }
201 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
202 sub rrref () { return server_ref($csuite); }
212 return "${package}_".(stripepoch $vsn).$sfx
217 return srcfn($vsn,".dsc");
220 sub changespat ($;$) {
221 my ($vsn, $arch) = @_;
222 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
225 sub upstreamversion ($) {
237 return unless forkcheck_mainprocess();
238 foreach my $f (@end) {
240 print STDERR "$us: cleanup: $@" if length $@;
244 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; finish 12; }
246 sub forceable_fail ($$) {
247 my ($forceoptsl, $msg) = @_;
248 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
249 print STDERR "warning: overriding problem due to --force:\n". $msg;
253 my ($forceoptsl) = @_;
254 my @got = grep { $forceopts{$_} } @$forceoptsl;
255 return 0 unless @got;
257 "warning: skipping checks or functionality due to --force-$got[0]\n";
260 sub no_such_package () {
261 print STDERR "$us: package $package does not exist in suite $isuite\n";
265 sub deliberately ($) {
267 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
270 sub deliberately_not_fast_forward () {
271 foreach (qw(not-fast-forward fresh-repo)) {
272 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
276 sub quiltmode_splitbrain () {
277 $quilt_mode =~ m/gbp|dpm|unapplied/;
280 sub opts_opt_multi_cmd {
282 push @cmd, split /\s+/, shift @_;
288 return opts_opt_multi_cmd @gbp_pq;
291 sub dgit_privdir () {
292 our $dgit_privdir_made //= ensure_a_playground 'dgit';
295 sub branch_gdr_info ($$) {
296 my ($symref, $head) = @_;
297 my ($status, $msg, $current, $ffq_prev, $gdrlast) =
298 gdr_ffq_prev_branchinfo($symref);
299 return () unless $status eq 'branch';
300 $ffq_prev = git_get_ref $ffq_prev;
301 $gdrlast = git_get_ref $gdrlast;
302 $gdrlast &&= is_fast_fwd $gdrlast, $head;
303 return ($ffq_prev, $gdrlast);
306 sub branch_is_gdr ($$) {
307 my ($symref, $head) = @_;
308 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
309 return 0 unless $ffq_prev || $gdrlast;
313 sub branch_is_gdr_unstitched_ff ($$$) {
314 my ($symref, $head, $ancestor) = @_;
315 my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
316 return 0 unless $ffq_prev;
317 return 0 unless is_fast_fwd $ancestor, $ffq_prev;
321 #---------- remote protocol support, common ----------
323 # remote push initiator/responder protocol:
324 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
325 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
326 # < dgit-remote-push-ready <actual-proto-vsn>
333 # > supplementary-message NBYTES # $protovsn >= 3
338 # > file parsed-changelog
339 # [indicates that output of dpkg-parsechangelog follows]
340 # > data-block NBYTES
341 # > [NBYTES bytes of data (no newline)]
342 # [maybe some more blocks]
351 # > param head DGIT-VIEW-HEAD
352 # > param csuite SUITE
353 # > param tagformat old|new
354 # > param maint-view MAINT-VIEW-HEAD
356 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
357 # > file buildinfo # for buildinfos to sign
359 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
360 # # goes into tag, for replay prevention
363 # [indicates that signed tag is wanted]
364 # < data-block NBYTES
365 # < [NBYTES bytes of data (no newline)]
366 # [maybe some more blocks]
370 # > want signed-dsc-changes
371 # < data-block NBYTES [transfer of signed dsc]
373 # < data-block NBYTES [transfer of signed changes]
375 # < data-block NBYTES [transfer of each signed buildinfo
376 # [etc] same number and order as "file buildinfo"]
384 sub i_child_report () {
385 # Sees if our child has died, and reap it if so. Returns a string
386 # describing how it died if it failed, or undef otherwise.
387 return undef unless $i_child_pid;
388 my $got = waitpid $i_child_pid, WNOHANG;
389 return undef if $got <= 0;
390 die unless $got == $i_child_pid;
391 $i_child_pid = undef;
392 return undef unless $?;
393 return "build host child ".waitstatusmsg();
398 fail "connection lost: $!" if $fh->error;
399 fail "protocol violation; $m not expected";
402 sub badproto_badread ($$) {
404 fail "connection lost: $!" if $!;
405 my $report = i_child_report();
406 fail $report if defined $report;
407 badproto $fh, "eof (reading $wh)";
410 sub protocol_expect (&$) {
411 my ($match, $fh) = @_;
414 defined && chomp or badproto_badread $fh, "protocol message";
422 badproto $fh, "\`$_'";
425 sub protocol_send_file ($$) {
426 my ($fh, $ourfn) = @_;
427 open PF, "<", $ourfn or die "$ourfn: $!";
430 my $got = read PF, $d, 65536;
431 die "$ourfn: $!" unless defined $got;
433 print $fh "data-block ".length($d)."\n" or die $!;
434 print $fh $d or die $!;
436 PF->error and die "$ourfn $!";
437 print $fh "data-end\n" or die $!;
441 sub protocol_read_bytes ($$) {
442 my ($fh, $nbytes) = @_;
443 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
445 my $got = read $fh, $d, $nbytes;
446 $got==$nbytes or badproto_badread $fh, "data block";
450 sub protocol_receive_file ($$) {
451 my ($fh, $ourfn) = @_;
452 printdebug "() $ourfn\n";
453 open PF, ">", $ourfn or die "$ourfn: $!";
455 my ($y,$l) = protocol_expect {
456 m/^data-block (.*)$/ ? (1,$1) :
457 m/^data-end$/ ? (0,) :
461 my $d = protocol_read_bytes $fh, $l;
462 print PF $d or die $!;
467 #---------- remote protocol support, responder ----------
469 sub responder_send_command ($) {
471 return unless $we_are_responder;
472 # called even without $we_are_responder
473 printdebug ">> $command\n";
474 print PO $command, "\n" or die $!;
477 sub responder_send_file ($$) {
478 my ($keyword, $ourfn) = @_;
479 return unless $we_are_responder;
480 printdebug "]] $keyword $ourfn\n";
481 responder_send_command "file $keyword";
482 protocol_send_file \*PO, $ourfn;
485 sub responder_receive_files ($@) {
486 my ($keyword, @ourfns) = @_;
487 die unless $we_are_responder;
488 printdebug "[[ $keyword @ourfns\n";
489 responder_send_command "want $keyword";
490 foreach my $fn (@ourfns) {
491 protocol_receive_file \*PI, $fn;
494 protocol_expect { m/^files-end$/ } \*PI;
497 #---------- remote protocol support, initiator ----------
499 sub initiator_expect (&) {
501 protocol_expect { &$match } \*RO;
504 #---------- end remote code ----------
507 if ($we_are_responder) {
509 responder_send_command "progress ".length($m) or die $!;
510 print PO $m or die $!;
520 $ua = LWP::UserAgent->new();
524 progress "downloading $what...";
525 my $r = $ua->get(@_) or die $!;
526 return undef if $r->code == 404;
527 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
528 return $r->decoded_content(charset => 'none');
531 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
533 sub act_local () { return $dryrun_level <= 1; }
534 sub act_scary () { return !$dryrun_level; }
537 if (!$dryrun_level) {
538 progress "$us ok: @_";
540 progress "would be ok: @_ (but dry run only)";
545 printcmd(\*STDERR,$debugprefix."#",@_);
548 sub runcmd_ordryrun {
556 sub runcmd_ordryrun_local {
564 our $helpmsg = <<END;
566 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
567 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
568 dgit [dgit-opts] build [dpkg-buildpackage-opts]
569 dgit [dgit-opts] sbuild [sbuild-opts]
570 dgit [dgit-opts] push [dgit-opts] [suite]
571 dgit [dgit-opts] push-source [dgit-opts] [suite]
572 dgit [dgit-opts] rpush build-host:build-dir ...
573 important dgit options:
574 -k<keyid> sign tag and package with <keyid> instead of default
575 --dry-run -n do not change anything, but go through the motions
576 --damp-run -L like --dry-run but make local changes, without signing
577 --new -N allow introducing a new package
578 --debug -D increase debug level
579 -c<name>=<value> set git config option (used directly by dgit too)
582 our $later_warning_msg = <<END;
583 Perhaps the upload is stuck in incoming. Using the version from git.
587 print STDERR "$us: @_\n", $helpmsg or die $!;
592 @ARGV or badusage "too few arguments";
593 return scalar shift @ARGV;
597 not_necessarily_a_tree();
600 print $helpmsg or die $!;
604 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
606 our %defcfg = ('dgit.default.distro' => 'debian',
607 'dgit.default.default-suite' => 'unstable',
608 'dgit.default.old-dsc-distro' => 'debian',
609 'dgit-suite.*-security.distro' => 'debian-security',
610 'dgit.default.username' => '',
611 'dgit.default.archive-query-default-component' => 'main',
612 'dgit.default.ssh' => 'ssh',
613 'dgit.default.archive-query' => 'madison:',
614 'dgit.default.sshpsql-dbname' => 'service=projectb',
615 'dgit.default.aptget-components' => 'main',
616 'dgit.default.dgit-tag-format' => 'new,old,maint',
617 'dgit.dsc-url-proto-ok.http' => 'true',
618 'dgit.dsc-url-proto-ok.https' => 'true',
619 'dgit.dsc-url-proto-ok.git' => 'true',
620 'dgit.vcs-git.suites', => 'sid', # ;-separated
621 'dgit.default.dsc-url-proto-ok' => 'false',
622 # old means "repo server accepts pushes with old dgit tags"
623 # new means "repo server accepts pushes with new dgit tags"
624 # maint means "repo server accepts split brain pushes"
625 # hist means "repo server may have old pushes without new tag"
626 # ("hist" is implied by "old")
627 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
628 'dgit-distro.debian.git-check' => 'url',
629 'dgit-distro.debian.git-check-suffix' => '/info/refs',
630 'dgit-distro.debian.new-private-pushers' => 't',
631 'dgit-distro.debian/push.git-url' => '',
632 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
633 'dgit-distro.debian/push.git-user-force' => 'dgit',
634 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
635 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
636 'dgit-distro.debian/push.git-create' => 'true',
637 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
638 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
639 # 'dgit-distro.debian.archive-query-tls-key',
640 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
641 # ^ this does not work because curl is broken nowadays
642 # Fixing #790093 properly will involve providing providing the key
643 # in some pacagke and maybe updating these paths.
645 # 'dgit-distro.debian.archive-query-tls-curl-args',
646 # '--ca-path=/etc/ssl/ca-debian',
647 # ^ this is a workaround but works (only) on DSA-administered machines
648 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
649 'dgit-distro.debian.git-url-suffix' => '',
650 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
651 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
652 'dgit-distro.debian-security.archive-query' => 'aptget:',
653 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
654 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
655 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
656 'dgit-distro.debian-security.nominal-distro' => 'debian',
657 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
658 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
659 'dgit-distro.ubuntu.git-check' => 'false',
660 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
661 'dgit-distro.test-dummy.ssh' => "$td/ssh",
662 'dgit-distro.test-dummy.username' => "alice",
663 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
664 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
665 'dgit-distro.test-dummy.git-url' => "$td/git",
666 'dgit-distro.test-dummy.git-host' => "git",
667 'dgit-distro.test-dummy.git-path' => "$td/git",
668 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
669 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
670 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
671 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
675 our @gitcfgsources = qw(cmdline local global system);
676 our $invoked_in_git_tree = 1;
678 sub git_slurp_config () {
679 # This algoritm is a bit subtle, but this is needed so that for
680 # options which we want to be single-valued, we allow the
681 # different config sources to override properly. See #835858.
682 foreach my $src (@gitcfgsources) {
683 next if $src eq 'cmdline';
684 # we do this ourselves since git doesn't handle it
686 $gitcfgs{$src} = git_slurp_config_src $src;
690 sub git_get_config ($) {
692 foreach my $src (@gitcfgsources) {
693 my $l = $gitcfgs{$src}{$c};
694 confess "internal error ($l $c)" if $l && !ref $l;
695 printdebug"C $c ".(defined $l ?
696 join " ", map { messagequote "'$_'" } @$l :
700 @$l==1 or badcfg "multiple values for $c".
701 " (in $src git config)" if @$l > 1;
709 return undef if $c =~ /RETURN-UNDEF/;
710 printdebug "C? $c\n" if $debuglevel >= 5;
711 my $v = git_get_config($c);
712 return $v if defined $v;
713 my $dv = $defcfg{$c};
715 printdebug "CD $c $dv\n" if $debuglevel >= 4;
719 badcfg "need value for one of: @_\n".
720 "$us: distro or suite appears not to be (properly) supported";
723 sub not_necessarily_a_tree () {
724 # needs to be called from pre_*
725 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
726 $invoked_in_git_tree = 0;
729 sub access_basedistro__noalias () {
730 if (defined $idistro) {
733 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
734 return $def if defined $def;
735 foreach my $src (@gitcfgsources, 'internal') {
736 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
738 foreach my $k (keys %$kl) {
739 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
741 next unless match_glob $dpat, $isuite;
745 return cfg("dgit.default.distro");
749 sub access_basedistro () {
750 my $noalias = access_basedistro__noalias();
751 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
752 return $canon // $noalias;
755 sub access_nomdistro () {
756 my $base = access_basedistro();
757 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
758 $r =~ m/^$distro_re$/ or badcfg
759 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
763 sub access_quirk () {
764 # returns (quirk name, distro to use instead or undef, quirk-specific info)
765 my $basedistro = access_basedistro();
766 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
768 if (defined $backports_quirk) {
769 my $re = $backports_quirk;
770 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
772 $re =~ s/\%/([-0-9a-z_]+)/
773 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
774 if ($isuite =~ m/^$re$/) {
775 return ('backports',"$basedistro-backports",$1);
778 return ('none',undef);
783 sub parse_cfg_bool ($$$) {
784 my ($what,$def,$v) = @_;
787 $v =~ m/^[ty1]/ ? 1 :
788 $v =~ m/^[fn0]/ ? 0 :
789 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
792 sub access_forpush_config () {
793 my $d = access_basedistro();
797 parse_cfg_bool('new-private-pushers', 0,
798 cfg("dgit-distro.$d.new-private-pushers",
801 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
804 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
805 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
806 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
807 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
810 sub access_forpush () {
811 $access_forpush //= access_forpush_config();
812 return $access_forpush;
816 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
817 badcfg "pushing but distro is configured readonly"
818 if access_forpush_config() eq '0';
820 $supplementary_message = <<'END' unless $we_are_responder;
821 Push failed, before we got started.
822 You can retry the push, after fixing the problem, if you like.
824 parseopts_late_defaults();
828 parseopts_late_defaults();
831 sub supplementary_message ($) {
833 if (!$we_are_responder) {
834 $supplementary_message = $msg;
836 } elsif ($protovsn >= 3) {
837 responder_send_command "supplementary-message ".length($msg)
839 print PO $msg or die $!;
843 sub access_distros () {
844 # Returns list of distros to try, in order
847 # 0. `instead of' distro name(s) we have been pointed to
848 # 1. the access_quirk distro, if any
849 # 2a. the user's specified distro, or failing that } basedistro
850 # 2b. the distro calculated from the suite }
851 my @l = access_basedistro();
853 my (undef,$quirkdistro) = access_quirk();
854 unshift @l, $quirkdistro;
855 unshift @l, $instead_distro;
856 @l = grep { defined } @l;
858 push @l, access_nomdistro();
860 if (access_forpush()) {
861 @l = map { ("$_/push", $_) } @l;
866 sub access_cfg_cfgs (@) {
869 # The nesting of these loops determines the search order. We put
870 # the key loop on the outside so that we search all the distros
871 # for each key, before going on to the next key. That means that
872 # if access_cfg is called with a more specific, and then a less
873 # specific, key, an earlier distro can override the less specific
874 # without necessarily overriding any more specific keys. (If the
875 # distro wants to override the more specific keys it can simply do
876 # so; whereas if we did the loop the other way around, it would be
877 # impossible to for an earlier distro to override a less specific
878 # key but not the more specific ones without restating the unknown
879 # values of the more specific keys.
882 # We have to deal with RETURN-UNDEF specially, so that we don't
883 # terminate the search prematurely.
885 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
888 foreach my $d (access_distros()) {
889 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
891 push @cfgs, map { "dgit.default.$_" } @realkeys;
898 my (@cfgs) = access_cfg_cfgs(@keys);
899 my $value = cfg(@cfgs);
903 sub access_cfg_bool ($$) {
904 my ($def, @keys) = @_;
905 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
908 sub string_to_ssh ($) {
910 if ($spec =~ m/\s/) {
911 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
917 sub access_cfg_ssh () {
918 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
919 if (!defined $gitssh) {
922 return string_to_ssh $gitssh;
926 sub access_runeinfo ($) {
928 return ": dgit ".access_basedistro()." $info ;";
931 sub access_someuserhost ($) {
933 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
934 defined($user) && length($user) or
935 $user = access_cfg("$some-user",'username');
936 my $host = access_cfg("$some-host");
937 return length($user) ? "$user\@$host" : $host;
940 sub access_gituserhost () {
941 return access_someuserhost('git');
944 sub access_giturl (;$) {
946 my $url = access_cfg('git-url','RETURN-UNDEF');
949 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
950 return undef unless defined $proto;
953 access_gituserhost().
954 access_cfg('git-path');
956 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
959 return "$url/$package$suffix";
962 sub parsecontrolfh ($$;$) {
963 my ($fh, $desc, $allowsigned) = @_;
964 our $dpkgcontrolhash_noissigned;
967 my %opts = ('name' => $desc);
968 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
969 $c = Dpkg::Control::Hash->new(%opts);
970 $c->parse($fh,$desc) or die "parsing of $desc failed";
971 last if $allowsigned;
972 last if $dpkgcontrolhash_noissigned;
973 my $issigned= $c->get_option('is_pgp_signed');
974 if (!defined $issigned) {
975 $dpkgcontrolhash_noissigned= 1;
976 seek $fh, 0,0 or die "seek $desc: $!";
977 } elsif ($issigned) {
978 fail "control file $desc is (already) PGP-signed. ".
979 " Note that dgit push needs to modify the .dsc and then".
980 " do the signature itself";
989 my ($file, $desc, $allowsigned) = @_;
990 my $fh = new IO::Handle;
991 open $fh, '<', $file or die "$file: $!";
992 my $c = parsecontrolfh($fh,$desc,$allowsigned);
993 $fh->error and die $!;
999 my ($dctrl,$field) = @_;
1000 my $v = $dctrl->{$field};
1001 return $v if defined $v;
1002 fail "missing field $field in ".$dctrl->get_option('name');
1005 sub parsechangelog {
1006 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
1007 my $p = new IO::Handle;
1008 my @cmd = (qw(dpkg-parsechangelog), @_);
1009 open $p, '-|', @cmd or die $!;
1011 $?=0; $!=0; close $p or failedcmd @cmd;
1015 sub commit_getclogp ($) {
1016 # Returns the parsed changelog hashref for a particular commit
1018 our %commit_getclogp_memo;
1019 my $memo = $commit_getclogp_memo{$objid};
1020 return $memo if $memo;
1022 my $mclog = dgit_privdir()."clog";
1023 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1024 "$objid:debian/changelog";
1025 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1028 sub parse_dscdata () {
1029 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1030 printdebug Dumper($dscdata) if $debuglevel>1;
1031 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1032 printdebug Dumper($dsc) if $debuglevel>1;
1037 sub archive_query ($;@) {
1038 my ($method) = shift @_;
1039 fail "this operation does not support multiple comma-separated suites"
1041 my $query = access_cfg('archive-query','RETURN-UNDEF');
1042 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1045 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1048 sub archive_query_prepend_mirror {
1049 my $m = access_cfg('mirror');
1050 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1053 sub pool_dsc_subpath ($$) {
1054 my ($vsn,$component) = @_; # $package is implict arg
1055 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1056 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1059 sub cfg_apply_map ($$$) {
1060 my ($varref, $what, $mapspec) = @_;
1061 return unless $mapspec;
1063 printdebug "config $what EVAL{ $mapspec; }\n";
1065 eval "package Dgit::Config; $mapspec;";
1070 #---------- `ftpmasterapi' archive query method (nascent) ----------
1072 sub archive_api_query_cmd ($) {
1074 my @cmd = (@curl, qw(-sS));
1075 my $url = access_cfg('archive-query-url');
1076 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1078 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1079 foreach my $key (split /\:/, $keys) {
1080 $key =~ s/\%HOST\%/$host/g;
1082 fail "for $url: stat $key: $!" unless $!==ENOENT;
1085 fail "config requested specific TLS key but do not know".
1086 " how to get curl to use exactly that EE key ($key)";
1087 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1088 # # Sadly the above line does not work because of changes
1089 # # to gnutls. The real fix for #790093 may involve
1090 # # new curl options.
1093 # Fixing #790093 properly will involve providing a value
1094 # for this on clients.
1095 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1096 push @cmd, split / /, $kargs if defined $kargs;
1098 push @cmd, $url.$subpath;
1102 sub api_query ($$;$) {
1104 my ($data, $subpath, $ok404) = @_;
1105 badcfg "ftpmasterapi archive query method takes no data part"
1107 my @cmd = archive_api_query_cmd($subpath);
1108 my $url = $cmd[$#cmd];
1109 push @cmd, qw(-w %{http_code});
1110 my $json = cmdoutput @cmd;
1111 unless ($json =~ s/\d+\d+\d$//) {
1112 failedcmd_report_cmd undef, @cmd;
1113 fail "curl failed to print 3-digit HTTP code";
1116 return undef if $code eq '404' && $ok404;
1117 fail "fetch of $url gave HTTP code $code"
1118 unless $url =~ m#^file://# or $code =~ m/^2/;
1119 return decode_json($json);
1122 sub canonicalise_suite_ftpmasterapi {
1123 my ($proto,$data) = @_;
1124 my $suites = api_query($data, 'suites');
1126 foreach my $entry (@$suites) {
1128 my $v = $entry->{$_};
1129 defined $v && $v eq $isuite;
1130 } qw(codename name);
1131 push @matched, $entry;
1133 fail "unknown suite $isuite" unless @matched;
1136 @matched==1 or die "multiple matches for suite $isuite\n";
1137 $cn = "$matched[0]{codename}";
1138 defined $cn or die "suite $isuite info has no codename\n";
1139 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1141 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1146 sub archive_query_ftpmasterapi {
1147 my ($proto,$data) = @_;
1148 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1150 my $digester = Digest::SHA->new(256);
1151 foreach my $entry (@$info) {
1153 my $vsn = "$entry->{version}";
1154 my ($ok,$msg) = version_check $vsn;
1155 die "bad version: $msg\n" unless $ok;
1156 my $component = "$entry->{component}";
1157 $component =~ m/^$component_re$/ or die "bad component";
1158 my $filename = "$entry->{filename}";
1159 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1160 or die "bad filename";
1161 my $sha256sum = "$entry->{sha256sum}";
1162 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1163 push @rows, [ $vsn, "/pool/$component/$filename",
1164 $digester, $sha256sum ];
1166 die "bad ftpmaster api response: $@\n".Dumper($entry)
1169 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1170 return archive_query_prepend_mirror @rows;
1173 sub file_in_archive_ftpmasterapi {
1174 my ($proto,$data,$filename) = @_;
1175 my $pat = $filename;
1178 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1179 my $info = api_query($data, "file_in_archive/$pat", 1);
1182 #---------- `aptget' archive query method ----------
1185 our $aptget_releasefile;
1186 our $aptget_configpath;
1188 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1189 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1191 sub aptget_cache_clean {
1192 runcmd_ordryrun_local qw(sh -ec),
1193 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1197 sub aptget_lock_acquire () {
1198 my $lockfile = "$aptget_base/lock";
1199 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1200 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1203 sub aptget_prep ($) {
1205 return if defined $aptget_base;
1207 badcfg "aptget archive query method takes no data part"
1210 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1213 ensuredir "$cache/dgit";
1215 access_cfg('aptget-cachekey','RETURN-UNDEF')
1216 // access_nomdistro();
1218 $aptget_base = "$cache/dgit/aptget";
1219 ensuredir $aptget_base;
1221 my $quoted_base = $aptget_base;
1222 die "$quoted_base contains bad chars, cannot continue"
1223 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1225 ensuredir $aptget_base;
1227 aptget_lock_acquire();
1229 aptget_cache_clean();
1231 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1232 my $sourceslist = "source.list#$cachekey";
1234 my $aptsuites = $isuite;
1235 cfg_apply_map(\$aptsuites, 'suite map',
1236 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1238 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1239 printf SRCS "deb-src %s %s %s\n",
1240 access_cfg('mirror'),
1242 access_cfg('aptget-components')
1245 ensuredir "$aptget_base/cache";
1246 ensuredir "$aptget_base/lists";
1248 open CONF, ">", $aptget_configpath or die $!;
1250 Debug::NoLocking "true";
1251 APT::Get::List-Cleanup "false";
1252 #clear APT::Update::Post-Invoke-Success;
1253 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1254 Dir::State::Lists "$quoted_base/lists";
1255 Dir::Etc::preferences "$quoted_base/preferences";
1256 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1257 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1260 foreach my $key (qw(
1263 Dir::Cache::Archives
1264 Dir::Etc::SourceParts
1265 Dir::Etc::preferencesparts
1267 ensuredir "$aptget_base/$key";
1268 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1271 my $oldatime = (time // die $!) - 1;
1272 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1273 next unless stat_exists $oldlist;
1274 my ($mtime) = (stat _)[9];
1275 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1278 runcmd_ordryrun_local aptget_aptget(), qw(update);
1281 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1282 next unless stat_exists $oldlist;
1283 my ($atime) = (stat _)[8];
1284 next if $atime == $oldatime;
1285 push @releasefiles, $oldlist;
1287 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1288 @releasefiles = @inreleasefiles if @inreleasefiles;
1289 die "apt updated wrong number of Release files (@releasefiles), erk"
1290 unless @releasefiles == 1;
1292 ($aptget_releasefile) = @releasefiles;
1295 sub canonicalise_suite_aptget {
1296 my ($proto,$data) = @_;
1299 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1301 foreach my $name (qw(Codename Suite)) {
1302 my $val = $release->{$name};
1304 printdebug "release file $name: $val\n";
1305 $val =~ m/^$suite_re$/o or fail
1306 "Release file ($aptget_releasefile) specifies intolerable $name";
1307 cfg_apply_map(\$val, 'suite rmap',
1308 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1315 sub archive_query_aptget {
1316 my ($proto,$data) = @_;
1319 ensuredir "$aptget_base/source";
1320 foreach my $old (<$aptget_base/source/*.dsc>) {
1321 unlink $old or die "$old: $!";
1324 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1325 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1326 # avoids apt-get source failing with ambiguous error code
1328 runcmd_ordryrun_local
1329 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1330 aptget_aptget(), qw(--download-only --only-source source), $package;
1332 my @dscs = <$aptget_base/source/*.dsc>;
1333 fail "apt-get source did not produce a .dsc" unless @dscs;
1334 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1336 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1339 my $uri = "file://". uri_escape $dscs[0];
1340 $uri =~ s{\%2f}{/}gi;
1341 return [ (getfield $pre_dsc, 'Version'), $uri ];
1344 sub file_in_archive_aptget () { return undef; }
1346 #---------- `dummyapicat' archive query method ----------
1348 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1349 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1351 sub file_in_archive_dummycatapi ($$$) {
1352 my ($proto,$data,$filename) = @_;
1353 my $mirror = access_cfg('mirror');
1354 $mirror =~ s#^file://#/# or die "$mirror ?";
1356 my @cmd = (qw(sh -ec), '
1358 find -name "$2" -print0 |
1360 ', qw(x), $mirror, $filename);
1361 debugcmd "-|", @cmd;
1362 open FIA, "-|", @cmd or die $!;
1365 printdebug "| $_\n";
1366 m/^(\w+) (\S+)$/ or die "$_ ?";
1367 push @out, { sha256sum => $1, filename => $2 };
1369 close FIA or die failedcmd @cmd;
1373 #---------- `madison' archive query method ----------
1375 sub archive_query_madison {
1376 return archive_query_prepend_mirror
1377 map { [ @$_[0..1] ] } madison_get_parse(@_);
1380 sub madison_get_parse {
1381 my ($proto,$data) = @_;
1382 die unless $proto eq 'madison';
1383 if (!length $data) {
1384 $data= access_cfg('madison-distro','RETURN-UNDEF');
1385 $data //= access_basedistro();
1387 $rmad{$proto,$data,$package} ||= cmdoutput
1388 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1389 my $rmad = $rmad{$proto,$data,$package};
1392 foreach my $l (split /\n/, $rmad) {
1393 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1394 \s*( [^ \t|]+ )\s* \|
1395 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1396 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1397 $1 eq $package or die "$rmad $package ?";
1404 $component = access_cfg('archive-query-default-component');
1406 $5 eq 'source' or die "$rmad ?";
1407 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1409 return sort { -version_compare($a->[0],$b->[0]); } @out;
1412 sub canonicalise_suite_madison {
1413 # madison canonicalises for us
1414 my @r = madison_get_parse(@_);
1416 "unable to canonicalise suite using package $package".
1417 " which does not appear to exist in suite $isuite;".
1418 " --existing-package may help";
1422 sub file_in_archive_madison { return undef; }
1424 #---------- `sshpsql' archive query method ----------
1427 my ($data,$runeinfo,$sql) = @_;
1428 if (!length $data) {
1429 $data= access_someuserhost('sshpsql').':'.
1430 access_cfg('sshpsql-dbname');
1432 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1433 my ($userhost,$dbname) = ($`,$'); #';
1435 my @cmd = (access_cfg_ssh, $userhost,
1436 access_runeinfo("ssh-psql $runeinfo").
1437 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1438 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1440 open P, "-|", @cmd or die $!;
1443 printdebug(">|$_|\n");
1446 $!=0; $?=0; close P or failedcmd @cmd;
1448 my $nrows = pop @rows;
1449 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1450 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1451 @rows = map { [ split /\|/, $_ ] } @rows;
1452 my $ncols = scalar @{ shift @rows };
1453 die if grep { scalar @$_ != $ncols } @rows;
1457 sub sql_injection_check {
1458 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1461 sub archive_query_sshpsql ($$) {
1462 my ($proto,$data) = @_;
1463 sql_injection_check $isuite, $package;
1464 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1465 SELECT source.version, component.name, files.filename, files.sha256sum
1467 JOIN src_associations ON source.id = src_associations.source
1468 JOIN suite ON suite.id = src_associations.suite
1469 JOIN dsc_files ON dsc_files.source = source.id
1470 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1471 JOIN component ON component.id = files_archive_map.component_id
1472 JOIN files ON files.id = dsc_files.file
1473 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1474 AND source.source='$package'
1475 AND files.filename LIKE '%.dsc';
1477 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1478 my $digester = Digest::SHA->new(256);
1480 my ($vsn,$component,$filename,$sha256sum) = @$_;
1481 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1483 return archive_query_prepend_mirror @rows;
1486 sub canonicalise_suite_sshpsql ($$) {
1487 my ($proto,$data) = @_;
1488 sql_injection_check $isuite;
1489 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1490 SELECT suite.codename
1491 FROM suite where suite_name='$isuite' or codename='$isuite';
1493 @rows = map { $_->[0] } @rows;
1494 fail "unknown suite $isuite" unless @rows;
1495 die "ambiguous $isuite: @rows ?" if @rows>1;
1499 sub file_in_archive_sshpsql ($$$) { return undef; }
1501 #---------- `dummycat' archive query method ----------
1503 sub canonicalise_suite_dummycat ($$) {
1504 my ($proto,$data) = @_;
1505 my $dpath = "$data/suite.$isuite";
1506 if (!open C, "<", $dpath) {
1507 $!==ENOENT or die "$dpath: $!";
1508 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1512 chomp or die "$dpath: $!";
1514 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1518 sub archive_query_dummycat ($$) {
1519 my ($proto,$data) = @_;
1520 canonicalise_suite();
1521 my $dpath = "$data/package.$csuite.$package";
1522 if (!open C, "<", $dpath) {
1523 $!==ENOENT or die "$dpath: $!";
1524 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1532 printdebug "dummycat query $csuite $package $dpath | $_\n";
1533 my @row = split /\s+/, $_;
1534 @row==2 or die "$dpath: $_ ?";
1537 C->error and die "$dpath: $!";
1539 return archive_query_prepend_mirror
1540 sort { -version_compare($a->[0],$b->[0]); } @rows;
1543 sub file_in_archive_dummycat () { return undef; }
1545 #---------- tag format handling ----------
1547 sub access_cfg_tagformats () {
1548 split /\,/, access_cfg('dgit-tag-format');
1551 sub access_cfg_tagformats_can_splitbrain () {
1552 my %y = map { $_ => 1 } access_cfg_tagformats;
1553 foreach my $needtf (qw(new maint)) {
1554 next if $y{$needtf};
1560 sub need_tagformat ($$) {
1561 my ($fmt, $why) = @_;
1562 fail "need to use tag format $fmt ($why) but also need".
1563 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1564 " - no way to proceed"
1565 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1566 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1569 sub select_tagformat () {
1571 return if $tagformatfn && !$tagformat_want;
1572 die 'bug' if $tagformatfn && $tagformat_want;
1573 # ... $tagformat_want assigned after previous select_tagformat
1575 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1576 printdebug "select_tagformat supported @supported\n";
1578 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1579 printdebug "select_tagformat specified @$tagformat_want\n";
1581 my ($fmt,$why,$override) = @$tagformat_want;
1583 fail "target distro supports tag formats @supported".
1584 " but have to use $fmt ($why)"
1586 or grep { $_ eq $fmt } @supported;
1588 $tagformat_want = undef;
1590 $tagformatfn = ${*::}{"debiantag_$fmt"};
1592 fail "trying to use unknown tag format \`$fmt' ($why) !"
1593 unless $tagformatfn;
1596 #---------- archive query entrypoints and rest of program ----------
1598 sub canonicalise_suite () {
1599 return if defined $csuite;
1600 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1601 $csuite = archive_query('canonicalise_suite');
1602 if ($isuite ne $csuite) {
1603 progress "canonical suite name for $isuite is $csuite";
1605 progress "canonical suite name is $csuite";
1609 sub get_archive_dsc () {
1610 canonicalise_suite();
1611 my @vsns = archive_query('archive_query');
1612 foreach my $vinfo (@vsns) {
1613 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1614 $dscurl = $vsn_dscurl;
1615 $dscdata = url_get($dscurl);
1617 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1622 $digester->add($dscdata);
1623 my $got = $digester->hexdigest();
1625 fail "$dscurl has hash $got but".
1626 " archive told us to expect $digest";
1629 my $fmt = getfield $dsc, 'Format';
1630 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1631 "unsupported source format $fmt, sorry";
1633 $dsc_checked = !!$digester;
1634 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1638 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1641 sub check_for_git ();
1642 sub check_for_git () {
1644 my $how = access_cfg('git-check');
1645 if ($how eq 'ssh-cmd') {
1647 (access_cfg_ssh, access_gituserhost(),
1648 access_runeinfo("git-check $package").
1649 " set -e; cd ".access_cfg('git-path').";".
1650 " if test -d $package.git; then echo 1; else echo 0; fi");
1651 my $r= cmdoutput @cmd;
1652 if (defined $r and $r =~ m/^divert (\w+)$/) {
1654 my ($usedistro,) = access_distros();
1655 # NB that if we are pushing, $usedistro will be $distro/push
1656 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1657 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1658 progress "diverting to $divert (using config for $instead_distro)";
1659 return check_for_git();
1661 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1663 } elsif ($how eq 'url') {
1664 my $prefix = access_cfg('git-check-url','git-url');
1665 my $suffix = access_cfg('git-check-suffix','git-suffix',
1666 'RETURN-UNDEF') // '.git';
1667 my $url = "$prefix/$package$suffix";
1668 my @cmd = (@curl, qw(-sS -I), $url);
1669 my $result = cmdoutput @cmd;
1670 $result =~ s/^\S+ 200 .*\n\r?\n//;
1671 # curl -sS -I with https_proxy prints
1672 # HTTP/1.0 200 Connection established
1673 $result =~ m/^\S+ (404|200) /s or
1674 fail "unexpected results from git check query - ".
1675 Dumper($prefix, $result);
1677 if ($code eq '404') {
1679 } elsif ($code eq '200') {
1684 } elsif ($how eq 'true') {
1686 } elsif ($how eq 'false') {
1689 badcfg "unknown git-check \`$how'";
1693 sub create_remote_git_repo () {
1694 my $how = access_cfg('git-create');
1695 if ($how eq 'ssh-cmd') {
1697 (access_cfg_ssh, access_gituserhost(),
1698 access_runeinfo("git-create $package").
1699 "set -e; cd ".access_cfg('git-path').";".
1700 " cp -a _template $package.git");
1701 } elsif ($how eq 'true') {
1704 badcfg "unknown git-create \`$how'";
1708 our ($dsc_hash,$lastpush_mergeinput);
1709 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1713 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1714 $playground = fresh_playground 'dgit/unpack';
1717 sub mktree_in_ud_here () {
1718 playtree_setup $gitcfgs{local};
1721 sub git_write_tree () {
1722 my $tree = cmdoutput @git, qw(write-tree);
1723 $tree =~ m/^\w+$/ or die "$tree ?";
1727 sub git_add_write_tree () {
1728 runcmd @git, qw(add -Af .);
1729 return git_write_tree();
1732 sub remove_stray_gits ($) {
1734 my @gitscmd = qw(find -name .git -prune -print0);
1735 debugcmd "|",@gitscmd;
1736 open GITS, "-|", @gitscmd or die $!;
1741 print STDERR "$us: warning: removing from $what: ",
1742 (messagequote $_), "\n";
1746 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1749 sub mktree_in_ud_from_only_subdir ($;$) {
1750 my ($what,$raw) = @_;
1751 # changes into the subdir
1754 die "expected one subdir but found @dirs ?" unless @dirs==1;
1755 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1759 remove_stray_gits($what);
1760 mktree_in_ud_here();
1762 my ($format, $fopts) = get_source_format();
1763 if (madformat($format)) {
1768 my $tree=git_add_write_tree();
1769 return ($tree,$dir);
1772 our @files_csum_info_fields =
1773 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1774 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1775 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1777 sub dsc_files_info () {
1778 foreach my $csumi (@files_csum_info_fields) {
1779 my ($fname, $module, $method) = @$csumi;
1780 my $field = $dsc->{$fname};
1781 next unless defined $field;
1782 eval "use $module; 1;" or die $@;
1784 foreach (split /\n/, $field) {
1786 m/^(\w+) (\d+) (\S+)$/ or
1787 fail "could not parse .dsc $fname line \`$_'";
1788 my $digester = eval "$module"."->$method;" or die $@;
1793 Digester => $digester,
1798 fail "missing any supported Checksums-* or Files field in ".
1799 $dsc->get_option('name');
1803 map { $_->{Filename} } dsc_files_info();
1806 sub files_compare_inputs (@) {
1811 my $showinputs = sub {
1812 return join "; ", map { $_->get_option('name') } @$inputs;
1815 foreach my $in (@$inputs) {
1817 my $in_name = $in->get_option('name');
1819 printdebug "files_compare_inputs $in_name\n";
1821 foreach my $csumi (@files_csum_info_fields) {
1822 my ($fname) = @$csumi;
1823 printdebug "files_compare_inputs $in_name $fname\n";
1825 my $field = $in->{$fname};
1826 next unless defined $field;
1829 foreach (split /\n/, $field) {
1832 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1833 fail "could not parse $in_name $fname line \`$_'";
1835 printdebug "files_compare_inputs $in_name $fname $f\n";
1839 my $re = \ $record{$f}{$fname};
1841 $fchecked{$f}{$in_name} = 1;
1843 fail "hash or size of $f varies in $fname fields".
1844 " (between: ".$showinputs->().")";
1849 @files = sort @files;
1850 $expected_files //= \@files;
1851 "@$expected_files" eq "@files" or
1852 fail "file list in $in_name varies between hash fields!";
1855 fail "$in_name has no files list field(s)";
1857 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1860 grep { keys %$_ == @$inputs-1 } values %fchecked
1861 or fail "no file appears in all file lists".
1862 " (looked in: ".$showinputs->().")";
1865 sub is_orig_file_in_dsc ($$) {
1866 my ($f, $dsc_files_info) = @_;
1867 return 0 if @$dsc_files_info <= 1;
1868 # One file means no origs, and the filename doesn't have a "what
1869 # part of dsc" component. (Consider versions ending `.orig'.)
1870 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1874 sub is_orig_file_of_vsn ($$) {
1875 my ($f, $upstreamvsn) = @_;
1876 my $base = srcfn $upstreamvsn, '';
1877 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1881 # This function determines whether a .changes file is source-only from
1882 # the point of view of dak. Thus, it permits *_source.buildinfo
1885 # It does not, however, permit any other buildinfo files. After a
1886 # source-only upload, the buildds will try to upload files like
1887 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
1888 # named like this in their (otherwise) source-only upload, the uploads
1889 # of the buildd can be rejected by dak. Fixing the resultant
1890 # situation can require manual intervention. So we block such
1891 # .buildinfo files when the user tells us to perform a source-only
1892 # upload (such as when using the push-source subcommand with the -C
1893 # option, which calls this function).
1895 # Note, though, that when dgit is told to prepare a source-only
1896 # upload, such as when subcommands like build-source and push-source
1897 # without -C are used, dgit has a more restrictive notion of
1898 # source-only .changes than dak: such uploads will never include
1899 # *_source.buildinfo files. This is because there is no use for such
1900 # files when using a tool like dgit to produce the source package, as
1901 # dgit ensures the source is identical to git HEAD.
1902 sub test_source_only_changes ($) {
1904 foreach my $l (split /\n/, getfield $changes, 'Files') {
1905 $l =~ m/\S+$/ or next;
1906 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
1907 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
1908 print "purportedly source-only changes polluted by $&\n";
1915 sub changes_update_origs_from_dsc ($$$$) {
1916 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1918 printdebug "checking origs needed ($upstreamvsn)...\n";
1919 $_ = getfield $changes, 'Files';
1920 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1921 fail "cannot find section/priority from .changes Files field";
1922 my $placementinfo = $1;
1924 printdebug "checking origs needed placement '$placementinfo'...\n";
1925 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1926 $l =~ m/\S+$/ or next;
1928 printdebug "origs $file | $l\n";
1929 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1930 printdebug "origs $file is_orig\n";
1931 my $have = archive_query('file_in_archive', $file);
1932 if (!defined $have) {
1934 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1940 printdebug "origs $file \$#\$have=$#$have\n";
1941 foreach my $h (@$have) {
1944 foreach my $csumi (@files_csum_info_fields) {
1945 my ($fname, $module, $method, $archivefield) = @$csumi;
1946 next unless defined $h->{$archivefield};
1947 $_ = $dsc->{$fname};
1948 next unless defined;
1949 m/^(\w+) .* \Q$file\E$/m or
1950 fail ".dsc $fname missing entry for $file";
1951 if ($h->{$archivefield} eq $1) {
1955 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1958 die "$file ".Dumper($h)." ?!" if $same && @differ;
1961 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1964 printdebug "origs $file f.same=$found_same".
1965 " #f._differ=$#found_differ\n";
1966 if (@found_differ && !$found_same) {
1968 "archive contains $file with different checksum",
1971 # Now we edit the changes file to add or remove it
1972 foreach my $csumi (@files_csum_info_fields) {
1973 my ($fname, $module, $method, $archivefield) = @$csumi;
1974 next unless defined $changes->{$fname};
1976 # in archive, delete from .changes if it's there
1977 $changed{$file} = "removed" if
1978 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1979 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1980 # not in archive, but it's here in the .changes
1982 my $dsc_data = getfield $dsc, $fname;
1983 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1985 $extra =~ s/ \d+ /$&$placementinfo /
1986 or die "$fname $extra >$dsc_data< ?"
1987 if $fname eq 'Files';
1988 $changes->{$fname} .= "\n". $extra;
1989 $changed{$file} = "added";
1994 foreach my $file (keys %changed) {
1996 "edited .changes for archive .orig contents: %s %s",
1997 $changed{$file}, $file;
1999 my $chtmp = "$changesfile.tmp";
2000 $changes->save($chtmp);
2002 rename $chtmp,$changesfile or die "$changesfile $!";
2004 progress "[new .changes left in $changesfile]";
2007 progress "$changesfile already has appropriate .orig(s) (if any)";
2011 sub make_commit ($) {
2013 return cmdoutput @git, qw(hash-object -w -t commit), $file;
2016 sub make_commit_text ($) {
2019 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
2021 print Dumper($text) if $debuglevel > 1;
2022 my $child = open2($out, $in, @cmd) or die $!;
2025 print $in $text or die $!;
2026 close $in or die $!;
2028 $h =~ m/^\w+$/ or die;
2030 printdebug "=> $h\n";
2033 waitpid $child, 0 == $child or die "$child $!";
2034 $? and failedcmd @cmd;
2038 sub clogp_authline ($) {
2040 my $author = getfield $clogp, 'Maintainer';
2041 if ($author =~ m/^[^"\@]+\,/) {
2042 # single entry Maintainer field with unquoted comma
2043 $author = ($& =~ y/,//rd).$'; # strip the comma
2045 # git wants a single author; any remaining commas in $author
2046 # are by now preceded by @ (or "). It seems safer to punt on
2047 # "..." for now rather than attempting to dequote or something.
2048 $author =~ s#,.*##ms unless $author =~ m/"/;
2049 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2050 my $authline = "$author $date";
2051 $authline =~ m/$git_authline_re/o or
2052 fail "unexpected commit author line format \`$authline'".
2053 " (was generated from changelog Maintainer field)";
2054 return ($1,$2,$3) if wantarray;
2058 sub vendor_patches_distro ($$) {
2059 my ($checkdistro, $what) = @_;
2060 return unless defined $checkdistro;
2062 my $series = "debian/patches/\L$checkdistro\E.series";
2063 printdebug "checking for vendor-specific $series ($what)\n";
2065 if (!open SERIES, "<", $series) {
2066 die "$series $!" unless $!==ENOENT;
2075 Unfortunately, this source package uses a feature of dpkg-source where
2076 the same source package unpacks to different source code on different
2077 distros. dgit cannot safely operate on such packages on affected
2078 distros, because the meaning of source packages is not stable.
2080 Please ask the distro/maintainer to remove the distro-specific series
2081 files and use a different technique (if necessary, uploading actually
2082 different packages, if different distros are supposed to have
2086 fail "Found active distro-specific series file for".
2087 " $checkdistro ($what): $series, cannot continue";
2089 die "$series $!" if SERIES->error;
2093 sub check_for_vendor_patches () {
2094 # This dpkg-source feature doesn't seem to be documented anywhere!
2095 # But it can be found in the changelog (reformatted):
2097 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2098 # Author: Raphael Hertzog <hertzog@debian.org>
2099 # Date: Sun Oct 3 09:36:48 2010 +0200
2101 # dpkg-source: correctly create .pc/.quilt_series with alternate
2104 # If you have debian/patches/ubuntu.series and you were
2105 # unpacking the source package on ubuntu, quilt was still
2106 # directed to debian/patches/series instead of
2107 # debian/patches/ubuntu.series.
2109 # debian/changelog | 3 +++
2110 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2111 # 2 files changed, 6 insertions(+), 1 deletion(-)
2114 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2115 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2116 "Dpkg::Vendor \`current vendor'");
2117 vendor_patches_distro(access_basedistro(),
2118 "(base) distro being accessed");
2119 vendor_patches_distro(access_nomdistro(),
2120 "(nominal) distro being accessed");
2123 sub generate_commits_from_dsc () {
2124 # See big comment in fetch_from_archive, below.
2125 # See also README.dsc-import.
2127 changedir $playground;
2129 my @dfi = dsc_files_info();
2130 foreach my $fi (@dfi) {
2131 my $f = $fi->{Filename};
2132 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2133 my $upper_f = "$maindir/../$f";
2135 printdebug "considering reusing $f: ";
2137 if (link_ltarget "$upper_f,fetch", $f) {
2138 printdebug "linked (using ...,fetch).\n";
2139 } elsif ((printdebug "($!) "),
2141 fail "accessing ../$f,fetch: $!";
2142 } elsif (link_ltarget $upper_f, $f) {
2143 printdebug "linked.\n";
2144 } elsif ((printdebug "($!) "),
2146 fail "accessing ../$f: $!";
2148 printdebug "absent.\n";
2152 complete_file_from_dsc('.', $fi, \$refetched)
2155 printdebug "considering saving $f: ";
2157 if (link $f, $upper_f) {
2158 printdebug "linked.\n";
2159 } elsif ((printdebug "($!) "),
2161 fail "saving ../$f: $!";
2162 } elsif (!$refetched) {
2163 printdebug "no need.\n";
2164 } elsif (link $f, "$upper_f,fetch") {
2165 printdebug "linked (using ...,fetch).\n";
2166 } elsif ((printdebug "($!) "),
2168 fail "saving ../$f,fetch: $!";
2170 printdebug "cannot.\n";
2174 # We unpack and record the orig tarballs first, so that we only
2175 # need disk space for one private copy of the unpacked source.
2176 # But we can't make them into commits until we have the metadata
2177 # from the debian/changelog, so we record the tree objects now and
2178 # make them into commits later.
2180 my $upstreamv = upstreamversion $dsc->{version};
2181 my $orig_f_base = srcfn $upstreamv, '';
2183 foreach my $fi (@dfi) {
2184 # We actually import, and record as a commit, every tarball
2185 # (unless there is only one file, in which case there seems
2188 my $f = $fi->{Filename};
2189 printdebug "import considering $f ";
2190 (printdebug "only one dfi\n"), next if @dfi == 1;
2191 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2192 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2196 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2198 printdebug "Y ", (join ' ', map { $_//"(none)" }
2199 $compr_ext, $orig_f_part
2202 my $input = new IO::File $f, '<' or die "$f $!";
2206 if (defined $compr_ext) {
2208 Dpkg::Compression::compression_guess_from_filename $f;
2209 fail "Dpkg::Compression cannot handle file $f in source package"
2210 if defined $compr_ext && !defined $cname;
2212 new Dpkg::Compression::Process compression => $cname;
2213 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2214 my $compr_fh = new IO::Handle;
2215 my $compr_pid = open $compr_fh, "-|" // die $!;
2217 open STDIN, "<&", $input or die $!;
2219 die "dgit (child): exec $compr_cmd[0]: $!\n";
2224 rmtree "_unpack-tar";
2225 mkdir "_unpack-tar" or die $!;
2226 my @tarcmd = qw(tar -x -f -
2227 --no-same-owner --no-same-permissions
2228 --no-acls --no-xattrs --no-selinux);
2229 my $tar_pid = fork // die $!;
2231 chdir "_unpack-tar" or die $!;
2232 open STDIN, "<&", $input or die $!;
2234 die "dgit (child): exec $tarcmd[0]: $!";
2236 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2237 !$? or failedcmd @tarcmd;
2240 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2242 # finally, we have the results in "tarball", but maybe
2243 # with the wrong permissions
2245 runcmd qw(chmod -R +rwX _unpack-tar);
2246 changedir "_unpack-tar";
2247 remove_stray_gits($f);
2248 mktree_in_ud_here();
2250 my ($tree) = git_add_write_tree();
2251 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2252 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2254 printdebug "one subtree $1\n";
2256 printdebug "multiple subtrees\n";
2259 rmtree "_unpack-tar";
2261 my $ent = [ $f, $tree ];
2263 Orig => !!$orig_f_part,
2264 Sort => (!$orig_f_part ? 2 :
2265 $orig_f_part =~ m/-/g ? 1 :
2273 # put any without "_" first (spec is not clear whether files
2274 # are always in the usual order). Tarballs without "_" are
2275 # the main orig or the debian tarball.
2276 $a->{Sort} <=> $b->{Sort} or
2280 my $any_orig = grep { $_->{Orig} } @tartrees;
2282 my $dscfn = "$package.dsc";
2284 my $treeimporthow = 'package';
2286 open D, ">", $dscfn or die "$dscfn: $!";
2287 print D $dscdata or die "$dscfn: $!";
2288 close D or die "$dscfn: $!";
2289 my @cmd = qw(dpkg-source);
2290 push @cmd, '--no-check' if $dsc_checked;
2291 if (madformat $dsc->{format}) {
2292 push @cmd, '--skip-patches';
2293 $treeimporthow = 'unpatched';
2295 push @cmd, qw(-x --), $dscfn;
2298 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2299 if (madformat $dsc->{format}) {
2300 check_for_vendor_patches();
2304 if (madformat $dsc->{format}) {
2305 my @pcmd = qw(dpkg-source --before-build .);
2306 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2308 $dappliedtree = git_add_write_tree();
2311 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2312 debugcmd "|",@clogcmd;
2313 open CLOGS, "-|", @clogcmd or die $!;
2318 printdebug "import clog search...\n";
2321 my $stanzatext = do { local $/=""; <CLOGS>; };
2322 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2323 last if !defined $stanzatext;
2325 my $desc = "package changelog, entry no.$.";
2326 open my $stanzafh, "<", \$stanzatext or die;
2327 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2328 $clogp //= $thisstanza;
2330 printdebug "import clog $thisstanza->{version} $desc...\n";
2332 last if !$any_orig; # we don't need $r1clogp
2334 # We look for the first (most recent) changelog entry whose
2335 # version number is lower than the upstream version of this
2336 # package. Then the last (least recent) previous changelog
2337 # entry is treated as the one which introduced this upstream
2338 # version and used for the synthetic commits for the upstream
2341 # One might think that a more sophisticated algorithm would be
2342 # necessary. But: we do not want to scan the whole changelog
2343 # file. Stopping when we see an earlier version, which
2344 # necessarily then is an earlier upstream version, is the only
2345 # realistic way to do that. Then, either the earliest
2346 # changelog entry we have seen so far is indeed the earliest
2347 # upload of this upstream version; or there are only changelog
2348 # entries relating to later upstream versions (which is not
2349 # possible unless the changelog and .dsc disagree about the
2350 # version). Then it remains to choose between the physically
2351 # last entry in the file, and the one with the lowest version
2352 # number. If these are not the same, we guess that the
2353 # versions were created in a non-monotic order rather than
2354 # that the changelog entries have been misordered.
2356 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2358 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2359 $r1clogp = $thisstanza;
2361 printdebug "import clog $r1clogp->{version} becomes r1\n";
2363 die $! if CLOGS->error;
2364 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2366 $clogp or fail "package changelog has no entries!";
2368 my $authline = clogp_authline $clogp;
2369 my $changes = getfield $clogp, 'Changes';
2370 $changes =~ s/^\n//; # Changes: \n
2371 my $cversion = getfield $clogp, 'Version';
2374 $r1clogp //= $clogp; # maybe there's only one entry;
2375 my $r1authline = clogp_authline $r1clogp;
2376 # Strictly, r1authline might now be wrong if it's going to be
2377 # unused because !$any_orig. Whatever.
2379 printdebug "import tartrees authline $authline\n";
2380 printdebug "import tartrees r1authline $r1authline\n";
2382 foreach my $tt (@tartrees) {
2383 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2385 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2388 committer $r1authline
2392 [dgit import orig $tt->{F}]
2400 [dgit import tarball $package $cversion $tt->{F}]
2405 printdebug "import main commit\n";
2407 open C, ">../commit.tmp" or die $!;
2408 print C <<END or die $!;
2411 print C <<END or die $! foreach @tartrees;
2414 print C <<END or die $!;
2420 [dgit import $treeimporthow $package $cversion]
2424 my $rawimport_hash = make_commit qw(../commit.tmp);
2426 if (madformat $dsc->{format}) {
2427 printdebug "import apply patches...\n";
2429 # regularise the state of the working tree so that
2430 # the checkout of $rawimport_hash works nicely.
2431 my $dappliedcommit = make_commit_text(<<END);
2438 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2440 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2442 # We need the answers to be reproducible
2443 my @authline = clogp_authline($clogp);
2444 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2445 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2446 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2447 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2448 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2449 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2451 my $path = $ENV{PATH} or die;
2453 # we use ../../gbp-pq-output, which (given that we are in
2454 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2457 foreach my $use_absurd (qw(0 1)) {
2458 runcmd @git, qw(checkout -q unpa);
2459 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2460 local $ENV{PATH} = $path;
2463 progress "warning: $@";
2464 $path = "$absurdity:$path";
2465 progress "$us: trying slow absurd-git-apply...";
2466 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2471 die "forbid absurd git-apply\n" if $use_absurd
2472 && forceing [qw(import-gitapply-no-absurd)];
2473 die "only absurd git-apply!\n" if !$use_absurd
2474 && forceing [qw(import-gitapply-absurd)];
2476 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2477 local $ENV{PATH} = $path if $use_absurd;
2479 my @showcmd = (gbp_pq, qw(import));
2480 my @realcmd = shell_cmd
2481 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2482 debugcmd "+",@realcmd;
2483 if (system @realcmd) {
2484 die +(shellquote @showcmd).
2486 failedcmd_waitstatus()."\n";
2489 my $gapplied = git_rev_parse('HEAD');
2490 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2491 $gappliedtree eq $dappliedtree or
2493 gbp-pq import and dpkg-source disagree!
2494 gbp-pq import gave commit $gapplied
2495 gbp-pq import gave tree $gappliedtree
2496 dpkg-source --before-build gave tree $dappliedtree
2498 $rawimport_hash = $gapplied;
2503 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2508 progress "synthesised git commit from .dsc $cversion";
2510 my $rawimport_mergeinput = {
2511 Commit => $rawimport_hash,
2512 Info => "Import of source package",
2514 my @output = ($rawimport_mergeinput);
2516 if ($lastpush_mergeinput) {
2517 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2518 my $oversion = getfield $oldclogp, 'Version';
2520 version_compare($oversion, $cversion);
2522 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2523 { Message => <<END, ReverseParents => 1 });
2524 Record $package ($cversion) in archive suite $csuite
2526 } elsif ($vcmp > 0) {
2527 print STDERR <<END or die $!;
2529 Version actually in archive: $cversion (older)
2530 Last version pushed with dgit: $oversion (newer or same)
2533 @output = $lastpush_mergeinput;
2535 # Same version. Use what's in the server git branch,
2536 # discarding our own import. (This could happen if the
2537 # server automatically imports all packages into git.)
2538 @output = $lastpush_mergeinput;
2546 sub complete_file_from_dsc ($$;$) {
2547 our ($dstdir, $fi, $refetched) = @_;
2548 # Ensures that we have, in $dstdir, the file $fi, with the correct
2549 # contents. (Downloading it from alongside $dscurl if necessary.)
2550 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2551 # and will set $$refetched=1 if it did so (or tried to).
2553 my $f = $fi->{Filename};
2554 my $tf = "$dstdir/$f";
2558 my $checkhash = sub {
2559 open F, "<", "$tf" or die "$tf: $!";
2560 $fi->{Digester}->reset();
2561 $fi->{Digester}->addfile(*F);
2562 F->error and die $!;
2563 $got = $fi->{Digester}->hexdigest();
2564 return $got eq $fi->{Hash};
2567 if (stat_exists $tf) {
2568 if ($checkhash->()) {
2569 progress "using existing $f";
2573 fail "file $f has hash $got but .dsc".
2574 " demands hash $fi->{Hash} ".
2575 "(perhaps you should delete this file?)";
2577 progress "need to fetch correct version of $f";
2578 unlink $tf or die "$tf $!";
2581 printdebug "$tf does not exist, need to fetch\n";
2585 $furl =~ s{/[^/]+$}{};
2587 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2588 die "$f ?" if $f =~ m#/#;
2589 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2590 return 0 if !act_local();
2593 fail "file $f has hash $got but .dsc".
2594 " demands hash $fi->{Hash} ".
2595 "(got wrong file from archive!)";
2600 sub ensure_we_have_orig () {
2601 my @dfi = dsc_files_info();
2602 foreach my $fi (@dfi) {
2603 my $f = $fi->{Filename};
2604 next unless is_orig_file_in_dsc($f, \@dfi);
2605 complete_file_from_dsc('..', $fi)
2610 #---------- git fetch ----------
2612 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2613 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2615 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2616 # locally fetched refs because they have unhelpful names and clutter
2617 # up gitk etc. So we track whether we have "used up" head ref (ie,
2618 # whether we have made another local ref which refers to this object).
2620 # (If we deleted them unconditionally, then we might end up
2621 # re-fetching the same git objects each time dgit fetch was run.)
2623 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2624 # in git_fetch_us to fetch the refs in question, and possibly a call
2625 # to lrfetchref_used.
2627 our (%lrfetchrefs_f, %lrfetchrefs_d);
2628 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2630 sub lrfetchref_used ($) {
2631 my ($fullrefname) = @_;
2632 my $objid = $lrfetchrefs_f{$fullrefname};
2633 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2636 sub git_lrfetch_sane {
2637 my ($url, $supplementary, @specs) = @_;
2638 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2639 # at least as regards @specs. Also leave the results in
2640 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2641 # able to clean these up.
2643 # With $supplementary==1, @specs must not contain wildcards
2644 # and we add to our previous fetches (non-atomically).
2646 # This is rather miserable:
2647 # When git fetch --prune is passed a fetchspec ending with a *,
2648 # it does a plausible thing. If there is no * then:
2649 # - it matches subpaths too, even if the supplied refspec
2650 # starts refs, and behaves completely madly if the source
2651 # has refs/refs/something. (See, for example, Debian #NNNN.)
2652 # - if there is no matching remote ref, it bombs out the whole
2654 # We want to fetch a fixed ref, and we don't know in advance
2655 # if it exists, so this is not suitable.
2657 # Our workaround is to use git ls-remote. git ls-remote has its
2658 # own qairks. Notably, it has the absurd multi-tail-matching
2659 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2660 # refs/refs/foo etc.
2662 # Also, we want an idempotent snapshot, but we have to make two
2663 # calls to the remote: one to git ls-remote and to git fetch. The
2664 # solution is use git ls-remote to obtain a target state, and
2665 # git fetch to try to generate it. If we don't manage to generate
2666 # the target state, we try again.
2668 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2670 my $specre = join '|', map {
2673 my $wildcard = $x =~ s/\\\*$/.*/;
2674 die if $wildcard && $supplementary;
2677 printdebug "git_lrfetch_sane specre=$specre\n";
2678 my $wanted_rref = sub {
2680 return m/^(?:$specre)$/;
2683 my $fetch_iteration = 0;
2686 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2687 if (++$fetch_iteration > 10) {
2688 fail "too many iterations trying to get sane fetch!";
2691 my @look = map { "refs/$_" } @specs;
2692 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2696 open GITLS, "-|", @lcmd or die $!;
2698 printdebug "=> ", $_;
2699 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2700 my ($objid,$rrefname) = ($1,$2);
2701 if (!$wanted_rref->($rrefname)) {
2703 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2707 $wantr{$rrefname} = $objid;
2710 close GITLS or failedcmd @lcmd;
2712 # OK, now %want is exactly what we want for refs in @specs
2714 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2715 "+refs/$_:".lrfetchrefs."/$_";
2718 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2720 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2721 runcmd_ordryrun_local @fcmd if @fspecs;
2723 if (!$supplementary) {
2724 %lrfetchrefs_f = ();
2728 git_for_each_ref(lrfetchrefs, sub {
2729 my ($objid,$objtype,$lrefname,$reftail) = @_;
2730 $lrfetchrefs_f{$lrefname} = $objid;
2731 $objgot{$objid} = 1;
2734 if ($supplementary) {
2738 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2739 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2740 if (!exists $wantr{$rrefname}) {
2741 if ($wanted_rref->($rrefname)) {
2743 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2747 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2750 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2751 delete $lrfetchrefs_f{$lrefname};
2755 foreach my $rrefname (sort keys %wantr) {
2756 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2757 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2758 my $want = $wantr{$rrefname};
2759 next if $got eq $want;
2760 if (!defined $objgot{$want}) {
2761 fail <<END unless act_local();
2762 --dry-run specified but we actually wanted the results of git fetch,
2763 so this is not going to work. Try running dgit fetch first,
2764 or using --damp-run instead of --dry-run.
2767 warning: git ls-remote suggests we want $lrefname
2768 warning: and it should refer to $want
2769 warning: but git fetch didn't fetch that object to any relevant ref.
2770 warning: This may be due to a race with someone updating the server.
2771 warning: Will try again...
2773 next FETCH_ITERATION;
2776 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2778 runcmd_ordryrun_local @git, qw(update-ref -m),
2779 "dgit fetch git fetch fixup", $lrefname, $want;
2780 $lrfetchrefs_f{$lrefname} = $want;
2785 if (defined $csuite) {
2786 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2787 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2788 my ($objid,$objtype,$lrefname,$reftail) = @_;
2789 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2790 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2794 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2795 Dumper(\%lrfetchrefs_f);
2798 sub git_fetch_us () {
2799 # Want to fetch only what we are going to use, unless
2800 # deliberately-not-ff, in which case we must fetch everything.
2802 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2804 (quiltmode_splitbrain
2805 ? (map { $_->('*',access_nomdistro) }
2806 \&debiantag_new, \&debiantag_maintview)
2807 : debiantags('*',access_nomdistro));
2808 push @specs, server_branch($csuite);
2809 push @specs, $rewritemap;
2810 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2812 my $url = access_giturl();
2813 git_lrfetch_sane $url, 0, @specs;
2816 my @tagpats = debiantags('*',access_nomdistro);
2818 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2819 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2820 printdebug "currently $fullrefname=$objid\n";
2821 $here{$fullrefname} = $objid;
2823 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2824 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2825 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2826 printdebug "offered $lref=$objid\n";
2827 if (!defined $here{$lref}) {
2828 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2829 runcmd_ordryrun_local @upd;
2830 lrfetchref_used $fullrefname;
2831 } elsif ($here{$lref} eq $objid) {
2832 lrfetchref_used $fullrefname;
2835 "Not updating $lref from $here{$lref} to $objid.\n";
2840 #---------- dsc and archive handling ----------
2842 sub mergeinfo_getclogp ($) {
2843 # Ensures thit $mi->{Clogp} exists and returns it
2845 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2848 sub mergeinfo_version ($) {
2849 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2852 sub fetch_from_archive_record_1 ($) {
2854 runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
2855 cmdoutput @git, qw(log -n2), $hash;
2856 # ... gives git a chance to complain if our commit is malformed
2859 sub fetch_from_archive_record_2 ($) {
2861 my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
2865 dryrun_report @upd_cmd;
2869 sub parse_dsc_field_def_dsc_distro () {
2870 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2871 dgit.default.distro);
2874 sub parse_dsc_field ($$) {
2875 my ($dsc, $what) = @_;
2877 foreach my $field (@ourdscfield) {
2878 $f = $dsc->{$field};
2883 progress "$what: NO git hash";
2884 parse_dsc_field_def_dsc_distro();
2885 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2886 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2887 progress "$what: specified git info ($dsc_distro)";
2888 $dsc_hint_tag = [ $dsc_hint_tag ];
2889 } elsif ($f =~ m/^\w+\s*$/) {
2891 parse_dsc_field_def_dsc_distro();
2892 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2894 progress "$what: specified git hash";
2896 fail "$what: invalid Dgit info";
2900 sub resolve_dsc_field_commit ($$) {
2901 my ($already_distro, $already_mapref) = @_;
2903 return unless defined $dsc_hash;
2906 defined $already_mapref &&
2907 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2908 ? $already_mapref : undef;
2912 my ($what, @fetch) = @_;
2914 local $idistro = $dsc_distro;
2915 my $lrf = lrfetchrefs;
2917 if (!$chase_dsc_distro) {
2919 "not chasing .dsc distro $dsc_distro: not fetching $what";
2924 ".dsc names distro $dsc_distro: fetching $what";
2926 my $url = access_giturl();
2927 if (!defined $url) {
2928 defined $dsc_hint_url or fail <<END;
2929 .dsc Dgit metadata is in context of distro $dsc_distro
2930 for which we have no configured url and .dsc provides no hint
2933 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2934 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2935 parse_cfg_bool "dsc-url-proto-ok", 'false',
2936 cfg("dgit.dsc-url-proto-ok.$proto",
2937 "dgit.default.dsc-url-proto-ok")
2939 .dsc Dgit metadata is in context of distro $dsc_distro
2940 for which we have no configured url;
2941 .dsc provides hinted url with protocol $proto which is unsafe.
2942 (can be overridden by config - consult documentation)
2944 $url = $dsc_hint_url;
2947 git_lrfetch_sane $url, 1, @fetch;
2952 my $rewrite_enable = do {
2953 local $idistro = $dsc_distro;
2954 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2957 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2958 if (!defined $mapref) {
2959 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2960 $mapref = $lrf.'/'.$rewritemap;
2962 my $rewritemapdata = git_cat_file $mapref.':map';
2963 if (defined $rewritemapdata
2964 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2966 "server's git history rewrite map contains a relevant entry!";
2969 if (defined $dsc_hash) {
2970 progress "using rewritten git hash in place of .dsc value";
2972 progress "server data says .dsc hash is to be disregarded";
2977 if (!defined git_cat_file $dsc_hash) {
2978 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2979 my $lrf = $do_fetch->("additional commits", @tags) &&
2980 defined git_cat_file $dsc_hash
2982 .dsc Dgit metadata requires commit $dsc_hash
2983 but we could not obtain that object anywhere.
2985 foreach my $t (@tags) {
2986 my $fullrefname = $lrf.'/'.$t;
2987 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2988 next unless $lrfetchrefs_f{$fullrefname};
2989 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2990 lrfetchref_used $fullrefname;
2995 sub fetch_from_archive () {
2996 ensure_setup_existing_tree();
2998 # Ensures that lrref() is what is actually in the archive, one way
2999 # or another, according to us - ie this client's
3000 # appropritaely-updated archive view. Also returns the commit id.
3001 # If there is nothing in the archive, leaves lrref alone and
3002 # returns undef. git_fetch_us must have already been called.
3006 parse_dsc_field($dsc, 'last upload to archive');
3007 resolve_dsc_field_commit access_basedistro,
3008 lrfetchrefs."/".$rewritemap
3010 progress "no version available from the archive";
3013 # If the archive's .dsc has a Dgit field, there are three
3014 # relevant git commitids we need to choose between and/or merge
3016 # 1. $dsc_hash: the Dgit field from the archive
3017 # 2. $lastpush_hash: the suite branch on the dgit git server
3018 # 3. $lastfetch_hash: our local tracking brach for the suite
3020 # These may all be distinct and need not be in any fast forward
3023 # If the dsc was pushed to this suite, then the server suite
3024 # branch will have been updated; but it might have been pushed to
3025 # a different suite and copied by the archive. Conversely a more
3026 # recent version may have been pushed with dgit but not appeared
3027 # in the archive (yet).
3029 # $lastfetch_hash may be awkward because archive imports
3030 # (particularly, imports of Dgit-less .dscs) are performed only as
3031 # needed on individual clients, so different clients may perform a
3032 # different subset of them - and these imports are only made
3033 # public during push. So $lastfetch_hash may represent a set of
3034 # imports different to a subsequent upload by a different dgit
3037 # Our approach is as follows:
3039 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3040 # descendant of $dsc_hash, then it was pushed by a dgit user who
3041 # had based their work on $dsc_hash, so we should prefer it.
3042 # Otherwise, $dsc_hash was installed into this suite in the
3043 # archive other than by a dgit push, and (necessarily) after the
3044 # last dgit push into that suite (since a dgit push would have
3045 # been descended from the dgit server git branch); thus, in that
3046 # case, we prefer the archive's version (and produce a
3047 # pseudo-merge to overwrite the dgit server git branch).
3049 # (If there is no Dgit field in the archive's .dsc then
3050 # generate_commit_from_dsc uses the version numbers to decide
3051 # whether the suite branch or the archive is newer. If the suite
3052 # branch is newer it ignores the archive's .dsc; otherwise it
3053 # generates an import of the .dsc, and produces a pseudo-merge to
3054 # overwrite the suite branch with the archive contents.)
3056 # The outcome of that part of the algorithm is the `public view',
3057 # and is same for all dgit clients: it does not depend on any
3058 # unpublished history in the local tracking branch.
3060 # As between the public view and the local tracking branch: The
3061 # local tracking branch is only updated by dgit fetch, and
3062 # whenever dgit fetch runs it includes the public view in the
3063 # local tracking branch. Therefore if the public view is not
3064 # descended from the local tracking branch, the local tracking
3065 # branch must contain history which was imported from the archive
3066 # but never pushed; and, its tip is now out of date. So, we make
3067 # a pseudo-merge to overwrite the old imports and stitch the old
3070 # Finally: we do not necessarily reify the public view (as
3071 # described above). This is so that we do not end up stacking two
3072 # pseudo-merges. So what we actually do is figure out the inputs
3073 # to any public view pseudo-merge and put them in @mergeinputs.
3076 # $mergeinputs[]{Commit}
3077 # $mergeinputs[]{Info}
3078 # $mergeinputs[0] is the one whose tree we use
3079 # @mergeinputs is in the order we use in the actual commit)
3082 # $mergeinputs[]{Message} is a commit message to use
3083 # $mergeinputs[]{ReverseParents} if def specifies that parent
3084 # list should be in opposite order
3085 # Such an entry has no Commit or Info. It applies only when found
3086 # in the last entry. (This ugliness is to support making
3087 # identical imports to previous dgit versions.)
3089 my $lastpush_hash = git_get_ref(lrfetchref());
3090 printdebug "previous reference hash=$lastpush_hash\n";
3091 $lastpush_mergeinput = $lastpush_hash && {
3092 Commit => $lastpush_hash,
3093 Info => "dgit suite branch on dgit git server",
3096 my $lastfetch_hash = git_get_ref(lrref());
3097 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3098 my $lastfetch_mergeinput = $lastfetch_hash && {
3099 Commit => $lastfetch_hash,
3100 Info => "dgit client's archive history view",
3103 my $dsc_mergeinput = $dsc_hash && {
3104 Commit => $dsc_hash,
3105 Info => "Dgit field in .dsc from archive",
3109 my $del_lrfetchrefs = sub {
3112 printdebug "del_lrfetchrefs...\n";
3113 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3114 my $objid = $lrfetchrefs_d{$fullrefname};
3115 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3117 $gur ||= new IO::Handle;
3118 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3120 printf $gur "delete %s %s\n", $fullrefname, $objid;
3123 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3127 if (defined $dsc_hash) {
3128 ensure_we_have_orig();
3129 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3130 @mergeinputs = $dsc_mergeinput
3131 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3132 print STDERR <<END or die $!;
3134 Git commit in archive is behind the last version allegedly pushed/uploaded.
3135 Commit referred to by archive: $dsc_hash
3136 Last version pushed with dgit: $lastpush_hash
3139 @mergeinputs = ($lastpush_mergeinput);
3141 # Archive has .dsc which is not a descendant of the last dgit
3142 # push. This can happen if the archive moves .dscs about.
3143 # Just follow its lead.
3144 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3145 progress "archive .dsc names newer git commit";
3146 @mergeinputs = ($dsc_mergeinput);
3148 progress "archive .dsc names other git commit, fixing up";
3149 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3153 @mergeinputs = generate_commits_from_dsc();
3154 # We have just done an import. Now, our import algorithm might
3155 # have been improved. But even so we do not want to generate
3156 # a new different import of the same package. So if the
3157 # version numbers are the same, just use our existing version.
3158 # If the version numbers are different, the archive has changed
3159 # (perhaps, rewound).
3160 if ($lastfetch_mergeinput &&
3161 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3162 (mergeinfo_version $mergeinputs[0]) )) {
3163 @mergeinputs = ($lastfetch_mergeinput);
3165 } elsif ($lastpush_hash) {
3166 # only in git, not in the archive yet
3167 @mergeinputs = ($lastpush_mergeinput);
3168 print STDERR <<END or die $!;
3170 Package not found in the archive, but has allegedly been pushed using dgit.
3174 printdebug "nothing found!\n";
3175 if (defined $skew_warning_vsn) {
3176 print STDERR <<END or die $!;
3178 Warning: relevant archive skew detected.
3179 Archive allegedly contains $skew_warning_vsn
3180 But we were not able to obtain any version from the archive or git.
3184 unshift @end, $del_lrfetchrefs;
3188 if ($lastfetch_hash &&
3190 my $h = $_->{Commit};
3191 $h and is_fast_fwd($lastfetch_hash, $h);
3192 # If true, one of the existing parents of this commit
3193 # is a descendant of the $lastfetch_hash, so we'll
3194 # be ff from that automatically.
3198 push @mergeinputs, $lastfetch_mergeinput;
3201 printdebug "fetch mergeinfos:\n";
3202 foreach my $mi (@mergeinputs) {
3204 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3206 printdebug sprintf " ReverseParents=%d Message=%s",
3207 $mi->{ReverseParents}, $mi->{Message};
3211 my $compat_info= pop @mergeinputs
3212 if $mergeinputs[$#mergeinputs]{Message};
3214 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3217 if (@mergeinputs > 1) {
3219 my $tree_commit = $mergeinputs[0]{Commit};
3221 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3222 $tree =~ m/\n\n/; $tree = $`;
3223 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3226 # We use the changelog author of the package in question the
3227 # author of this pseudo-merge. This is (roughly) correct if
3228 # this commit is simply representing aa non-dgit upload.
3229 # (Roughly because it does not record sponsorship - but we
3230 # don't have sponsorship info because that's in the .changes,
3231 # which isn't in the archivw.)
3233 # But, it might be that we are representing archive history
3234 # updates (including in-archive copies). These are not really
3235 # the responsibility of the person who created the .dsc, but
3236 # there is no-one whose name we should better use. (The
3237 # author of the .dsc-named commit is clearly worse.)
3239 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3240 my $author = clogp_authline $useclogp;
3241 my $cversion = getfield $useclogp, 'Version';
3243 my $mcf = dgit_privdir()."/mergecommit";
3244 open MC, ">", $mcf or die "$mcf $!";
3245 print MC <<END or die $!;
3249 my @parents = grep { $_->{Commit} } @mergeinputs;
3250 @parents = reverse @parents if $compat_info->{ReverseParents};
3251 print MC <<END or die $! foreach @parents;
3255 print MC <<END or die $!;
3261 if (defined $compat_info->{Message}) {
3262 print MC $compat_info->{Message} or die $!;
3264 print MC <<END or die $!;
3265 Record $package ($cversion) in archive suite $csuite
3269 my $message_add_info = sub {
3271 my $mversion = mergeinfo_version $mi;
3272 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3276 $message_add_info->($mergeinputs[0]);
3277 print MC <<END or die $!;
3278 should be treated as descended from
3280 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3284 $hash = make_commit $mcf;
3286 $hash = $mergeinputs[0]{Commit};
3288 printdebug "fetch hash=$hash\n";
3291 my ($lasth, $what) = @_;
3292 return unless $lasth;
3293 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3296 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3298 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3300 fetch_from_archive_record_1($hash);
3302 if (defined $skew_warning_vsn) {
3303 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3304 my $gotclogp = commit_getclogp($hash);
3305 my $got_vsn = getfield $gotclogp, 'Version';
3306 printdebug "SKEW CHECK GOT $got_vsn\n";
3307 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3308 print STDERR <<END or die $!;
3310 Warning: archive skew detected. Using the available version:
3311 Archive allegedly contains $skew_warning_vsn
3312 We were able to obtain only $got_vsn
3318 if ($lastfetch_hash ne $hash) {
3319 fetch_from_archive_record_2($hash);
3322 lrfetchref_used lrfetchref();
3324 check_gitattrs($hash, "fetched source tree");
3326 unshift @end, $del_lrfetchrefs;
3330 sub set_local_git_config ($$) {
3332 runcmd @git, qw(config), $k, $v;
3335 sub setup_mergechangelogs (;$) {
3337 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3339 my $driver = 'dpkg-mergechangelogs';
3340 my $cb = "merge.$driver";
3341 confess unless defined $maindir;
3342 my $attrs = "$maindir_gitcommon/info/attributes";
3343 ensuredir "$maindir_gitcommon/info";
3345 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3346 if (!open ATTRS, "<", $attrs) {
3347 $!==ENOENT or die "$attrs: $!";
3351 next if m{^debian/changelog\s};
3352 print NATTRS $_, "\n" or die $!;
3354 ATTRS->error and die $!;
3357 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3360 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3361 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3363 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3366 sub setup_useremail (;$) {
3368 return unless $always || access_cfg_bool(1, 'setup-useremail');
3371 my ($k, $envvar) = @_;
3372 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3373 return unless defined $v;
3374 set_local_git_config "user.$k", $v;
3377 $setup->('email', 'DEBEMAIL');
3378 $setup->('name', 'DEBFULLNAME');
3381 sub ensure_setup_existing_tree () {
3382 my $k = "remote.$remotename.skipdefaultupdate";
3383 my $c = git_get_config $k;
3384 return if defined $c;
3385 set_local_git_config $k, 'true';
3388 sub open_main_gitattrs () {
3389 confess 'internal error no maindir' unless defined $maindir;
3390 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3392 or die "open $maindir_gitcommon/info/attributes: $!";
3396 our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
3398 sub is_gitattrs_setup () {
3401 # 1: gitattributes set up and should be left alone
3403 # 0: there is a dgit-defuse-attrs but it needs fixing
3404 # undef: there is none
3405 my $gai = open_main_gitattrs();
3406 return 0 unless $gai;
3408 next unless m{$gitattrs_ourmacro_re};
3409 return 1 if m{\s-working-tree-encoding\s};
3410 printdebug "is_gitattrs_setup: found old macro\n";
3413 $gai->error and die $!;
3414 printdebug "is_gitattrs_setup: found nothing\n";
3418 sub setup_gitattrs (;$) {
3420 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3422 my $already = is_gitattrs_setup();
3425 [attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
3426 not doing further gitattributes setup
3430 my $new = "[attr]dgit-defuse-attrs $negate_harmful_gitattrs";
3431 my $af = "$maindir_gitcommon/info/attributes";
3432 ensuredir "$maindir_gitcommon/info";
3434 open GAO, "> $af.new" or die $!;
3435 print GAO <<END or die $! unless defined $already;
3438 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3440 my $gai = open_main_gitattrs();
3443 if (m{$gitattrs_ourmacro_re}) {
3444 die unless defined $already;
3448 print GAO $_, "\n" or die $!;
3450 $gai->error and die $!;
3452 close GAO or die $!;
3453 rename "$af.new", "$af" or die "install $af: $!";
3456 sub setup_new_tree () {
3457 setup_mergechangelogs();
3462 sub check_gitattrs ($$) {
3463 my ($treeish, $what) = @_;
3465 return if is_gitattrs_setup;
3468 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3470 my $gafl = new IO::File;
3471 open $gafl, "-|", @cmd or die $!;
3474 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3476 next unless m{(?:^|/)\.gitattributes$};
3478 # oh dear, found one
3480 dgit: warning: $what contains .gitattributes
3481 dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree.
3486 # tree contains no .gitattributes files
3487 $?=0; $!=0; close $gafl or failedcmd @cmd;
3491 sub multisuite_suite_child ($$$) {
3492 my ($tsuite, $merginputs, $fn) = @_;
3493 # in child, sets things up, calls $fn->(), and returns undef
3494 # in parent, returns canonical suite name for $tsuite
3495 my $canonsuitefh = IO::File::new_tmpfile;
3496 my $pid = fork // die $!;
3500 $us .= " [$isuite]";
3501 $debugprefix .= " ";
3502 progress "fetching $tsuite...";
3503 canonicalise_suite();
3504 print $canonsuitefh $csuite, "\n" or die $!;
3505 close $canonsuitefh or die $!;
3509 waitpid $pid,0 == $pid or die $!;
3510 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3511 seek $canonsuitefh,0,0 or die $!;
3512 local $csuite = <$canonsuitefh>;
3513 die $! unless defined $csuite && chomp $csuite;
3515 printdebug "multisuite $tsuite missing\n";
3518 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3519 push @$merginputs, {
3526 sub fork_for_multisuite ($) {
3527 my ($before_fetch_merge) = @_;
3528 # if nothing unusual, just returns ''
3531 # returns 0 to caller in child, to do first of the specified suites
3532 # in child, $csuite is not yet set
3534 # returns 1 to caller in parent, to finish up anything needed after
3535 # in parent, $csuite is set to canonicalised portmanteau
3537 my $org_isuite = $isuite;
3538 my @suites = split /\,/, $isuite;
3539 return '' unless @suites > 1;
3540 printdebug "fork_for_multisuite: @suites\n";
3544 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3546 return 0 unless defined $cbasesuite;
3548 fail "package $package missing in (base suite) $cbasesuite"
3549 unless @mergeinputs;
3551 my @csuites = ($cbasesuite);
3553 $before_fetch_merge->();
3555 foreach my $tsuite (@suites[1..$#suites]) {
3556 $tsuite =~ s/^-/$cbasesuite-/;
3557 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3563 # xxx collecte the ref here
3565 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3566 push @csuites, $csubsuite;
3569 foreach my $mi (@mergeinputs) {
3570 my $ref = git_get_ref $mi->{Ref};
3571 die "$mi->{Ref} ?" unless length $ref;
3572 $mi->{Commit} = $ref;
3575 $csuite = join ",", @csuites;
3577 my $previous = git_get_ref lrref;
3579 unshift @mergeinputs, {
3580 Commit => $previous,
3581 Info => "local combined tracking branch",
3583 "archive seems to have rewound: local tracking branch is ahead!",
3587 foreach my $ix (0..$#mergeinputs) {
3588 $mergeinputs[$ix]{Index} = $ix;
3591 @mergeinputs = sort {
3592 -version_compare(mergeinfo_version $a,
3593 mergeinfo_version $b) # highest version first
3595 $a->{Index} <=> $b->{Index}; # earliest in spec first
3601 foreach my $mi (@mergeinputs) {
3602 printdebug "multisuite merge check $mi->{Info}\n";
3603 foreach my $previous (@needed) {
3604 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3605 printdebug "multisuite merge un-needed $previous->{Info}\n";
3609 printdebug "multisuite merge this-needed\n";
3610 $mi->{Character} = '+';
3613 $needed[0]{Character} = '*';
3615 my $output = $needed[0]{Commit};
3618 printdebug "multisuite merge nontrivial\n";
3619 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3621 my $commit = "tree $tree\n";
3622 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3623 "Input branches:\n";
3625 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3626 printdebug "multisuite merge include $mi->{Info}\n";
3627 $mi->{Character} //= ' ';
3628 $commit .= "parent $mi->{Commit}\n";
3629 $msg .= sprintf " %s %-25s %s\n",
3631 (mergeinfo_version $mi),
3634 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3636 " * marks the highest version branch, which choose to use\n".
3637 " + marks each branch which was not already an ancestor\n\n".
3638 "[dgit multi-suite $csuite]\n";
3640 "author $authline\n".
3641 "committer $authline\n\n";
3642 $output = make_commit_text $commit.$msg;
3643 printdebug "multisuite merge generated $output\n";
3646 fetch_from_archive_record_1($output);
3647 fetch_from_archive_record_2($output);
3649 progress "calculated combined tracking suite $csuite";
3654 sub clone_set_head () {
3655 open H, "> .git/HEAD" or die $!;
3656 print H "ref: ".lref()."\n" or die $!;
3659 sub clone_finish ($) {
3661 runcmd @git, qw(reset --hard), lrref();
3662 runcmd qw(bash -ec), <<'END';
3664 git ls-tree -r --name-only -z HEAD | \
3665 xargs -0r touch -h -r . --
3667 printdone "ready for work in $dstdir";
3671 # in multisuite, returns twice!
3672 # once in parent after first suite fetched,
3673 # and then again in child after everything is finished
3675 badusage "dry run makes no sense with clone" unless act_local();
3677 my $multi_fetched = fork_for_multisuite(sub {
3678 printdebug "multi clone before fetch merge\n";
3682 if ($multi_fetched) {
3683 printdebug "multi clone after fetch merge\n";
3685 clone_finish($dstdir);
3688 printdebug "clone main body\n";
3690 canonicalise_suite();
3691 my $hasgit = check_for_git();
3692 mkdir $dstdir or fail "create \`$dstdir': $!";
3694 runcmd @git, qw(init -q);
3698 my $giturl = access_giturl(1);
3699 if (defined $giturl) {
3700 runcmd @git, qw(remote add), 'origin', $giturl;
3703 progress "fetching existing git history";
3705 runcmd_ordryrun_local @git, qw(fetch origin);
3707 progress "starting new git history";
3709 fetch_from_archive() or no_such_package;
3710 my $vcsgiturl = $dsc->{'Vcs-Git'};
3711 if (length $vcsgiturl) {
3712 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3713 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3715 clone_finish($dstdir);
3719 canonicalise_suite();
3720 if (check_for_git()) {
3723 fetch_from_archive() or no_such_package();
3725 my $vcsgiturl = $dsc && $dsc->{'Vcs-Git'};
3726 if (length $vcsgiturl and
3727 (grep { $csuite eq $_ }
3729 cfg 'dgit.vcs-git.suites')) {
3730 my $current = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
3731 if (defined $current && $current ne $vcsgiturl) {
3733 FYI: Vcs-Git in $csuite has different url to your vcs-git remote.
3734 Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?
3738 printdone "fetched into ".lrref();
3742 my $multi_fetched = fork_for_multisuite(sub { });
3743 fetch() unless $multi_fetched; # parent
3744 return if $multi_fetched eq '0'; # child
3745 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3747 printdone "fetched to ".lrref()." and merged into HEAD";
3750 sub check_not_dirty () {
3751 foreach my $f (qw(local-options local-patch-header)) {
3752 if (stat_exists "debian/source/$f") {
3753 fail "git tree contains debian/source/$f";
3757 return if $ignoredirty;
3759 git_check_unmodified();
3762 sub commit_admin ($) {
3765 runcmd_ordryrun_local @git, qw(commit -m), $m;
3768 sub quiltify_nofix_bail ($$) {
3769 my ($headinfo, $xinfo) = @_;
3770 if ($quilt_mode eq 'nofix') {
3771 fail "quilt fixup required but quilt mode is \`nofix'\n".
3772 "HEAD commit".$headinfo." differs from tree implied by ".
3773 " debian/patches".$xinfo;
3777 sub commit_quilty_patch () {
3778 my $output = cmdoutput @git, qw(status --porcelain);
3780 foreach my $l (split /\n/, $output) {
3781 next unless $l =~ m/\S/;
3782 if ($l =~ m{^(?:\?\?| [MADRC]) (.pc|debian/patches)}) {
3786 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3788 progress "nothing quilty to commit, ok.";
3791 quiltify_nofix_bail "", " (wanted to commit patch update)";
3792 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3793 runcmd_ordryrun_local @git, qw(add -f), @adds;
3795 Commit Debian 3.0 (quilt) metadata
3797 [dgit ($our_version) quilt-fixup]
3801 sub get_source_format () {
3803 if (open F, "debian/source/options") {
3807 s/\s+$//; # ignore missing final newline
3809 my ($k, $v) = ($`, $'); #');
3810 $v =~ s/^"(.*)"$/$1/;
3816 F->error and die $!;
3819 die $! unless $!==&ENOENT;
3822 if (!open F, "debian/source/format") {
3823 die $! unless $!==&ENOENT;
3827 F->error and die $!;
3829 return ($_, \%options);
3832 sub madformat_wantfixup ($) {
3834 return 0 unless $format eq '3.0 (quilt)';
3835 our $quilt_mode_warned;
3836 if ($quilt_mode eq 'nocheck') {
3837 progress "Not doing any fixup of \`$format' due to".
3838 " ----no-quilt-fixup or --quilt=nocheck"
3839 unless $quilt_mode_warned++;
3842 progress "Format \`$format', need to check/update patch stack"
3843 unless $quilt_mode_warned++;
3847 sub maybe_split_brain_save ($$$) {
3848 my ($headref, $dgitview, $msg) = @_;
3849 # => message fragment "$saved" describing disposition of $dgitview
3850 return "commit id $dgitview" unless defined $split_brain_save;
3851 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
3853 "dgit --dgit-view-save $msg HEAD=$headref",
3854 $split_brain_save, $dgitview);
3856 return "and left in $split_brain_save";
3859 # An "infopair" is a tuple [ $thing, $what ]
3860 # (often $thing is a commit hash; $what is a description)
3862 sub infopair_cond_equal ($$) {
3864 $x->[0] eq $y->[0] or fail <<END;
3865 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3869 sub infopair_lrf_tag_lookup ($$) {
3870 my ($tagnames, $what) = @_;
3871 # $tagname may be an array ref
3872 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3873 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3874 foreach my $tagname (@tagnames) {
3875 my $lrefname = lrfetchrefs."/tags/$tagname";
3876 my $tagobj = $lrfetchrefs_f{$lrefname};
3877 next unless defined $tagobj;
3878 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3879 return [ git_rev_parse($tagobj), $what ];
3881 fail @tagnames==1 ? <<END : <<END;
3882 Wanted tag $what (@tagnames) on dgit server, but not found
3884 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3888 sub infopair_cond_ff ($$) {
3889 my ($anc,$desc) = @_;
3890 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3891 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3895 sub pseudomerge_version_check ($$) {
3896 my ($clogp, $archive_hash) = @_;
3898 my $arch_clogp = commit_getclogp $archive_hash;
3899 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3900 'version currently in archive' ];
3901 if (defined $overwrite_version) {
3902 if (length $overwrite_version) {
3903 infopair_cond_equal([ $overwrite_version,
3904 '--overwrite= version' ],
3907 my $v = $i_arch_v->[0];
3908 progress "Checking package changelog for archive version $v ...";
3911 my @xa = ("-f$v", "-t$v");
3912 my $vclogp = parsechangelog @xa;
3915 [ (getfield $vclogp, $fn),
3916 "$fn field from dpkg-parsechangelog @xa" ];
3918 my $cv = $gf->('Version');
3919 infopair_cond_equal($i_arch_v, $cv);
3920 $cd = $gf->('Distribution');
3923 $@ =~ s/^dgit: //gm;
3925 "Perhaps debian/changelog does not mention $v ?";
3927 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3928 $cd->[1] is $cd->[0]
3929 Your tree seems to based on earlier (not uploaded) $v.
3934 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3938 sub pseudomerge_make_commit ($$$$ $$) {
3939 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3940 $msg_cmd, $msg_msg) = @_;
3941 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3943 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3944 my $authline = clogp_authline $clogp;
3948 !defined $overwrite_version ? ""
3949 : !length $overwrite_version ? " --overwrite"
3950 : " --overwrite=".$overwrite_version;
3952 # Contributing parent is the first parent - that makes
3953 # git rev-list --first-parent DTRT.
3954 my $pmf = dgit_privdir()."/pseudomerge";
3955 open MC, ">", $pmf or die "$pmf $!";
3956 print MC <<END or die $!;
3959 parent $archive_hash
3969 return make_commit($pmf);
3972 sub splitbrain_pseudomerge ($$$$) {
3973 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3974 # => $merged_dgitview
3975 printdebug "splitbrain_pseudomerge...\n";
3977 # We: debian/PREVIOUS HEAD($maintview)
3978 # expect: o ----------------- o
3981 # a/d/PREVIOUS $dgitview
3984 # we do: `------------------ o
3988 return $dgitview unless defined $archive_hash;
3989 return $dgitview if deliberately_not_fast_forward();
3991 printdebug "splitbrain_pseudomerge...\n";
3993 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3995 if (!defined $overwrite_version) {
3996 progress "Checking that HEAD inciudes all changes in archive...";
3999 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
4001 if (defined $overwrite_version) {
4003 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
4004 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
4005 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
4006 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
4007 my $i_archive = [ $archive_hash, "current archive contents" ];
4009 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
4011 infopair_cond_equal($i_dgit, $i_archive);
4012 infopair_cond_ff($i_dep14, $i_dgit);
4013 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
4017 $us: check failed (maybe --overwrite is needed, consult documentation)
4022 my $r = pseudomerge_make_commit
4023 $clogp, $dgitview, $archive_hash, $i_arch_v,
4024 "dgit --quilt=$quilt_mode",
4025 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
4026 Declare fast forward from $i_arch_v->[0]
4028 Make fast forward from $i_arch_v->[0]
4031 maybe_split_brain_save $maintview, $r, "pseudomerge";
4033 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
4037 sub plain_overwrite_pseudomerge ($$$) {
4038 my ($clogp, $head, $archive_hash) = @_;
4040 printdebug "plain_overwrite_pseudomerge...";
4042 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4044 return $head if is_fast_fwd $archive_hash, $head;
4046 my $m = "Declare fast forward from $i_arch_v->[0]";
4048 my $r = pseudomerge_make_commit
4049 $clogp, $head, $archive_hash, $i_arch_v,
4052 runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
4054 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
4058 sub push_parse_changelog ($) {
4061 my $clogp = Dpkg::Control::Hash->new();
4062 $clogp->load($clogpfn) or die;
4064 my $clogpackage = getfield $clogp, 'Source';
4065 $package //= $clogpackage;
4066 fail "-p specified $package but changelog specified $clogpackage"
4067 unless $package eq $clogpackage;
4068 my $cversion = getfield $clogp, 'Version';
4070 if (!$we_are_initiator) {
4071 # rpush initiator can't do this because it doesn't have $isuite yet
4072 my $tag = debiantag($cversion, access_nomdistro);
4073 runcmd @git, qw(check-ref-format), $tag;
4076 my $dscfn = dscfn($cversion);
4078 return ($clogp, $cversion, $dscfn);
4081 sub push_parse_dsc ($$$) {
4082 my ($dscfn,$dscfnwhat, $cversion) = @_;
4083 $dsc = parsecontrol($dscfn,$dscfnwhat);
4084 my $dversion = getfield $dsc, 'Version';
4085 my $dscpackage = getfield $dsc, 'Source';
4086 ($dscpackage eq $package && $dversion eq $cversion) or
4087 fail "$dscfn is for $dscpackage $dversion".
4088 " but debian/changelog is for $package $cversion";
4091 sub push_tagwants ($$$$) {
4092 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4095 TagFn => \&debiantag,
4100 if (defined $maintviewhead) {
4102 TagFn => \&debiantag_maintview,
4103 Objid => $maintviewhead,
4104 TfSuffix => '-maintview',
4107 } elsif ($dodep14tag eq 'no' ? 0
4108 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4109 : $dodep14tag eq 'always'
4110 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4111 --dep14tag-always (or equivalent in config) means server must support
4112 both "new" and "maint" tag formats, but config says it doesn't.
4114 : die "$dodep14tag ?") {
4116 TagFn => \&debiantag_maintview,
4118 TfSuffix => '-dgit',
4122 foreach my $tw (@tagwants) {
4123 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4124 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4126 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4130 sub push_mktags ($$ $$ $) {
4132 $changesfile,$changesfilewhat,
4135 die unless $tagwants->[0]{View} eq 'dgit';
4137 my $declaredistro = access_nomdistro();
4138 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4139 $dsc->{$ourdscfield[0]} = join " ",
4140 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4142 $dsc->save("$dscfn.tmp") or die $!;
4144 my $changes = parsecontrol($changesfile,$changesfilewhat);
4145 foreach my $field (qw(Source Distribution Version)) {
4146 $changes->{$field} eq $clogp->{$field} or
4147 fail "changes field $field \`$changes->{$field}'".
4148 " does not match changelog \`$clogp->{$field}'";
4151 my $cversion = getfield $clogp, 'Version';
4152 my $clogsuite = getfield $clogp, 'Distribution';
4154 # We make the git tag by hand because (a) that makes it easier
4155 # to control the "tagger" (b) we can do remote signing
4156 my $authline = clogp_authline $clogp;
4157 my $delibs = join(" ", "",@deliberatelies);
4161 my $tfn = $tw->{Tfn};
4162 my $head = $tw->{Objid};
4163 my $tag = $tw->{Tag};
4165 open TO, '>', $tfn->('.tmp') or die $!;
4166 print TO <<END or die $!;
4173 if ($tw->{View} eq 'dgit') {
4174 print TO <<END or die $!;
4175 $package release $cversion for $clogsuite ($csuite) [dgit]
4176 [dgit distro=$declaredistro$delibs]
4178 foreach my $ref (sort keys %previously) {
4179 print TO <<END or die $!;
4180 [dgit previously:$ref=$previously{$ref}]
4183 } elsif ($tw->{View} eq 'maint') {
4184 print TO <<END or die $!;
4185 $package release $cversion for $clogsuite ($csuite)
4186 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4189 die Dumper($tw)."?";
4194 my $tagobjfn = $tfn->('.tmp');
4196 if (!defined $keyid) {
4197 $keyid = access_cfg('keyid','RETURN-UNDEF');
4199 if (!defined $keyid) {
4200 $keyid = getfield $clogp, 'Maintainer';
4202 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4203 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4204 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4205 push @sign_cmd, $tfn->('.tmp');
4206 runcmd_ordryrun @sign_cmd;
4208 $tagobjfn = $tfn->('.signed.tmp');
4209 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4210 $tfn->('.tmp'), $tfn->('.tmp.asc');
4216 my @r = map { $mktag->($_); } @$tagwants;
4220 sub sign_changes ($) {
4221 my ($changesfile) = @_;
4223 my @debsign_cmd = @debsign;
4224 push @debsign_cmd, "-k$keyid" if defined $keyid;
4225 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4226 push @debsign_cmd, $changesfile;
4227 runcmd_ordryrun @debsign_cmd;
4232 printdebug "actually entering push\n";
4234 supplementary_message(<<'END');
4235 Push failed, while checking state of the archive.
4236 You can retry the push, after fixing the problem, if you like.
4238 if (check_for_git()) {
4241 my $archive_hash = fetch_from_archive();
4242 if (!$archive_hash) {
4244 fail "package appears to be new in this suite;".
4245 " if this is intentional, use --new";
4248 supplementary_message(<<'END');
4249 Push failed, while preparing your push.
4250 You can retry the push, after fixing the problem, if you like.
4253 need_tagformat 'new', "quilt mode $quilt_mode"
4254 if quiltmode_splitbrain;
4258 access_giturl(); # check that success is vaguely likely
4259 rpush_handle_protovsn_bothends() if $we_are_initiator;
4262 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4263 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4265 responder_send_file('parsed-changelog', $clogpfn);
4267 my ($clogp, $cversion, $dscfn) =
4268 push_parse_changelog("$clogpfn");
4270 my $dscpath = "$buildproductsdir/$dscfn";
4271 stat_exists $dscpath or
4272 fail "looked for .dsc $dscpath, but $!;".
4273 " maybe you forgot to build";
4275 responder_send_file('dsc', $dscpath);
4277 push_parse_dsc($dscpath, $dscfn, $cversion);
4279 my $format = getfield $dsc, 'Format';
4280 printdebug "format $format\n";
4282 my $symref = git_get_symref();
4283 my $actualhead = git_rev_parse('HEAD');
4285 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4286 runcmd_ordryrun_local @git_debrebase, 'stitch';
4287 $actualhead = git_rev_parse('HEAD');
4290 my $dgithead = $actualhead;
4291 my $maintviewhead = undef;
4293 my $upstreamversion = upstreamversion $clogp->{Version};
4295 if (madformat_wantfixup($format)) {
4296 # user might have not used dgit build, so maybe do this now:
4297 if (quiltmode_splitbrain()) {
4298 changedir $playground;
4299 quilt_make_fake_dsc($upstreamversion);
4301 ($dgithead, $cachekey) =
4302 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4304 "--quilt=$quilt_mode but no cached dgit view:
4305 perhaps HEAD changed since dgit build[-source] ?";
4307 $dgithead = splitbrain_pseudomerge($clogp,
4308 $actualhead, $dgithead,
4310 $maintviewhead = $actualhead;
4312 prep_ud(); # so _only_subdir() works, below
4314 commit_quilty_patch();
4318 if (defined $overwrite_version && !defined $maintviewhead
4320 $dgithead = plain_overwrite_pseudomerge($clogp,
4328 if ($archive_hash) {
4329 if (is_fast_fwd($archive_hash, $dgithead)) {
4331 } elsif (deliberately_not_fast_forward) {
4334 fail "dgit push: HEAD is not a descendant".
4335 " of the archive's version.\n".
4336 "To overwrite the archive's contents,".
4337 " pass --overwrite[=VERSION].\n".
4338 "To rewind history, if permitted by the archive,".
4339 " use --deliberately-not-fast-forward.";
4343 changedir $playground;
4344 progress "checking that $dscfn corresponds to HEAD";
4345 runcmd qw(dpkg-source -x --),
4346 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4347 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4348 check_for_vendor_patches() if madformat($dsc->{format});
4350 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4351 debugcmd "+",@diffcmd;
4353 my $r = system @diffcmd;
4356 my $referent = $split_brain ? $dgithead : 'HEAD';
4357 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4360 my $raw = cmdoutput @git,
4361 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4363 foreach (split /\0/, $raw) {
4364 if (defined $changed) {
4365 push @mode_changes, "$changed: $_\n" if $changed;
4368 } elsif (m/^:0+ 0+ /) {
4370 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4371 $changed = "Mode change from $1 to $2"
4376 if (@mode_changes) {
4377 fail <<END.(join '', @mode_changes).<<END;
4378 HEAD specifies a different tree to $dscfn:
4381 There is a problem with your source tree (see dgit(7) for some hints).
4382 To see a full diff, run git diff $tree $referent
4387 HEAD specifies a different tree to $dscfn:
4389 Perhaps you forgot to build. Or perhaps there is a problem with your
4390 source tree (see dgit(7) for some hints). To see a full diff, run
4391 git diff $tree $referent
4397 if (!$changesfile) {
4398 my $pat = changespat $cversion;
4399 my @cs = glob "$buildproductsdir/$pat";
4400 fail "failed to find unique changes file".
4401 " (looked for $pat in $buildproductsdir);".
4402 " perhaps you need to use dgit -C"
4404 ($changesfile) = @cs;
4406 $changesfile = "$buildproductsdir/$changesfile";
4409 # Check that changes and .dsc agree enough
4410 $changesfile =~ m{[^/]*$};
4411 my $changes = parsecontrol($changesfile,$&);
4412 files_compare_inputs($dsc, $changes)
4413 unless forceing [qw(dsc-changes-mismatch)];
4415 # Perhaps adjust .dsc to contain right set of origs
4416 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4418 unless forceing [qw(changes-origs-exactly)];
4420 # Checks complete, we're going to try and go ahead:
4422 responder_send_file('changes',$changesfile);
4423 responder_send_command("param head $dgithead");
4424 responder_send_command("param csuite $csuite");
4425 responder_send_command("param isuite $isuite");
4426 responder_send_command("param tagformat $tagformat");
4427 if (defined $maintviewhead) {
4428 die unless ($protovsn//4) >= 4;
4429 responder_send_command("param maint-view $maintviewhead");
4432 # Perhaps send buildinfo(s) for signing
4433 my $changes_files = getfield $changes, 'Files';
4434 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4435 foreach my $bi (@buildinfos) {
4436 responder_send_command("param buildinfo-filename $bi");
4437 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4440 if (deliberately_not_fast_forward) {
4441 git_for_each_ref(lrfetchrefs, sub {
4442 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4443 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4444 responder_send_command("previously $rrefname=$objid");
4445 $previously{$rrefname} = $objid;
4449 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4450 dgit_privdir()."/tag");
4453 supplementary_message(<<'END');
4454 Push failed, while signing the tag.
4455 You can retry the push, after fixing the problem, if you like.
4457 # If we manage to sign but fail to record it anywhere, it's fine.
4458 if ($we_are_responder) {
4459 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4460 responder_receive_files('signed-tag', @tagobjfns);
4462 @tagobjfns = push_mktags($clogp,$dscpath,
4463 $changesfile,$changesfile,
4466 supplementary_message(<<'END');
4467 Push failed, *after* signing the tag.
4468 If you want to try again, you should use a new version number.
4471 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4473 foreach my $tw (@tagwants) {
4474 my $tag = $tw->{Tag};
4475 my $tagobjfn = $tw->{TagObjFn};
4477 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4478 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4479 runcmd_ordryrun_local
4480 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4483 supplementary_message(<<'END');
4484 Push failed, while updating the remote git repository - see messages above.
4485 If you want to try again, you should use a new version number.
4487 if (!check_for_git()) {
4488 create_remote_git_repo();
4491 my @pushrefs = $forceflag.$dgithead.":".rrref();
4492 foreach my $tw (@tagwants) {
4493 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4496 runcmd_ordryrun @git,
4497 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4498 runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
4500 supplementary_message(<<'END');
4501 Push failed, while obtaining signatures on the .changes and .dsc.
4502 If it was just that the signature failed, you may try again by using
4503 debsign by hand to sign the changes
4505 and then dput to complete the upload.
4506 If you need to change the package, you must use a new version number.
4508 if ($we_are_responder) {
4509 my $dryrunsuffix = act_local() ? "" : ".tmp";
4510 my @rfiles = ($dscpath, $changesfile);
4511 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4512 responder_receive_files('signed-dsc-changes',
4513 map { "$_$dryrunsuffix" } @rfiles);
4516 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4518 progress "[new .dsc left in $dscpath.tmp]";
4520 sign_changes $changesfile;
4523 supplementary_message(<<END);
4524 Push failed, while uploading package(s) to the archive server.
4525 You can retry the upload of exactly these same files with dput of:
4527 If that .changes file is broken, you will need to use a new version
4528 number for your next attempt at the upload.
4530 my $host = access_cfg('upload-host','RETURN-UNDEF');
4531 my @hostarg = defined($host) ? ($host,) : ();
4532 runcmd_ordryrun @dput, @hostarg, $changesfile;
4533 printdone "pushed and uploaded $cversion";
4535 supplementary_message('');
4536 responder_send_command("complete");
4540 not_necessarily_a_tree();
4545 badusage "-p is not allowed with clone; specify as argument instead"
4546 if defined $package;
4549 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4550 ($package,$isuite) = @ARGV;
4551 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4552 ($package,$dstdir) = @ARGV;
4553 } elsif (@ARGV==3) {
4554 ($package,$isuite,$dstdir) = @ARGV;
4556 badusage "incorrect arguments to dgit clone";
4560 $dstdir ||= "$package";
4561 if (stat_exists $dstdir) {
4562 fail "$dstdir already exists";
4566 if ($rmonerror && !$dryrun_level) {
4567 $cwd_remove= getcwd();
4569 return unless defined $cwd_remove;
4570 if (!chdir "$cwd_remove") {
4571 return if $!==&ENOENT;
4572 die "chdir $cwd_remove: $!";
4574 printdebug "clone rmonerror removing $dstdir\n";
4576 rmtree($dstdir) or die "remove $dstdir: $!\n";
4577 } elsif (grep { $! == $_ }
4578 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4580 print STDERR "check whether to remove $dstdir: $!\n";
4586 $cwd_remove = undef;
4589 sub branchsuite () {
4590 my $branch = git_get_symref();
4591 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4598 sub fetchpullargs () {
4599 if (!defined $package) {
4600 my $sourcep = parsecontrol('debian/control','debian/control');
4601 $package = getfield $sourcep, 'Source';
4604 $isuite = branchsuite();
4606 my $clogp = parsechangelog();
4607 my $clogsuite = getfield $clogp, 'Distribution';
4608 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4610 } elsif (@ARGV==1) {
4613 badusage "incorrect arguments to dgit fetch or dgit pull";
4621 my $multi_fetched = fork_for_multisuite(sub { });
4622 finish 0 if $multi_fetched;
4629 if (quiltmode_splitbrain()) {
4630 my ($format, $fopts) = get_source_format();
4631 madformat($format) and fail <<END
4632 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4638 sub cmd_update_vcs_git () {
4640 if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
4641 ($specsuite,) = split /\;/, cfg 'dgit.vcs-git.suites';
4643 ($specsuite) = (@ARGV);
4648 if ($ARGV[0] eq '-') {
4650 } elsif ($ARGV[0] eq '-') {
4655 my $sourcep = parsecontrol 'debian/control', 'debian/control';
4656 $package = getfield $sourcep, 'Source';
4658 if ($specsuite eq '.') {
4661 $isuite = $specsuite;
4665 my $url = getfield $ctrl, 'Vcs-Git';
4668 my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
4669 if (!defined $orgurl) {
4670 print STDERR "setting up vcs-git: $url\n";
4671 @cmd = (@git, qw(remote add vcs-git), $url);
4672 } elsif ($orgurl eq $url) {
4673 print STDERR "vcs git already configured: $url\n";
4675 print STDERR "changing vcs-git url to: $url\n";
4676 @cmd = (@git, qw(remote set-url vcs-git), $url);
4678 runcmd_ordryrun_local @cmd;
4680 print "fetching (@ARGV)\n";
4681 runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
4687 build_or_push_prep_early();
4692 } elsif (@ARGV==1) {
4693 ($specsuite) = (@ARGV);
4695 badusage "incorrect arguments to dgit $subcommand";
4698 local ($package) = $existing_package; # this is a hack
4699 canonicalise_suite();
4701 canonicalise_suite();
4703 if (defined $specsuite &&
4704 $specsuite ne $isuite &&
4705 $specsuite ne $csuite) {
4706 fail "dgit $subcommand: changelog specifies $isuite ($csuite)".
4707 " but command line specifies $specsuite";
4716 sub cmd_push_source {
4719 my $changes = parsecontrol("$buildproductsdir/$changesfile",
4720 "source changes file");
4721 unless (test_source_only_changes($changes)) {
4722 fail "user-specified changes file is not source-only";
4725 # Building a source package is very fast, so just do it
4726 build_source_for_push();
4731 #---------- remote commands' implementation ----------
4733 sub pre_remote_push_build_host {
4734 my ($nrargs) = shift @ARGV;
4735 my (@rargs) = @ARGV[0..$nrargs-1];
4736 @ARGV = @ARGV[$nrargs..$#ARGV];
4738 my ($dir,$vsnwant) = @rargs;
4739 # vsnwant is a comma-separated list; we report which we have
4740 # chosen in our ready response (so other end can tell if they
4743 $we_are_responder = 1;
4744 $us .= " (build host)";
4746 open PI, "<&STDIN" or die $!;
4747 open STDIN, "/dev/null" or die $!;
4748 open PO, ">&STDOUT" or die $!;
4750 open STDOUT, ">&STDERR" or die $!;
4754 ($protovsn) = grep {
4755 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4756 } @rpushprotovsn_support;
4758 fail "build host has dgit rpush protocol versions ".
4759 (join ",", @rpushprotovsn_support).
4760 " but invocation host has $vsnwant"
4761 unless defined $protovsn;
4765 sub cmd_remote_push_build_host {
4766 responder_send_command("dgit-remote-push-ready $protovsn");
4770 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4771 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4772 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4773 # a good error message)
4775 sub rpush_handle_protovsn_bothends () {
4776 if ($protovsn < 4) {
4777 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4786 my $report = i_child_report();
4787 if (defined $report) {
4788 printdebug "($report)\n";
4789 } elsif ($i_child_pid) {
4790 printdebug "(killing build host child $i_child_pid)\n";
4791 kill 15, $i_child_pid;
4793 if (defined $i_tmp && !defined $initiator_tempdir) {
4795 eval { rmtree $i_tmp; };
4800 return unless forkcheck_mainprocess();
4805 my ($base,$selector,@args) = @_;
4806 $selector =~ s/\-/_/g;
4807 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4811 not_necessarily_a_tree();
4816 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4824 push @rargs, join ",", @rpushprotovsn_support;
4827 push @rdgit, @ropts;
4828 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4830 my @cmd = (@ssh, $host, shellquote @rdgit);
4833 $we_are_initiator=1;
4835 if (defined $initiator_tempdir) {
4836 rmtree $initiator_tempdir;
4837 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4838 $i_tmp = $initiator_tempdir;
4842 $i_child_pid = open2(\*RO, \*RI, @cmd);
4844 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4845 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4846 $supplementary_message = '' unless $protovsn >= 3;
4849 my ($icmd,$iargs) = initiator_expect {
4850 m/^(\S+)(?: (.*))?$/;
4853 i_method "i_resp", $icmd, $iargs;
4857 sub i_resp_progress ($) {
4859 my $msg = protocol_read_bytes \*RO, $rhs;
4863 sub i_resp_supplementary_message ($) {
4865 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4868 sub i_resp_complete {
4869 my $pid = $i_child_pid;
4870 $i_child_pid = undef; # prevents killing some other process with same pid
4871 printdebug "waiting for build host child $pid...\n";
4872 my $got = waitpid $pid, 0;
4873 die $! unless $got == $pid;
4874 die "build host child failed $?" if $?;
4877 printdebug "all done\n";
4881 sub i_resp_file ($) {
4883 my $localname = i_method "i_localname", $keyword;
4884 my $localpath = "$i_tmp/$localname";
4885 stat_exists $localpath and
4886 badproto \*RO, "file $keyword ($localpath) twice";
4887 protocol_receive_file \*RO, $localpath;
4888 i_method "i_file", $keyword;
4893 sub i_resp_param ($) {
4894 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4898 sub i_resp_previously ($) {
4899 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4900 or badproto \*RO, "bad previously spec";
4901 my $r = system qw(git check-ref-format), $1;
4902 die "bad previously ref spec ($r)" if $r;
4903 $previously{$1} = $2;
4908 sub i_resp_want ($) {
4910 die "$keyword ?" if $i_wanted{$keyword}++;
4912 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4913 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4914 die unless $isuite =~ m/^$suite_re$/;
4917 rpush_handle_protovsn_bothends();
4919 fail "rpush negotiated protocol version $protovsn".
4920 " which does not support quilt mode $quilt_mode"
4921 if quiltmode_splitbrain;
4923 my @localpaths = i_method "i_want", $keyword;
4924 printdebug "[[ $keyword @localpaths\n";
4925 foreach my $localpath (@localpaths) {
4926 protocol_send_file \*RI, $localpath;
4928 print RI "files-end\n" or die $!;
4931 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4933 sub i_localname_parsed_changelog {
4934 return "remote-changelog.822";
4936 sub i_file_parsed_changelog {
4937 ($i_clogp, $i_version, $i_dscfn) =
4938 push_parse_changelog "$i_tmp/remote-changelog.822";
4939 die if $i_dscfn =~ m#/|^\W#;
4942 sub i_localname_dsc {
4943 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4948 sub i_localname_buildinfo ($) {
4949 my $bi = $i_param{'buildinfo-filename'};
4950 defined $bi or badproto \*RO, "buildinfo before filename";
4951 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4952 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4953 or badproto \*RO, "improper buildinfo filename";
4956 sub i_file_buildinfo {
4957 my $bi = $i_param{'buildinfo-filename'};
4958 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4959 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4960 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4961 files_compare_inputs($bd, $ch);
4962 (getfield $bd, $_) eq (getfield $ch, $_) or
4963 fail "buildinfo mismatch $_"
4964 foreach qw(Source Version);
4965 !defined $bd->{$_} or
4966 fail "buildinfo contains $_"
4967 foreach qw(Changes Changed-by Distribution);
4969 push @i_buildinfos, $bi;
4970 delete $i_param{'buildinfo-filename'};
4973 sub i_localname_changes {
4974 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4975 $i_changesfn = $i_dscfn;
4976 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4977 return $i_changesfn;
4979 sub i_file_changes { }
4981 sub i_want_signed_tag {
4982 printdebug Dumper(\%i_param, $i_dscfn);
4983 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4984 && defined $i_param{'csuite'}
4985 or badproto \*RO, "premature desire for signed-tag";
4986 my $head = $i_param{'head'};
4987 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4989 my $maintview = $i_param{'maint-view'};
4990 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4993 if ($protovsn >= 4) {
4994 my $p = $i_param{'tagformat'} // '<undef>';
4996 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4999 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
5001 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
5003 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
5006 push_mktags $i_clogp, $i_dscfn,
5007 $i_changesfn, 'remote changes',
5011 sub i_want_signed_dsc_changes {
5012 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
5013 sign_changes $i_changesfn;
5014 return ($i_dscfn, $i_changesfn, @i_buildinfos);
5017 #---------- building etc. ----------
5023 #----- `3.0 (quilt)' handling -----
5025 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
5027 sub quiltify_dpkg_commit ($$$;$) {
5028 my ($patchname,$author,$msg, $xinfo) = @_;
5031 mkpath '.git/dgit'; # we are in playtree
5032 my $descfn = ".git/dgit/quilt-description.tmp";
5033 open O, '>', $descfn or die "$descfn: $!";
5034 $msg =~ s/\n+/\n\n/;
5035 print O <<END or die $!;
5037 ${xinfo}Subject: $msg
5044 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
5045 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
5046 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
5047 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
5051 sub quiltify_trees_differ ($$;$$$) {
5052 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
5053 # returns true iff the two tree objects differ other than in debian/
5054 # with $finegrained,
5055 # returns bitmask 01 - differ in upstream files except .gitignore
5056 # 02 - differ in .gitignore
5057 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
5058 # is set for each modified .gitignore filename $fn
5059 # if $unrepres is defined, array ref to which is appeneded
5060 # a list of unrepresentable changes (removals of upstream files
5063 my @cmd = (@git, qw(diff-tree -z --no-renames));
5064 push @cmd, qw(--name-only) unless $unrepres;
5065 push @cmd, qw(-r) if $finegrained || $unrepres;
5067 my $diffs= cmdoutput @cmd;
5070 foreach my $f (split /\0/, $diffs) {
5071 if ($unrepres && !@lmodes) {
5072 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
5075 my ($oldmode,$newmode) = @lmodes;
5078 next if $f =~ m#^debian(?:/.*)?$#s;
5082 die "not a plain file or symlink\n"
5083 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5084 $oldmode =~ m/^(?:10|12)\d{4}$/;
5085 if ($oldmode =~ m/[^0]/ &&
5086 $newmode =~ m/[^0]/) {
5087 # both old and new files exist
5088 die "mode or type changed\n" if $oldmode ne $newmode;
5089 die "modified symlink\n" unless $newmode =~ m/^10/;
5090 } elsif ($oldmode =~ m/[^0]/) {
5092 die "deletion of symlink\n"
5093 unless $oldmode =~ m/^10/;
5096 die "creation with non-default mode\n"
5097 unless $newmode =~ m/^100644$/ or
5098 $newmode =~ m/^120000$/;
5102 local $/="\n"; chomp $@;
5103 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5107 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5108 $r |= $isignore ? 02 : 01;
5109 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5111 printdebug "quiltify_trees_differ $x $y => $r\n";
5115 sub quiltify_tree_sentinelfiles ($) {
5116 # lists the `sentinel' files present in the tree
5118 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5119 qw(-- debian/rules debian/control);
5124 sub quiltify_splitbrain_needed () {
5125 if (!$split_brain) {
5126 progress "dgit view: changes are required...";
5127 runcmd @git, qw(checkout -q -b dgit-view);
5132 sub quiltify_splitbrain ($$$$$$$) {
5133 my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
5134 $editedignores, $cachekey) = @_;
5135 my $gitignore_special = 1;
5136 if ($quilt_mode !~ m/gbp|dpm/) {
5137 # treat .gitignore just like any other upstream file
5138 $diffbits = { %$diffbits };
5139 $_ = !!$_ foreach values %$diffbits;
5140 $gitignore_special = 0;
5142 # We would like any commits we generate to be reproducible
5143 my @authline = clogp_authline($clogp);
5144 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5145 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5146 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5147 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5148 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5149 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5151 my $fulldiffhint = sub {
5153 my $cmd = "git diff $x $y -- :/ ':!debian'";
5154 $cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special;
5155 return "\nFor full diff showing the problem(s), type:\n $cmd\n";
5158 if ($quilt_mode =~ m/gbp|unapplied/ &&
5159 ($diffbits->{O2H} & 01)) {
5161 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
5162 " but git tree differs from orig in upstream files.";
5163 $msg .= $fulldiffhint->($unapplied, 'HEAD');
5164 if (!stat_exists "debian/patches") {
5166 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5170 if ($quilt_mode =~ m/dpm/ &&
5171 ($diffbits->{H2A} & 01)) {
5172 fail <<END. $fulldiffhint->($oldtiptree,'HEAD');
5173 --quilt=$quilt_mode specified, implying patches-applied git tree
5174 but git tree differs from result of applying debian/patches to upstream
5177 if ($quilt_mode =~ m/gbp|unapplied/ &&
5178 ($diffbits->{O2A} & 01)) { # some patches
5179 quiltify_splitbrain_needed();
5180 progress "dgit view: creating patches-applied version using gbp pq";
5181 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5182 # gbp pq import creates a fresh branch; push back to dgit-view
5183 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5184 runcmd @git, qw(checkout -q dgit-view);
5186 if ($quilt_mode =~ m/gbp|dpm/ &&
5187 ($diffbits->{O2A} & 02)) {
5189 --quilt=$quilt_mode specified, implying that HEAD is for use with a
5190 tool which does not create patches for changes to upstream
5191 .gitignores: but, such patches exist in debian/patches.
5194 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5195 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5196 quiltify_splitbrain_needed();
5197 progress "dgit view: creating patch to represent .gitignore changes";
5198 ensuredir "debian/patches";
5199 my $gipatch = "debian/patches/auto-gitignore";
5200 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
5201 stat GIPATCH or die "$gipatch: $!";
5202 fail "$gipatch already exists; but want to create it".
5203 " to record .gitignore changes" if (stat _)[7];
5204 print GIPATCH <<END or die "$gipatch: $!";
5205 Subject: Update .gitignore from Debian packaging branch
5207 The Debian packaging git branch contains these updates to the upstream
5208 .gitignore file(s). This patch is autogenerated, to provide these
5209 updates to users of the official Debian archive view of the package.
5211 [dgit ($our_version) update-gitignore]
5214 close GIPATCH or die "$gipatch: $!";
5215 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5216 $unapplied, $headref, "--", sort keys %$editedignores;
5217 open SERIES, "+>>", "debian/patches/series" or die $!;
5218 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5220 defined read SERIES, $newline, 1 or die $!;
5221 print SERIES "\n" or die $! unless $newline eq "\n";
5222 print SERIES "auto-gitignore\n" or die $!;
5223 close SERIES or die $!;
5224 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5226 Commit patch to update .gitignore
5228 [dgit ($our_version) update-gitignore-quilt-fixup]
5232 my $dgitview = git_rev_parse 'HEAD';
5235 # When we no longer need to support squeeze, use --create-reflog
5237 ensuredir "$maindir_gitcommon/logs/refs/dgit-intern";
5238 my $makelogfh = new IO::File "$maindir_gitcommon/logs/refs/$splitbraincache", '>>'
5241 my $oldcache = git_get_ref "refs/$splitbraincache";
5242 if ($oldcache eq $dgitview) {
5243 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5244 # git update-ref doesn't always update, in this case. *sigh*
5245 my $dummy = make_commit_text <<END;
5248 author Dgit <dgit\@example.com> 1000000000 +0000
5249 committer Dgit <dgit\@example.com> 1000000000 +0000
5251 Dummy commit - do not use
5253 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5254 "refs/$splitbraincache", $dummy;
5256 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5259 changedir "$playground/work";
5261 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5262 progress "dgit view: created ($saved)";
5265 sub quiltify ($$$$) {
5266 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5268 # Quilt patchification algorithm
5270 # We search backwards through the history of the main tree's HEAD
5271 # (T) looking for a start commit S whose tree object is identical
5272 # to to the patch tip tree (ie the tree corresponding to the
5273 # current dpkg-committed patch series). For these purposes
5274 # `identical' disregards anything in debian/ - this wrinkle is
5275 # necessary because dpkg-source treates debian/ specially.
5277 # We can only traverse edges where at most one of the ancestors'
5278 # trees differs (in changes outside in debian/). And we cannot
5279 # handle edges which change .pc/ or debian/patches. To avoid
5280 # going down a rathole we avoid traversing edges which introduce
5281 # debian/rules or debian/control. And we set a limit on the
5282 # number of edges we are willing to look at.
5284 # If we succeed, we walk forwards again. For each traversed edge
5285 # PC (with P parent, C child) (starting with P=S and ending with
5286 # C=T) to we do this:
5288 # - dpkg-source --commit with a patch name and message derived from C
5289 # After traversing PT, we git commit the changes which
5290 # should be contained within debian/patches.
5292 # The search for the path S..T is breadth-first. We maintain a
5293 # todo list containing search nodes. A search node identifies a
5294 # commit, and looks something like this:
5296 # Commit => $git_commit_id,
5297 # Child => $c, # or undef if P=T
5298 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5299 # Nontrivial => true iff $p..$c has relevant changes
5306 my %considered; # saves being exponential on some weird graphs
5308 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5311 my ($search,$whynot) = @_;
5312 printdebug " search NOT $search->{Commit} $whynot\n";
5313 $search->{Whynot} = $whynot;
5314 push @nots, $search;
5315 no warnings qw(exiting);
5324 my $c = shift @todo;
5325 next if $considered{$c->{Commit}}++;
5327 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5329 printdebug "quiltify investigate $c->{Commit}\n";
5332 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5333 printdebug " search finished hooray!\n";
5338 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5339 if ($quilt_mode eq 'smash') {
5340 printdebug " search quitting smash\n";
5344 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5345 $not->($c, "has $c_sentinels not $t_sentinels")
5346 if $c_sentinels ne $t_sentinels;
5348 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5349 $commitdata =~ m/\n\n/;
5351 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5352 @parents = map { { Commit => $_, Child => $c } } @parents;
5354 $not->($c, "root commit") if !@parents;
5356 foreach my $p (@parents) {
5357 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5359 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5360 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5362 foreach my $p (@parents) {
5363 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5365 my @cmd= (@git, qw(diff-tree -r --name-only),
5366 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5367 my $patchstackchange = cmdoutput @cmd;
5368 if (length $patchstackchange) {
5369 $patchstackchange =~ s/\n/,/g;
5370 $not->($p, "changed $patchstackchange");
5373 printdebug " search queue P=$p->{Commit} ",
5374 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5380 printdebug "quiltify want to smash\n";
5383 my $x = $_[0]{Commit};
5384 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5387 my $reportnot = sub {
5389 my $s = $abbrev->($notp);
5390 my $c = $notp->{Child};
5391 $s .= "..".$abbrev->($c) if $c;
5392 $s .= ": ".$notp->{Whynot};
5395 if ($quilt_mode eq 'linear') {
5396 print STDERR "\n$us: error: quilt fixup cannot be linear. Stopped at:\n";
5397 foreach my $notp (@nots) {
5398 print STDERR "$us: ", $reportnot->($notp), "\n";
5400 print STDERR "$us: $_\n" foreach @$failsuggestion;
5401 fail "quilt fixup naive history linearisation failed.\n".
5402 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5403 } elsif ($quilt_mode eq 'smash') {
5404 } elsif ($quilt_mode eq 'auto') {
5405 progress "quilt fixup cannot be linear, smashing...";
5407 die "$quilt_mode ?";
5410 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5411 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5413 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5415 quiltify_dpkg_commit "auto-$version-$target-$time",
5416 (getfield $clogp, 'Maintainer'),
5417 "Automatically generated patch ($clogp->{Version})\n".
5418 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5422 progress "quiltify linearisation planning successful, executing...";
5424 for (my $p = $sref_S;
5425 my $c = $p->{Child};
5427 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5428 next unless $p->{Nontrivial};
5430 my $cc = $c->{Commit};
5432 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5433 $commitdata =~ m/\n\n/ or die "$c ?";
5436 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5439 my $commitdate = cmdoutput
5440 @git, qw(log -n1 --pretty=format:%aD), $cc;
5442 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5444 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5451 my $gbp_check_suitable = sub {
5456 die "contains unexpected slashes\n" if m{//} || m{/$};
5457 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5458 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5459 die "is series file\n" if m{$series_filename_re}o;
5460 die "too long" if length > 200;
5462 return $_ unless $@;
5463 print STDERR "quiltifying commit $cc:".
5464 " ignoring/dropping Gbp-Pq $what: $@";
5468 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5470 (\S+) \s* \n //ixm) {
5471 $patchname = $gbp_check_suitable->($1, 'Name');
5473 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5475 (\S+) \s* \n //ixm) {
5476 $patchdir = $gbp_check_suitable->($1, 'Topic');
5481 if (!defined $patchname) {
5482 $patchname = $title;
5483 $patchname =~ s/[.:]$//;
5486 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5487 my $translitname = $converter->convert($patchname);
5488 die unless defined $translitname;
5489 $patchname = $translitname;
5492 "dgit: patch title transliteration error: $@"
5494 $patchname =~ y/ A-Z/-a-z/;
5495 $patchname =~ y/-a-z0-9_.+=~//cd;
5496 $patchname =~ s/^\W/x-$&/;
5497 $patchname = substr($patchname,0,40);
5498 $patchname .= ".patch";
5500 if (!defined $patchdir) {
5503 if (length $patchdir) {
5504 $patchname = "$patchdir/$patchname";
5506 if ($patchname =~ m{^(.*)/}) {
5507 mkpath "debian/patches/$1";
5512 stat "debian/patches/$patchname$index";
5514 $!==ENOENT or die "$patchname$index $!";
5516 runcmd @git, qw(checkout -q), $cc;
5518 # We use the tip's changelog so that dpkg-source doesn't
5519 # produce complaining messages from dpkg-parsechangelog. None
5520 # of the information dpkg-source gets from the changelog is
5521 # actually relevant - it gets put into the original message
5522 # which dpkg-source provides our stunt editor, and then
5524 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5526 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5527 "Date: $commitdate\n".
5528 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5530 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5533 runcmd @git, qw(checkout -q master);
5536 sub build_maybe_quilt_fixup () {
5537 my ($format,$fopts) = get_source_format;
5538 return unless madformat_wantfixup $format;
5541 check_for_vendor_patches();
5543 if (quiltmode_splitbrain) {
5544 fail <<END unless access_cfg_tagformats_can_splitbrain;
5545 quilt mode $quilt_mode requires split view so server needs to support
5546 both "new" and "maint" tag formats, but config says it doesn't.
5550 my $clogp = parsechangelog();
5551 my $headref = git_rev_parse('HEAD');
5552 my $symref = git_get_symref();
5554 if ($quilt_mode eq 'linear'
5555 && !$fopts->{'single-debian-patch'}
5556 && branch_is_gdr($symref, $headref)) {
5557 # This is much faster. It also makes patches that gdr
5558 # likes better for future updates without laundering.
5560 # However, it can fail in some casses where we would
5561 # succeed: if there are existing patches, which correspond
5562 # to a prefix of the branch, but are not in gbp/gdr
5563 # format, gdr will fail (exiting status 7), but we might
5564 # be able to figure out where to start linearising. That
5565 # will be slower so hopefully there's not much to do.
5566 my @cmd = (@git_debrebase,
5567 qw(--noop-ok -funclean-mixed -funclean-ordering
5568 make-patches --quiet-would-amend));
5569 # We tolerate soe snags that gdr wouldn't, by default.
5573 failedcmd @cmd if system @cmd and $?!=7*256;
5577 $headref = git_rev_parse('HEAD');
5581 changedir $playground;
5583 my $upstreamversion = upstreamversion $version;
5585 if ($fopts->{'single-debian-patch'}) {
5586 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5588 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5591 die 'bug' if $split_brain && !$need_split_build_invocation;
5594 runcmd_ordryrun_local
5595 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5598 sub quilt_fixup_mkwork ($) {
5601 mkdir "work" or die $!;
5603 mktree_in_ud_here();
5604 runcmd @git, qw(reset -q --hard), $headref;
5607 sub quilt_fixup_linkorigs ($$) {
5608 my ($upstreamversion, $fn) = @_;
5609 # calls $fn->($leafname);
5611 foreach my $f (<$maindir/../*>) { #/){
5612 my $b=$f; $b =~ s{.*/}{};
5614 local ($debuglevel) = $debuglevel-1;
5615 printdebug "QF linkorigs $b, $f ?\n";
5617 next unless is_orig_file_of_vsn $b, $upstreamversion;
5618 printdebug "QF linkorigs $b, $f Y\n";
5619 link_ltarget $f, $b or die "$b $!";
5624 sub quilt_fixup_delete_pc () {
5625 runcmd @git, qw(rm -rqf .pc);
5627 Commit removal of .pc (quilt series tracking data)
5629 [dgit ($our_version) upgrade quilt-remove-pc]
5633 sub quilt_fixup_singlepatch ($$$) {
5634 my ($clogp, $headref, $upstreamversion) = @_;
5636 progress "starting quiltify (single-debian-patch)";
5638 # dpkg-source --commit generates new patches even if
5639 # single-debian-patch is in debian/source/options. In order to
5640 # get it to generate debian/patches/debian-changes, it is
5641 # necessary to build the source package.
5643 quilt_fixup_linkorigs($upstreamversion, sub { });
5644 quilt_fixup_mkwork($headref);
5646 rmtree("debian/patches");
5648 runcmd @dpkgsource, qw(-b .);
5650 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5651 rename srcfn("$upstreamversion", "/debian/patches"),
5652 "work/debian/patches";
5655 commit_quilty_patch();
5658 sub quilt_make_fake_dsc ($) {
5659 my ($upstreamversion) = @_;
5661 my $fakeversion="$upstreamversion-~~DGITFAKE";
5663 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5664 print $fakedsc <<END or die $!;
5667 Version: $fakeversion
5671 my $dscaddfile=sub {
5674 my $md = new Digest::MD5;
5676 my $fh = new IO::File $b, '<' or die "$b $!";
5681 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5684 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5686 my @files=qw(debian/source/format debian/rules
5687 debian/control debian/changelog);
5688 foreach my $maybe (qw(debian/patches debian/source/options
5689 debian/tests/control)) {
5690 next unless stat_exists "$maindir/$maybe";
5691 push @files, $maybe;
5694 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5695 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5697 $dscaddfile->($debtar);
5698 close $fakedsc or die $!;
5701 sub quilt_check_splitbrain_cache ($$) {
5702 my ($headref, $upstreamversion) = @_;
5703 # Called only if we are in (potentially) split brain mode.
5704 # Called in playground.
5705 # Computes the cache key and looks in the cache.
5706 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5708 my $splitbrain_cachekey;
5711 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5712 # we look in the reflog of dgit-intern/quilt-cache
5713 # we look for an entry whose message is the key for the cache lookup
5714 my @cachekey = (qw(dgit), $our_version);
5715 push @cachekey, $upstreamversion;
5716 push @cachekey, $quilt_mode;
5717 push @cachekey, $headref;
5719 push @cachekey, hashfile('fake.dsc');
5721 my $srcshash = Digest::SHA->new(256);
5722 my %sfs = ( %INC, '$0(dgit)' => $0 );
5723 foreach my $sfk (sort keys %sfs) {
5724 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5725 $srcshash->add($sfk," ");
5726 $srcshash->add(hashfile($sfs{$sfk}));
5727 $srcshash->add("\n");
5729 push @cachekey, $srcshash->hexdigest();
5730 $splitbrain_cachekey = "@cachekey";
5732 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5734 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5735 debugcmd "|(probably)",@cmd;
5736 my $child = open GC, "-|"; defined $child or die $!;
5738 chdir $maindir or die $!;
5739 if (!stat "$maindir_gitcommon/logs/refs/$splitbraincache") {
5740 $! == ENOENT or die $!;
5741 printdebug ">(no reflog)\n";
5748 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5749 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5752 quilt_fixup_mkwork($headref);
5753 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5754 if ($cachehit ne $headref) {
5755 progress "dgit view: found cached ($saved)";
5756 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5758 return ($cachehit, $splitbrain_cachekey);
5760 progress "dgit view: found cached, no changes required";
5761 return ($headref, $splitbrain_cachekey);
5763 die $! if GC->error;
5764 failedcmd unless close GC;
5766 printdebug "splitbrain cache miss\n";
5767 return (undef, $splitbrain_cachekey);
5770 sub quilt_fixup_multipatch ($$$) {
5771 my ($clogp, $headref, $upstreamversion) = @_;
5773 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5776 # - honour any existing .pc in case it has any strangeness
5777 # - determine the git commit corresponding to the tip of
5778 # the patch stack (if there is one)
5779 # - if there is such a git commit, convert each subsequent
5780 # git commit into a quilt patch with dpkg-source --commit
5781 # - otherwise convert all the differences in the tree into
5782 # a single git commit
5786 # Our git tree doesn't necessarily contain .pc. (Some versions of
5787 # dgit would include the .pc in the git tree.) If there isn't
5788 # one, we need to generate one by unpacking the patches that we
5791 # We first look for a .pc in the git tree. If there is one, we
5792 # will use it. (This is not the normal case.)
5794 # Otherwise need to regenerate .pc so that dpkg-source --commit
5795 # can work. We do this as follows:
5796 # 1. Collect all relevant .orig from parent directory
5797 # 2. Generate a debian.tar.gz out of
5798 # debian/{patches,rules,source/format,source/options}
5799 # 3. Generate a fake .dsc containing just these fields:
5800 # Format Source Version Files
5801 # 4. Extract the fake .dsc
5802 # Now the fake .dsc has a .pc directory.
5803 # (In fact we do this in every case, because in future we will
5804 # want to search for a good base commit for generating patches.)
5806 # Then we can actually do the dpkg-source --commit
5807 # 1. Make a new working tree with the same object
5808 # store as our main tree and check out the main
5810 # 2. Copy .pc from the fake's extraction, if necessary
5811 # 3. Run dpkg-source --commit
5812 # 4. If the result has changes to debian/, then
5813 # - git add them them
5814 # - git add .pc if we had a .pc in-tree
5816 # 5. If we had a .pc in-tree, delete it, and git commit
5817 # 6. Back in the main tree, fast forward to the new HEAD
5819 # Another situation we may have to cope with is gbp-style
5820 # patches-unapplied trees.
5822 # We would want to detect these, so we know to escape into
5823 # quilt_fixup_gbp. However, this is in general not possible.
5824 # Consider a package with a one patch which the dgit user reverts
5825 # (with git revert or the moral equivalent).
5827 # That is indistinguishable in contents from a patches-unapplied
5828 # tree. And looking at the history to distinguish them is not
5829 # useful because the user might have made a confusing-looking git
5830 # history structure (which ought to produce an error if dgit can't
5831 # cope, not a silent reintroduction of an unwanted patch).
5833 # So gbp users will have to pass an option. But we can usually
5834 # detect their failure to do so: if the tree is not a clean
5835 # patches-applied tree, quilt linearisation fails, but the tree
5836 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5837 # they want --quilt=unapplied.
5839 # To help detect this, when we are extracting the fake dsc, we
5840 # first extract it with --skip-patches, and then apply the patches
5841 # afterwards with dpkg-source --before-build. That lets us save a
5842 # tree object corresponding to .origs.
5844 my $splitbrain_cachekey;
5846 quilt_make_fake_dsc($upstreamversion);
5848 if (quiltmode_splitbrain()) {
5850 ($cachehit, $splitbrain_cachekey) =
5851 quilt_check_splitbrain_cache($headref, $upstreamversion);
5852 return if $cachehit;
5856 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5858 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5859 rename $fakexdir, "fake" or die "$fakexdir $!";
5863 remove_stray_gits("source package");
5864 mktree_in_ud_here();
5868 rmtree 'debian'; # git checkout commitish paths does not delete!
5869 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5870 my $unapplied=git_add_write_tree();
5871 printdebug "fake orig tree object $unapplied\n";
5875 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5877 if (system @bbcmd) {
5878 failedcmd @bbcmd if $? < 0;
5880 failed to apply your git tree's patch stack (from debian/patches/) to
5881 the corresponding upstream tarball(s). Your source tree and .orig
5882 are probably too inconsistent. dgit can only fix up certain kinds of
5883 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5889 quilt_fixup_mkwork($headref);
5892 if (stat_exists ".pc") {
5894 progress "Tree already contains .pc - will use it then delete it.";
5897 rename '../fake/.pc','.pc' or die $!;
5900 changedir '../fake';
5902 my $oldtiptree=git_add_write_tree();
5903 printdebug "fake o+d/p tree object $unapplied\n";
5904 changedir '../work';
5907 # We calculate some guesswork now about what kind of tree this might
5908 # be. This is mostly for error reporting.
5914 # O = orig, without patches applied
5915 # A = "applied", ie orig with H's debian/patches applied
5916 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5917 \%editedignores, \@unrepres),
5918 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5919 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5923 foreach my $b (qw(01 02)) {
5924 foreach my $v (qw(O2H O2A H2A)) {
5925 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5928 printdebug "differences \@dl @dl.\n";
5931 "$us: base trees orig=%.20s o+d/p=%.20s",
5932 $unapplied, $oldtiptree;
5934 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5935 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5936 $dl[0], $dl[1], $dl[3], $dl[4],
5940 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5942 forceable_fail [qw(unrepresentable)], <<END;
5943 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5948 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5949 push @failsuggestion, "This might be a patches-unapplied branch.";
5950 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5951 push @failsuggestion, "This might be a patches-applied branch.";
5953 push @failsuggestion, "Maybe you need to specify one of".
5954 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5956 if (quiltmode_splitbrain()) {
5957 quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,
5958 $diffbits, \%editedignores,
5959 $splitbrain_cachekey);
5963 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5964 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5966 if (!open P, '>>', ".pc/applied-patches") {
5967 $!==&ENOENT or die $!;
5972 commit_quilty_patch();
5974 if ($mustdeletepc) {
5975 quilt_fixup_delete_pc();
5979 sub quilt_fixup_editor () {
5980 my $descfn = $ENV{$fakeeditorenv};
5981 my $editing = $ARGV[$#ARGV];
5982 open I1, '<', $descfn or die "$descfn: $!";
5983 open I2, '<', $editing or die "$editing: $!";
5984 unlink $editing or die "$editing: $!";
5985 open O, '>', $editing or die "$editing: $!";
5986 while (<I1>) { print O or die $!; } I1->error and die $!;
5989 $copying ||= m/^\-\-\- /;
5990 next unless $copying;
5993 I2->error and die $!;
5998 sub maybe_apply_patches_dirtily () {
5999 return unless $quilt_mode =~ m/gbp|unapplied/;
6000 print STDERR <<END or die $!;
6002 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
6003 dgit: Have to apply the patches - making the tree dirty.
6004 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
6007 $patches_applied_dirtily = 01;
6008 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
6009 runcmd qw(dpkg-source --before-build .);
6012 sub maybe_unapply_patches_again () {
6013 progress "dgit: Unapplying patches again to tidy up the tree."
6014 if $patches_applied_dirtily;
6015 runcmd qw(dpkg-source --after-build .)
6016 if $patches_applied_dirtily & 01;
6018 if $patches_applied_dirtily & 02;
6019 $patches_applied_dirtily = 0;
6022 #----- other building -----
6024 our $clean_using_builder;
6025 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
6026 # clean the tree before building (perhaps invoked indirectly by
6027 # whatever we are using to run the build), rather than separately
6028 # and explicitly by us.
6031 return if $clean_using_builder;
6032 if ($cleanmode eq 'dpkg-source') {
6033 maybe_apply_patches_dirtily();
6034 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
6035 } elsif ($cleanmode eq 'dpkg-source-d') {
6036 maybe_apply_patches_dirtily();
6037 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
6038 } elsif ($cleanmode eq 'git') {
6039 runcmd_ordryrun_local @git, qw(clean -xdf);
6040 } elsif ($cleanmode eq 'git-ff') {
6041 runcmd_ordryrun_local @git, qw(clean -xdff);
6042 } elsif ($cleanmode eq 'check') {
6043 my $leftovers = cmdoutput @git, qw(clean -xdn);
6044 if (length $leftovers) {
6045 print STDERR $leftovers, "\n" or die $!;
6046 fail "tree contains uncommitted files and --clean=check specified";
6048 } elsif ($cleanmode eq 'none') {
6055 badusage "clean takes no additional arguments" if @ARGV;
6058 maybe_unapply_patches_again();
6061 sub build_or_push_prep_early () {
6062 our $build_or_push_prep_early_done //= 0;
6063 return if $build_or_push_prep_early_done++;
6064 badusage "-p is not allowed with dgit $subcommand" if defined $package;
6065 my $clogp = parsechangelog();
6066 $isuite = getfield $clogp, 'Distribution';
6067 $package = getfield $clogp, 'Source';
6068 $version = getfield $clogp, 'Version';
6071 sub build_prep_early () {
6072 build_or_push_prep_early();
6080 build_maybe_quilt_fixup();
6082 my $pat = changespat $version;
6083 foreach my $f (glob "$buildproductsdir/$pat") {
6085 unlink $f or fail "remove old changes file $f: $!";
6087 progress "would remove $f";
6093 sub changesopts_initial () {
6094 my @opts =@changesopts[1..$#changesopts];
6097 sub changesopts_version () {
6098 if (!defined $changes_since_version) {
6101 @vsns = archive_query('archive_query');
6102 my @quirk = access_quirk();
6103 if ($quirk[0] eq 'backports') {
6104 local $isuite = $quirk[2];
6106 canonicalise_suite();
6107 push @vsns, archive_query('archive_query');
6113 "archive query failed (queried because --since-version not specified)";
6116 @vsns = map { $_->[0] } @vsns;
6117 @vsns = sort { -version_compare($a, $b) } @vsns;
6118 $changes_since_version = $vsns[0];
6119 progress "changelog will contain changes since $vsns[0]";
6121 $changes_since_version = '_';
6122 progress "package seems new, not specifying -v<version>";
6125 if ($changes_since_version ne '_') {
6126 return ("-v$changes_since_version");
6132 sub changesopts () {
6133 return (changesopts_initial(), changesopts_version());
6136 sub massage_dbp_args ($;$) {
6137 my ($cmd,$xargs) = @_;
6140 # - if we're going to split the source build out so we can
6141 # do strange things to it, massage the arguments to dpkg-buildpackage
6142 # so that the main build doessn't build source (or add an argument
6143 # to stop it building source by default).
6145 # - add -nc to stop dpkg-source cleaning the source tree,
6146 # unless we're not doing a split build and want dpkg-source
6147 # as cleanmode, in which case we can do nothing
6150 # 0 - source will NOT need to be built separately by caller
6151 # +1 - source will need to be built separately by caller
6152 # +2 - source will need to be built separately by caller AND
6153 # dpkg-buildpackage should not in fact be run at all!
6154 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6155 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
6156 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
6157 $clean_using_builder = 1;
6160 # -nc has the side effect of specifying -b if nothing else specified
6161 # and some combinations of -S, -b, et al, are errors, rather than
6162 # later simply overriding earlie. So we need to:
6163 # - search the command line for these options
6164 # - pick the last one
6165 # - perhaps add our own as a default
6166 # - perhaps adjust it to the corresponding non-source-building version
6168 foreach my $l ($cmd, $xargs) {
6170 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
6173 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6175 if ($need_split_build_invocation) {
6176 printdebug "massage split $dmode.\n";
6177 $r = $dmode =~ m/[S]/ ? +2 :
6178 $dmode =~ y/gGF/ABb/ ? +1 :
6179 $dmode =~ m/[ABb]/ ? 0 :
6182 printdebug "massage done $r $dmode.\n";
6184 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6190 my $wasdir = must_getcwd();
6196 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
6197 my ($msg_if_onlyone) = @_;
6198 # If there is only one .changes file, fail with $msg_if_onlyone,
6199 # or if that is undef, be a no-op.
6200 # Returns the changes file to report to the user.
6201 my $pat = changespat $version;
6202 my @changesfiles = glob $pat;
6203 @changesfiles = sort {
6204 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6208 if (@changesfiles==1) {
6209 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
6210 only one changes file from build (@changesfiles)
6212 $result = $changesfiles[0];
6213 } elsif (@changesfiles==2) {
6214 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6215 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6216 fail "$l found in binaries changes file $binchanges"
6219 runcmd_ordryrun_local @mergechanges, @changesfiles;
6220 my $multichanges = changespat $version,'multi';
6222 stat_exists $multichanges or fail "$multichanges: $!";
6223 foreach my $cf (glob $pat) {
6224 next if $cf eq $multichanges;
6225 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
6228 $result = $multichanges;
6230 fail "wrong number of different changes files (@changesfiles)";
6232 printdone "build successful, results in $result\n" or die $!;
6235 sub midbuild_checkchanges () {
6236 my $pat = changespat $version;
6237 return if $rmchanges;
6238 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
6239 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
6241 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
6242 Suggest you delete @unwanted.
6247 sub midbuild_checkchanges_vanilla ($) {
6249 midbuild_checkchanges() if $wantsrc == 1;
6252 sub postbuild_mergechanges_vanilla ($) {
6254 if ($wantsrc == 1) {
6256 postbuild_mergechanges(undef);
6259 printdone "build successful\n";
6265 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6266 my $wantsrc = massage_dbp_args \@dbp;
6269 midbuild_checkchanges_vanilla $wantsrc;
6274 push @dbp, changesopts_version();
6275 maybe_apply_patches_dirtily();
6276 runcmd_ordryrun_local @dbp;
6278 maybe_unapply_patches_again();
6279 postbuild_mergechanges_vanilla $wantsrc;
6283 $quilt_mode //= 'gbp';
6289 # gbp can make .origs out of thin air. In my tests it does this
6290 # even for a 1.0 format package, with no origs present. So I
6291 # guess it keys off just the version number. We don't know
6292 # exactly what .origs ought to exist, but let's assume that we
6293 # should run gbp if: the version has an upstream part and the main
6295 my $upstreamversion = upstreamversion $version;
6296 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6297 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6299 if ($gbp_make_orig) {
6301 $cleanmode = 'none'; # don't do it again
6302 $need_split_build_invocation = 1;
6305 my @dbp = @dpkgbuildpackage;
6307 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6309 if (!length $gbp_build[0]) {
6310 if (length executable_on_path('git-buildpackage')) {
6311 $gbp_build[0] = qw(git-buildpackage);
6313 $gbp_build[0] = 'gbp buildpackage';
6316 my @cmd = opts_opt_multi_cmd @gbp_build;
6318 push @cmd, (qw(-us -uc --git-no-sign-tags),
6319 "--git-builder=".(shellquote @dbp));
6321 if ($gbp_make_orig) {
6322 my $priv = dgit_privdir();
6323 my $ok = "$priv/origs-gen-ok";
6324 unlink $ok or $!==&ENOENT or die $!;
6325 my @origs_cmd = @cmd;
6326 push @origs_cmd, qw(--git-cleaner=true);
6327 push @origs_cmd, "--git-prebuild=".
6328 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6329 push @origs_cmd, @ARGV;
6331 debugcmd @origs_cmd;
6333 do { local $!; stat_exists $ok; }
6334 or failedcmd @origs_cmd;
6336 dryrun_report @origs_cmd;
6342 midbuild_checkchanges_vanilla $wantsrc;
6344 if (!$clean_using_builder) {
6345 push @cmd, '--git-cleaner=true';
6349 maybe_unapply_patches_again();
6351 push @cmd, changesopts();
6352 runcmd_ordryrun_local @cmd, @ARGV;
6354 postbuild_mergechanges_vanilla $wantsrc;
6356 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6358 sub build_source_for_push {
6360 maybe_unapply_patches_again();
6361 $changesfile = $sourcechanges;
6367 $sourcechanges = changespat $version,'source';
6369 unlink "../$sourcechanges" or $!==ENOENT
6370 or fail "remove $sourcechanges: $!";
6372 $dscfn = dscfn($version);
6373 my @cmd = (@dpkgsource, qw(-b --));
6375 changedir $playground;
6376 runcmd_ordryrun_local @cmd, "work";
6377 my @udfiles = <${package}_*>;
6379 foreach my $f (@udfiles) {
6380 printdebug "source copy, found $f\n";
6383 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6384 $f eq srcfn($version, $&));
6385 printdebug "source copy, found $f - renaming\n";
6386 rename "$playground/$f", "../$f" or $!==ENOENT
6387 or fail "put in place new source file ($f): $!";
6390 my $pwd = must_getcwd();
6391 my $leafdir = basename $pwd;
6393 runcmd_ordryrun_local @cmd, $leafdir;
6396 runcmd_ordryrun_local qw(sh -ec),
6397 'exec >$1; shift; exec "$@"','x',
6398 "../$sourcechanges",
6399 @dpkggenchanges, qw(-S), changesopts();
6402 sub cmd_build_source {
6404 badusage "build-source takes no additional arguments" if @ARGV;
6406 maybe_unapply_patches_again();
6407 printdone "source built, results in $dscfn and $sourcechanges";
6412 midbuild_checkchanges();
6415 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6416 stat_exists $sourcechanges
6417 or fail "$sourcechanges (in parent directory): $!";
6419 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6421 maybe_unapply_patches_again();
6423 postbuild_mergechanges(<<END);
6424 perhaps you need to pass -A ? (sbuild's default is to build only
6425 arch-specific binaries; dgit 1.4 used to override that.)
6430 sub cmd_quilt_fixup {
6431 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6434 build_maybe_quilt_fixup();
6437 sub import_dsc_result {
6438 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6439 my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
6441 check_gitattrs($newhash, "source tree");
6443 progress "dgit: import-dsc: $what_msg";
6446 sub cmd_import_dsc {
6450 last unless $ARGV[0] =~ m/^-/;
6453 if (m/^--require-valid-signature$/) {
6456 badusage "unknown dgit import-dsc sub-option \`$_'";
6460 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6461 my ($dscfn, $dstbranch) = @ARGV;
6463 badusage "dry run makes no sense with import-dsc" unless act_local();
6465 my $force = $dstbranch =~ s/^\+// ? +1 :
6466 $dstbranch =~ s/^\.\.// ? -1 :
6468 my $info = $force ? " $&" : '';
6469 $info = "$dscfn$info";
6471 my $specbranch = $dstbranch;
6472 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6473 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6475 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6476 my $chead = cmdoutput_errok @symcmd;
6477 defined $chead or $?==256 or failedcmd @symcmd;
6479 fail "$dstbranch is checked out - will not update it"
6480 if defined $chead and $chead eq $dstbranch;
6482 my $oldhash = git_get_ref $dstbranch;
6484 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6485 $dscdata = do { local $/ = undef; <D>; };
6486 D->error and fail "read $dscfn: $!";
6489 # we don't normally need this so import it here
6490 use Dpkg::Source::Package;
6491 my $dp = new Dpkg::Source::Package filename => $dscfn,
6492 require_valid_signature => $needsig;
6494 local $SIG{__WARN__} = sub {
6496 return unless $needsig;
6497 fail "import-dsc signature check failed";
6499 if (!$dp->is_signed()) {
6500 warn "$us: warning: importing unsigned .dsc\n";
6502 my $r = $dp->check_signature();
6503 die "->check_signature => $r" if $needsig && $r;
6509 $package = getfield $dsc, 'Source';
6511 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6512 unless forceing [qw(import-dsc-with-dgit-field)];
6513 parse_dsc_field_def_dsc_distro();
6515 $isuite = 'DGIT-IMPORT-DSC';
6516 $idistro //= $dsc_distro;
6520 if (defined $dsc_hash) {
6521 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6522 resolve_dsc_field_commit undef, undef;
6524 if (defined $dsc_hash) {
6525 my @cmd = (qw(sh -ec),
6526 "echo $dsc_hash | git cat-file --batch-check");
6527 my $objgot = cmdoutput @cmd;
6528 if ($objgot =~ m#^\w+ missing\b#) {
6530 .dsc contains Dgit field referring to object $dsc_hash
6531 Your git tree does not have that object. Try `git fetch' from a
6532 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6535 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6537 progress "Not fast forward, forced update.";
6539 fail "Not fast forward to $dsc_hash";
6542 import_dsc_result $dstbranch, $dsc_hash,
6543 "dgit import-dsc (Dgit): $info",
6544 "updated git ref $dstbranch";
6549 Branch $dstbranch already exists
6550 Specify ..$specbranch for a pseudo-merge, binding in existing history
6551 Specify +$specbranch to overwrite, discarding existing history
6553 if $oldhash && !$force;
6555 my @dfi = dsc_files_info();
6556 foreach my $fi (@dfi) {
6557 my $f = $fi->{Filename};
6561 fail "lstat $here works but stat gives $! !";
6563 fail "stat $here: $!" unless $! == ENOENT;
6565 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6567 } elsif ($dscfn =~ m#^/#) {
6570 fail "cannot import $dscfn which seems to be inside working tree!";
6572 $there =~ s#/+[^/]+$## or
6573 fail "import $dscfn requires ../$f, but it does not exist";
6575 my $test = $there =~ m{^/} ? $there : "../$there";
6576 stat $test or fail "import $dscfn requires $test, but: $!";
6577 symlink $there, $here or fail "symlink $there to $here: $!";
6578 progress "made symlink $here -> $there";
6579 # print STDERR Dumper($fi);
6581 my @mergeinputs = generate_commits_from_dsc();
6582 die unless @mergeinputs == 1;
6584 my $newhash = $mergeinputs[0]{Commit};
6588 progress "Import, forced update - synthetic orphan git history.";
6589 } elsif ($force < 0) {
6590 progress "Import, merging.";
6591 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6592 my $version = getfield $dsc, 'Version';
6593 my $clogp = commit_getclogp $newhash;
6594 my $authline = clogp_authline $clogp;
6595 $newhash = make_commit_text <<END;
6602 Merge $package ($version) import into $dstbranch
6605 die; # caught earlier
6609 import_dsc_result $dstbranch, $newhash,
6610 "dgit import-dsc: $info",
6611 "results are in in git ref $dstbranch";
6614 sub pre_archive_api_query () {
6615 not_necessarily_a_tree();
6617 sub cmd_archive_api_query {
6618 badusage "need only 1 subpath argument" unless @ARGV==1;
6619 my ($subpath) = @ARGV;
6620 local $isuite = 'DGIT-API-QUERY-CMD';
6621 my @cmd = archive_api_query_cmd($subpath);
6624 exec @cmd or fail "exec curl: $!\n";
6627 sub repos_server_url () {
6628 $package = '_dgit-repos-server';
6629 local $access_forpush = 1;
6630 local $isuite = 'DGIT-REPOS-SERVER';
6631 my $url = access_giturl();
6634 sub pre_clone_dgit_repos_server () {
6635 not_necessarily_a_tree();
6637 sub cmd_clone_dgit_repos_server {
6638 badusage "need destination argument" unless @ARGV==1;
6639 my ($destdir) = @ARGV;
6640 my $url = repos_server_url();
6641 my @cmd = (@git, qw(clone), $url, $destdir);
6643 exec @cmd or fail "exec git clone: $!\n";
6646 sub pre_print_dgit_repos_server_source_url () {
6647 not_necessarily_a_tree();
6649 sub cmd_print_dgit_repos_server_source_url {
6650 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6652 my $url = repos_server_url();
6653 print $url, "\n" or die $!;
6656 sub pre_print_dpkg_source_ignores {
6657 not_necessarily_a_tree();
6659 sub cmd_print_dpkg_source_ignores {
6660 badusage "no arguments allowed to dgit print-dpkg-source-ignores"
6662 print "@dpkg_source_ignores\n" or die $!;
6665 sub cmd_setup_mergechangelogs {
6666 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6667 local $isuite = 'DGIT-SETUP-TREE';
6668 setup_mergechangelogs(1);
6671 sub cmd_setup_useremail {
6672 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6673 local $isuite = 'DGIT-SETUP-TREE';
6677 sub cmd_setup_gitattributes {
6678 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6679 local $isuite = 'DGIT-SETUP-TREE';
6683 sub cmd_setup_new_tree {
6684 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6685 local $isuite = 'DGIT-SETUP-TREE';
6689 #---------- argument parsing and main program ----------
6692 print "dgit version $our_version\n" or die $!;
6696 our (%valopts_long, %valopts_short);
6697 our (%funcopts_long);
6699 our (@modeopt_cfgs);
6701 sub defvalopt ($$$$) {
6702 my ($long,$short,$val_re,$how) = @_;
6703 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6704 $valopts_long{$long} = $oi;
6705 $valopts_short{$short} = $oi;
6706 # $how subref should:
6707 # do whatever assignemnt or thing it likes with $_[0]
6708 # if the option should not be passed on to remote, @rvalopts=()
6709 # or $how can be a scalar ref, meaning simply assign the value
6712 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6713 defvalopt '--distro', '-d', '.+', \$idistro;
6714 defvalopt '', '-k', '.+', \$keyid;
6715 defvalopt '--existing-package','', '.*', \$existing_package;
6716 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6717 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6718 defvalopt '--package', '-p', $package_re, \$package;
6719 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6721 defvalopt '', '-C', '.+', sub {
6722 ($changesfile) = (@_);
6723 if ($changesfile =~ s#^(.*)/##) {
6724 $buildproductsdir = $1;
6728 defvalopt '--initiator-tempdir','','.*', sub {
6729 ($initiator_tempdir) = (@_);
6730 $initiator_tempdir =~ m#^/# or
6731 badusage "--initiator-tempdir must be used specify an".
6732 " absolute, not relative, directory."
6735 sub defoptmodes ($@) {
6736 my ($varref, $cfgkey, $default, %optmap) = @_;
6738 while (my ($opt,$val) = each %optmap) {
6739 $funcopts_long{$opt} = sub { $$varref = $val; };
6740 $permit{$val} = $val;
6742 push @modeopt_cfgs, {
6745 Default => $default,
6750 defoptmodes \$dodep14tag, qw( dep14tag want
6753 --always-dep14tag always );
6758 if (defined $ENV{'DGIT_SSH'}) {
6759 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6760 } elsif (defined $ENV{'GIT_SSH'}) {
6761 @ssh = ($ENV{'GIT_SSH'});
6769 if (!defined $val) {
6770 badusage "$what needs a value" unless @ARGV;
6772 push @rvalopts, $val;
6774 badusage "bad value \`$val' for $what" unless
6775 $val =~ m/^$oi->{Re}$(?!\n)/s;
6776 my $how = $oi->{How};
6777 if (ref($how) eq 'SCALAR') {
6782 push @ropts, @rvalopts;
6786 last unless $ARGV[0] =~ m/^-/;
6790 if (m/^--dry-run$/) {
6793 } elsif (m/^--damp-run$/) {
6796 } elsif (m/^--no-sign$/) {
6799 } elsif (m/^--help$/) {
6801 } elsif (m/^--version$/) {
6803 } elsif (m/^--new$/) {
6806 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6807 ($om = $opts_opt_map{$1}) &&
6811 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6812 !$opts_opt_cmdonly{$1} &&
6813 ($om = $opts_opt_map{$1})) {
6816 } elsif (m/^--(gbp|dpm)$/s) {
6817 push @ropts, "--quilt=$1";
6819 } elsif (m/^--ignore-dirty$/s) {
6822 } elsif (m/^--no-quilt-fixup$/s) {
6824 $quilt_mode = 'nocheck';
6825 } elsif (m/^--no-rm-on-error$/s) {
6828 } elsif (m/^--no-chase-dsc-distro$/s) {
6830 $chase_dsc_distro = 0;
6831 } elsif (m/^--overwrite$/s) {
6833 $overwrite_version = '';
6834 } elsif (m/^--overwrite=(.+)$/s) {
6836 $overwrite_version = $1;
6837 } elsif (m/^--delayed=(\d+)$/s) {
6840 } elsif (m/^--dgit-view-save=(.+)$/s) {
6842 $split_brain_save = $1;
6843 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6844 } elsif (m/^--(no-)?rm-old-changes$/s) {
6847 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6849 push @deliberatelies, $&;
6850 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6854 } elsif (m/^--force-/) {
6856 "$us: warning: ignoring unknown force option $_\n";
6858 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6859 # undocumented, for testing
6861 $tagformat_want = [ $1, 'command line', 1 ];
6862 # 1 menas overrides distro configuration
6863 } elsif (m/^--always-split-source-build$/s) {
6864 # undocumented, for testing
6866 $need_split_build_invocation = 1;
6867 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6868 # undocumented, for testing
6870 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6871 # ^ it's supposed to be an array ref
6872 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6873 $val = $2 ? $' : undef; #';
6874 $valopt->($oi->{Long});
6875 } elsif ($funcopts_long{$_}) {
6877 $funcopts_long{$_}();
6879 badusage "unknown long option \`$_'";
6886 } elsif (s/^-L/-/) {
6889 } elsif (s/^-h/-/) {
6891 } elsif (s/^-D/-/) {
6895 } elsif (s/^-N/-/) {
6900 push @changesopts, $_;
6902 } elsif (s/^-wn$//s) {
6904 $cleanmode = 'none';
6905 } elsif (s/^-wg$//s) {
6908 } elsif (s/^-wgf$//s) {
6910 $cleanmode = 'git-ff';
6911 } elsif (s/^-wd$//s) {
6913 $cleanmode = 'dpkg-source';
6914 } elsif (s/^-wdd$//s) {
6916 $cleanmode = 'dpkg-source-d';
6917 } elsif (s/^-wc$//s) {
6919 $cleanmode = 'check';
6920 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6921 push @git, '-c', $&;
6922 $gitcfgs{cmdline}{$1} = [ $2 ];
6923 } elsif (s/^-c([^=]+)$//s) {
6924 push @git, '-c', $&;
6925 $gitcfgs{cmdline}{$1} = [ 'true' ];
6926 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6928 $val = undef unless length $val;
6929 $valopt->($oi->{Short});
6932 badusage "unknown short option \`$_'";
6939 sub check_env_sanity () {
6940 my $blocked = new POSIX::SigSet;
6941 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6944 foreach my $name (qw(PIPE CHLD)) {
6945 my $signame = "SIG$name";
6946 my $signum = eval "POSIX::$signame" // die;
6947 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6948 die "$signame is set to something other than SIG_DFL\n";
6949 $blocked->ismember($signum) and
6950 die "$signame is blocked\n";
6956 On entry to dgit, $@
6957 This is a bug produced by something in in your execution environment.
6963 sub parseopts_late_defaults () {
6964 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6965 if defined $idistro;
6966 $isuite //= cfg('dgit.default.default-suite');
6968 foreach my $k (keys %opts_opt_map) {
6969 my $om = $opts_opt_map{$k};
6971 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6973 badcfg "cannot set command for $k"
6974 unless length $om->[0];
6978 foreach my $c (access_cfg_cfgs("opts-$k")) {
6980 map { $_ ? @$_ : () }
6981 map { $gitcfgs{$_}{$c} }
6982 reverse @gitcfgsources;
6983 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6984 "\n" if $debuglevel >= 4;
6986 badcfg "cannot configure options for $k"
6987 if $opts_opt_cmdonly{$k};
6988 my $insertpos = $opts_cfg_insertpos{$k};
6989 @$om = ( @$om[0..$insertpos-1],
6991 @$om[$insertpos..$#$om] );
6995 if (!defined $rmchanges) {
6996 local $access_forpush;
6997 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
7000 if (!defined $quilt_mode) {
7001 local $access_forpush;
7002 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
7003 // access_cfg('quilt-mode', 'RETURN-UNDEF')
7005 $quilt_mode =~ m/^($quilt_modes_re)$/
7006 or badcfg "unknown quilt-mode \`$quilt_mode'";
7010 foreach my $moc (@modeopt_cfgs) {
7011 local $access_forpush;
7012 my $vr = $moc->{Var};
7013 next if defined $$vr;
7014 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
7015 my $v = $moc->{Vals}{$$vr};
7016 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
7020 $need_split_build_invocation ||= quiltmode_splitbrain();
7022 if (!defined $cleanmode) {
7023 local $access_forpush;
7024 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
7025 $cleanmode //= 'dpkg-source';
7027 badcfg "unknown clean-mode \`$cleanmode'" unless
7028 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
7032 if ($ENV{$fakeeditorenv}) {
7034 quilt_fixup_editor();
7040 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
7041 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
7042 if $dryrun_level == 1;
7044 print STDERR $helpmsg or die $!;
7047 $cmd = $subcommand = shift @ARGV;
7050 my $pre_fn = ${*::}{"pre_$cmd"};
7051 $pre_fn->() if $pre_fn;
7053 record_maindir if $invoked_in_git_tree;
7056 my $fn = ${*::}{"cmd_$cmd"};
7057 $fn or badusage "unknown operation $cmd";