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.default.dsc-url-proto-ok' => 'false',
621 # old means "repo server accepts pushes with old dgit tags"
622 # new means "repo server accepts pushes with new dgit tags"
623 # maint means "repo server accepts split brain pushes"
624 # hist means "repo server may have old pushes without new tag"
625 # ("hist" is implied by "old")
626 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
627 'dgit-distro.debian.git-check' => 'url',
628 'dgit-distro.debian.git-check-suffix' => '/info/refs',
629 'dgit-distro.debian.new-private-pushers' => 't',
630 'dgit-distro.debian/push.git-url' => '',
631 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
632 'dgit-distro.debian/push.git-user-force' => 'dgit',
633 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
634 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
635 'dgit-distro.debian/push.git-create' => 'true',
636 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
637 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
638 # 'dgit-distro.debian.archive-query-tls-key',
639 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
640 # ^ this does not work because curl is broken nowadays
641 # Fixing #790093 properly will involve providing providing the key
642 # in some pacagke and maybe updating these paths.
644 # 'dgit-distro.debian.archive-query-tls-curl-args',
645 # '--ca-path=/etc/ssl/ca-debian',
646 # ^ this is a workaround but works (only) on DSA-administered machines
647 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
648 'dgit-distro.debian.git-url-suffix' => '',
649 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
650 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
651 'dgit-distro.debian-security.archive-query' => 'aptget:',
652 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
653 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
654 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
655 'dgit-distro.debian-security.nominal-distro' => 'debian',
656 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
657 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
658 'dgit-distro.ubuntu.git-check' => 'false',
659 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
660 'dgit-distro.test-dummy.ssh' => "$td/ssh",
661 'dgit-distro.test-dummy.username' => "alice",
662 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
663 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
664 'dgit-distro.test-dummy.git-url' => "$td/git",
665 'dgit-distro.test-dummy.git-host' => "git",
666 'dgit-distro.test-dummy.git-path' => "$td/git",
667 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
668 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
669 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
670 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
674 our @gitcfgsources = qw(cmdline local global system);
675 our $invoked_in_git_tree = 1;
677 sub git_slurp_config () {
678 # This algoritm is a bit subtle, but this is needed so that for
679 # options which we want to be single-valued, we allow the
680 # different config sources to override properly. See #835858.
681 foreach my $src (@gitcfgsources) {
682 next if $src eq 'cmdline';
683 # we do this ourselves since git doesn't handle it
685 $gitcfgs{$src} = git_slurp_config_src $src;
689 sub git_get_config ($) {
691 foreach my $src (@gitcfgsources) {
692 my $l = $gitcfgs{$src}{$c};
693 confess "internal error ($l $c)" if $l && !ref $l;
694 printdebug"C $c ".(defined $l ?
695 join " ", map { messagequote "'$_'" } @$l :
699 @$l==1 or badcfg "multiple values for $c".
700 " (in $src git config)" if @$l > 1;
708 return undef if $c =~ /RETURN-UNDEF/;
709 printdebug "C? $c\n" if $debuglevel >= 5;
710 my $v = git_get_config($c);
711 return $v if defined $v;
712 my $dv = $defcfg{$c};
714 printdebug "CD $c $dv\n" if $debuglevel >= 4;
718 badcfg "need value for one of: @_\n".
719 "$us: distro or suite appears not to be (properly) supported";
722 sub not_necessarily_a_tree () {
723 # needs to be called from pre_*
724 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
725 $invoked_in_git_tree = 0;
728 sub access_basedistro__noalias () {
729 if (defined $idistro) {
732 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
733 return $def if defined $def;
734 foreach my $src (@gitcfgsources, 'internal') {
735 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
737 foreach my $k (keys %$kl) {
738 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
740 next unless match_glob $dpat, $isuite;
744 return cfg("dgit.default.distro");
748 sub access_basedistro () {
749 my $noalias = access_basedistro__noalias();
750 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
751 return $canon // $noalias;
754 sub access_nomdistro () {
755 my $base = access_basedistro();
756 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
757 $r =~ m/^$distro_re$/ or badcfg
758 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
762 sub access_quirk () {
763 # returns (quirk name, distro to use instead or undef, quirk-specific info)
764 my $basedistro = access_basedistro();
765 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
767 if (defined $backports_quirk) {
768 my $re = $backports_quirk;
769 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
771 $re =~ s/\%/([-0-9a-z_]+)/
772 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
773 if ($isuite =~ m/^$re$/) {
774 return ('backports',"$basedistro-backports",$1);
777 return ('none',undef);
782 sub parse_cfg_bool ($$$) {
783 my ($what,$def,$v) = @_;
786 $v =~ m/^[ty1]/ ? 1 :
787 $v =~ m/^[fn0]/ ? 0 :
788 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
791 sub access_forpush_config () {
792 my $d = access_basedistro();
796 parse_cfg_bool('new-private-pushers', 0,
797 cfg("dgit-distro.$d.new-private-pushers",
800 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
803 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
804 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
805 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
806 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
809 sub access_forpush () {
810 $access_forpush //= access_forpush_config();
811 return $access_forpush;
815 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
816 badcfg "pushing but distro is configured readonly"
817 if access_forpush_config() eq '0';
819 $supplementary_message = <<'END' unless $we_are_responder;
820 Push failed, before we got started.
821 You can retry the push, after fixing the problem, if you like.
823 parseopts_late_defaults();
827 parseopts_late_defaults();
830 sub supplementary_message ($) {
832 if (!$we_are_responder) {
833 $supplementary_message = $msg;
835 } elsif ($protovsn >= 3) {
836 responder_send_command "supplementary-message ".length($msg)
838 print PO $msg or die $!;
842 sub access_distros () {
843 # Returns list of distros to try, in order
846 # 0. `instead of' distro name(s) we have been pointed to
847 # 1. the access_quirk distro, if any
848 # 2a. the user's specified distro, or failing that } basedistro
849 # 2b. the distro calculated from the suite }
850 my @l = access_basedistro();
852 my (undef,$quirkdistro) = access_quirk();
853 unshift @l, $quirkdistro;
854 unshift @l, $instead_distro;
855 @l = grep { defined } @l;
857 push @l, access_nomdistro();
859 if (access_forpush()) {
860 @l = map { ("$_/push", $_) } @l;
865 sub access_cfg_cfgs (@) {
868 # The nesting of these loops determines the search order. We put
869 # the key loop on the outside so that we search all the distros
870 # for each key, before going on to the next key. That means that
871 # if access_cfg is called with a more specific, and then a less
872 # specific, key, an earlier distro can override the less specific
873 # without necessarily overriding any more specific keys. (If the
874 # distro wants to override the more specific keys it can simply do
875 # so; whereas if we did the loop the other way around, it would be
876 # impossible to for an earlier distro to override a less specific
877 # key but not the more specific ones without restating the unknown
878 # values of the more specific keys.
881 # We have to deal with RETURN-UNDEF specially, so that we don't
882 # terminate the search prematurely.
884 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
887 foreach my $d (access_distros()) {
888 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
890 push @cfgs, map { "dgit.default.$_" } @realkeys;
897 my (@cfgs) = access_cfg_cfgs(@keys);
898 my $value = cfg(@cfgs);
902 sub access_cfg_bool ($$) {
903 my ($def, @keys) = @_;
904 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
907 sub string_to_ssh ($) {
909 if ($spec =~ m/\s/) {
910 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
916 sub access_cfg_ssh () {
917 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
918 if (!defined $gitssh) {
921 return string_to_ssh $gitssh;
925 sub access_runeinfo ($) {
927 return ": dgit ".access_basedistro()." $info ;";
930 sub access_someuserhost ($) {
932 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
933 defined($user) && length($user) or
934 $user = access_cfg("$some-user",'username');
935 my $host = access_cfg("$some-host");
936 return length($user) ? "$user\@$host" : $host;
939 sub access_gituserhost () {
940 return access_someuserhost('git');
943 sub access_giturl (;$) {
945 my $url = access_cfg('git-url','RETURN-UNDEF');
948 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
949 return undef unless defined $proto;
952 access_gituserhost().
953 access_cfg('git-path');
955 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
958 return "$url/$package$suffix";
961 sub parsecontrolfh ($$;$) {
962 my ($fh, $desc, $allowsigned) = @_;
963 our $dpkgcontrolhash_noissigned;
966 my %opts = ('name' => $desc);
967 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
968 $c = Dpkg::Control::Hash->new(%opts);
969 $c->parse($fh,$desc) or die "parsing of $desc failed";
970 last if $allowsigned;
971 last if $dpkgcontrolhash_noissigned;
972 my $issigned= $c->get_option('is_pgp_signed');
973 if (!defined $issigned) {
974 $dpkgcontrolhash_noissigned= 1;
975 seek $fh, 0,0 or die "seek $desc: $!";
976 } elsif ($issigned) {
977 fail "control file $desc is (already) PGP-signed. ".
978 " Note that dgit push needs to modify the .dsc and then".
979 " do the signature itself";
988 my ($file, $desc, $allowsigned) = @_;
989 my $fh = new IO::Handle;
990 open $fh, '<', $file or die "$file: $!";
991 my $c = parsecontrolfh($fh,$desc,$allowsigned);
992 $fh->error and die $!;
998 my ($dctrl,$field) = @_;
999 my $v = $dctrl->{$field};
1000 return $v if defined $v;
1001 fail "missing field $field in ".$dctrl->get_option('name');
1004 sub parsechangelog {
1005 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
1006 my $p = new IO::Handle;
1007 my @cmd = (qw(dpkg-parsechangelog), @_);
1008 open $p, '-|', @cmd or die $!;
1010 $?=0; $!=0; close $p or failedcmd @cmd;
1014 sub commit_getclogp ($) {
1015 # Returns the parsed changelog hashref for a particular commit
1017 our %commit_getclogp_memo;
1018 my $memo = $commit_getclogp_memo{$objid};
1019 return $memo if $memo;
1021 my $mclog = dgit_privdir()."clog";
1022 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1023 "$objid:debian/changelog";
1024 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1027 sub parse_dscdata () {
1028 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1029 printdebug Dumper($dscdata) if $debuglevel>1;
1030 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1031 printdebug Dumper($dsc) if $debuglevel>1;
1036 sub archive_query ($;@) {
1037 my ($method) = shift @_;
1038 fail "this operation does not support multiple comma-separated suites"
1040 my $query = access_cfg('archive-query','RETURN-UNDEF');
1041 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1044 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1047 sub archive_query_prepend_mirror {
1048 my $m = access_cfg('mirror');
1049 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1052 sub pool_dsc_subpath ($$) {
1053 my ($vsn,$component) = @_; # $package is implict arg
1054 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1055 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1058 sub cfg_apply_map ($$$) {
1059 my ($varref, $what, $mapspec) = @_;
1060 return unless $mapspec;
1062 printdebug "config $what EVAL{ $mapspec; }\n";
1064 eval "package Dgit::Config; $mapspec;";
1069 #---------- `ftpmasterapi' archive query method (nascent) ----------
1071 sub archive_api_query_cmd ($) {
1073 my @cmd = (@curl, qw(-sS));
1074 my $url = access_cfg('archive-query-url');
1075 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1077 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1078 foreach my $key (split /\:/, $keys) {
1079 $key =~ s/\%HOST\%/$host/g;
1081 fail "for $url: stat $key: $!" unless $!==ENOENT;
1084 fail "config requested specific TLS key but do not know".
1085 " how to get curl to use exactly that EE key ($key)";
1086 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1087 # # Sadly the above line does not work because of changes
1088 # # to gnutls. The real fix for #790093 may involve
1089 # # new curl options.
1092 # Fixing #790093 properly will involve providing a value
1093 # for this on clients.
1094 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1095 push @cmd, split / /, $kargs if defined $kargs;
1097 push @cmd, $url.$subpath;
1101 sub api_query ($$;$) {
1103 my ($data, $subpath, $ok404) = @_;
1104 badcfg "ftpmasterapi archive query method takes no data part"
1106 my @cmd = archive_api_query_cmd($subpath);
1107 my $url = $cmd[$#cmd];
1108 push @cmd, qw(-w %{http_code});
1109 my $json = cmdoutput @cmd;
1110 unless ($json =~ s/\d+\d+\d$//) {
1111 failedcmd_report_cmd undef, @cmd;
1112 fail "curl failed to print 3-digit HTTP code";
1115 return undef if $code eq '404' && $ok404;
1116 fail "fetch of $url gave HTTP code $code"
1117 unless $url =~ m#^file://# or $code =~ m/^2/;
1118 return decode_json($json);
1121 sub canonicalise_suite_ftpmasterapi {
1122 my ($proto,$data) = @_;
1123 my $suites = api_query($data, 'suites');
1125 foreach my $entry (@$suites) {
1127 my $v = $entry->{$_};
1128 defined $v && $v eq $isuite;
1129 } qw(codename name);
1130 push @matched, $entry;
1132 fail "unknown suite $isuite" unless @matched;
1135 @matched==1 or die "multiple matches for suite $isuite\n";
1136 $cn = "$matched[0]{codename}";
1137 defined $cn or die "suite $isuite info has no codename\n";
1138 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1140 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1145 sub archive_query_ftpmasterapi {
1146 my ($proto,$data) = @_;
1147 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1149 my $digester = Digest::SHA->new(256);
1150 foreach my $entry (@$info) {
1152 my $vsn = "$entry->{version}";
1153 my ($ok,$msg) = version_check $vsn;
1154 die "bad version: $msg\n" unless $ok;
1155 my $component = "$entry->{component}";
1156 $component =~ m/^$component_re$/ or die "bad component";
1157 my $filename = "$entry->{filename}";
1158 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1159 or die "bad filename";
1160 my $sha256sum = "$entry->{sha256sum}";
1161 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1162 push @rows, [ $vsn, "/pool/$component/$filename",
1163 $digester, $sha256sum ];
1165 die "bad ftpmaster api response: $@\n".Dumper($entry)
1168 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1169 return archive_query_prepend_mirror @rows;
1172 sub file_in_archive_ftpmasterapi {
1173 my ($proto,$data,$filename) = @_;
1174 my $pat = $filename;
1177 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1178 my $info = api_query($data, "file_in_archive/$pat", 1);
1181 #---------- `aptget' archive query method ----------
1184 our $aptget_releasefile;
1185 our $aptget_configpath;
1187 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1188 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1190 sub aptget_cache_clean {
1191 runcmd_ordryrun_local qw(sh -ec),
1192 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1196 sub aptget_lock_acquire () {
1197 my $lockfile = "$aptget_base/lock";
1198 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1199 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1202 sub aptget_prep ($) {
1204 return if defined $aptget_base;
1206 badcfg "aptget archive query method takes no data part"
1209 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1212 ensuredir "$cache/dgit";
1214 access_cfg('aptget-cachekey','RETURN-UNDEF')
1215 // access_nomdistro();
1217 $aptget_base = "$cache/dgit/aptget";
1218 ensuredir $aptget_base;
1220 my $quoted_base = $aptget_base;
1221 die "$quoted_base contains bad chars, cannot continue"
1222 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1224 ensuredir $aptget_base;
1226 aptget_lock_acquire();
1228 aptget_cache_clean();
1230 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1231 my $sourceslist = "source.list#$cachekey";
1233 my $aptsuites = $isuite;
1234 cfg_apply_map(\$aptsuites, 'suite map',
1235 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1237 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1238 printf SRCS "deb-src %s %s %s\n",
1239 access_cfg('mirror'),
1241 access_cfg('aptget-components')
1244 ensuredir "$aptget_base/cache";
1245 ensuredir "$aptget_base/lists";
1247 open CONF, ">", $aptget_configpath or die $!;
1249 Debug::NoLocking "true";
1250 APT::Get::List-Cleanup "false";
1251 #clear APT::Update::Post-Invoke-Success;
1252 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1253 Dir::State::Lists "$quoted_base/lists";
1254 Dir::Etc::preferences "$quoted_base/preferences";
1255 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1256 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1259 foreach my $key (qw(
1262 Dir::Cache::Archives
1263 Dir::Etc::SourceParts
1264 Dir::Etc::preferencesparts
1266 ensuredir "$aptget_base/$key";
1267 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1270 my $oldatime = (time // die $!) - 1;
1271 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1272 next unless stat_exists $oldlist;
1273 my ($mtime) = (stat _)[9];
1274 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1277 runcmd_ordryrun_local aptget_aptget(), qw(update);
1280 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1281 next unless stat_exists $oldlist;
1282 my ($atime) = (stat _)[8];
1283 next if $atime == $oldatime;
1284 push @releasefiles, $oldlist;
1286 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1287 @releasefiles = @inreleasefiles if @inreleasefiles;
1288 die "apt updated wrong number of Release files (@releasefiles), erk"
1289 unless @releasefiles == 1;
1291 ($aptget_releasefile) = @releasefiles;
1294 sub canonicalise_suite_aptget {
1295 my ($proto,$data) = @_;
1298 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1300 foreach my $name (qw(Codename Suite)) {
1301 my $val = $release->{$name};
1303 printdebug "release file $name: $val\n";
1304 $val =~ m/^$suite_re$/o or fail
1305 "Release file ($aptget_releasefile) specifies intolerable $name";
1306 cfg_apply_map(\$val, 'suite rmap',
1307 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1314 sub archive_query_aptget {
1315 my ($proto,$data) = @_;
1318 ensuredir "$aptget_base/source";
1319 foreach my $old (<$aptget_base/source/*.dsc>) {
1320 unlink $old or die "$old: $!";
1323 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1324 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1325 # avoids apt-get source failing with ambiguous error code
1327 runcmd_ordryrun_local
1328 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1329 aptget_aptget(), qw(--download-only --only-source source), $package;
1331 my @dscs = <$aptget_base/source/*.dsc>;
1332 fail "apt-get source did not produce a .dsc" unless @dscs;
1333 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1335 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1338 my $uri = "file://". uri_escape $dscs[0];
1339 $uri =~ s{\%2f}{/}gi;
1340 return [ (getfield $pre_dsc, 'Version'), $uri ];
1343 sub file_in_archive_aptget () { return undef; }
1345 #---------- `dummyapicat' archive query method ----------
1347 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1348 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1350 sub file_in_archive_dummycatapi ($$$) {
1351 my ($proto,$data,$filename) = @_;
1352 my $mirror = access_cfg('mirror');
1353 $mirror =~ s#^file://#/# or die "$mirror ?";
1355 my @cmd = (qw(sh -ec), '
1357 find -name "$2" -print0 |
1359 ', qw(x), $mirror, $filename);
1360 debugcmd "-|", @cmd;
1361 open FIA, "-|", @cmd or die $!;
1364 printdebug "| $_\n";
1365 m/^(\w+) (\S+)$/ or die "$_ ?";
1366 push @out, { sha256sum => $1, filename => $2 };
1368 close FIA or die failedcmd @cmd;
1372 #---------- `madison' archive query method ----------
1374 sub archive_query_madison {
1375 return archive_query_prepend_mirror
1376 map { [ @$_[0..1] ] } madison_get_parse(@_);
1379 sub madison_get_parse {
1380 my ($proto,$data) = @_;
1381 die unless $proto eq 'madison';
1382 if (!length $data) {
1383 $data= access_cfg('madison-distro','RETURN-UNDEF');
1384 $data //= access_basedistro();
1386 $rmad{$proto,$data,$package} ||= cmdoutput
1387 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1388 my $rmad = $rmad{$proto,$data,$package};
1391 foreach my $l (split /\n/, $rmad) {
1392 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1393 \s*( [^ \t|]+ )\s* \|
1394 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1395 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1396 $1 eq $package or die "$rmad $package ?";
1403 $component = access_cfg('archive-query-default-component');
1405 $5 eq 'source' or die "$rmad ?";
1406 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1408 return sort { -version_compare($a->[0],$b->[0]); } @out;
1411 sub canonicalise_suite_madison {
1412 # madison canonicalises for us
1413 my @r = madison_get_parse(@_);
1415 "unable to canonicalise suite using package $package".
1416 " which does not appear to exist in suite $isuite;".
1417 " --existing-package may help";
1421 sub file_in_archive_madison { return undef; }
1423 #---------- `sshpsql' archive query method ----------
1426 my ($data,$runeinfo,$sql) = @_;
1427 if (!length $data) {
1428 $data= access_someuserhost('sshpsql').':'.
1429 access_cfg('sshpsql-dbname');
1431 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1432 my ($userhost,$dbname) = ($`,$'); #';
1434 my @cmd = (access_cfg_ssh, $userhost,
1435 access_runeinfo("ssh-psql $runeinfo").
1436 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1437 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1439 open P, "-|", @cmd or die $!;
1442 printdebug(">|$_|\n");
1445 $!=0; $?=0; close P or failedcmd @cmd;
1447 my $nrows = pop @rows;
1448 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1449 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1450 @rows = map { [ split /\|/, $_ ] } @rows;
1451 my $ncols = scalar @{ shift @rows };
1452 die if grep { scalar @$_ != $ncols } @rows;
1456 sub sql_injection_check {
1457 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1460 sub archive_query_sshpsql ($$) {
1461 my ($proto,$data) = @_;
1462 sql_injection_check $isuite, $package;
1463 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1464 SELECT source.version, component.name, files.filename, files.sha256sum
1466 JOIN src_associations ON source.id = src_associations.source
1467 JOIN suite ON suite.id = src_associations.suite
1468 JOIN dsc_files ON dsc_files.source = source.id
1469 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1470 JOIN component ON component.id = files_archive_map.component_id
1471 JOIN files ON files.id = dsc_files.file
1472 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1473 AND source.source='$package'
1474 AND files.filename LIKE '%.dsc';
1476 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1477 my $digester = Digest::SHA->new(256);
1479 my ($vsn,$component,$filename,$sha256sum) = @$_;
1480 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1482 return archive_query_prepend_mirror @rows;
1485 sub canonicalise_suite_sshpsql ($$) {
1486 my ($proto,$data) = @_;
1487 sql_injection_check $isuite;
1488 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1489 SELECT suite.codename
1490 FROM suite where suite_name='$isuite' or codename='$isuite';
1492 @rows = map { $_->[0] } @rows;
1493 fail "unknown suite $isuite" unless @rows;
1494 die "ambiguous $isuite: @rows ?" if @rows>1;
1498 sub file_in_archive_sshpsql ($$$) { return undef; }
1500 #---------- `dummycat' archive query method ----------
1502 sub canonicalise_suite_dummycat ($$) {
1503 my ($proto,$data) = @_;
1504 my $dpath = "$data/suite.$isuite";
1505 if (!open C, "<", $dpath) {
1506 $!==ENOENT or die "$dpath: $!";
1507 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1511 chomp or die "$dpath: $!";
1513 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1517 sub archive_query_dummycat ($$) {
1518 my ($proto,$data) = @_;
1519 canonicalise_suite();
1520 my $dpath = "$data/package.$csuite.$package";
1521 if (!open C, "<", $dpath) {
1522 $!==ENOENT or die "$dpath: $!";
1523 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1531 printdebug "dummycat query $csuite $package $dpath | $_\n";
1532 my @row = split /\s+/, $_;
1533 @row==2 or die "$dpath: $_ ?";
1536 C->error and die "$dpath: $!";
1538 return archive_query_prepend_mirror
1539 sort { -version_compare($a->[0],$b->[0]); } @rows;
1542 sub file_in_archive_dummycat () { return undef; }
1544 #---------- tag format handling ----------
1546 sub access_cfg_tagformats () {
1547 split /\,/, access_cfg('dgit-tag-format');
1550 sub access_cfg_tagformats_can_splitbrain () {
1551 my %y = map { $_ => 1 } access_cfg_tagformats;
1552 foreach my $needtf (qw(new maint)) {
1553 next if $y{$needtf};
1559 sub need_tagformat ($$) {
1560 my ($fmt, $why) = @_;
1561 fail "need to use tag format $fmt ($why) but also need".
1562 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1563 " - no way to proceed"
1564 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1565 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1568 sub select_tagformat () {
1570 return if $tagformatfn && !$tagformat_want;
1571 die 'bug' if $tagformatfn && $tagformat_want;
1572 # ... $tagformat_want assigned after previous select_tagformat
1574 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1575 printdebug "select_tagformat supported @supported\n";
1577 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1578 printdebug "select_tagformat specified @$tagformat_want\n";
1580 my ($fmt,$why,$override) = @$tagformat_want;
1582 fail "target distro supports tag formats @supported".
1583 " but have to use $fmt ($why)"
1585 or grep { $_ eq $fmt } @supported;
1587 $tagformat_want = undef;
1589 $tagformatfn = ${*::}{"debiantag_$fmt"};
1591 fail "trying to use unknown tag format \`$fmt' ($why) !"
1592 unless $tagformatfn;
1595 #---------- archive query entrypoints and rest of program ----------
1597 sub canonicalise_suite () {
1598 return if defined $csuite;
1599 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1600 $csuite = archive_query('canonicalise_suite');
1601 if ($isuite ne $csuite) {
1602 progress "canonical suite name for $isuite is $csuite";
1604 progress "canonical suite name is $csuite";
1608 sub get_archive_dsc () {
1609 canonicalise_suite();
1610 my @vsns = archive_query('archive_query');
1611 foreach my $vinfo (@vsns) {
1612 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1613 $dscurl = $vsn_dscurl;
1614 $dscdata = url_get($dscurl);
1616 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1621 $digester->add($dscdata);
1622 my $got = $digester->hexdigest();
1624 fail "$dscurl has hash $got but".
1625 " archive told us to expect $digest";
1628 my $fmt = getfield $dsc, 'Format';
1629 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1630 "unsupported source format $fmt, sorry";
1632 $dsc_checked = !!$digester;
1633 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1637 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1640 sub check_for_git ();
1641 sub check_for_git () {
1643 my $how = access_cfg('git-check');
1644 if ($how eq 'ssh-cmd') {
1646 (access_cfg_ssh, access_gituserhost(),
1647 access_runeinfo("git-check $package").
1648 " set -e; cd ".access_cfg('git-path').";".
1649 " if test -d $package.git; then echo 1; else echo 0; fi");
1650 my $r= cmdoutput @cmd;
1651 if (defined $r and $r =~ m/^divert (\w+)$/) {
1653 my ($usedistro,) = access_distros();
1654 # NB that if we are pushing, $usedistro will be $distro/push
1655 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1656 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1657 progress "diverting to $divert (using config for $instead_distro)";
1658 return check_for_git();
1660 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1662 } elsif ($how eq 'url') {
1663 my $prefix = access_cfg('git-check-url','git-url');
1664 my $suffix = access_cfg('git-check-suffix','git-suffix',
1665 'RETURN-UNDEF') // '.git';
1666 my $url = "$prefix/$package$suffix";
1667 my @cmd = (@curl, qw(-sS -I), $url);
1668 my $result = cmdoutput @cmd;
1669 $result =~ s/^\S+ 200 .*\n\r?\n//;
1670 # curl -sS -I with https_proxy prints
1671 # HTTP/1.0 200 Connection established
1672 $result =~ m/^\S+ (404|200) /s or
1673 fail "unexpected results from git check query - ".
1674 Dumper($prefix, $result);
1676 if ($code eq '404') {
1678 } elsif ($code eq '200') {
1683 } elsif ($how eq 'true') {
1685 } elsif ($how eq 'false') {
1688 badcfg "unknown git-check \`$how'";
1692 sub create_remote_git_repo () {
1693 my $how = access_cfg('git-create');
1694 if ($how eq 'ssh-cmd') {
1696 (access_cfg_ssh, access_gituserhost(),
1697 access_runeinfo("git-create $package").
1698 "set -e; cd ".access_cfg('git-path').";".
1699 " cp -a _template $package.git");
1700 } elsif ($how eq 'true') {
1703 badcfg "unknown git-create \`$how'";
1707 our ($dsc_hash,$lastpush_mergeinput);
1708 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1712 dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
1713 $playground = fresh_playground 'dgit/unpack';
1716 sub mktree_in_ud_here () {
1717 playtree_setup $gitcfgs{local};
1720 sub git_write_tree () {
1721 my $tree = cmdoutput @git, qw(write-tree);
1722 $tree =~ m/^\w+$/ or die "$tree ?";
1726 sub git_add_write_tree () {
1727 runcmd @git, qw(add -Af .);
1728 return git_write_tree();
1731 sub remove_stray_gits ($) {
1733 my @gitscmd = qw(find -name .git -prune -print0);
1734 debugcmd "|",@gitscmd;
1735 open GITS, "-|", @gitscmd or die $!;
1740 print STDERR "$us: warning: removing from $what: ",
1741 (messagequote $_), "\n";
1745 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1748 sub mktree_in_ud_from_only_subdir ($;$) {
1749 my ($what,$raw) = @_;
1750 # changes into the subdir
1753 die "expected one subdir but found @dirs ?" unless @dirs==1;
1754 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1758 remove_stray_gits($what);
1759 mktree_in_ud_here();
1761 my ($format, $fopts) = get_source_format();
1762 if (madformat($format)) {
1767 my $tree=git_add_write_tree();
1768 return ($tree,$dir);
1771 our @files_csum_info_fields =
1772 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1773 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1774 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1776 sub dsc_files_info () {
1777 foreach my $csumi (@files_csum_info_fields) {
1778 my ($fname, $module, $method) = @$csumi;
1779 my $field = $dsc->{$fname};
1780 next unless defined $field;
1781 eval "use $module; 1;" or die $@;
1783 foreach (split /\n/, $field) {
1785 m/^(\w+) (\d+) (\S+)$/ or
1786 fail "could not parse .dsc $fname line \`$_'";
1787 my $digester = eval "$module"."->$method;" or die $@;
1792 Digester => $digester,
1797 fail "missing any supported Checksums-* or Files field in ".
1798 $dsc->get_option('name');
1802 map { $_->{Filename} } dsc_files_info();
1805 sub files_compare_inputs (@) {
1810 my $showinputs = sub {
1811 return join "; ", map { $_->get_option('name') } @$inputs;
1814 foreach my $in (@$inputs) {
1816 my $in_name = $in->get_option('name');
1818 printdebug "files_compare_inputs $in_name\n";
1820 foreach my $csumi (@files_csum_info_fields) {
1821 my ($fname) = @$csumi;
1822 printdebug "files_compare_inputs $in_name $fname\n";
1824 my $field = $in->{$fname};
1825 next unless defined $field;
1828 foreach (split /\n/, $field) {
1831 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1832 fail "could not parse $in_name $fname line \`$_'";
1834 printdebug "files_compare_inputs $in_name $fname $f\n";
1838 my $re = \ $record{$f}{$fname};
1840 $fchecked{$f}{$in_name} = 1;
1842 fail "hash or size of $f varies in $fname fields".
1843 " (between: ".$showinputs->().")";
1848 @files = sort @files;
1849 $expected_files //= \@files;
1850 "@$expected_files" eq "@files" or
1851 fail "file list in $in_name varies between hash fields!";
1854 fail "$in_name has no files list field(s)";
1856 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1859 grep { keys %$_ == @$inputs-1 } values %fchecked
1860 or fail "no file appears in all file lists".
1861 " (looked in: ".$showinputs->().")";
1864 sub is_orig_file_in_dsc ($$) {
1865 my ($f, $dsc_files_info) = @_;
1866 return 0 if @$dsc_files_info <= 1;
1867 # One file means no origs, and the filename doesn't have a "what
1868 # part of dsc" component. (Consider versions ending `.orig'.)
1869 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1873 sub is_orig_file_of_vsn ($$) {
1874 my ($f, $upstreamvsn) = @_;
1875 my $base = srcfn $upstreamvsn, '';
1876 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1880 # This function determines whether a .changes file is source-only from
1881 # the point of view of dak. Thus, it permits *_source.buildinfo
1884 # It does not, however, permit any other buildinfo files. After a
1885 # source-only upload, the buildds will try to upload files like
1886 # foo_1.2.3_amd64.buildinfo. If the package maintainer included files
1887 # named like this in their (otherwise) source-only upload, the uploads
1888 # of the buildd can be rejected by dak. Fixing the resultant
1889 # situation can require manual intervention. So we block such
1890 # .buildinfo files when the user tells us to perform a source-only
1891 # upload (such as when using the push-source subcommand with the -C
1892 # option, which calls this function).
1894 # Note, though, that when dgit is told to prepare a source-only
1895 # upload, such as when subcommands like build-source and push-source
1896 # without -C are used, dgit has a more restrictive notion of
1897 # source-only .changes than dak: such uploads will never include
1898 # *_source.buildinfo files. This is because there is no use for such
1899 # files when using a tool like dgit to produce the source package, as
1900 # dgit ensures the source is identical to git HEAD.
1901 sub test_source_only_changes ($) {
1903 foreach my $l (split /\n/, getfield $changes, 'Files') {
1904 $l =~ m/\S+$/ or next;
1905 # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages
1906 unless ($& =~ m/(?:\.dsc|\.diff\.gz|\.tar\.[a-z0-9]+|_source\.buildinfo)$/) {
1907 print "purportedly source-only changes polluted by $&\n";
1914 sub changes_update_origs_from_dsc ($$$$) {
1915 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1917 printdebug "checking origs needed ($upstreamvsn)...\n";
1918 $_ = getfield $changes, 'Files';
1919 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1920 fail "cannot find section/priority from .changes Files field";
1921 my $placementinfo = $1;
1923 printdebug "checking origs needed placement '$placementinfo'...\n";
1924 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1925 $l =~ m/\S+$/ or next;
1927 printdebug "origs $file | $l\n";
1928 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1929 printdebug "origs $file is_orig\n";
1930 my $have = archive_query('file_in_archive', $file);
1931 if (!defined $have) {
1933 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1939 printdebug "origs $file \$#\$have=$#$have\n";
1940 foreach my $h (@$have) {
1943 foreach my $csumi (@files_csum_info_fields) {
1944 my ($fname, $module, $method, $archivefield) = @$csumi;
1945 next unless defined $h->{$archivefield};
1946 $_ = $dsc->{$fname};
1947 next unless defined;
1948 m/^(\w+) .* \Q$file\E$/m or
1949 fail ".dsc $fname missing entry for $file";
1950 if ($h->{$archivefield} eq $1) {
1954 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1957 die "$file ".Dumper($h)." ?!" if $same && @differ;
1960 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1963 printdebug "origs $file f.same=$found_same".
1964 " #f._differ=$#found_differ\n";
1965 if (@found_differ && !$found_same) {
1967 "archive contains $file with different checksum",
1970 # Now we edit the changes file to add or remove it
1971 foreach my $csumi (@files_csum_info_fields) {
1972 my ($fname, $module, $method, $archivefield) = @$csumi;
1973 next unless defined $changes->{$fname};
1975 # in archive, delete from .changes if it's there
1976 $changed{$file} = "removed" if
1977 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1978 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1979 # not in archive, but it's here in the .changes
1981 my $dsc_data = getfield $dsc, $fname;
1982 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1984 $extra =~ s/ \d+ /$&$placementinfo /
1985 or die "$fname $extra >$dsc_data< ?"
1986 if $fname eq 'Files';
1987 $changes->{$fname} .= "\n". $extra;
1988 $changed{$file} = "added";
1993 foreach my $file (keys %changed) {
1995 "edited .changes for archive .orig contents: %s %s",
1996 $changed{$file}, $file;
1998 my $chtmp = "$changesfile.tmp";
1999 $changes->save($chtmp);
2001 rename $chtmp,$changesfile or die "$changesfile $!";
2003 progress "[new .changes left in $changesfile]";
2006 progress "$changesfile already has appropriate .orig(s) (if any)";
2010 sub make_commit ($) {
2012 return cmdoutput @git, qw(hash-object -w -t commit), $file;
2015 sub make_commit_text ($) {
2018 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
2020 print Dumper($text) if $debuglevel > 1;
2021 my $child = open2($out, $in, @cmd) or die $!;
2024 print $in $text or die $!;
2025 close $in or die $!;
2027 $h =~ m/^\w+$/ or die;
2029 printdebug "=> $h\n";
2032 waitpid $child, 0 == $child or die "$child $!";
2033 $? and failedcmd @cmd;
2037 sub clogp_authline ($) {
2039 my $author = getfield $clogp, 'Maintainer';
2040 if ($author =~ m/^[^"\@]+\,/) {
2041 # single entry Maintainer field with unquoted comma
2042 $author = ($& =~ y/,//rd).$'; # strip the comma
2044 # git wants a single author; any remaining commas in $author
2045 # are by now preceded by @ (or "). It seems safer to punt on
2046 # "..." for now rather than attempting to dequote or something.
2047 $author =~ s#,.*##ms unless $author =~ m/"/;
2048 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2049 my $authline = "$author $date";
2050 $authline =~ m/$git_authline_re/o or
2051 fail "unexpected commit author line format \`$authline'".
2052 " (was generated from changelog Maintainer field)";
2053 return ($1,$2,$3) if wantarray;
2057 sub vendor_patches_distro ($$) {
2058 my ($checkdistro, $what) = @_;
2059 return unless defined $checkdistro;
2061 my $series = "debian/patches/\L$checkdistro\E.series";
2062 printdebug "checking for vendor-specific $series ($what)\n";
2064 if (!open SERIES, "<", $series) {
2065 die "$series $!" unless $!==ENOENT;
2074 Unfortunately, this source package uses a feature of dpkg-source where
2075 the same source package unpacks to different source code on different
2076 distros. dgit cannot safely operate on such packages on affected
2077 distros, because the meaning of source packages is not stable.
2079 Please ask the distro/maintainer to remove the distro-specific series
2080 files and use a different technique (if necessary, uploading actually
2081 different packages, if different distros are supposed to have
2085 fail "Found active distro-specific series file for".
2086 " $checkdistro ($what): $series, cannot continue";
2088 die "$series $!" if SERIES->error;
2092 sub check_for_vendor_patches () {
2093 # This dpkg-source feature doesn't seem to be documented anywhere!
2094 # But it can be found in the changelog (reformatted):
2096 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2097 # Author: Raphael Hertzog <hertzog@debian.org>
2098 # Date: Sun Oct 3 09:36:48 2010 +0200
2100 # dpkg-source: correctly create .pc/.quilt_series with alternate
2103 # If you have debian/patches/ubuntu.series and you were
2104 # unpacking the source package on ubuntu, quilt was still
2105 # directed to debian/patches/series instead of
2106 # debian/patches/ubuntu.series.
2108 # debian/changelog | 3 +++
2109 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2110 # 2 files changed, 6 insertions(+), 1 deletion(-)
2113 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2114 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2115 "Dpkg::Vendor \`current vendor'");
2116 vendor_patches_distro(access_basedistro(),
2117 "(base) distro being accessed");
2118 vendor_patches_distro(access_nomdistro(),
2119 "(nominal) distro being accessed");
2122 sub generate_commits_from_dsc () {
2123 # See big comment in fetch_from_archive, below.
2124 # See also README.dsc-import.
2126 changedir $playground;
2128 my @dfi = dsc_files_info();
2129 foreach my $fi (@dfi) {
2130 my $f = $fi->{Filename};
2131 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2132 my $upper_f = "$maindir/../$f";
2134 printdebug "considering reusing $f: ";
2136 if (link_ltarget "$upper_f,fetch", $f) {
2137 printdebug "linked (using ...,fetch).\n";
2138 } elsif ((printdebug "($!) "),
2140 fail "accessing ../$f,fetch: $!";
2141 } elsif (link_ltarget $upper_f, $f) {
2142 printdebug "linked.\n";
2143 } elsif ((printdebug "($!) "),
2145 fail "accessing ../$f: $!";
2147 printdebug "absent.\n";
2151 complete_file_from_dsc('.', $fi, \$refetched)
2154 printdebug "considering saving $f: ";
2156 if (link $f, $upper_f) {
2157 printdebug "linked.\n";
2158 } elsif ((printdebug "($!) "),
2160 fail "saving ../$f: $!";
2161 } elsif (!$refetched) {
2162 printdebug "no need.\n";
2163 } elsif (link $f, "$upper_f,fetch") {
2164 printdebug "linked (using ...,fetch).\n";
2165 } elsif ((printdebug "($!) "),
2167 fail "saving ../$f,fetch: $!";
2169 printdebug "cannot.\n";
2173 # We unpack and record the orig tarballs first, so that we only
2174 # need disk space for one private copy of the unpacked source.
2175 # But we can't make them into commits until we have the metadata
2176 # from the debian/changelog, so we record the tree objects now and
2177 # make them into commits later.
2179 my $upstreamv = upstreamversion $dsc->{version};
2180 my $orig_f_base = srcfn $upstreamv, '';
2182 foreach my $fi (@dfi) {
2183 # We actually import, and record as a commit, every tarball
2184 # (unless there is only one file, in which case there seems
2187 my $f = $fi->{Filename};
2188 printdebug "import considering $f ";
2189 (printdebug "only one dfi\n"), next if @dfi == 1;
2190 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2191 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2195 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2197 printdebug "Y ", (join ' ', map { $_//"(none)" }
2198 $compr_ext, $orig_f_part
2201 my $input = new IO::File $f, '<' or die "$f $!";
2205 if (defined $compr_ext) {
2207 Dpkg::Compression::compression_guess_from_filename $f;
2208 fail "Dpkg::Compression cannot handle file $f in source package"
2209 if defined $compr_ext && !defined $cname;
2211 new Dpkg::Compression::Process compression => $cname;
2212 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2213 my $compr_fh = new IO::Handle;
2214 my $compr_pid = open $compr_fh, "-|" // die $!;
2216 open STDIN, "<&", $input or die $!;
2218 die "dgit (child): exec $compr_cmd[0]: $!\n";
2223 rmtree "_unpack-tar";
2224 mkdir "_unpack-tar" or die $!;
2225 my @tarcmd = qw(tar -x -f -
2226 --no-same-owner --no-same-permissions
2227 --no-acls --no-xattrs --no-selinux);
2228 my $tar_pid = fork // die $!;
2230 chdir "_unpack-tar" or die $!;
2231 open STDIN, "<&", $input or die $!;
2233 die "dgit (child): exec $tarcmd[0]: $!";
2235 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2236 !$? or failedcmd @tarcmd;
2239 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2241 # finally, we have the results in "tarball", but maybe
2242 # with the wrong permissions
2244 runcmd qw(chmod -R +rwX _unpack-tar);
2245 changedir "_unpack-tar";
2246 remove_stray_gits($f);
2247 mktree_in_ud_here();
2249 my ($tree) = git_add_write_tree();
2250 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2251 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2253 printdebug "one subtree $1\n";
2255 printdebug "multiple subtrees\n";
2258 rmtree "_unpack-tar";
2260 my $ent = [ $f, $tree ];
2262 Orig => !!$orig_f_part,
2263 Sort => (!$orig_f_part ? 2 :
2264 $orig_f_part =~ m/-/g ? 1 :
2272 # put any without "_" first (spec is not clear whether files
2273 # are always in the usual order). Tarballs without "_" are
2274 # the main orig or the debian tarball.
2275 $a->{Sort} <=> $b->{Sort} or
2279 my $any_orig = grep { $_->{Orig} } @tartrees;
2281 my $dscfn = "$package.dsc";
2283 my $treeimporthow = 'package';
2285 open D, ">", $dscfn or die "$dscfn: $!";
2286 print D $dscdata or die "$dscfn: $!";
2287 close D or die "$dscfn: $!";
2288 my @cmd = qw(dpkg-source);
2289 push @cmd, '--no-check' if $dsc_checked;
2290 if (madformat $dsc->{format}) {
2291 push @cmd, '--skip-patches';
2292 $treeimporthow = 'unpatched';
2294 push @cmd, qw(-x --), $dscfn;
2297 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2298 if (madformat $dsc->{format}) {
2299 check_for_vendor_patches();
2303 if (madformat $dsc->{format}) {
2304 my @pcmd = qw(dpkg-source --before-build .);
2305 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2307 $dappliedtree = git_add_write_tree();
2310 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2311 debugcmd "|",@clogcmd;
2312 open CLOGS, "-|", @clogcmd or die $!;
2317 printdebug "import clog search...\n";
2320 my $stanzatext = do { local $/=""; <CLOGS>; };
2321 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2322 last if !defined $stanzatext;
2324 my $desc = "package changelog, entry no.$.";
2325 open my $stanzafh, "<", \$stanzatext or die;
2326 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2327 $clogp //= $thisstanza;
2329 printdebug "import clog $thisstanza->{version} $desc...\n";
2331 last if !$any_orig; # we don't need $r1clogp
2333 # We look for the first (most recent) changelog entry whose
2334 # version number is lower than the upstream version of this
2335 # package. Then the last (least recent) previous changelog
2336 # entry is treated as the one which introduced this upstream
2337 # version and used for the synthetic commits for the upstream
2340 # One might think that a more sophisticated algorithm would be
2341 # necessary. But: we do not want to scan the whole changelog
2342 # file. Stopping when we see an earlier version, which
2343 # necessarily then is an earlier upstream version, is the only
2344 # realistic way to do that. Then, either the earliest
2345 # changelog entry we have seen so far is indeed the earliest
2346 # upload of this upstream version; or there are only changelog
2347 # entries relating to later upstream versions (which is not
2348 # possible unless the changelog and .dsc disagree about the
2349 # version). Then it remains to choose between the physically
2350 # last entry in the file, and the one with the lowest version
2351 # number. If these are not the same, we guess that the
2352 # versions were created in a non-monotic order rather than
2353 # that the changelog entries have been misordered.
2355 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2357 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2358 $r1clogp = $thisstanza;
2360 printdebug "import clog $r1clogp->{version} becomes r1\n";
2362 die $! if CLOGS->error;
2363 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2365 $clogp or fail "package changelog has no entries!";
2367 my $authline = clogp_authline $clogp;
2368 my $changes = getfield $clogp, 'Changes';
2369 $changes =~ s/^\n//; # Changes: \n
2370 my $cversion = getfield $clogp, 'Version';
2373 $r1clogp //= $clogp; # maybe there's only one entry;
2374 my $r1authline = clogp_authline $r1clogp;
2375 # Strictly, r1authline might now be wrong if it's going to be
2376 # unused because !$any_orig. Whatever.
2378 printdebug "import tartrees authline $authline\n";
2379 printdebug "import tartrees r1authline $r1authline\n";
2381 foreach my $tt (@tartrees) {
2382 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2384 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2387 committer $r1authline
2391 [dgit import orig $tt->{F}]
2399 [dgit import tarball $package $cversion $tt->{F}]
2404 printdebug "import main commit\n";
2406 open C, ">../commit.tmp" or die $!;
2407 print C <<END or die $!;
2410 print C <<END or die $! foreach @tartrees;
2413 print C <<END or die $!;
2419 [dgit import $treeimporthow $package $cversion]
2423 my $rawimport_hash = make_commit qw(../commit.tmp);
2425 if (madformat $dsc->{format}) {
2426 printdebug "import apply patches...\n";
2428 # regularise the state of the working tree so that
2429 # the checkout of $rawimport_hash works nicely.
2430 my $dappliedcommit = make_commit_text(<<END);
2437 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2439 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2441 # We need the answers to be reproducible
2442 my @authline = clogp_authline($clogp);
2443 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2444 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2445 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2446 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2447 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2448 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2450 my $path = $ENV{PATH} or die;
2452 # we use ../../gbp-pq-output, which (given that we are in
2453 # $playground/PLAYTREE, and $playground is .git/dgit/unpack,
2456 foreach my $use_absurd (qw(0 1)) {
2457 runcmd @git, qw(checkout -q unpa);
2458 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2459 local $ENV{PATH} = $path;
2462 progress "warning: $@";
2463 $path = "$absurdity:$path";
2464 progress "$us: trying slow absurd-git-apply...";
2465 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2470 die "forbid absurd git-apply\n" if $use_absurd
2471 && forceing [qw(import-gitapply-no-absurd)];
2472 die "only absurd git-apply!\n" if !$use_absurd
2473 && forceing [qw(import-gitapply-absurd)];
2475 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2476 local $ENV{PATH} = $path if $use_absurd;
2478 my @showcmd = (gbp_pq, qw(import));
2479 my @realcmd = shell_cmd
2480 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2481 debugcmd "+",@realcmd;
2482 if (system @realcmd) {
2483 die +(shellquote @showcmd).
2485 failedcmd_waitstatus()."\n";
2488 my $gapplied = git_rev_parse('HEAD');
2489 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2490 $gappliedtree eq $dappliedtree or
2492 gbp-pq import and dpkg-source disagree!
2493 gbp-pq import gave commit $gapplied
2494 gbp-pq import gave tree $gappliedtree
2495 dpkg-source --before-build gave tree $dappliedtree
2497 $rawimport_hash = $gapplied;
2502 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2507 progress "synthesised git commit from .dsc $cversion";
2509 my $rawimport_mergeinput = {
2510 Commit => $rawimport_hash,
2511 Info => "Import of source package",
2513 my @output = ($rawimport_mergeinput);
2515 if ($lastpush_mergeinput) {
2516 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2517 my $oversion = getfield $oldclogp, 'Version';
2519 version_compare($oversion, $cversion);
2521 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2522 { Message => <<END, ReverseParents => 1 });
2523 Record $package ($cversion) in archive suite $csuite
2525 } elsif ($vcmp > 0) {
2526 print STDERR <<END or die $!;
2528 Version actually in archive: $cversion (older)
2529 Last version pushed with dgit: $oversion (newer or same)
2532 @output = $lastpush_mergeinput;
2534 # Same version. Use what's in the server git branch,
2535 # discarding our own import. (This could happen if the
2536 # server automatically imports all packages into git.)
2537 @output = $lastpush_mergeinput;
2545 sub complete_file_from_dsc ($$;$) {
2546 our ($dstdir, $fi, $refetched) = @_;
2547 # Ensures that we have, in $dstdir, the file $fi, with the correct
2548 # contents. (Downloading it from alongside $dscurl if necessary.)
2549 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2550 # and will set $$refetched=1 if it did so (or tried to).
2552 my $f = $fi->{Filename};
2553 my $tf = "$dstdir/$f";
2557 my $checkhash = sub {
2558 open F, "<", "$tf" or die "$tf: $!";
2559 $fi->{Digester}->reset();
2560 $fi->{Digester}->addfile(*F);
2561 F->error and die $!;
2562 $got = $fi->{Digester}->hexdigest();
2563 return $got eq $fi->{Hash};
2566 if (stat_exists $tf) {
2567 if ($checkhash->()) {
2568 progress "using existing $f";
2572 fail "file $f has hash $got but .dsc".
2573 " demands hash $fi->{Hash} ".
2574 "(perhaps you should delete this file?)";
2576 progress "need to fetch correct version of $f";
2577 unlink $tf or die "$tf $!";
2580 printdebug "$tf does not exist, need to fetch\n";
2584 $furl =~ s{/[^/]+$}{};
2586 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2587 die "$f ?" if $f =~ m#/#;
2588 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2589 return 0 if !act_local();
2592 fail "file $f has hash $got but .dsc".
2593 " demands hash $fi->{Hash} ".
2594 "(got wrong file from archive!)";
2599 sub ensure_we_have_orig () {
2600 my @dfi = dsc_files_info();
2601 foreach my $fi (@dfi) {
2602 my $f = $fi->{Filename};
2603 next unless is_orig_file_in_dsc($f, \@dfi);
2604 complete_file_from_dsc('..', $fi)
2609 #---------- git fetch ----------
2611 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2612 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2614 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2615 # locally fetched refs because they have unhelpful names and clutter
2616 # up gitk etc. So we track whether we have "used up" head ref (ie,
2617 # whether we have made another local ref which refers to this object).
2619 # (If we deleted them unconditionally, then we might end up
2620 # re-fetching the same git objects each time dgit fetch was run.)
2622 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2623 # in git_fetch_us to fetch the refs in question, and possibly a call
2624 # to lrfetchref_used.
2626 our (%lrfetchrefs_f, %lrfetchrefs_d);
2627 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2629 sub lrfetchref_used ($) {
2630 my ($fullrefname) = @_;
2631 my $objid = $lrfetchrefs_f{$fullrefname};
2632 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2635 sub git_lrfetch_sane {
2636 my ($url, $supplementary, @specs) = @_;
2637 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2638 # at least as regards @specs. Also leave the results in
2639 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2640 # able to clean these up.
2642 # With $supplementary==1, @specs must not contain wildcards
2643 # and we add to our previous fetches (non-atomically).
2645 # This is rather miserable:
2646 # When git fetch --prune is passed a fetchspec ending with a *,
2647 # it does a plausible thing. If there is no * then:
2648 # - it matches subpaths too, even if the supplied refspec
2649 # starts refs, and behaves completely madly if the source
2650 # has refs/refs/something. (See, for example, Debian #NNNN.)
2651 # - if there is no matching remote ref, it bombs out the whole
2653 # We want to fetch a fixed ref, and we don't know in advance
2654 # if it exists, so this is not suitable.
2656 # Our workaround is to use git ls-remote. git ls-remote has its
2657 # own qairks. Notably, it has the absurd multi-tail-matching
2658 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2659 # refs/refs/foo etc.
2661 # Also, we want an idempotent snapshot, but we have to make two
2662 # calls to the remote: one to git ls-remote and to git fetch. The
2663 # solution is use git ls-remote to obtain a target state, and
2664 # git fetch to try to generate it. If we don't manage to generate
2665 # the target state, we try again.
2667 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2669 my $specre = join '|', map {
2672 my $wildcard = $x =~ s/\\\*$/.*/;
2673 die if $wildcard && $supplementary;
2676 printdebug "git_lrfetch_sane specre=$specre\n";
2677 my $wanted_rref = sub {
2679 return m/^(?:$specre)$/;
2682 my $fetch_iteration = 0;
2685 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2686 if (++$fetch_iteration > 10) {
2687 fail "too many iterations trying to get sane fetch!";
2690 my @look = map { "refs/$_" } @specs;
2691 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2695 open GITLS, "-|", @lcmd or die $!;
2697 printdebug "=> ", $_;
2698 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2699 my ($objid,$rrefname) = ($1,$2);
2700 if (!$wanted_rref->($rrefname)) {
2702 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2706 $wantr{$rrefname} = $objid;
2709 close GITLS or failedcmd @lcmd;
2711 # OK, now %want is exactly what we want for refs in @specs
2713 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2714 "+refs/$_:".lrfetchrefs."/$_";
2717 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2719 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2720 runcmd_ordryrun_local @fcmd if @fspecs;
2722 if (!$supplementary) {
2723 %lrfetchrefs_f = ();
2727 git_for_each_ref(lrfetchrefs, sub {
2728 my ($objid,$objtype,$lrefname,$reftail) = @_;
2729 $lrfetchrefs_f{$lrefname} = $objid;
2730 $objgot{$objid} = 1;
2733 if ($supplementary) {
2737 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2738 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2739 if (!exists $wantr{$rrefname}) {
2740 if ($wanted_rref->($rrefname)) {
2742 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2746 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2749 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2750 delete $lrfetchrefs_f{$lrefname};
2754 foreach my $rrefname (sort keys %wantr) {
2755 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2756 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2757 my $want = $wantr{$rrefname};
2758 next if $got eq $want;
2759 if (!defined $objgot{$want}) {
2761 warning: git ls-remote suggests we want $lrefname
2762 warning: and it should refer to $want
2763 warning: but git fetch didn't fetch that object to any relevant ref.
2764 warning: This may be due to a race with someone updating the server.
2765 warning: Will try again...
2767 next FETCH_ITERATION;
2770 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2772 runcmd_ordryrun_local @git, qw(update-ref -m),
2773 "dgit fetch git fetch fixup", $lrefname, $want;
2774 $lrfetchrefs_f{$lrefname} = $want;
2779 if (defined $csuite) {
2780 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2781 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2782 my ($objid,$objtype,$lrefname,$reftail) = @_;
2783 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2784 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2788 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2789 Dumper(\%lrfetchrefs_f);
2792 sub git_fetch_us () {
2793 # Want to fetch only what we are going to use, unless
2794 # deliberately-not-ff, in which case we must fetch everything.
2796 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2798 (quiltmode_splitbrain
2799 ? (map { $_->('*',access_nomdistro) }
2800 \&debiantag_new, \&debiantag_maintview)
2801 : debiantags('*',access_nomdistro));
2802 push @specs, server_branch($csuite);
2803 push @specs, $rewritemap;
2804 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2806 my $url = access_giturl();
2807 git_lrfetch_sane $url, 0, @specs;
2810 my @tagpats = debiantags('*',access_nomdistro);
2812 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2813 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2814 printdebug "currently $fullrefname=$objid\n";
2815 $here{$fullrefname} = $objid;
2817 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2818 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2819 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2820 printdebug "offered $lref=$objid\n";
2821 if (!defined $here{$lref}) {
2822 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2823 runcmd_ordryrun_local @upd;
2824 lrfetchref_used $fullrefname;
2825 } elsif ($here{$lref} eq $objid) {
2826 lrfetchref_used $fullrefname;
2829 "Not updating $lref from $here{$lref} to $objid.\n";
2834 #---------- dsc and archive handling ----------
2836 sub mergeinfo_getclogp ($) {
2837 # Ensures thit $mi->{Clogp} exists and returns it
2839 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2842 sub mergeinfo_version ($) {
2843 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2846 sub fetch_from_archive_record_1 ($) {
2848 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2849 'DGIT_ARCHIVE', $hash;
2850 cmdoutput @git, qw(log -n2), $hash;
2851 # ... gives git a chance to complain if our commit is malformed
2854 sub fetch_from_archive_record_2 ($) {
2856 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2860 dryrun_report @upd_cmd;
2864 sub parse_dsc_field_def_dsc_distro () {
2865 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2866 dgit.default.distro);
2869 sub parse_dsc_field ($$) {
2870 my ($dsc, $what) = @_;
2872 foreach my $field (@ourdscfield) {
2873 $f = $dsc->{$field};
2878 progress "$what: NO git hash";
2879 parse_dsc_field_def_dsc_distro();
2880 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2881 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2882 progress "$what: specified git info ($dsc_distro)";
2883 $dsc_hint_tag = [ $dsc_hint_tag ];
2884 } elsif ($f =~ m/^\w+\s*$/) {
2886 parse_dsc_field_def_dsc_distro();
2887 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2889 progress "$what: specified git hash";
2891 fail "$what: invalid Dgit info";
2895 sub resolve_dsc_field_commit ($$) {
2896 my ($already_distro, $already_mapref) = @_;
2898 return unless defined $dsc_hash;
2901 defined $already_mapref &&
2902 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2903 ? $already_mapref : undef;
2907 my ($what, @fetch) = @_;
2909 local $idistro = $dsc_distro;
2910 my $lrf = lrfetchrefs;
2912 if (!$chase_dsc_distro) {
2914 "not chasing .dsc distro $dsc_distro: not fetching $what";
2919 ".dsc names distro $dsc_distro: fetching $what";
2921 my $url = access_giturl();
2922 if (!defined $url) {
2923 defined $dsc_hint_url or fail <<END;
2924 .dsc Dgit metadata is in context of distro $dsc_distro
2925 for which we have no configured url and .dsc provides no hint
2928 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2929 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2930 parse_cfg_bool "dsc-url-proto-ok", 'false',
2931 cfg("dgit.dsc-url-proto-ok.$proto",
2932 "dgit.default.dsc-url-proto-ok")
2934 .dsc Dgit metadata is in context of distro $dsc_distro
2935 for which we have no configured url;
2936 .dsc provides hinted url with protocol $proto which is unsafe.
2937 (can be overridden by config - consult documentation)
2939 $url = $dsc_hint_url;
2942 git_lrfetch_sane $url, 1, @fetch;
2947 my $rewrite_enable = do {
2948 local $idistro = $dsc_distro;
2949 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2952 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2953 if (!defined $mapref) {
2954 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2955 $mapref = $lrf.'/'.$rewritemap;
2957 my $rewritemapdata = git_cat_file $mapref.':map';
2958 if (defined $rewritemapdata
2959 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2961 "server's git history rewrite map contains a relevant entry!";
2964 if (defined $dsc_hash) {
2965 progress "using rewritten git hash in place of .dsc value";
2967 progress "server data says .dsc hash is to be disregarded";
2972 if (!defined git_cat_file $dsc_hash) {
2973 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2974 my $lrf = $do_fetch->("additional commits", @tags) &&
2975 defined git_cat_file $dsc_hash
2977 .dsc Dgit metadata requires commit $dsc_hash
2978 but we could not obtain that object anywhere.
2980 foreach my $t (@tags) {
2981 my $fullrefname = $lrf.'/'.$t;
2982 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2983 next unless $lrfetchrefs_f{$fullrefname};
2984 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2985 lrfetchref_used $fullrefname;
2990 sub fetch_from_archive () {
2991 ensure_setup_existing_tree();
2993 # Ensures that lrref() is what is actually in the archive, one way
2994 # or another, according to us - ie this client's
2995 # appropritaely-updated archive view. Also returns the commit id.
2996 # If there is nothing in the archive, leaves lrref alone and
2997 # returns undef. git_fetch_us must have already been called.
3001 parse_dsc_field($dsc, 'last upload to archive');
3002 resolve_dsc_field_commit access_basedistro,
3003 lrfetchrefs."/".$rewritemap
3005 progress "no version available from the archive";
3008 # If the archive's .dsc has a Dgit field, there are three
3009 # relevant git commitids we need to choose between and/or merge
3011 # 1. $dsc_hash: the Dgit field from the archive
3012 # 2. $lastpush_hash: the suite branch on the dgit git server
3013 # 3. $lastfetch_hash: our local tracking brach for the suite
3015 # These may all be distinct and need not be in any fast forward
3018 # If the dsc was pushed to this suite, then the server suite
3019 # branch will have been updated; but it might have been pushed to
3020 # a different suite and copied by the archive. Conversely a more
3021 # recent version may have been pushed with dgit but not appeared
3022 # in the archive (yet).
3024 # $lastfetch_hash may be awkward because archive imports
3025 # (particularly, imports of Dgit-less .dscs) are performed only as
3026 # needed on individual clients, so different clients may perform a
3027 # different subset of them - and these imports are only made
3028 # public during push. So $lastfetch_hash may represent a set of
3029 # imports different to a subsequent upload by a different dgit
3032 # Our approach is as follows:
3034 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3035 # descendant of $dsc_hash, then it was pushed by a dgit user who
3036 # had based their work on $dsc_hash, so we should prefer it.
3037 # Otherwise, $dsc_hash was installed into this suite in the
3038 # archive other than by a dgit push, and (necessarily) after the
3039 # last dgit push into that suite (since a dgit push would have
3040 # been descended from the dgit server git branch); thus, in that
3041 # case, we prefer the archive's version (and produce a
3042 # pseudo-merge to overwrite the dgit server git branch).
3044 # (If there is no Dgit field in the archive's .dsc then
3045 # generate_commit_from_dsc uses the version numbers to decide
3046 # whether the suite branch or the archive is newer. If the suite
3047 # branch is newer it ignores the archive's .dsc; otherwise it
3048 # generates an import of the .dsc, and produces a pseudo-merge to
3049 # overwrite the suite branch with the archive contents.)
3051 # The outcome of that part of the algorithm is the `public view',
3052 # and is same for all dgit clients: it does not depend on any
3053 # unpublished history in the local tracking branch.
3055 # As between the public view and the local tracking branch: The
3056 # local tracking branch is only updated by dgit fetch, and
3057 # whenever dgit fetch runs it includes the public view in the
3058 # local tracking branch. Therefore if the public view is not
3059 # descended from the local tracking branch, the local tracking
3060 # branch must contain history which was imported from the archive
3061 # but never pushed; and, its tip is now out of date. So, we make
3062 # a pseudo-merge to overwrite the old imports and stitch the old
3065 # Finally: we do not necessarily reify the public view (as
3066 # described above). This is so that we do not end up stacking two
3067 # pseudo-merges. So what we actually do is figure out the inputs
3068 # to any public view pseudo-merge and put them in @mergeinputs.
3071 # $mergeinputs[]{Commit}
3072 # $mergeinputs[]{Info}
3073 # $mergeinputs[0] is the one whose tree we use
3074 # @mergeinputs is in the order we use in the actual commit)
3077 # $mergeinputs[]{Message} is a commit message to use
3078 # $mergeinputs[]{ReverseParents} if def specifies that parent
3079 # list should be in opposite order
3080 # Such an entry has no Commit or Info. It applies only when found
3081 # in the last entry. (This ugliness is to support making
3082 # identical imports to previous dgit versions.)
3084 my $lastpush_hash = git_get_ref(lrfetchref());
3085 printdebug "previous reference hash=$lastpush_hash\n";
3086 $lastpush_mergeinput = $lastpush_hash && {
3087 Commit => $lastpush_hash,
3088 Info => "dgit suite branch on dgit git server",
3091 my $lastfetch_hash = git_get_ref(lrref());
3092 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3093 my $lastfetch_mergeinput = $lastfetch_hash && {
3094 Commit => $lastfetch_hash,
3095 Info => "dgit client's archive history view",
3098 my $dsc_mergeinput = $dsc_hash && {
3099 Commit => $dsc_hash,
3100 Info => "Dgit field in .dsc from archive",
3104 my $del_lrfetchrefs = sub {
3107 printdebug "del_lrfetchrefs...\n";
3108 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3109 my $objid = $lrfetchrefs_d{$fullrefname};
3110 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3112 $gur ||= new IO::Handle;
3113 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3115 printf $gur "delete %s %s\n", $fullrefname, $objid;
3118 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3122 if (defined $dsc_hash) {
3123 ensure_we_have_orig();
3124 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3125 @mergeinputs = $dsc_mergeinput
3126 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3127 print STDERR <<END or die $!;
3129 Git commit in archive is behind the last version allegedly pushed/uploaded.
3130 Commit referred to by archive: $dsc_hash
3131 Last version pushed with dgit: $lastpush_hash
3134 @mergeinputs = ($lastpush_mergeinput);
3136 # Archive has .dsc which is not a descendant of the last dgit
3137 # push. This can happen if the archive moves .dscs about.
3138 # Just follow its lead.
3139 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3140 progress "archive .dsc names newer git commit";
3141 @mergeinputs = ($dsc_mergeinput);
3143 progress "archive .dsc names other git commit, fixing up";
3144 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3148 @mergeinputs = generate_commits_from_dsc();
3149 # We have just done an import. Now, our import algorithm might
3150 # have been improved. But even so we do not want to generate
3151 # a new different import of the same package. So if the
3152 # version numbers are the same, just use our existing version.
3153 # If the version numbers are different, the archive has changed
3154 # (perhaps, rewound).
3155 if ($lastfetch_mergeinput &&
3156 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3157 (mergeinfo_version $mergeinputs[0]) )) {
3158 @mergeinputs = ($lastfetch_mergeinput);
3160 } elsif ($lastpush_hash) {
3161 # only in git, not in the archive yet
3162 @mergeinputs = ($lastpush_mergeinput);
3163 print STDERR <<END or die $!;
3165 Package not found in the archive, but has allegedly been pushed using dgit.
3169 printdebug "nothing found!\n";
3170 if (defined $skew_warning_vsn) {
3171 print STDERR <<END or die $!;
3173 Warning: relevant archive skew detected.
3174 Archive allegedly contains $skew_warning_vsn
3175 But we were not able to obtain any version from the archive or git.
3179 unshift @end, $del_lrfetchrefs;
3183 if ($lastfetch_hash &&
3185 my $h = $_->{Commit};
3186 $h and is_fast_fwd($lastfetch_hash, $h);
3187 # If true, one of the existing parents of this commit
3188 # is a descendant of the $lastfetch_hash, so we'll
3189 # be ff from that automatically.
3193 push @mergeinputs, $lastfetch_mergeinput;
3196 printdebug "fetch mergeinfos:\n";
3197 foreach my $mi (@mergeinputs) {
3199 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3201 printdebug sprintf " ReverseParents=%d Message=%s",
3202 $mi->{ReverseParents}, $mi->{Message};
3206 my $compat_info= pop @mergeinputs
3207 if $mergeinputs[$#mergeinputs]{Message};
3209 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3212 if (@mergeinputs > 1) {
3214 my $tree_commit = $mergeinputs[0]{Commit};
3216 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3217 $tree =~ m/\n\n/; $tree = $`;
3218 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3221 # We use the changelog author of the package in question the
3222 # author of this pseudo-merge. This is (roughly) correct if
3223 # this commit is simply representing aa non-dgit upload.
3224 # (Roughly because it does not record sponsorship - but we
3225 # don't have sponsorship info because that's in the .changes,
3226 # which isn't in the archivw.)
3228 # But, it might be that we are representing archive history
3229 # updates (including in-archive copies). These are not really
3230 # the responsibility of the person who created the .dsc, but
3231 # there is no-one whose name we should better use. (The
3232 # author of the .dsc-named commit is clearly worse.)
3234 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3235 my $author = clogp_authline $useclogp;
3236 my $cversion = getfield $useclogp, 'Version';
3238 my $mcf = dgit_privdir()."/mergecommit";
3239 open MC, ">", $mcf or die "$mcf $!";
3240 print MC <<END or die $!;
3244 my @parents = grep { $_->{Commit} } @mergeinputs;
3245 @parents = reverse @parents if $compat_info->{ReverseParents};
3246 print MC <<END or die $! foreach @parents;
3250 print MC <<END or die $!;
3256 if (defined $compat_info->{Message}) {
3257 print MC $compat_info->{Message} or die $!;
3259 print MC <<END or die $!;
3260 Record $package ($cversion) in archive suite $csuite
3264 my $message_add_info = sub {
3266 my $mversion = mergeinfo_version $mi;
3267 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3271 $message_add_info->($mergeinputs[0]);
3272 print MC <<END or die $!;
3273 should be treated as descended from
3275 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3279 $hash = make_commit $mcf;
3281 $hash = $mergeinputs[0]{Commit};
3283 printdebug "fetch hash=$hash\n";
3286 my ($lasth, $what) = @_;
3287 return unless $lasth;
3288 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3291 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3293 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3295 fetch_from_archive_record_1($hash);
3297 if (defined $skew_warning_vsn) {
3298 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3299 my $gotclogp = commit_getclogp($hash);
3300 my $got_vsn = getfield $gotclogp, 'Version';
3301 printdebug "SKEW CHECK GOT $got_vsn\n";
3302 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3303 print STDERR <<END or die $!;
3305 Warning: archive skew detected. Using the available version:
3306 Archive allegedly contains $skew_warning_vsn
3307 We were able to obtain only $got_vsn
3313 if ($lastfetch_hash ne $hash) {
3314 fetch_from_archive_record_2($hash);
3317 lrfetchref_used lrfetchref();
3319 check_gitattrs($hash, "fetched source tree");
3321 unshift @end, $del_lrfetchrefs;
3325 sub set_local_git_config ($$) {
3327 runcmd @git, qw(config), $k, $v;
3330 sub setup_mergechangelogs (;$) {
3332 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3334 my $driver = 'dpkg-mergechangelogs';
3335 my $cb = "merge.$driver";
3336 confess unless defined $maindir;
3337 my $attrs = "$maindir_gitcommon/info/attributes";
3338 ensuredir "$maindir_gitcommon/info";
3340 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3341 if (!open ATTRS, "<", $attrs) {
3342 $!==ENOENT or die "$attrs: $!";
3346 next if m{^debian/changelog\s};
3347 print NATTRS $_, "\n" or die $!;
3349 ATTRS->error and die $!;
3352 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3355 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3356 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3358 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3361 sub setup_useremail (;$) {
3363 return unless $always || access_cfg_bool(1, 'setup-useremail');
3366 my ($k, $envvar) = @_;
3367 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3368 return unless defined $v;
3369 set_local_git_config "user.$k", $v;
3372 $setup->('email', 'DEBEMAIL');
3373 $setup->('name', 'DEBFULLNAME');
3376 sub ensure_setup_existing_tree () {
3377 my $k = "remote.$remotename.skipdefaultupdate";
3378 my $c = git_get_config $k;
3379 return if defined $c;
3380 set_local_git_config $k, 'true';
3383 sub open_main_gitattrs () {
3384 confess 'internal error no maindir' unless defined $maindir;
3385 my $gai = new IO::File "$maindir_gitcommon/info/attributes"
3387 or die "open $maindir_gitcommon/info/attributes: $!";
3391 our $gitattrs_ourmacro_re = qr{^\[attr\]dgit-defuse-attrs\s};
3393 sub is_gitattrs_setup () {
3396 # 1: gitattributes set up and should be left alone
3398 # 0: there is a dgit-defuse-attrs but it needs fixing
3399 # undef: there is none
3400 my $gai = open_main_gitattrs();
3401 return 0 unless $gai;
3403 next unless m{$gitattrs_ourmacro_re};
3404 return 1 if m{\s-working-tree-encoding\s};
3405 printdebug "is_gitattrs_setup: found old macro\n";
3408 $gai->error and die $!;
3409 printdebug "is_gitattrs_setup: found nothing\n";
3413 sub setup_gitattrs (;$) {
3415 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3417 my $already = is_gitattrs_setup();
3420 [attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes
3421 not doing further gitattributes setup
3425 my $new = "[attr]dgit-defuse-attrs $negate_harmful_gitattrs";
3426 my $af = "$maindir_gitcommon/info/attributes";
3427 ensuredir "$maindir_gitcommon/info";
3429 open GAO, "> $af.new" or die $!;
3430 print GAO <<END or die $! unless defined $already;
3433 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3435 my $gai = open_main_gitattrs();
3438 if (m{$gitattrs_ourmacro_re}) {
3439 die unless defined $already;
3443 print GAO $_, "\n" or die $!;
3445 $gai->error and die $!;
3447 close GAO or die $!;
3448 rename "$af.new", "$af" or die "install $af: $!";
3451 sub setup_new_tree () {
3452 setup_mergechangelogs();
3457 sub check_gitattrs ($$) {
3458 my ($treeish, $what) = @_;
3460 return if is_gitattrs_setup;
3463 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3465 my $gafl = new IO::File;
3466 open $gafl, "-|", @cmd or die $!;
3469 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3471 next unless m{(?:^|/)\.gitattributes$};
3473 # oh dear, found one
3475 dgit: warning: $what contains .gitattributes
3476 dgit: .gitattributes not (fully) defused. Recommended: dgit setup-new-tree.
3481 # tree contains no .gitattributes files
3482 $?=0; $!=0; close $gafl or failedcmd @cmd;
3486 sub multisuite_suite_child ($$$) {
3487 my ($tsuite, $merginputs, $fn) = @_;
3488 # in child, sets things up, calls $fn->(), and returns undef
3489 # in parent, returns canonical suite name for $tsuite
3490 my $canonsuitefh = IO::File::new_tmpfile;
3491 my $pid = fork // die $!;
3495 $us .= " [$isuite]";
3496 $debugprefix .= " ";
3497 progress "fetching $tsuite...";
3498 canonicalise_suite();
3499 print $canonsuitefh $csuite, "\n" or die $!;
3500 close $canonsuitefh or die $!;
3504 waitpid $pid,0 == $pid or die $!;
3505 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3506 seek $canonsuitefh,0,0 or die $!;
3507 local $csuite = <$canonsuitefh>;
3508 die $! unless defined $csuite && chomp $csuite;
3510 printdebug "multisuite $tsuite missing\n";
3513 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3514 push @$merginputs, {
3521 sub fork_for_multisuite ($) {
3522 my ($before_fetch_merge) = @_;
3523 # if nothing unusual, just returns ''
3526 # returns 0 to caller in child, to do first of the specified suites
3527 # in child, $csuite is not yet set
3529 # returns 1 to caller in parent, to finish up anything needed after
3530 # in parent, $csuite is set to canonicalised portmanteau
3532 my $org_isuite = $isuite;
3533 my @suites = split /\,/, $isuite;
3534 return '' unless @suites > 1;
3535 printdebug "fork_for_multisuite: @suites\n";
3539 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3541 return 0 unless defined $cbasesuite;
3543 fail "package $package missing in (base suite) $cbasesuite"
3544 unless @mergeinputs;
3546 my @csuites = ($cbasesuite);
3548 $before_fetch_merge->();
3550 foreach my $tsuite (@suites[1..$#suites]) {
3551 $tsuite =~ s/^-/$cbasesuite-/;
3552 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3558 # xxx collecte the ref here
3560 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3561 push @csuites, $csubsuite;
3564 foreach my $mi (@mergeinputs) {
3565 my $ref = git_get_ref $mi->{Ref};
3566 die "$mi->{Ref} ?" unless length $ref;
3567 $mi->{Commit} = $ref;
3570 $csuite = join ",", @csuites;
3572 my $previous = git_get_ref lrref;
3574 unshift @mergeinputs, {
3575 Commit => $previous,
3576 Info => "local combined tracking branch",
3578 "archive seems to have rewound: local tracking branch is ahead!",
3582 foreach my $ix (0..$#mergeinputs) {
3583 $mergeinputs[$ix]{Index} = $ix;
3586 @mergeinputs = sort {
3587 -version_compare(mergeinfo_version $a,
3588 mergeinfo_version $b) # highest version first
3590 $a->{Index} <=> $b->{Index}; # earliest in spec first
3596 foreach my $mi (@mergeinputs) {
3597 printdebug "multisuite merge check $mi->{Info}\n";
3598 foreach my $previous (@needed) {
3599 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3600 printdebug "multisuite merge un-needed $previous->{Info}\n";
3604 printdebug "multisuite merge this-needed\n";
3605 $mi->{Character} = '+';
3608 $needed[0]{Character} = '*';
3610 my $output = $needed[0]{Commit};
3613 printdebug "multisuite merge nontrivial\n";
3614 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3616 my $commit = "tree $tree\n";
3617 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3618 "Input branches:\n";
3620 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3621 printdebug "multisuite merge include $mi->{Info}\n";
3622 $mi->{Character} //= ' ';
3623 $commit .= "parent $mi->{Commit}\n";
3624 $msg .= sprintf " %s %-25s %s\n",
3626 (mergeinfo_version $mi),
3629 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3631 " * marks the highest version branch, which choose to use\n".
3632 " + marks each branch which was not already an ancestor\n\n".
3633 "[dgit multi-suite $csuite]\n";
3635 "author $authline\n".
3636 "committer $authline\n\n";
3637 $output = make_commit_text $commit.$msg;
3638 printdebug "multisuite merge generated $output\n";
3641 fetch_from_archive_record_1($output);
3642 fetch_from_archive_record_2($output);
3644 progress "calculated combined tracking suite $csuite";
3649 sub clone_set_head () {
3650 open H, "> .git/HEAD" or die $!;
3651 print H "ref: ".lref()."\n" or die $!;
3654 sub clone_finish ($) {
3656 runcmd @git, qw(reset --hard), lrref();
3657 runcmd qw(bash -ec), <<'END';
3659 git ls-tree -r --name-only -z HEAD | \
3660 xargs -0r touch -h -r . --
3662 printdone "ready for work in $dstdir";
3666 # in multisuite, returns twice!
3667 # once in parent after first suite fetched,
3668 # and then again in child after everything is finished
3670 badusage "dry run makes no sense with clone" unless act_local();
3672 my $multi_fetched = fork_for_multisuite(sub {
3673 printdebug "multi clone before fetch merge\n";
3677 if ($multi_fetched) {
3678 printdebug "multi clone after fetch merge\n";
3680 clone_finish($dstdir);
3683 printdebug "clone main body\n";
3685 canonicalise_suite();
3686 my $hasgit = check_for_git();
3687 mkdir $dstdir or fail "create \`$dstdir': $!";
3689 runcmd @git, qw(init -q);
3693 my $giturl = access_giturl(1);
3694 if (defined $giturl) {
3695 runcmd @git, qw(remote add), 'origin', $giturl;
3698 progress "fetching existing git history";
3700 runcmd_ordryrun_local @git, qw(fetch origin);
3702 progress "starting new git history";
3704 fetch_from_archive() or no_such_package;
3705 my $vcsgiturl = $dsc->{'Vcs-Git'};
3706 if (length $vcsgiturl) {
3707 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3708 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3710 clone_finish($dstdir);
3714 canonicalise_suite();
3715 if (check_for_git()) {
3718 fetch_from_archive() or no_such_package();
3719 printdone "fetched into ".lrref();
3723 my $multi_fetched = fork_for_multisuite(sub { });
3724 fetch() unless $multi_fetched; # parent
3725 return if $multi_fetched eq '0'; # child
3726 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3728 printdone "fetched to ".lrref()." and merged into HEAD";
3731 sub check_not_dirty () {
3732 foreach my $f (qw(local-options local-patch-header)) {
3733 if (stat_exists "debian/source/$f") {
3734 fail "git tree contains debian/source/$f";
3738 return if $ignoredirty;
3740 git_check_unmodified();
3743 sub commit_admin ($) {
3746 runcmd_ordryrun_local @git, qw(commit -m), $m;
3749 sub quiltify_nofix_bail ($$) {
3750 my ($headinfo, $xinfo) = @_;
3751 if ($quilt_mode eq 'nofix') {
3752 fail "quilt fixup required but quilt mode is \`nofix'\n".
3753 "HEAD commit".$headinfo." differs from tree implied by ".
3754 " debian/patches".$xinfo;
3758 sub commit_quilty_patch () {
3759 my $output = cmdoutput @git, qw(status --porcelain);
3761 foreach my $l (split /\n/, $output) {
3762 next unless $l =~ m/\S/;
3763 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3767 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3769 progress "nothing quilty to commit, ok.";
3772 quiltify_nofix_bail "", " (wanted to commit patch update)";
3773 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3774 runcmd_ordryrun_local @git, qw(add -f), @adds;
3776 Commit Debian 3.0 (quilt) metadata
3778 [dgit ($our_version) quilt-fixup]
3782 sub get_source_format () {
3784 if (open F, "debian/source/options") {
3788 s/\s+$//; # ignore missing final newline
3790 my ($k, $v) = ($`, $'); #');
3791 $v =~ s/^"(.*)"$/$1/;
3797 F->error and die $!;
3800 die $! unless $!==&ENOENT;
3803 if (!open F, "debian/source/format") {
3804 die $! unless $!==&ENOENT;
3808 F->error and die $!;
3810 return ($_, \%options);
3813 sub madformat_wantfixup ($) {
3815 return 0 unless $format eq '3.0 (quilt)';
3816 our $quilt_mode_warned;
3817 if ($quilt_mode eq 'nocheck') {
3818 progress "Not doing any fixup of \`$format' due to".
3819 " ----no-quilt-fixup or --quilt=nocheck"
3820 unless $quilt_mode_warned++;
3823 progress "Format \`$format', need to check/update patch stack"
3824 unless $quilt_mode_warned++;
3828 sub maybe_split_brain_save ($$$) {
3829 my ($headref, $dgitview, $msg) = @_;
3830 # => message fragment "$saved" describing disposition of $dgitview
3831 return "commit id $dgitview" unless defined $split_brain_save;
3832 my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
3833 @git, qw(update-ref -m),
3834 "dgit --dgit-view-save $msg HEAD=$headref",
3835 $split_brain_save, $dgitview);
3837 return "and left in $split_brain_save";
3840 # An "infopair" is a tuple [ $thing, $what ]
3841 # (often $thing is a commit hash; $what is a description)
3843 sub infopair_cond_equal ($$) {
3845 $x->[0] eq $y->[0] or fail <<END;
3846 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3850 sub infopair_lrf_tag_lookup ($$) {
3851 my ($tagnames, $what) = @_;
3852 # $tagname may be an array ref
3853 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3854 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3855 foreach my $tagname (@tagnames) {
3856 my $lrefname = lrfetchrefs."/tags/$tagname";
3857 my $tagobj = $lrfetchrefs_f{$lrefname};
3858 next unless defined $tagobj;
3859 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3860 return [ git_rev_parse($tagobj), $what ];
3862 fail @tagnames==1 ? <<END : <<END;
3863 Wanted tag $what (@tagnames) on dgit server, but not found
3865 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3869 sub infopair_cond_ff ($$) {
3870 my ($anc,$desc) = @_;
3871 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3872 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3876 sub pseudomerge_version_check ($$) {
3877 my ($clogp, $archive_hash) = @_;
3879 my $arch_clogp = commit_getclogp $archive_hash;
3880 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3881 'version currently in archive' ];
3882 if (defined $overwrite_version) {
3883 if (length $overwrite_version) {
3884 infopair_cond_equal([ $overwrite_version,
3885 '--overwrite= version' ],
3888 my $v = $i_arch_v->[0];
3889 progress "Checking package changelog for archive version $v ...";
3892 my @xa = ("-f$v", "-t$v");
3893 my $vclogp = parsechangelog @xa;
3896 [ (getfield $vclogp, $fn),
3897 "$fn field from dpkg-parsechangelog @xa" ];
3899 my $cv = $gf->('Version');
3900 infopair_cond_equal($i_arch_v, $cv);
3901 $cd = $gf->('Distribution');
3904 $@ =~ s/^dgit: //gm;
3906 "Perhaps debian/changelog does not mention $v ?";
3908 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3909 $cd->[1] is $cd->[0]
3910 Your tree seems to based on earlier (not uploaded) $v.
3915 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3919 sub pseudomerge_make_commit ($$$$ $$) {
3920 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3921 $msg_cmd, $msg_msg) = @_;
3922 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3924 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3925 my $authline = clogp_authline $clogp;
3929 !defined $overwrite_version ? ""
3930 : !length $overwrite_version ? " --overwrite"
3931 : " --overwrite=".$overwrite_version;
3933 # Contributing parent is the first parent - that makes
3934 # git rev-list --first-parent DTRT.
3935 my $pmf = dgit_privdir()."/pseudomerge";
3936 open MC, ">", $pmf or die "$pmf $!";
3937 print MC <<END or die $!;
3940 parent $archive_hash
3950 return make_commit($pmf);
3953 sub splitbrain_pseudomerge ($$$$) {
3954 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3955 # => $merged_dgitview
3956 printdebug "splitbrain_pseudomerge...\n";
3958 # We: debian/PREVIOUS HEAD($maintview)
3959 # expect: o ----------------- o
3962 # a/d/PREVIOUS $dgitview
3965 # we do: `------------------ o
3969 return $dgitview unless defined $archive_hash;
3970 return $dgitview if deliberately_not_fast_forward();
3972 printdebug "splitbrain_pseudomerge...\n";
3974 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3976 if (!defined $overwrite_version) {
3977 progress "Checking that HEAD inciudes all changes in archive...";
3980 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3982 if (defined $overwrite_version) {
3984 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3985 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3986 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3987 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3988 my $i_archive = [ $archive_hash, "current archive contents" ];
3990 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3992 infopair_cond_equal($i_dgit, $i_archive);
3993 infopair_cond_ff($i_dep14, $i_dgit);
3994 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3998 $us: check failed (maybe --overwrite is needed, consult documentation)
4003 my $r = pseudomerge_make_commit
4004 $clogp, $dgitview, $archive_hash, $i_arch_v,
4005 "dgit --quilt=$quilt_mode",
4006 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
4007 Declare fast forward from $i_arch_v->[0]
4009 Make fast forward from $i_arch_v->[0]
4012 maybe_split_brain_save $maintview, $r, "pseudomerge";
4014 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
4018 sub plain_overwrite_pseudomerge ($$$) {
4019 my ($clogp, $head, $archive_hash) = @_;
4021 printdebug "plain_overwrite_pseudomerge...";
4023 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
4025 return $head if is_fast_fwd $archive_hash, $head;
4027 my $m = "Declare fast forward from $i_arch_v->[0]";
4029 my $r = pseudomerge_make_commit
4030 $clogp, $head, $archive_hash, $i_arch_v,
4033 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
4035 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
4039 sub push_parse_changelog ($) {
4042 my $clogp = Dpkg::Control::Hash->new();
4043 $clogp->load($clogpfn) or die;
4045 my $clogpackage = getfield $clogp, 'Source';
4046 $package //= $clogpackage;
4047 fail "-p specified $package but changelog specified $clogpackage"
4048 unless $package eq $clogpackage;
4049 my $cversion = getfield $clogp, 'Version';
4051 if (!$we_are_initiator) {
4052 # rpush initiator can't do this because it doesn't have $isuite yet
4053 my $tag = debiantag($cversion, access_nomdistro);
4054 runcmd @git, qw(check-ref-format), $tag;
4057 my $dscfn = dscfn($cversion);
4059 return ($clogp, $cversion, $dscfn);
4062 sub push_parse_dsc ($$$) {
4063 my ($dscfn,$dscfnwhat, $cversion) = @_;
4064 $dsc = parsecontrol($dscfn,$dscfnwhat);
4065 my $dversion = getfield $dsc, 'Version';
4066 my $dscpackage = getfield $dsc, 'Source';
4067 ($dscpackage eq $package && $dversion eq $cversion) or
4068 fail "$dscfn is for $dscpackage $dversion".
4069 " but debian/changelog is for $package $cversion";
4072 sub push_tagwants ($$$$) {
4073 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4076 TagFn => \&debiantag,
4081 if (defined $maintviewhead) {
4083 TagFn => \&debiantag_maintview,
4084 Objid => $maintviewhead,
4085 TfSuffix => '-maintview',
4088 } elsif ($dodep14tag eq 'no' ? 0
4089 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4090 : $dodep14tag eq 'always'
4091 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4092 --dep14tag-always (or equivalent in config) means server must support
4093 both "new" and "maint" tag formats, but config says it doesn't.
4095 : die "$dodep14tag ?") {
4097 TagFn => \&debiantag_maintview,
4099 TfSuffix => '-dgit',
4103 foreach my $tw (@tagwants) {
4104 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4105 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4107 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4111 sub push_mktags ($$ $$ $) {
4113 $changesfile,$changesfilewhat,
4116 die unless $tagwants->[0]{View} eq 'dgit';
4118 my $declaredistro = access_nomdistro();
4119 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4120 $dsc->{$ourdscfield[0]} = join " ",
4121 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4123 $dsc->save("$dscfn.tmp") or die $!;
4125 my $changes = parsecontrol($changesfile,$changesfilewhat);
4126 foreach my $field (qw(Source Distribution Version)) {
4127 $changes->{$field} eq $clogp->{$field} or
4128 fail "changes field $field \`$changes->{$field}'".
4129 " does not match changelog \`$clogp->{$field}'";
4132 my $cversion = getfield $clogp, 'Version';
4133 my $clogsuite = getfield $clogp, 'Distribution';
4135 # We make the git tag by hand because (a) that makes it easier
4136 # to control the "tagger" (b) we can do remote signing
4137 my $authline = clogp_authline $clogp;
4138 my $delibs = join(" ", "",@deliberatelies);
4142 my $tfn = $tw->{Tfn};
4143 my $head = $tw->{Objid};
4144 my $tag = $tw->{Tag};
4146 open TO, '>', $tfn->('.tmp') or die $!;
4147 print TO <<END or die $!;
4154 if ($tw->{View} eq 'dgit') {
4155 print TO <<END or die $!;
4156 $package release $cversion for $clogsuite ($csuite) [dgit]
4157 [dgit distro=$declaredistro$delibs]
4159 foreach my $ref (sort keys %previously) {
4160 print TO <<END or die $!;
4161 [dgit previously:$ref=$previously{$ref}]
4164 } elsif ($tw->{View} eq 'maint') {
4165 print TO <<END or die $!;
4166 $package release $cversion for $clogsuite ($csuite)
4167 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4170 die Dumper($tw)."?";
4175 my $tagobjfn = $tfn->('.tmp');
4177 if (!defined $keyid) {
4178 $keyid = access_cfg('keyid','RETURN-UNDEF');
4180 if (!defined $keyid) {
4181 $keyid = getfield $clogp, 'Maintainer';
4183 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4184 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4185 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4186 push @sign_cmd, $tfn->('.tmp');
4187 runcmd_ordryrun @sign_cmd;
4189 $tagobjfn = $tfn->('.signed.tmp');
4190 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4191 $tfn->('.tmp'), $tfn->('.tmp.asc');
4197 my @r = map { $mktag->($_); } @$tagwants;
4201 sub sign_changes ($) {
4202 my ($changesfile) = @_;
4204 my @debsign_cmd = @debsign;
4205 push @debsign_cmd, "-k$keyid" if defined $keyid;
4206 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4207 push @debsign_cmd, $changesfile;
4208 runcmd_ordryrun @debsign_cmd;
4213 printdebug "actually entering push\n";
4215 supplementary_message(<<'END');
4216 Push failed, while checking state of the archive.
4217 You can retry the push, after fixing the problem, if you like.
4219 if (check_for_git()) {
4222 my $archive_hash = fetch_from_archive();
4223 if (!$archive_hash) {
4225 fail "package appears to be new in this suite;".
4226 " if this is intentional, use --new";
4229 supplementary_message(<<'END');
4230 Push failed, while preparing your push.
4231 You can retry the push, after fixing the problem, if you like.
4234 need_tagformat 'new', "quilt mode $quilt_mode"
4235 if quiltmode_splitbrain;
4239 access_giturl(); # check that success is vaguely likely
4240 rpush_handle_protovsn_bothends() if $we_are_initiator;
4243 my $clogpfn = dgit_privdir()."/changelog.822.tmp";
4244 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4246 responder_send_file('parsed-changelog', $clogpfn);
4248 my ($clogp, $cversion, $dscfn) =
4249 push_parse_changelog("$clogpfn");
4251 my $dscpath = "$buildproductsdir/$dscfn";
4252 stat_exists $dscpath or
4253 fail "looked for .dsc $dscpath, but $!;".
4254 " maybe you forgot to build";
4256 responder_send_file('dsc', $dscpath);
4258 push_parse_dsc($dscpath, $dscfn, $cversion);
4260 my $format = getfield $dsc, 'Format';
4261 printdebug "format $format\n";
4263 my $symref = git_get_symref();
4264 my $actualhead = git_rev_parse('HEAD');
4266 if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
4267 runcmd_ordryrun_local @git_debrebase, 'stitch';
4268 $actualhead = git_rev_parse('HEAD');
4271 my $dgithead = $actualhead;
4272 my $maintviewhead = undef;
4274 my $upstreamversion = upstreamversion $clogp->{Version};
4276 if (madformat_wantfixup($format)) {
4277 # user might have not used dgit build, so maybe do this now:
4278 if (quiltmode_splitbrain()) {
4279 changedir $playground;
4280 quilt_make_fake_dsc($upstreamversion);
4282 ($dgithead, $cachekey) =
4283 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4285 "--quilt=$quilt_mode but no cached dgit view:
4286 perhaps HEAD changed since dgit build[-source] ?";
4288 $dgithead = splitbrain_pseudomerge($clogp,
4289 $actualhead, $dgithead,
4291 $maintviewhead = $actualhead;
4293 prep_ud(); # so _only_subdir() works, below
4295 commit_quilty_patch();
4299 if (defined $overwrite_version && !defined $maintviewhead) {
4300 $dgithead = plain_overwrite_pseudomerge($clogp,
4308 if ($archive_hash) {
4309 if (is_fast_fwd($archive_hash, $dgithead)) {
4311 } elsif (deliberately_not_fast_forward) {
4314 fail "dgit push: HEAD is not a descendant".
4315 " of the archive's version.\n".
4316 "To overwrite the archive's contents,".
4317 " pass --overwrite[=VERSION].\n".
4318 "To rewind history, if permitted by the archive,".
4319 " use --deliberately-not-fast-forward.";
4323 changedir $playground;
4324 progress "checking that $dscfn corresponds to HEAD";
4325 runcmd qw(dpkg-source -x --),
4326 $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath";
4327 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4328 check_for_vendor_patches() if madformat($dsc->{format});
4330 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4331 debugcmd "+",@diffcmd;
4333 my $r = system @diffcmd;
4336 my $referent = $split_brain ? $dgithead : 'HEAD';
4337 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4340 my $raw = cmdoutput @git,
4341 qw(diff --no-renames -z -r --raw), $tree, $dgithead;
4343 foreach (split /\0/, $raw) {
4344 if (defined $changed) {
4345 push @mode_changes, "$changed: $_\n" if $changed;
4348 } elsif (m/^:0+ 0+ /) {
4350 } elsif (m/^:(?:10*)?(\d+) (?:10*)?(\d+) /) {
4351 $changed = "Mode change from $1 to $2"
4356 if (@mode_changes) {
4357 fail <<END.(join '', @mode_changes).<<END;
4358 HEAD specifies a different tree to $dscfn:
4361 There is a problem with your source tree (see dgit(7) for some hints).
4362 To see a full diff, run git diff $tree $referent
4367 HEAD specifies a different tree to $dscfn:
4369 Perhaps you forgot to build. Or perhaps there is a problem with your
4370 source tree (see dgit(7) for some hints). To see a full diff, run
4371 git diff $tree $referent
4377 if (!$changesfile) {
4378 my $pat = changespat $cversion;
4379 my @cs = glob "$buildproductsdir/$pat";
4380 fail "failed to find unique changes file".
4381 " (looked for $pat in $buildproductsdir);".
4382 " perhaps you need to use dgit -C"
4384 ($changesfile) = @cs;
4386 $changesfile = "$buildproductsdir/$changesfile";
4389 # Check that changes and .dsc agree enough
4390 $changesfile =~ m{[^/]*$};
4391 my $changes = parsecontrol($changesfile,$&);
4392 files_compare_inputs($dsc, $changes)
4393 unless forceing [qw(dsc-changes-mismatch)];
4395 # Perhaps adjust .dsc to contain right set of origs
4396 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4398 unless forceing [qw(changes-origs-exactly)];
4400 # Checks complete, we're going to try and go ahead:
4402 responder_send_file('changes',$changesfile);
4403 responder_send_command("param head $dgithead");
4404 responder_send_command("param csuite $csuite");
4405 responder_send_command("param isuite $isuite");
4406 responder_send_command("param tagformat $tagformat");
4407 if (defined $maintviewhead) {
4408 die unless ($protovsn//4) >= 4;
4409 responder_send_command("param maint-view $maintviewhead");
4412 # Perhaps send buildinfo(s) for signing
4413 my $changes_files = getfield $changes, 'Files';
4414 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4415 foreach my $bi (@buildinfos) {
4416 responder_send_command("param buildinfo-filename $bi");
4417 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4420 if (deliberately_not_fast_forward) {
4421 git_for_each_ref(lrfetchrefs, sub {
4422 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4423 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4424 responder_send_command("previously $rrefname=$objid");
4425 $previously{$rrefname} = $objid;
4429 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4430 dgit_privdir()."/tag");
4433 supplementary_message(<<'END');
4434 Push failed, while signing the tag.
4435 You can retry the push, after fixing the problem, if you like.
4437 # If we manage to sign but fail to record it anywhere, it's fine.
4438 if ($we_are_responder) {
4439 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4440 responder_receive_files('signed-tag', @tagobjfns);
4442 @tagobjfns = push_mktags($clogp,$dscpath,
4443 $changesfile,$changesfile,
4446 supplementary_message(<<'END');
4447 Push failed, *after* signing the tag.
4448 If you want to try again, you should use a new version number.
4451 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4453 foreach my $tw (@tagwants) {
4454 my $tag = $tw->{Tag};
4455 my $tagobjfn = $tw->{TagObjFn};
4457 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4458 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4459 runcmd_ordryrun_local
4460 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4463 supplementary_message(<<'END');
4464 Push failed, while updating the remote git repository - see messages above.
4465 If you want to try again, you should use a new version number.
4467 if (!check_for_git()) {
4468 create_remote_git_repo();
4471 my @pushrefs = $forceflag.$dgithead.":".rrref();
4472 foreach my $tw (@tagwants) {
4473 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4476 runcmd_ordryrun @git,
4477 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4478 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4480 supplementary_message(<<'END');
4481 Push failed, while obtaining signatures on the .changes and .dsc.
4482 If it was just that the signature failed, you may try again by using
4483 debsign by hand to sign the changes
4485 and then dput to complete the upload.
4486 If you need to change the package, you must use a new version number.
4488 if ($we_are_responder) {
4489 my $dryrunsuffix = act_local() ? "" : ".tmp";
4490 my @rfiles = ($dscpath, $changesfile);
4491 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4492 responder_receive_files('signed-dsc-changes',
4493 map { "$_$dryrunsuffix" } @rfiles);
4496 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4498 progress "[new .dsc left in $dscpath.tmp]";
4500 sign_changes $changesfile;
4503 supplementary_message(<<END);
4504 Push failed, while uploading package(s) to the archive server.
4505 You can retry the upload of exactly these same files with dput of:
4507 If that .changes file is broken, you will need to use a new version
4508 number for your next attempt at the upload.
4510 my $host = access_cfg('upload-host','RETURN-UNDEF');
4511 my @hostarg = defined($host) ? ($host,) : ();
4512 runcmd_ordryrun @dput, @hostarg, $changesfile;
4513 printdone "pushed and uploaded $cversion";
4515 supplementary_message('');
4516 responder_send_command("complete");
4520 not_necessarily_a_tree();
4525 badusage "-p is not allowed with clone; specify as argument instead"
4526 if defined $package;
4529 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4530 ($package,$isuite) = @ARGV;
4531 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4532 ($package,$dstdir) = @ARGV;
4533 } elsif (@ARGV==3) {
4534 ($package,$isuite,$dstdir) = @ARGV;
4536 badusage "incorrect arguments to dgit clone";
4540 $dstdir ||= "$package";
4541 if (stat_exists $dstdir) {
4542 fail "$dstdir already exists";
4546 if ($rmonerror && !$dryrun_level) {
4547 $cwd_remove= getcwd();
4549 return unless defined $cwd_remove;
4550 if (!chdir "$cwd_remove") {
4551 return if $!==&ENOENT;
4552 die "chdir $cwd_remove: $!";
4554 printdebug "clone rmonerror removing $dstdir\n";
4556 rmtree($dstdir) or die "remove $dstdir: $!\n";
4557 } elsif (grep { $! == $_ }
4558 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4560 print STDERR "check whether to remove $dstdir: $!\n";
4566 $cwd_remove = undef;
4569 sub branchsuite () {
4570 my $branch = git_get_symref();
4571 if (defined $branch && $branch =~ m#$lbranch_re#o) {
4578 sub fetchpullargs () {
4579 if (!defined $package) {
4580 my $sourcep = parsecontrol('debian/control','debian/control');
4581 $package = getfield $sourcep, 'Source';
4584 $isuite = branchsuite();
4586 my $clogp = parsechangelog();
4587 my $clogsuite = getfield $clogp, 'Distribution';
4588 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4590 } elsif (@ARGV==1) {
4593 badusage "incorrect arguments to dgit fetch or dgit pull";
4601 my $multi_fetched = fork_for_multisuite(sub { });
4602 finish 0 if $multi_fetched;
4609 if (quiltmode_splitbrain()) {
4610 my ($format, $fopts) = get_source_format();
4611 madformat($format) and fail <<END
4612 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4620 build_or_push_prep_early();
4625 } elsif (@ARGV==1) {
4626 ($specsuite) = (@ARGV);
4628 badusage "incorrect arguments to dgit $subcommand";
4631 local ($package) = $existing_package; # this is a hack
4632 canonicalise_suite();
4634 canonicalise_suite();
4636 if (defined $specsuite &&
4637 $specsuite ne $isuite &&
4638 $specsuite ne $csuite) {
4639 fail "dgit $subcommand: changelog specifies $isuite ($csuite)".
4640 " but command line specifies $specsuite";
4649 sub cmd_push_source {
4652 my $changes = parsecontrol("$buildproductsdir/$changesfile",
4653 "source changes file");
4654 unless (test_source_only_changes($changes)) {
4655 fail "user-specified changes file is not source-only";
4658 # Building a source package is very fast, so just do it
4659 build_source_for_push();
4664 #---------- remote commands' implementation ----------
4666 sub pre_remote_push_build_host {
4667 my ($nrargs) = shift @ARGV;
4668 my (@rargs) = @ARGV[0..$nrargs-1];
4669 @ARGV = @ARGV[$nrargs..$#ARGV];
4671 my ($dir,$vsnwant) = @rargs;
4672 # vsnwant is a comma-separated list; we report which we have
4673 # chosen in our ready response (so other end can tell if they
4676 $we_are_responder = 1;
4677 $us .= " (build host)";
4679 open PI, "<&STDIN" or die $!;
4680 open STDIN, "/dev/null" or die $!;
4681 open PO, ">&STDOUT" or die $!;
4683 open STDOUT, ">&STDERR" or die $!;
4687 ($protovsn) = grep {
4688 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4689 } @rpushprotovsn_support;
4691 fail "build host has dgit rpush protocol versions ".
4692 (join ",", @rpushprotovsn_support).
4693 " but invocation host has $vsnwant"
4694 unless defined $protovsn;
4698 sub cmd_remote_push_build_host {
4699 responder_send_command("dgit-remote-push-ready $protovsn");
4703 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4704 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4705 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4706 # a good error message)
4708 sub rpush_handle_protovsn_bothends () {
4709 if ($protovsn < 4) {
4710 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4719 my $report = i_child_report();
4720 if (defined $report) {
4721 printdebug "($report)\n";
4722 } elsif ($i_child_pid) {
4723 printdebug "(killing build host child $i_child_pid)\n";
4724 kill 15, $i_child_pid;
4726 if (defined $i_tmp && !defined $initiator_tempdir) {
4728 eval { rmtree $i_tmp; };
4733 return unless forkcheck_mainprocess();
4738 my ($base,$selector,@args) = @_;
4739 $selector =~ s/\-/_/g;
4740 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4744 not_necessarily_a_tree();
4749 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4757 push @rargs, join ",", @rpushprotovsn_support;
4760 push @rdgit, @ropts;
4761 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4763 my @cmd = (@ssh, $host, shellquote @rdgit);
4766 $we_are_initiator=1;
4768 if (defined $initiator_tempdir) {
4769 rmtree $initiator_tempdir;
4770 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4771 $i_tmp = $initiator_tempdir;
4775 $i_child_pid = open2(\*RO, \*RI, @cmd);
4777 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4778 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4779 $supplementary_message = '' unless $protovsn >= 3;
4782 my ($icmd,$iargs) = initiator_expect {
4783 m/^(\S+)(?: (.*))?$/;
4786 i_method "i_resp", $icmd, $iargs;
4790 sub i_resp_progress ($) {
4792 my $msg = protocol_read_bytes \*RO, $rhs;
4796 sub i_resp_supplementary_message ($) {
4798 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4801 sub i_resp_complete {
4802 my $pid = $i_child_pid;
4803 $i_child_pid = undef; # prevents killing some other process with same pid
4804 printdebug "waiting for build host child $pid...\n";
4805 my $got = waitpid $pid, 0;
4806 die $! unless $got == $pid;
4807 die "build host child failed $?" if $?;
4810 printdebug "all done\n";
4814 sub i_resp_file ($) {
4816 my $localname = i_method "i_localname", $keyword;
4817 my $localpath = "$i_tmp/$localname";
4818 stat_exists $localpath and
4819 badproto \*RO, "file $keyword ($localpath) twice";
4820 protocol_receive_file \*RO, $localpath;
4821 i_method "i_file", $keyword;
4826 sub i_resp_param ($) {
4827 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4831 sub i_resp_previously ($) {
4832 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4833 or badproto \*RO, "bad previously spec";
4834 my $r = system qw(git check-ref-format), $1;
4835 die "bad previously ref spec ($r)" if $r;
4836 $previously{$1} = $2;
4841 sub i_resp_want ($) {
4843 die "$keyword ?" if $i_wanted{$keyword}++;
4845 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4846 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4847 die unless $isuite =~ m/^$suite_re$/;
4850 rpush_handle_protovsn_bothends();
4852 fail "rpush negotiated protocol version $protovsn".
4853 " which does not support quilt mode $quilt_mode"
4854 if quiltmode_splitbrain;
4856 my @localpaths = i_method "i_want", $keyword;
4857 printdebug "[[ $keyword @localpaths\n";
4858 foreach my $localpath (@localpaths) {
4859 protocol_send_file \*RI, $localpath;
4861 print RI "files-end\n" or die $!;
4864 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4866 sub i_localname_parsed_changelog {
4867 return "remote-changelog.822";
4869 sub i_file_parsed_changelog {
4870 ($i_clogp, $i_version, $i_dscfn) =
4871 push_parse_changelog "$i_tmp/remote-changelog.822";
4872 die if $i_dscfn =~ m#/|^\W#;
4875 sub i_localname_dsc {
4876 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4881 sub i_localname_buildinfo ($) {
4882 my $bi = $i_param{'buildinfo-filename'};
4883 defined $bi or badproto \*RO, "buildinfo before filename";
4884 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4885 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4886 or badproto \*RO, "improper buildinfo filename";
4889 sub i_file_buildinfo {
4890 my $bi = $i_param{'buildinfo-filename'};
4891 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4892 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4893 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4894 files_compare_inputs($bd, $ch);
4895 (getfield $bd, $_) eq (getfield $ch, $_) or
4896 fail "buildinfo mismatch $_"
4897 foreach qw(Source Version);
4898 !defined $bd->{$_} or
4899 fail "buildinfo contains $_"
4900 foreach qw(Changes Changed-by Distribution);
4902 push @i_buildinfos, $bi;
4903 delete $i_param{'buildinfo-filename'};
4906 sub i_localname_changes {
4907 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4908 $i_changesfn = $i_dscfn;
4909 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4910 return $i_changesfn;
4912 sub i_file_changes { }
4914 sub i_want_signed_tag {
4915 printdebug Dumper(\%i_param, $i_dscfn);
4916 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4917 && defined $i_param{'csuite'}
4918 or badproto \*RO, "premature desire for signed-tag";
4919 my $head = $i_param{'head'};
4920 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4922 my $maintview = $i_param{'maint-view'};
4923 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4926 if ($protovsn >= 4) {
4927 my $p = $i_param{'tagformat'} // '<undef>';
4929 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4932 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4934 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4936 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4939 push_mktags $i_clogp, $i_dscfn,
4940 $i_changesfn, 'remote changes',
4944 sub i_want_signed_dsc_changes {
4945 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4946 sign_changes $i_changesfn;
4947 return ($i_dscfn, $i_changesfn, @i_buildinfos);
4950 #---------- building etc. ----------
4956 #----- `3.0 (quilt)' handling -----
4958 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4960 sub quiltify_dpkg_commit ($$$;$) {
4961 my ($patchname,$author,$msg, $xinfo) = @_;
4964 mkpath '.git/dgit'; # we are in playtree
4965 my $descfn = ".git/dgit/quilt-description.tmp";
4966 open O, '>', $descfn or die "$descfn: $!";
4967 $msg =~ s/\n+/\n\n/;
4968 print O <<END or die $!;
4970 ${xinfo}Subject: $msg
4977 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4978 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4979 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4980 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4984 sub quiltify_trees_differ ($$;$$$) {
4985 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4986 # returns true iff the two tree objects differ other than in debian/
4987 # with $finegrained,
4988 # returns bitmask 01 - differ in upstream files except .gitignore
4989 # 02 - differ in .gitignore
4990 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4991 # is set for each modified .gitignore filename $fn
4992 # if $unrepres is defined, array ref to which is appeneded
4993 # a list of unrepresentable changes (removals of upstream files
4996 my @cmd = (@git, qw(diff-tree -z --no-renames));
4997 push @cmd, qw(--name-only) unless $unrepres;
4998 push @cmd, qw(-r) if $finegrained || $unrepres;
5000 my $diffs= cmdoutput @cmd;
5003 foreach my $f (split /\0/, $diffs) {
5004 if ($unrepres && !@lmodes) {
5005 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
5008 my ($oldmode,$newmode) = @lmodes;
5011 next if $f =~ m#^debian(?:/.*)?$#s;
5015 die "not a plain file or symlink\n"
5016 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
5017 $oldmode =~ m/^(?:10|12)\d{4}$/;
5018 if ($oldmode =~ m/[^0]/ &&
5019 $newmode =~ m/[^0]/) {
5020 # both old and new files exist
5021 die "mode or type changed\n" if $oldmode ne $newmode;
5022 die "modified symlink\n" unless $newmode =~ m/^10/;
5023 } elsif ($oldmode =~ m/[^0]/) {
5025 die "deletion of symlink\n"
5026 unless $oldmode =~ m/^10/;
5029 die "creation with non-default mode\n"
5030 unless $newmode =~ m/^100644$/ or
5031 $newmode =~ m/^120000$/;
5035 local $/="\n"; chomp $@;
5036 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
5040 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
5041 $r |= $isignore ? 02 : 01;
5042 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
5044 printdebug "quiltify_trees_differ $x $y => $r\n";
5048 sub quiltify_tree_sentinelfiles ($) {
5049 # lists the `sentinel' files present in the tree
5051 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
5052 qw(-- debian/rules debian/control);
5057 sub quiltify_splitbrain_needed () {
5058 if (!$split_brain) {
5059 progress "dgit view: changes are required...";
5060 runcmd @git, qw(checkout -q -b dgit-view);
5065 sub quiltify_splitbrain ($$$$$$) {
5066 my ($clogp, $unapplied, $headref, $diffbits,
5067 $editedignores, $cachekey) = @_;
5068 if ($quilt_mode !~ m/gbp|dpm/) {
5069 # treat .gitignore just like any other upstream file
5070 $diffbits = { %$diffbits };
5071 $_ = !!$_ foreach values %$diffbits;
5073 # We would like any commits we generate to be reproducible
5074 my @authline = clogp_authline($clogp);
5075 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
5076 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
5077 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
5078 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
5079 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
5080 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
5082 if ($quilt_mode =~ m/gbp|unapplied/ &&
5083 ($diffbits->{O2H} & 01)) {
5085 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
5086 " but git tree differs from orig in upstream files.";
5087 if (!stat_exists "debian/patches") {
5089 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
5093 if ($quilt_mode =~ m/dpm/ &&
5094 ($diffbits->{H2A} & 01)) {
5096 --quilt=$quilt_mode specified, implying patches-applied git tree
5097 but git tree differs from result of applying debian/patches to upstream
5100 if ($quilt_mode =~ m/gbp|unapplied/ &&
5101 ($diffbits->{O2A} & 01)) { # some patches
5102 quiltify_splitbrain_needed();
5103 progress "dgit view: creating patches-applied version using gbp pq";
5104 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
5105 # gbp pq import creates a fresh branch; push back to dgit-view
5106 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5107 runcmd @git, qw(checkout -q dgit-view);
5109 if ($quilt_mode =~ m/gbp|dpm/ &&
5110 ($diffbits->{O2A} & 02)) {
5112 --quilt=$quilt_mode specified, implying that HEAD is for use with a
5113 tool which does not create patches for changes to upstream
5114 .gitignores: but, such patches exist in debian/patches.
5117 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5118 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5119 quiltify_splitbrain_needed();
5120 progress "dgit view: creating patch to represent .gitignore changes";
5121 ensuredir "debian/patches";
5122 my $gipatch = "debian/patches/auto-gitignore";
5123 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
5124 stat GIPATCH or die "$gipatch: $!";
5125 fail "$gipatch already exists; but want to create it".
5126 " to record .gitignore changes" if (stat _)[7];
5127 print GIPATCH <<END or die "$gipatch: $!";
5128 Subject: Update .gitignore from Debian packaging branch
5130 The Debian packaging git branch contains these updates to the upstream
5131 .gitignore file(s). This patch is autogenerated, to provide these
5132 updates to users of the official Debian archive view of the package.
5134 [dgit ($our_version) update-gitignore]
5137 close GIPATCH or die "$gipatch: $!";
5138 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5139 $unapplied, $headref, "--", sort keys %$editedignores;
5140 open SERIES, "+>>", "debian/patches/series" or die $!;
5141 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5143 defined read SERIES, $newline, 1 or die $!;
5144 print SERIES "\n" or die $! unless $newline eq "\n";
5145 print SERIES "auto-gitignore\n" or die $!;
5146 close SERIES or die $!;
5147 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5149 Commit patch to update .gitignore
5151 [dgit ($our_version) update-gitignore-quilt-fixup]
5155 my $dgitview = git_rev_parse 'HEAD';
5158 # When we no longer need to support squeeze, use --create-reflog
5160 ensuredir "$maindir_gitcommon/logs/refs/dgit-intern";
5161 my $makelogfh = new IO::File "$maindir_gitcommon/logs/refs/$splitbraincache", '>>'
5164 my $oldcache = git_get_ref "refs/$splitbraincache";
5165 if ($oldcache eq $dgitview) {
5166 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5167 # git update-ref doesn't always update, in this case. *sigh*
5168 my $dummy = make_commit_text <<END;
5171 author Dgit <dgit\@example.com> 1000000000 +0000
5172 committer Dgit <dgit\@example.com> 1000000000 +0000
5174 Dummy commit - do not use
5176 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5177 "refs/$splitbraincache", $dummy;
5179 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5182 changedir "$playground/work";
5184 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5185 progress "dgit view: created ($saved)";
5188 sub quiltify ($$$$) {
5189 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5191 # Quilt patchification algorithm
5193 # We search backwards through the history of the main tree's HEAD
5194 # (T) looking for a start commit S whose tree object is identical
5195 # to to the patch tip tree (ie the tree corresponding to the
5196 # current dpkg-committed patch series). For these purposes
5197 # `identical' disregards anything in debian/ - this wrinkle is
5198 # necessary because dpkg-source treates debian/ specially.
5200 # We can only traverse edges where at most one of the ancestors'
5201 # trees differs (in changes outside in debian/). And we cannot
5202 # handle edges which change .pc/ or debian/patches. To avoid
5203 # going down a rathole we avoid traversing edges which introduce
5204 # debian/rules or debian/control. And we set a limit on the
5205 # number of edges we are willing to look at.
5207 # If we succeed, we walk forwards again. For each traversed edge
5208 # PC (with P parent, C child) (starting with P=S and ending with
5209 # C=T) to we do this:
5211 # - dpkg-source --commit with a patch name and message derived from C
5212 # After traversing PT, we git commit the changes which
5213 # should be contained within debian/patches.
5215 # The search for the path S..T is breadth-first. We maintain a
5216 # todo list containing search nodes. A search node identifies a
5217 # commit, and looks something like this:
5219 # Commit => $git_commit_id,
5220 # Child => $c, # or undef if P=T
5221 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5222 # Nontrivial => true iff $p..$c has relevant changes
5229 my %considered; # saves being exponential on some weird graphs
5231 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5234 my ($search,$whynot) = @_;
5235 printdebug " search NOT $search->{Commit} $whynot\n";
5236 $search->{Whynot} = $whynot;
5237 push @nots, $search;
5238 no warnings qw(exiting);
5247 my $c = shift @todo;
5248 next if $considered{$c->{Commit}}++;
5250 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5252 printdebug "quiltify investigate $c->{Commit}\n";
5255 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5256 printdebug " search finished hooray!\n";
5261 quiltify_nofix_bail " $c->{Commit}", " (tree object $oldtiptree)";
5262 if ($quilt_mode eq 'smash') {
5263 printdebug " search quitting smash\n";
5267 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5268 $not->($c, "has $c_sentinels not $t_sentinels")
5269 if $c_sentinels ne $t_sentinels;
5271 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5272 $commitdata =~ m/\n\n/;
5274 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5275 @parents = map { { Commit => $_, Child => $c } } @parents;
5277 $not->($c, "root commit") if !@parents;
5279 foreach my $p (@parents) {
5280 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5282 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5283 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5285 foreach my $p (@parents) {
5286 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5288 my @cmd= (@git, qw(diff-tree -r --name-only),
5289 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5290 my $patchstackchange = cmdoutput @cmd;
5291 if (length $patchstackchange) {
5292 $patchstackchange =~ s/\n/,/g;
5293 $not->($p, "changed $patchstackchange");
5296 printdebug " search queue P=$p->{Commit} ",
5297 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5303 printdebug "quiltify want to smash\n";
5306 my $x = $_[0]{Commit};
5307 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5310 my $reportnot = sub {
5312 my $s = $abbrev->($notp);
5313 my $c = $notp->{Child};
5314 $s .= "..".$abbrev->($c) if $c;
5315 $s .= ": ".$notp->{Whynot};
5318 if ($quilt_mode eq 'linear') {
5319 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5320 foreach my $notp (@nots) {
5321 print STDERR "$us: ", $reportnot->($notp), "\n";
5323 print STDERR "$us: $_\n" foreach @$failsuggestion;
5324 fail "quilt fixup naive history linearisation failed.\n".
5325 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5326 } elsif ($quilt_mode eq 'smash') {
5327 } elsif ($quilt_mode eq 'auto') {
5328 progress "quilt fixup cannot be linear, smashing...";
5330 die "$quilt_mode ?";
5333 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5334 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5336 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5338 quiltify_dpkg_commit "auto-$version-$target-$time",
5339 (getfield $clogp, 'Maintainer'),
5340 "Automatically generated patch ($clogp->{Version})\n".
5341 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5345 progress "quiltify linearisation planning successful, executing...";
5347 for (my $p = $sref_S;
5348 my $c = $p->{Child};
5350 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5351 next unless $p->{Nontrivial};
5353 my $cc = $c->{Commit};
5355 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5356 $commitdata =~ m/\n\n/ or die "$c ?";
5359 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5362 my $commitdate = cmdoutput
5363 @git, qw(log -n1 --pretty=format:%aD), $cc;
5365 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5367 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5374 my $gbp_check_suitable = sub {
5379 die "contains unexpected slashes\n" if m{//} || m{/$};
5380 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5381 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5382 die "is series file\n" if m{$series_filename_re}o;
5383 die "too long" if length > 200;
5385 return $_ unless $@;
5386 print STDERR "quiltifying commit $cc:".
5387 " ignoring/dropping Gbp-Pq $what: $@";
5391 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5393 (\S+) \s* \n //ixm) {
5394 $patchname = $gbp_check_suitable->($1, 'Name');
5396 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5398 (\S+) \s* \n //ixm) {
5399 $patchdir = $gbp_check_suitable->($1, 'Topic');
5404 if (!defined $patchname) {
5405 $patchname = $title;
5406 $patchname =~ s/[.:]$//;
5409 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5410 my $translitname = $converter->convert($patchname);
5411 die unless defined $translitname;
5412 $patchname = $translitname;
5415 "dgit: patch title transliteration error: $@"
5417 $patchname =~ y/ A-Z/-a-z/;
5418 $patchname =~ y/-a-z0-9_.+=~//cd;
5419 $patchname =~ s/^\W/x-$&/;
5420 $patchname = substr($patchname,0,40);
5421 $patchname .= ".patch";
5423 if (!defined $patchdir) {
5426 if (length $patchdir) {
5427 $patchname = "$patchdir/$patchname";
5429 if ($patchname =~ m{^(.*)/}) {
5430 mkpath "debian/patches/$1";
5435 stat "debian/patches/$patchname$index";
5437 $!==ENOENT or die "$patchname$index $!";
5439 runcmd @git, qw(checkout -q), $cc;
5441 # We use the tip's changelog so that dpkg-source doesn't
5442 # produce complaining messages from dpkg-parsechangelog. None
5443 # of the information dpkg-source gets from the changelog is
5444 # actually relevant - it gets put into the original message
5445 # which dpkg-source provides our stunt editor, and then
5447 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5449 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5450 "Date: $commitdate\n".
5451 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5453 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5456 runcmd @git, qw(checkout -q master);
5459 sub build_maybe_quilt_fixup () {
5460 my ($format,$fopts) = get_source_format;
5461 return unless madformat_wantfixup $format;
5464 check_for_vendor_patches();
5466 if (quiltmode_splitbrain) {
5467 fail <<END unless access_cfg_tagformats_can_splitbrain;
5468 quilt mode $quilt_mode requires split view so server needs to support
5469 both "new" and "maint" tag formats, but config says it doesn't.
5473 my $clogp = parsechangelog();
5474 my $headref = git_rev_parse('HEAD');
5475 my $symref = git_get_symref();
5477 if ($quilt_mode eq 'linear'
5478 && !$fopts->{'single-debian-patch'}
5479 && branch_is_gdr($symref, $headref)) {
5480 # This is much faster. It also makes patches that gdr
5481 # likes better for future updates without laundering.
5483 # However, it can fail in some casses where we would
5484 # succeed: if there are existing patches, which correspond
5485 # to a prefix of the branch, but are not in gbp/gdr
5486 # format, gdr will fail (exiting status 7), but we might
5487 # be able to figure out where to start linearising. That
5488 # will be slower so hopefully there's not much to do.
5489 my @cmd = (@git_debrebase,
5490 qw(--noop-ok -funclean-mixed -funclean-ordering
5491 make-patches --quiet-would-amend));
5492 # We tolerate soe snags that gdr wouldn't, by default.
5495 failedcmd @cmd if system @cmd and $?!=7;
5499 $headref = git_rev_parse('HEAD');
5503 changedir $playground;
5505 my $upstreamversion = upstreamversion $version;
5507 if ($fopts->{'single-debian-patch'}) {
5508 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5510 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5513 die 'bug' if $split_brain && !$need_split_build_invocation;
5516 runcmd_ordryrun_local
5517 @git, qw(pull --ff-only -q), "$playground/work", qw(master);
5520 sub quilt_fixup_mkwork ($) {
5523 mkdir "work" or die $!;
5525 mktree_in_ud_here();
5526 runcmd @git, qw(reset -q --hard), $headref;
5529 sub quilt_fixup_linkorigs ($$) {
5530 my ($upstreamversion, $fn) = @_;
5531 # calls $fn->($leafname);
5533 foreach my $f (<$maindir/../*>) { #/){
5534 my $b=$f; $b =~ s{.*/}{};
5536 local ($debuglevel) = $debuglevel-1;
5537 printdebug "QF linkorigs $b, $f ?\n";
5539 next unless is_orig_file_of_vsn $b, $upstreamversion;
5540 printdebug "QF linkorigs $b, $f Y\n";
5541 link_ltarget $f, $b or die "$b $!";
5546 sub quilt_fixup_delete_pc () {
5547 runcmd @git, qw(rm -rqf .pc);
5549 Commit removal of .pc (quilt series tracking data)
5551 [dgit ($our_version) upgrade quilt-remove-pc]
5555 sub quilt_fixup_singlepatch ($$$) {
5556 my ($clogp, $headref, $upstreamversion) = @_;
5558 progress "starting quiltify (single-debian-patch)";
5560 # dpkg-source --commit generates new patches even if
5561 # single-debian-patch is in debian/source/options. In order to
5562 # get it to generate debian/patches/debian-changes, it is
5563 # necessary to build the source package.
5565 quilt_fixup_linkorigs($upstreamversion, sub { });
5566 quilt_fixup_mkwork($headref);
5568 rmtree("debian/patches");
5570 runcmd @dpkgsource, qw(-b .);
5572 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5573 rename srcfn("$upstreamversion", "/debian/patches"),
5574 "work/debian/patches";
5577 commit_quilty_patch();
5580 sub quilt_make_fake_dsc ($) {
5581 my ($upstreamversion) = @_;
5583 my $fakeversion="$upstreamversion-~~DGITFAKE";
5585 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5586 print $fakedsc <<END or die $!;
5589 Version: $fakeversion
5593 my $dscaddfile=sub {
5596 my $md = new Digest::MD5;
5598 my $fh = new IO::File $b, '<' or die "$b $!";
5603 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5606 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5608 my @files=qw(debian/source/format debian/rules
5609 debian/control debian/changelog);
5610 foreach my $maybe (qw(debian/patches debian/source/options
5611 debian/tests/control)) {
5612 next unless stat_exists "$maindir/$maybe";
5613 push @files, $maybe;
5616 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5617 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C), $maindir, @files;
5619 $dscaddfile->($debtar);
5620 close $fakedsc or die $!;
5623 sub quilt_check_splitbrain_cache ($$) {
5624 my ($headref, $upstreamversion) = @_;
5625 # Called only if we are in (potentially) split brain mode.
5626 # Called in playground.
5627 # Computes the cache key and looks in the cache.
5628 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5630 my $splitbrain_cachekey;
5633 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5634 # we look in the reflog of dgit-intern/quilt-cache
5635 # we look for an entry whose message is the key for the cache lookup
5636 my @cachekey = (qw(dgit), $our_version);
5637 push @cachekey, $upstreamversion;
5638 push @cachekey, $quilt_mode;
5639 push @cachekey, $headref;
5641 push @cachekey, hashfile('fake.dsc');
5643 my $srcshash = Digest::SHA->new(256);
5644 my %sfs = ( %INC, '$0(dgit)' => $0 );
5645 foreach my $sfk (sort keys %sfs) {
5646 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5647 $srcshash->add($sfk," ");
5648 $srcshash->add(hashfile($sfs{$sfk}));
5649 $srcshash->add("\n");
5651 push @cachekey, $srcshash->hexdigest();
5652 $splitbrain_cachekey = "@cachekey";
5654 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5656 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5657 debugcmd "|(probably)",@cmd;
5658 my $child = open GC, "-|"; defined $child or die $!;
5660 chdir $maindir or die $!;
5661 if (!stat "$maindir_gitcommon/logs/refs/$splitbraincache") {
5662 $! == ENOENT or die $!;
5663 printdebug ">(no reflog)\n";
5670 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5671 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5674 quilt_fixup_mkwork($headref);
5675 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5676 if ($cachehit ne $headref) {
5677 progress "dgit view: found cached ($saved)";
5678 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5680 return ($cachehit, $splitbrain_cachekey);
5682 progress "dgit view: found cached, no changes required";
5683 return ($headref, $splitbrain_cachekey);
5685 die $! if GC->error;
5686 failedcmd unless close GC;
5688 printdebug "splitbrain cache miss\n";
5689 return (undef, $splitbrain_cachekey);
5692 sub quilt_fixup_multipatch ($$$) {
5693 my ($clogp, $headref, $upstreamversion) = @_;
5695 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5698 # - honour any existing .pc in case it has any strangeness
5699 # - determine the git commit corresponding to the tip of
5700 # the patch stack (if there is one)
5701 # - if there is such a git commit, convert each subsequent
5702 # git commit into a quilt patch with dpkg-source --commit
5703 # - otherwise convert all the differences in the tree into
5704 # a single git commit
5708 # Our git tree doesn't necessarily contain .pc. (Some versions of
5709 # dgit would include the .pc in the git tree.) If there isn't
5710 # one, we need to generate one by unpacking the patches that we
5713 # We first look for a .pc in the git tree. If there is one, we
5714 # will use it. (This is not the normal case.)
5716 # Otherwise need to regenerate .pc so that dpkg-source --commit
5717 # can work. We do this as follows:
5718 # 1. Collect all relevant .orig from parent directory
5719 # 2. Generate a debian.tar.gz out of
5720 # debian/{patches,rules,source/format,source/options}
5721 # 3. Generate a fake .dsc containing just these fields:
5722 # Format Source Version Files
5723 # 4. Extract the fake .dsc
5724 # Now the fake .dsc has a .pc directory.
5725 # (In fact we do this in every case, because in future we will
5726 # want to search for a good base commit for generating patches.)
5728 # Then we can actually do the dpkg-source --commit
5729 # 1. Make a new working tree with the same object
5730 # store as our main tree and check out the main
5732 # 2. Copy .pc from the fake's extraction, if necessary
5733 # 3. Run dpkg-source --commit
5734 # 4. If the result has changes to debian/, then
5735 # - git add them them
5736 # - git add .pc if we had a .pc in-tree
5738 # 5. If we had a .pc in-tree, delete it, and git commit
5739 # 6. Back in the main tree, fast forward to the new HEAD
5741 # Another situation we may have to cope with is gbp-style
5742 # patches-unapplied trees.
5744 # We would want to detect these, so we know to escape into
5745 # quilt_fixup_gbp. However, this is in general not possible.
5746 # Consider a package with a one patch which the dgit user reverts
5747 # (with git revert or the moral equivalent).
5749 # That is indistinguishable in contents from a patches-unapplied
5750 # tree. And looking at the history to distinguish them is not
5751 # useful because the user might have made a confusing-looking git
5752 # history structure (which ought to produce an error if dgit can't
5753 # cope, not a silent reintroduction of an unwanted patch).
5755 # So gbp users will have to pass an option. But we can usually
5756 # detect their failure to do so: if the tree is not a clean
5757 # patches-applied tree, quilt linearisation fails, but the tree
5758 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5759 # they want --quilt=unapplied.
5761 # To help detect this, when we are extracting the fake dsc, we
5762 # first extract it with --skip-patches, and then apply the patches
5763 # afterwards with dpkg-source --before-build. That lets us save a
5764 # tree object corresponding to .origs.
5766 my $splitbrain_cachekey;
5768 quilt_make_fake_dsc($upstreamversion);
5770 if (quiltmode_splitbrain()) {
5772 ($cachehit, $splitbrain_cachekey) =
5773 quilt_check_splitbrain_cache($headref, $upstreamversion);
5774 return if $cachehit;
5778 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5780 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5781 rename $fakexdir, "fake" or die "$fakexdir $!";
5785 remove_stray_gits("source package");
5786 mktree_in_ud_here();
5790 rmtree 'debian'; # git checkout commitish paths does not delete!
5791 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5792 my $unapplied=git_add_write_tree();
5793 printdebug "fake orig tree object $unapplied\n";
5797 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5799 if (system @bbcmd) {
5800 failedcmd @bbcmd if $? < 0;
5802 failed to apply your git tree's patch stack (from debian/patches/) to
5803 the corresponding upstream tarball(s). Your source tree and .orig
5804 are probably too inconsistent. dgit can only fix up certain kinds of
5805 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5811 quilt_fixup_mkwork($headref);
5814 if (stat_exists ".pc") {
5816 progress "Tree already contains .pc - will use it then delete it.";
5819 rename '../fake/.pc','.pc' or die $!;
5822 changedir '../fake';
5824 my $oldtiptree=git_add_write_tree();
5825 printdebug "fake o+d/p tree object $unapplied\n";
5826 changedir '../work';
5829 # We calculate some guesswork now about what kind of tree this might
5830 # be. This is mostly for error reporting.
5836 # O = orig, without patches applied
5837 # A = "applied", ie orig with H's debian/patches applied
5838 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5839 \%editedignores, \@unrepres),
5840 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5841 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5845 foreach my $b (qw(01 02)) {
5846 foreach my $v (qw(O2H O2A H2A)) {
5847 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5850 printdebug "differences \@dl @dl.\n";
5853 "$us: base trees orig=%.20s o+d/p=%.20s",
5854 $unapplied, $oldtiptree;
5856 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5857 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5858 $dl[0], $dl[1], $dl[3], $dl[4],
5862 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5864 forceable_fail [qw(unrepresentable)], <<END;
5865 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5870 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5871 push @failsuggestion, "This might be a patches-unapplied branch.";
5872 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5873 push @failsuggestion, "This might be a patches-applied branch.";
5875 push @failsuggestion, "Maybe you need to specify one of".
5876 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5878 if (quiltmode_splitbrain()) {
5879 quiltify_splitbrain($clogp, $unapplied, $headref,
5880 $diffbits, \%editedignores,
5881 $splitbrain_cachekey);
5885 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5886 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5888 if (!open P, '>>', ".pc/applied-patches") {
5889 $!==&ENOENT or die $!;
5894 commit_quilty_patch();
5896 if ($mustdeletepc) {
5897 quilt_fixup_delete_pc();
5901 sub quilt_fixup_editor () {
5902 my $descfn = $ENV{$fakeeditorenv};
5903 my $editing = $ARGV[$#ARGV];
5904 open I1, '<', $descfn or die "$descfn: $!";
5905 open I2, '<', $editing or die "$editing: $!";
5906 unlink $editing or die "$editing: $!";
5907 open O, '>', $editing or die "$editing: $!";
5908 while (<I1>) { print O or die $!; } I1->error and die $!;
5911 $copying ||= m/^\-\-\- /;
5912 next unless $copying;
5915 I2->error and die $!;
5920 sub maybe_apply_patches_dirtily () {
5921 return unless $quilt_mode =~ m/gbp|unapplied/;
5922 print STDERR <<END or die $!;
5924 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5925 dgit: Have to apply the patches - making the tree dirty.
5926 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5929 $patches_applied_dirtily = 01;
5930 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5931 runcmd qw(dpkg-source --before-build .);
5934 sub maybe_unapply_patches_again () {
5935 progress "dgit: Unapplying patches again to tidy up the tree."
5936 if $patches_applied_dirtily;
5937 runcmd qw(dpkg-source --after-build .)
5938 if $patches_applied_dirtily & 01;
5940 if $patches_applied_dirtily & 02;
5941 $patches_applied_dirtily = 0;
5944 #----- other building -----
5946 our $clean_using_builder;
5947 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5948 # clean the tree before building (perhaps invoked indirectly by
5949 # whatever we are using to run the build), rather than separately
5950 # and explicitly by us.
5953 return if $clean_using_builder;
5954 if ($cleanmode eq 'dpkg-source') {
5955 maybe_apply_patches_dirtily();
5956 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5957 } elsif ($cleanmode eq 'dpkg-source-d') {
5958 maybe_apply_patches_dirtily();
5959 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5960 } elsif ($cleanmode eq 'git') {
5961 runcmd_ordryrun_local @git, qw(clean -xdf);
5962 } elsif ($cleanmode eq 'git-ff') {
5963 runcmd_ordryrun_local @git, qw(clean -xdff);
5964 } elsif ($cleanmode eq 'check') {
5965 my $leftovers = cmdoutput @git, qw(clean -xdn);
5966 if (length $leftovers) {
5967 print STDERR $leftovers, "\n" or die $!;
5968 fail "tree contains uncommitted files and --clean=check specified";
5970 } elsif ($cleanmode eq 'none') {
5977 badusage "clean takes no additional arguments" if @ARGV;
5980 maybe_unapply_patches_again();
5983 sub build_or_push_prep_early () {
5984 our $build_or_push_prep_early_done //= 0;
5985 return if $build_or_push_prep_early_done++;
5986 badusage "-p is not allowed with dgit $subcommand" if defined $package;
5987 my $clogp = parsechangelog();
5988 $isuite = getfield $clogp, 'Distribution';
5989 $package = getfield $clogp, 'Source';
5990 $version = getfield $clogp, 'Version';
5993 sub build_prep_early () {
5994 build_or_push_prep_early();
6002 build_maybe_quilt_fixup();
6004 my $pat = changespat $version;
6005 foreach my $f (glob "$buildproductsdir/$pat") {
6007 unlink $f or fail "remove old changes file $f: $!";
6009 progress "would remove $f";
6015 sub changesopts_initial () {
6016 my @opts =@changesopts[1..$#changesopts];
6019 sub changesopts_version () {
6020 if (!defined $changes_since_version) {
6021 my @vsns = archive_query('archive_query');
6022 my @quirk = access_quirk();
6023 if ($quirk[0] eq 'backports') {
6024 local $isuite = $quirk[2];
6026 canonicalise_suite();
6027 push @vsns, archive_query('archive_query');
6030 @vsns = map { $_->[0] } @vsns;
6031 @vsns = sort { -version_compare($a, $b) } @vsns;
6032 $changes_since_version = $vsns[0];
6033 progress "changelog will contain changes since $vsns[0]";
6035 $changes_since_version = '_';
6036 progress "package seems new, not specifying -v<version>";
6039 if ($changes_since_version ne '_') {
6040 return ("-v$changes_since_version");
6046 sub changesopts () {
6047 return (changesopts_initial(), changesopts_version());
6050 sub massage_dbp_args ($;$) {
6051 my ($cmd,$xargs) = @_;
6054 # - if we're going to split the source build out so we can
6055 # do strange things to it, massage the arguments to dpkg-buildpackage
6056 # so that the main build doessn't build source (or add an argument
6057 # to stop it building source by default).
6059 # - add -nc to stop dpkg-source cleaning the source tree,
6060 # unless we're not doing a split build and want dpkg-source
6061 # as cleanmode, in which case we can do nothing
6064 # 0 - source will NOT need to be built separately by caller
6065 # +1 - source will need to be built separately by caller
6066 # +2 - source will need to be built separately by caller AND
6067 # dpkg-buildpackage should not in fact be run at all!
6068 debugcmd '#massaging#', @$cmd if $debuglevel>1;
6069 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
6070 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
6071 $clean_using_builder = 1;
6074 # -nc has the side effect of specifying -b if nothing else specified
6075 # and some combinations of -S, -b, et al, are errors, rather than
6076 # later simply overriding earlie. So we need to:
6077 # - search the command line for these options
6078 # - pick the last one
6079 # - perhaps add our own as a default
6080 # - perhaps adjust it to the corresponding non-source-building version
6082 foreach my $l ($cmd, $xargs) {
6084 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
6087 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
6089 if ($need_split_build_invocation) {
6090 printdebug "massage split $dmode.\n";
6091 $r = $dmode =~ m/[S]/ ? +2 :
6092 $dmode =~ y/gGF/ABb/ ? +1 :
6093 $dmode =~ m/[ABb]/ ? 0 :
6096 printdebug "massage done $r $dmode.\n";
6098 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
6104 my $wasdir = must_getcwd();
6110 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
6111 my ($msg_if_onlyone) = @_;
6112 # If there is only one .changes file, fail with $msg_if_onlyone,
6113 # or if that is undef, be a no-op.
6114 # Returns the changes file to report to the user.
6115 my $pat = changespat $version;
6116 my @changesfiles = glob $pat;
6117 @changesfiles = sort {
6118 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
6122 if (@changesfiles==1) {
6123 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
6124 only one changes file from build (@changesfiles)
6126 $result = $changesfiles[0];
6127 } elsif (@changesfiles==2) {
6128 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
6129 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
6130 fail "$l found in binaries changes file $binchanges"
6133 runcmd_ordryrun_local @mergechanges, @changesfiles;
6134 my $multichanges = changespat $version,'multi';
6136 stat_exists $multichanges or fail "$multichanges: $!";
6137 foreach my $cf (glob $pat) {
6138 next if $cf eq $multichanges;
6139 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
6142 $result = $multichanges;
6144 fail "wrong number of different changes files (@changesfiles)";
6146 printdone "build successful, results in $result\n" or die $!;
6149 sub midbuild_checkchanges () {
6150 my $pat = changespat $version;
6151 return if $rmchanges;
6152 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
6153 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
6155 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
6156 Suggest you delete @unwanted.
6161 sub midbuild_checkchanges_vanilla ($) {
6163 midbuild_checkchanges() if $wantsrc == 1;
6166 sub postbuild_mergechanges_vanilla ($) {
6168 if ($wantsrc == 1) {
6170 postbuild_mergechanges(undef);
6173 printdone "build successful\n";
6179 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6180 my $wantsrc = massage_dbp_args \@dbp;
6183 midbuild_checkchanges_vanilla $wantsrc;
6188 push @dbp, changesopts_version();
6189 maybe_apply_patches_dirtily();
6190 runcmd_ordryrun_local @dbp;
6192 maybe_unapply_patches_again();
6193 postbuild_mergechanges_vanilla $wantsrc;
6197 $quilt_mode //= 'gbp';
6203 # gbp can make .origs out of thin air. In my tests it does this
6204 # even for a 1.0 format package, with no origs present. So I
6205 # guess it keys off just the version number. We don't know
6206 # exactly what .origs ought to exist, but let's assume that we
6207 # should run gbp if: the version has an upstream part and the main
6209 my $upstreamversion = upstreamversion $version;
6210 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6211 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6213 if ($gbp_make_orig) {
6215 $cleanmode = 'none'; # don't do it again
6216 $need_split_build_invocation = 1;
6219 my @dbp = @dpkgbuildpackage;
6221 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6223 if (!length $gbp_build[0]) {
6224 if (length executable_on_path('git-buildpackage')) {
6225 $gbp_build[0] = qw(git-buildpackage);
6227 $gbp_build[0] = 'gbp buildpackage';
6230 my @cmd = opts_opt_multi_cmd @gbp_build;
6232 push @cmd, (qw(-us -uc --git-no-sign-tags),
6233 "--git-builder=".(shellquote @dbp));
6235 if ($gbp_make_orig) {
6236 my $priv = dgit_privdir();
6237 my $ok = "$priv/origs-gen-ok";
6238 unlink $ok or $!==&ENOENT or die $!;
6239 my @origs_cmd = @cmd;
6240 push @origs_cmd, qw(--git-cleaner=true);
6241 push @origs_cmd, "--git-prebuild=".
6242 "touch ".(shellquote $ok)." ".(shellquote "$priv/no-such-dir/ok");
6243 push @origs_cmd, @ARGV;
6245 debugcmd @origs_cmd;
6247 do { local $!; stat_exists $ok; }
6248 or failedcmd @origs_cmd;
6250 dryrun_report @origs_cmd;
6256 midbuild_checkchanges_vanilla $wantsrc;
6258 if (!$clean_using_builder) {
6259 push @cmd, '--git-cleaner=true';
6263 maybe_unapply_patches_again();
6265 push @cmd, changesopts();
6266 runcmd_ordryrun_local @cmd, @ARGV;
6268 postbuild_mergechanges_vanilla $wantsrc;
6270 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6272 sub build_source_for_push {
6274 maybe_unapply_patches_again();
6275 $changesfile = $sourcechanges;
6281 $sourcechanges = changespat $version,'source';
6283 unlink "../$sourcechanges" or $!==ENOENT
6284 or fail "remove $sourcechanges: $!";
6286 $dscfn = dscfn($version);
6287 my @cmd = (@dpkgsource, qw(-b --));
6289 changedir $playground;
6290 runcmd_ordryrun_local @cmd, "work";
6291 my @udfiles = <${package}_*>;
6293 foreach my $f (@udfiles) {
6294 printdebug "source copy, found $f\n";
6297 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6298 $f eq srcfn($version, $&));
6299 printdebug "source copy, found $f - renaming\n";
6300 rename "$playground/$f", "../$f" or $!==ENOENT
6301 or fail "put in place new source file ($f): $!";
6304 my $pwd = must_getcwd();
6305 my $leafdir = basename $pwd;
6307 runcmd_ordryrun_local @cmd, $leafdir;
6310 runcmd_ordryrun_local qw(sh -ec),
6311 'exec >$1; shift; exec "$@"','x',
6312 "../$sourcechanges",
6313 @dpkggenchanges, qw(-S), changesopts();
6316 sub cmd_build_source {
6318 badusage "build-source takes no additional arguments" if @ARGV;
6320 maybe_unapply_patches_again();
6321 printdone "source built, results in $dscfn and $sourcechanges";
6326 midbuild_checkchanges();
6329 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6330 stat_exists $sourcechanges
6331 or fail "$sourcechanges (in parent directory): $!";
6333 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6335 maybe_unapply_patches_again();
6337 postbuild_mergechanges(<<END);
6338 perhaps you need to pass -A ? (sbuild's default is to build only
6339 arch-specific binaries; dgit 1.4 used to override that.)
6344 sub cmd_quilt_fixup {
6345 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6348 build_maybe_quilt_fixup();
6351 sub import_dsc_result {
6352 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6353 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6355 check_gitattrs($newhash, "source tree");
6357 progress "dgit: import-dsc: $what_msg";
6360 sub cmd_import_dsc {
6364 last unless $ARGV[0] =~ m/^-/;
6367 if (m/^--require-valid-signature$/) {
6370 badusage "unknown dgit import-dsc sub-option \`$_'";
6374 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6375 my ($dscfn, $dstbranch) = @ARGV;
6377 badusage "dry run makes no sense with import-dsc" unless act_local();
6379 my $force = $dstbranch =~ s/^\+// ? +1 :
6380 $dstbranch =~ s/^\.\.// ? -1 :
6382 my $info = $force ? " $&" : '';
6383 $info = "$dscfn$info";
6385 my $specbranch = $dstbranch;
6386 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6387 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6389 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6390 my $chead = cmdoutput_errok @symcmd;
6391 defined $chead or $?==256 or failedcmd @symcmd;
6393 fail "$dstbranch is checked out - will not update it"
6394 if defined $chead and $chead eq $dstbranch;
6396 my $oldhash = git_get_ref $dstbranch;
6398 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6399 $dscdata = do { local $/ = undef; <D>; };
6400 D->error and fail "read $dscfn: $!";
6403 # we don't normally need this so import it here
6404 use Dpkg::Source::Package;
6405 my $dp = new Dpkg::Source::Package filename => $dscfn,
6406 require_valid_signature => $needsig;
6408 local $SIG{__WARN__} = sub {
6410 return unless $needsig;
6411 fail "import-dsc signature check failed";
6413 if (!$dp->is_signed()) {
6414 warn "$us: warning: importing unsigned .dsc\n";
6416 my $r = $dp->check_signature();
6417 die "->check_signature => $r" if $needsig && $r;
6423 $package = getfield $dsc, 'Source';
6425 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6426 unless forceing [qw(import-dsc-with-dgit-field)];
6427 parse_dsc_field_def_dsc_distro();
6429 $isuite = 'DGIT-IMPORT-DSC';
6430 $idistro //= $dsc_distro;
6434 if (defined $dsc_hash) {
6435 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6436 resolve_dsc_field_commit undef, undef;
6438 if (defined $dsc_hash) {
6439 my @cmd = (qw(sh -ec),
6440 "echo $dsc_hash | git cat-file --batch-check");
6441 my $objgot = cmdoutput @cmd;
6442 if ($objgot =~ m#^\w+ missing\b#) {
6444 .dsc contains Dgit field referring to object $dsc_hash
6445 Your git tree does not have that object. Try `git fetch' from a
6446 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6449 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6451 progress "Not fast forward, forced update.";
6453 fail "Not fast forward to $dsc_hash";
6456 import_dsc_result $dstbranch, $dsc_hash,
6457 "dgit import-dsc (Dgit): $info",
6458 "updated git ref $dstbranch";
6463 Branch $dstbranch already exists
6464 Specify ..$specbranch for a pseudo-merge, binding in existing history
6465 Specify +$specbranch to overwrite, discarding existing history
6467 if $oldhash && !$force;
6469 my @dfi = dsc_files_info();
6470 foreach my $fi (@dfi) {
6471 my $f = $fi->{Filename};
6475 fail "lstat $here works but stat gives $! !";
6477 fail "stat $here: $!" unless $! == ENOENT;
6479 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6481 } elsif ($dscfn =~ m#^/#) {
6484 fail "cannot import $dscfn which seems to be inside working tree!";
6486 $there =~ s#/+[^/]+$## or
6487 fail "import $dscfn requires ../$f, but it does not exist";
6489 my $test = $there =~ m{^/} ? $there : "../$there";
6490 stat $test or fail "import $dscfn requires $test, but: $!";
6491 symlink $there, $here or fail "symlink $there to $here: $!";
6492 progress "made symlink $here -> $there";
6493 # print STDERR Dumper($fi);
6495 my @mergeinputs = generate_commits_from_dsc();
6496 die unless @mergeinputs == 1;
6498 my $newhash = $mergeinputs[0]{Commit};
6502 progress "Import, forced update - synthetic orphan git history.";
6503 } elsif ($force < 0) {
6504 progress "Import, merging.";
6505 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6506 my $version = getfield $dsc, 'Version';
6507 my $clogp = commit_getclogp $newhash;
6508 my $authline = clogp_authline $clogp;
6509 $newhash = make_commit_text <<END;
6516 Merge $package ($version) import into $dstbranch
6519 die; # caught earlier
6523 import_dsc_result $dstbranch, $newhash,
6524 "dgit import-dsc: $info",
6525 "results are in in git ref $dstbranch";
6528 sub pre_archive_api_query () {
6529 not_necessarily_a_tree();
6531 sub cmd_archive_api_query {
6532 badusage "need only 1 subpath argument" unless @ARGV==1;
6533 my ($subpath) = @ARGV;
6534 local $isuite = 'DGIT-API-QUERY-CMD';
6535 my @cmd = archive_api_query_cmd($subpath);
6538 exec @cmd or fail "exec curl: $!\n";
6541 sub repos_server_url () {
6542 $package = '_dgit-repos-server';
6543 local $access_forpush = 1;
6544 local $isuite = 'DGIT-REPOS-SERVER';
6545 my $url = access_giturl();
6548 sub pre_clone_dgit_repos_server () {
6549 not_necessarily_a_tree();
6551 sub cmd_clone_dgit_repos_server {
6552 badusage "need destination argument" unless @ARGV==1;
6553 my ($destdir) = @ARGV;
6554 my $url = repos_server_url();
6555 my @cmd = (@git, qw(clone), $url, $destdir);
6557 exec @cmd or fail "exec git clone: $!\n";
6560 sub pre_print_dgit_repos_server_source_url () {
6561 not_necessarily_a_tree();
6563 sub cmd_print_dgit_repos_server_source_url {
6564 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6566 my $url = repos_server_url();
6567 print $url, "\n" or die $!;
6570 sub pre_print_dpkg_source_ignores {
6571 not_necessarily_a_tree();
6573 sub cmd_print_dpkg_source_ignores {
6574 badusage "no arguments allowed to dgit print-dpkg-source-ignores"
6576 print "@dpkg_source_ignores\n" or die $!;
6579 sub cmd_setup_mergechangelogs {
6580 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6581 local $isuite = 'DGIT-SETUP-TREE';
6582 setup_mergechangelogs(1);
6585 sub cmd_setup_useremail {
6586 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6587 local $isuite = 'DGIT-SETUP-TREE';
6591 sub cmd_setup_gitattributes {
6592 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6593 local $isuite = 'DGIT-SETUP-TREE';
6597 sub cmd_setup_new_tree {
6598 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6599 local $isuite = 'DGIT-SETUP-TREE';
6603 #---------- argument parsing and main program ----------
6606 print "dgit version $our_version\n" or die $!;
6610 our (%valopts_long, %valopts_short);
6611 our (%funcopts_long);
6613 our (@modeopt_cfgs);
6615 sub defvalopt ($$$$) {
6616 my ($long,$short,$val_re,$how) = @_;
6617 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6618 $valopts_long{$long} = $oi;
6619 $valopts_short{$short} = $oi;
6620 # $how subref should:
6621 # do whatever assignemnt or thing it likes with $_[0]
6622 # if the option should not be passed on to remote, @rvalopts=()
6623 # or $how can be a scalar ref, meaning simply assign the value
6626 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6627 defvalopt '--distro', '-d', '.+', \$idistro;
6628 defvalopt '', '-k', '.+', \$keyid;
6629 defvalopt '--existing-package','', '.*', \$existing_package;
6630 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6631 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6632 defvalopt '--package', '-p', $package_re, \$package;
6633 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6635 defvalopt '', '-C', '.+', sub {
6636 ($changesfile) = (@_);
6637 if ($changesfile =~ s#^(.*)/##) {
6638 $buildproductsdir = $1;
6642 defvalopt '--initiator-tempdir','','.*', sub {
6643 ($initiator_tempdir) = (@_);
6644 $initiator_tempdir =~ m#^/# or
6645 badusage "--initiator-tempdir must be used specify an".
6646 " absolute, not relative, directory."
6649 sub defoptmodes ($@) {
6650 my ($varref, $cfgkey, $default, %optmap) = @_;
6652 while (my ($opt,$val) = each %optmap) {
6653 $funcopts_long{$opt} = sub { $$varref = $val; };
6654 $permit{$val} = $val;
6656 push @modeopt_cfgs, {
6659 Default => $default,
6664 defoptmodes \$dodep14tag, qw( dep14tag want
6667 --always-dep14tag always );
6672 if (defined $ENV{'DGIT_SSH'}) {
6673 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6674 } elsif (defined $ENV{'GIT_SSH'}) {
6675 @ssh = ($ENV{'GIT_SSH'});
6683 if (!defined $val) {
6684 badusage "$what needs a value" unless @ARGV;
6686 push @rvalopts, $val;
6688 badusage "bad value \`$val' for $what" unless
6689 $val =~ m/^$oi->{Re}$(?!\n)/s;
6690 my $how = $oi->{How};
6691 if (ref($how) eq 'SCALAR') {
6696 push @ropts, @rvalopts;
6700 last unless $ARGV[0] =~ m/^-/;
6704 if (m/^--dry-run$/) {
6707 } elsif (m/^--damp-run$/) {
6710 } elsif (m/^--no-sign$/) {
6713 } elsif (m/^--help$/) {
6715 } elsif (m/^--version$/) {
6717 } elsif (m/^--new$/) {
6720 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6721 ($om = $opts_opt_map{$1}) &&
6725 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6726 !$opts_opt_cmdonly{$1} &&
6727 ($om = $opts_opt_map{$1})) {
6730 } elsif (m/^--(gbp|dpm)$/s) {
6731 push @ropts, "--quilt=$1";
6733 } elsif (m/^--ignore-dirty$/s) {
6736 } elsif (m/^--no-quilt-fixup$/s) {
6738 $quilt_mode = 'nocheck';
6739 } elsif (m/^--no-rm-on-error$/s) {
6742 } elsif (m/^--no-chase-dsc-distro$/s) {
6744 $chase_dsc_distro = 0;
6745 } elsif (m/^--overwrite$/s) {
6747 $overwrite_version = '';
6748 } elsif (m/^--overwrite=(.+)$/s) {
6750 $overwrite_version = $1;
6751 } elsif (m/^--delayed=(\d+)$/s) {
6754 } elsif (m/^--dgit-view-save=(.+)$/s) {
6756 $split_brain_save = $1;
6757 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6758 } elsif (m/^--(no-)?rm-old-changes$/s) {
6761 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6763 push @deliberatelies, $&;
6764 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6768 } elsif (m/^--force-/) {
6770 "$us: warning: ignoring unknown force option $_\n";
6772 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6773 # undocumented, for testing
6775 $tagformat_want = [ $1, 'command line', 1 ];
6776 # 1 menas overrides distro configuration
6777 } elsif (m/^--always-split-source-build$/s) {
6778 # undocumented, for testing
6780 $need_split_build_invocation = 1;
6781 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6782 # undocumented, for testing
6784 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6785 # ^ it's supposed to be an array ref
6786 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6787 $val = $2 ? $' : undef; #';
6788 $valopt->($oi->{Long});
6789 } elsif ($funcopts_long{$_}) {
6791 $funcopts_long{$_}();
6793 badusage "unknown long option \`$_'";
6800 } elsif (s/^-L/-/) {
6803 } elsif (s/^-h/-/) {
6805 } elsif (s/^-D/-/) {
6809 } elsif (s/^-N/-/) {
6814 push @changesopts, $_;
6816 } elsif (s/^-wn$//s) {
6818 $cleanmode = 'none';
6819 } elsif (s/^-wg$//s) {
6822 } elsif (s/^-wgf$//s) {
6824 $cleanmode = 'git-ff';
6825 } elsif (s/^-wd$//s) {
6827 $cleanmode = 'dpkg-source';
6828 } elsif (s/^-wdd$//s) {
6830 $cleanmode = 'dpkg-source-d';
6831 } elsif (s/^-wc$//s) {
6833 $cleanmode = 'check';
6834 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6835 push @git, '-c', $&;
6836 $gitcfgs{cmdline}{$1} = [ $2 ];
6837 } elsif (s/^-c([^=]+)$//s) {
6838 push @git, '-c', $&;
6839 $gitcfgs{cmdline}{$1} = [ 'true' ];
6840 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6842 $val = undef unless length $val;
6843 $valopt->($oi->{Short});
6846 badusage "unknown short option \`$_'";
6853 sub check_env_sanity () {
6854 my $blocked = new POSIX::SigSet;
6855 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6858 foreach my $name (qw(PIPE CHLD)) {
6859 my $signame = "SIG$name";
6860 my $signum = eval "POSIX::$signame" // die;
6861 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6862 die "$signame is set to something other than SIG_DFL\n";
6863 $blocked->ismember($signum) and
6864 die "$signame is blocked\n";
6870 On entry to dgit, $@
6871 This is a bug produced by something in in your execution environment.
6877 sub parseopts_late_defaults () {
6878 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6879 if defined $idistro;
6880 $isuite //= cfg('dgit.default.default-suite');
6882 foreach my $k (keys %opts_opt_map) {
6883 my $om = $opts_opt_map{$k};
6885 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6887 badcfg "cannot set command for $k"
6888 unless length $om->[0];
6892 foreach my $c (access_cfg_cfgs("opts-$k")) {
6894 map { $_ ? @$_ : () }
6895 map { $gitcfgs{$_}{$c} }
6896 reverse @gitcfgsources;
6897 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6898 "\n" if $debuglevel >= 4;
6900 badcfg "cannot configure options for $k"
6901 if $opts_opt_cmdonly{$k};
6902 my $insertpos = $opts_cfg_insertpos{$k};
6903 @$om = ( @$om[0..$insertpos-1],
6905 @$om[$insertpos..$#$om] );
6909 if (!defined $rmchanges) {
6910 local $access_forpush;
6911 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6914 if (!defined $quilt_mode) {
6915 local $access_forpush;
6916 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6917 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6919 $quilt_mode =~ m/^($quilt_modes_re)$/
6920 or badcfg "unknown quilt-mode \`$quilt_mode'";
6924 foreach my $moc (@modeopt_cfgs) {
6925 local $access_forpush;
6926 my $vr = $moc->{Var};
6927 next if defined $$vr;
6928 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6929 my $v = $moc->{Vals}{$$vr};
6930 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6934 $need_split_build_invocation ||= quiltmode_splitbrain();
6936 if (!defined $cleanmode) {
6937 local $access_forpush;
6938 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6939 $cleanmode //= 'dpkg-source';
6941 badcfg "unknown clean-mode \`$cleanmode'" unless
6942 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6946 if ($ENV{$fakeeditorenv}) {
6948 quilt_fixup_editor();
6954 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6955 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6956 if $dryrun_level == 1;
6958 print STDERR $helpmsg or die $!;
6961 $cmd = $subcommand = shift @ARGV;
6964 my $pre_fn = ${*::}{"pre_$cmd"};
6965 $pre_fn->() if $pre_fn;
6967 record_maindir if $invoked_in_git_tree;
6970 my $fn = ${*::}{"cmd_$cmd"};
6971 $fn or badusage "unknown operation $cmd";