3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::Util qw(any);
38 use List::MoreUtils qw(pairwise);
39 use Text::Glob qw(match_glob);
40 use Fcntl qw(:DEFAULT :flock);
45 our $our_version = 'UNRELEASED'; ###substituted###
46 our $absurdity = undef; ###substituted###
48 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
51 our $isuite = 'unstable';
57 our $dryrun_level = 0;
59 our $buildproductsdir = '..';
65 our $existing_package = 'dpkg';
67 our $changes_since_version;
69 our $overwrite_version; # undef: not specified; '': check changelog
71 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
73 our $dodep14tag_re = 'want|no|always';
74 our $split_brain_save;
75 our $we_are_responder;
76 our $initiator_tempdir;
77 our $patches_applied_dirtily = 00;
81 our $chase_dsc_distro=1; #xxx configurable
83 our %forceopts = map { $_=>0 }
84 qw(unrepresentable unsupported-source-format
85 dsc-changes-mismatch changes-origs-exactly
86 import-gitapply-absurd
87 import-gitapply-no-absurd
88 import-dsc-with-dgit-field);
90 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
92 our $suite_re = '[-+.0-9a-z]+';
93 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
94 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
95 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
96 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
98 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
99 our $splitbraincache = 'dgit-intern/quilt-cache';
100 our $rewritemap = 'dgit-rewrite/map';
102 our (@git) = qw(git);
103 our (@dget) = qw(dget);
104 our (@curl) = qw(curl);
105 our (@dput) = qw(dput);
106 our (@debsign) = qw(debsign);
107 our (@gpg) = qw(gpg);
108 our (@sbuild) = qw(sbuild);
110 our (@dgit) = qw(dgit);
111 our (@aptget) = qw(apt-get);
112 our (@aptcache) = qw(apt-cache);
113 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
114 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
115 our (@dpkggenchanges) = qw(dpkg-genchanges);
116 our (@mergechanges) = qw(mergechanges -f);
117 our (@gbp_build) = ('');
118 our (@gbp_pq) = ('gbp pq');
119 our (@changesopts) = ('');
121 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
124 'debsign' => \@debsign,
126 'sbuild' => \@sbuild,
130 'apt-get' => \@aptget,
131 'apt-cache' => \@aptcache,
132 'dpkg-source' => \@dpkgsource,
133 'dpkg-buildpackage' => \@dpkgbuildpackage,
134 'dpkg-genchanges' => \@dpkggenchanges,
135 'gbp-build' => \@gbp_build,
136 'gbp-pq' => \@gbp_pq,
137 'ch' => \@changesopts,
138 'mergechanges' => \@mergechanges);
140 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
141 our %opts_cfg_insertpos = map {
143 scalar @{ $opts_opt_map{$_} }
144 } keys %opts_opt_map;
146 sub parseopts_late_defaults();
152 our $supplementary_message = '';
153 our $need_split_build_invocation = 0;
154 our $split_brain = 0;
158 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
161 our $remotename = 'dgit';
162 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
166 if (!defined $absurdity) {
168 $absurdity =~ s{/[^/]+$}{/absurd} or die;
172 my ($v,$distro) = @_;
173 return $tagformatfn->($v, $distro);
176 sub debiantag_maintview ($$) {
177 my ($v,$distro) = @_;
178 return "$distro/".dep14_version_mangle $v;
181 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
183 sub lbranch () { return "$branchprefix/$csuite"; }
184 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
185 sub lref () { return "refs/heads/".lbranch(); }
186 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
187 sub rrref () { return server_ref($csuite); }
197 return "${package}_".(stripepoch $vsn).$sfx
202 return srcfn($vsn,".dsc");
205 sub changespat ($;$) {
206 my ($vsn, $arch) = @_;
207 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
210 sub upstreamversion ($) {
222 foreach my $f (@end) {
224 print STDERR "$us: cleanup: $@" if length $@;
228 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
230 sub forceable_fail ($$) {
231 my ($forceoptsl, $msg) = @_;
232 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
233 print STDERR "warning: overriding problem due to --force:\n". $msg;
237 my ($forceoptsl) = @_;
238 my @got = grep { $forceopts{$_} } @$forceoptsl;
239 return 0 unless @got;
241 "warning: skipping checks or functionality due to --force-$got[0]\n";
244 sub no_such_package () {
245 print STDERR "$us: package $package does not exist in suite $isuite\n";
251 printdebug "CD $newdir\n";
252 chdir $newdir or confess "chdir: $newdir: $!";
255 sub deliberately ($) {
257 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
260 sub deliberately_not_fast_forward () {
261 foreach (qw(not-fast-forward fresh-repo)) {
262 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
266 sub quiltmode_splitbrain () {
267 $quilt_mode =~ m/gbp|dpm|unapplied/;
270 sub opts_opt_multi_cmd {
272 push @cmd, split /\s+/, shift @_;
278 return opts_opt_multi_cmd @gbp_pq;
281 #---------- remote protocol support, common ----------
283 # remote push initiator/responder protocol:
284 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
285 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
286 # < dgit-remote-push-ready <actual-proto-vsn>
293 # > supplementary-message NBYTES # $protovsn >= 3
298 # > file parsed-changelog
299 # [indicates that output of dpkg-parsechangelog follows]
300 # > data-block NBYTES
301 # > [NBYTES bytes of data (no newline)]
302 # [maybe some more blocks]
311 # > param head DGIT-VIEW-HEAD
312 # > param csuite SUITE
313 # > param tagformat old|new
314 # > param maint-view MAINT-VIEW-HEAD
316 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
317 # # goes into tag, for replay prevention
320 # [indicates that signed tag is wanted]
321 # < data-block NBYTES
322 # < [NBYTES bytes of data (no newline)]
323 # [maybe some more blocks]
327 # > want signed-dsc-changes
328 # < data-block NBYTES [transfer of signed dsc]
330 # < data-block NBYTES [transfer of signed changes]
338 sub i_child_report () {
339 # Sees if our child has died, and reap it if so. Returns a string
340 # describing how it died if it failed, or undef otherwise.
341 return undef unless $i_child_pid;
342 my $got = waitpid $i_child_pid, WNOHANG;
343 return undef if $got <= 0;
344 die unless $got == $i_child_pid;
345 $i_child_pid = undef;
346 return undef unless $?;
347 return "build host child ".waitstatusmsg();
352 fail "connection lost: $!" if $fh->error;
353 fail "protocol violation; $m not expected";
356 sub badproto_badread ($$) {
358 fail "connection lost: $!" if $!;
359 my $report = i_child_report();
360 fail $report if defined $report;
361 badproto $fh, "eof (reading $wh)";
364 sub protocol_expect (&$) {
365 my ($match, $fh) = @_;
368 defined && chomp or badproto_badread $fh, "protocol message";
376 badproto $fh, "\`$_'";
379 sub protocol_send_file ($$) {
380 my ($fh, $ourfn) = @_;
381 open PF, "<", $ourfn or die "$ourfn: $!";
384 my $got = read PF, $d, 65536;
385 die "$ourfn: $!" unless defined $got;
387 print $fh "data-block ".length($d)."\n" or die $!;
388 print $fh $d or die $!;
390 PF->error and die "$ourfn $!";
391 print $fh "data-end\n" or die $!;
395 sub protocol_read_bytes ($$) {
396 my ($fh, $nbytes) = @_;
397 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
399 my $got = read $fh, $d, $nbytes;
400 $got==$nbytes or badproto_badread $fh, "data block";
404 sub protocol_receive_file ($$) {
405 my ($fh, $ourfn) = @_;
406 printdebug "() $ourfn\n";
407 open PF, ">", $ourfn or die "$ourfn: $!";
409 my ($y,$l) = protocol_expect {
410 m/^data-block (.*)$/ ? (1,$1) :
411 m/^data-end$/ ? (0,) :
415 my $d = protocol_read_bytes $fh, $l;
416 print PF $d or die $!;
421 #---------- remote protocol support, responder ----------
423 sub responder_send_command ($) {
425 return unless $we_are_responder;
426 # called even without $we_are_responder
427 printdebug ">> $command\n";
428 print PO $command, "\n" or die $!;
431 sub responder_send_file ($$) {
432 my ($keyword, $ourfn) = @_;
433 return unless $we_are_responder;
434 printdebug "]] $keyword $ourfn\n";
435 responder_send_command "file $keyword";
436 protocol_send_file \*PO, $ourfn;
439 sub responder_receive_files ($@) {
440 my ($keyword, @ourfns) = @_;
441 die unless $we_are_responder;
442 printdebug "[[ $keyword @ourfns\n";
443 responder_send_command "want $keyword";
444 foreach my $fn (@ourfns) {
445 protocol_receive_file \*PI, $fn;
448 protocol_expect { m/^files-end$/ } \*PI;
451 #---------- remote protocol support, initiator ----------
453 sub initiator_expect (&) {
455 protocol_expect { &$match } \*RO;
458 #---------- end remote code ----------
461 if ($we_are_responder) {
463 responder_send_command "progress ".length($m) or die $!;
464 print PO $m or die $!;
474 $ua = LWP::UserAgent->new();
478 progress "downloading $what...";
479 my $r = $ua->get(@_) or die $!;
480 return undef if $r->code == 404;
481 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
482 return $r->decoded_content(charset => 'none');
485 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
490 failedcmd @_ if system @_;
493 sub act_local () { return $dryrun_level <= 1; }
494 sub act_scary () { return !$dryrun_level; }
497 if (!$dryrun_level) {
498 progress "$us ok: @_";
500 progress "would be ok: @_ (but dry run only)";
505 printcmd(\*STDERR,$debugprefix."#",@_);
508 sub runcmd_ordryrun {
516 sub runcmd_ordryrun_local {
525 my ($first_shell, @cmd) = @_;
526 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
529 our $helpmsg = <<END;
531 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
532 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
533 dgit [dgit-opts] build [dpkg-buildpackage-opts]
534 dgit [dgit-opts] sbuild [sbuild-opts]
535 dgit [dgit-opts] push [dgit-opts] [suite]
536 dgit [dgit-opts] rpush build-host:build-dir ...
537 important dgit options:
538 -k<keyid> sign tag and package with <keyid> instead of default
539 --dry-run -n do not change anything, but go through the motions
540 --damp-run -L like --dry-run but make local changes, without signing
541 --new -N allow introducing a new package
542 --debug -D increase debug level
543 -c<name>=<value> set git config option (used directly by dgit too)
546 our $later_warning_msg = <<END;
547 Perhaps the upload is stuck in incoming. Using the version from git.
551 print STDERR "$us: @_\n", $helpmsg or die $!;
556 @ARGV or badusage "too few arguments";
557 return scalar shift @ARGV;
561 print $helpmsg or die $!;
565 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
567 our %defcfg = ('dgit.default.distro' => 'debian',
568 'dgit-suite.*-security.distro' => 'debian-security',
569 'dgit.default.username' => '',
570 'dgit.default.archive-query-default-component' => 'main',
571 'dgit.default.ssh' => 'ssh',
572 'dgit.default.archive-query' => 'madison:',
573 'dgit.default.sshpsql-dbname' => 'service=projectb',
574 'dgit.default.aptget-components' => 'main',
575 'dgit.default.dgit-tag-format' => 'new,old,maint',
576 'dgit.dsc-url-proto-ok.http' => 'true',
577 'dgit.dsc-url-proto-ok.https' => 'true',
578 'dgit.dsc-url-proto-ok.git' => 'true',
579 'dgit.default.dsc-url-proto-ok' => 'false',
580 # old means "repo server accepts pushes with old dgit tags"
581 # new means "repo server accepts pushes with new dgit tags"
582 # maint means "repo server accepts split brain pushes"
583 # hist means "repo server may have old pushes without new tag"
584 # ("hist" is implied by "old")
585 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
586 'dgit-distro.debian.git-check' => 'url',
587 'dgit-distro.debian.git-check-suffix' => '/info/refs',
588 'dgit-distro.debian.new-private-pushers' => 't',
589 'dgit-distro.debian/push.git-url' => '',
590 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
591 'dgit-distro.debian/push.git-user-force' => 'dgit',
592 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
593 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
594 'dgit-distro.debian/push.git-create' => 'true',
595 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
596 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
597 # 'dgit-distro.debian.archive-query-tls-key',
598 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
599 # ^ this does not work because curl is broken nowadays
600 # Fixing #790093 properly will involve providing providing the key
601 # in some pacagke and maybe updating these paths.
603 # 'dgit-distro.debian.archive-query-tls-curl-args',
604 # '--ca-path=/etc/ssl/ca-debian',
605 # ^ this is a workaround but works (only) on DSA-administered machines
606 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
607 'dgit-distro.debian.git-url-suffix' => '',
608 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
609 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
610 'dgit-distro.debian-security.archive-query' => 'aptget:',
611 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
612 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
613 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
614 'dgit-distro.debian-security.nominal-distro' => 'debian',
615 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
616 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
617 'dgit-distro.ubuntu.git-check' => 'false',
618 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
619 'dgit-distro.test-dummy.ssh' => "$td/ssh",
620 'dgit-distro.test-dummy.username' => "alice",
621 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
622 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
623 'dgit-distro.test-dummy.git-url' => "$td/git",
624 'dgit-distro.test-dummy.git-host' => "git",
625 'dgit-distro.test-dummy.git-path' => "$td/git",
626 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
627 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
628 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
629 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
633 our @gitcfgsources = qw(cmdline local global system);
635 sub git_slurp_config () {
636 local ($debuglevel) = $debuglevel-2;
639 # This algoritm is a bit subtle, but this is needed so that for
640 # options which we want to be single-valued, we allow the
641 # different config sources to override properly. See #835858.
642 foreach my $src (@gitcfgsources) {
643 next if $src eq 'cmdline';
644 # we do this ourselves since git doesn't handle it
646 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
649 open GITS, "-|", @cmd or die $!;
652 printdebug "=> ", (messagequote $_), "\n";
654 push @{ $gitcfgs{$src}{$`} }, $'; #';
658 or ($!==0 && $?==256)
663 sub git_get_config ($) {
665 foreach my $src (@gitcfgsources) {
666 my $l = $gitcfgs{$src}{$c};
667 printdebug"C $c ".(defined $l ?
668 join " ", map { messagequote "'$_'" } @$l :
672 @$l==1 or badcfg "multiple values for $c".
673 " (in $src git config)" if @$l > 1;
681 return undef if $c =~ /RETURN-UNDEF/;
682 my $v = git_get_config($c);
683 return $v if defined $v;
684 my $dv = $defcfg{$c};
686 printdebug "CD $c $dv\n" if $debuglevel >= 4;
690 badcfg "need value for one of: @_\n".
691 "$us: distro or suite appears not to be (properly) supported";
694 sub access_basedistro () {
695 if (defined $idistro) {
698 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
699 return $def if defined $def;
700 foreach my $src (@gitcfgsources, 'internal') {
701 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
703 foreach my $k (keys %$kl) {
704 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
706 next unless match_glob $dpat, $isuite;
710 return cfg("dgit.default.distro");
714 sub access_nomdistro () {
715 my $base = access_basedistro();
716 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
717 $r =~ m/^$distro_re$/ or badcfg
718 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
722 sub access_quirk () {
723 # returns (quirk name, distro to use instead or undef, quirk-specific info)
724 my $basedistro = access_basedistro();
725 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
727 if (defined $backports_quirk) {
728 my $re = $backports_quirk;
729 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
731 $re =~ s/\%/([-0-9a-z_]+)/
732 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
733 if ($isuite =~ m/^$re$/) {
734 return ('backports',"$basedistro-backports",$1);
737 return ('none',undef);
742 sub parse_cfg_bool ($$$) {
743 my ($what,$def,$v) = @_;
746 $v =~ m/^[ty1]/ ? 1 :
747 $v =~ m/^[fn0]/ ? 0 :
748 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
751 sub access_forpush_config () {
752 my $d = access_basedistro();
756 parse_cfg_bool('new-private-pushers', 0,
757 cfg("dgit-distro.$d.new-private-pushers",
760 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
763 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
764 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
765 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
766 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
769 sub access_forpush () {
770 $access_forpush //= access_forpush_config();
771 return $access_forpush;
775 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
776 badcfg "pushing but distro is configured readonly"
777 if access_forpush_config() eq '0';
779 $supplementary_message = <<'END' unless $we_are_responder;
780 Push failed, before we got started.
781 You can retry the push, after fixing the problem, if you like.
783 parseopts_late_defaults();
787 parseopts_late_defaults();
790 sub supplementary_message ($) {
792 if (!$we_are_responder) {
793 $supplementary_message = $msg;
795 } elsif ($protovsn >= 3) {
796 responder_send_command "supplementary-message ".length($msg)
798 print PO $msg or die $!;
802 sub access_distros () {
803 # Returns list of distros to try, in order
806 # 0. `instead of' distro name(s) we have been pointed to
807 # 1. the access_quirk distro, if any
808 # 2a. the user's specified distro, or failing that } basedistro
809 # 2b. the distro calculated from the suite }
810 my @l = access_basedistro();
812 my (undef,$quirkdistro) = access_quirk();
813 unshift @l, $quirkdistro;
814 unshift @l, $instead_distro;
815 @l = grep { defined } @l;
817 push @l, access_nomdistro();
819 if (access_forpush()) {
820 @l = map { ("$_/push", $_) } @l;
825 sub access_cfg_cfgs (@) {
828 # The nesting of these loops determines the search order. We put
829 # the key loop on the outside so that we search all the distros
830 # for each key, before going on to the next key. That means that
831 # if access_cfg is called with a more specific, and then a less
832 # specific, key, an earlier distro can override the less specific
833 # without necessarily overriding any more specific keys. (If the
834 # distro wants to override the more specific keys it can simply do
835 # so; whereas if we did the loop the other way around, it would be
836 # impossible to for an earlier distro to override a less specific
837 # key but not the more specific ones without restating the unknown
838 # values of the more specific keys.
841 # We have to deal with RETURN-UNDEF specially, so that we don't
842 # terminate the search prematurely.
844 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
847 foreach my $d (access_distros()) {
848 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
850 push @cfgs, map { "dgit.default.$_" } @realkeys;
857 my (@cfgs) = access_cfg_cfgs(@keys);
858 my $value = cfg(@cfgs);
862 sub access_cfg_bool ($$) {
863 my ($def, @keys) = @_;
864 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
867 sub string_to_ssh ($) {
869 if ($spec =~ m/\s/) {
870 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
876 sub access_cfg_ssh () {
877 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
878 if (!defined $gitssh) {
881 return string_to_ssh $gitssh;
885 sub access_runeinfo ($) {
887 return ": dgit ".access_basedistro()." $info ;";
890 sub access_someuserhost ($) {
892 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
893 defined($user) && length($user) or
894 $user = access_cfg("$some-user",'username');
895 my $host = access_cfg("$some-host");
896 return length($user) ? "$user\@$host" : $host;
899 sub access_gituserhost () {
900 return access_someuserhost('git');
903 sub access_giturl (;$) {
905 my $url = access_cfg('git-url','RETURN-UNDEF');
908 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
909 return undef unless defined $proto;
912 access_gituserhost().
913 access_cfg('git-path');
915 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
918 return "$url/$package$suffix";
921 sub parsecontrolfh ($$;$) {
922 my ($fh, $desc, $allowsigned) = @_;
923 our $dpkgcontrolhash_noissigned;
926 my %opts = ('name' => $desc);
927 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
928 $c = Dpkg::Control::Hash->new(%opts);
929 $c->parse($fh,$desc) or die "parsing of $desc failed";
930 last if $allowsigned;
931 last if $dpkgcontrolhash_noissigned;
932 my $issigned= $c->get_option('is_pgp_signed');
933 if (!defined $issigned) {
934 $dpkgcontrolhash_noissigned= 1;
935 seek $fh, 0,0 or die "seek $desc: $!";
936 } elsif ($issigned) {
937 fail "control file $desc is (already) PGP-signed. ".
938 " Note that dgit push needs to modify the .dsc and then".
939 " do the signature itself";
948 my ($file, $desc, $allowsigned) = @_;
949 my $fh = new IO::Handle;
950 open $fh, '<', $file or die "$file: $!";
951 my $c = parsecontrolfh($fh,$desc,$allowsigned);
952 $fh->error and die $!;
958 my ($dctrl,$field) = @_;
959 my $v = $dctrl->{$field};
960 return $v if defined $v;
961 fail "missing field $field in ".$dctrl->get_option('name');
965 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
966 my $p = new IO::Handle;
967 my @cmd = (qw(dpkg-parsechangelog), @_);
968 open $p, '-|', @cmd or die $!;
970 $?=0; $!=0; close $p or failedcmd @cmd;
974 sub commit_getclogp ($) {
975 # Returns the parsed changelog hashref for a particular commit
977 our %commit_getclogp_memo;
978 my $memo = $commit_getclogp_memo{$objid};
979 return $memo if $memo;
981 my $mclog = ".git/dgit/clog-$objid";
982 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
983 "$objid:debian/changelog";
984 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
989 defined $d or fail "getcwd failed: $!";
993 sub parse_dscdata () {
994 my $dscfh = new IO::File \$dscdata, '<' or die $!;
995 printdebug Dumper($dscdata) if $debuglevel>1;
996 $dsc = parsecontrolfh($dscfh,$dscurl,1);
997 printdebug Dumper($dsc) if $debuglevel>1;
1002 sub archive_query ($;@) {
1003 my ($method) = shift @_;
1004 fail "this operation does not support multiple comma-separated suites"
1006 my $query = access_cfg('archive-query','RETURN-UNDEF');
1007 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1010 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1013 sub archive_query_prepend_mirror {
1014 my $m = access_cfg('mirror');
1015 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1018 sub pool_dsc_subpath ($$) {
1019 my ($vsn,$component) = @_; # $package is implict arg
1020 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1021 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1024 sub cfg_apply_map ($$$) {
1025 my ($varref, $what, $mapspec) = @_;
1026 return unless $mapspec;
1028 printdebug "config $what EVAL{ $mapspec; }\n";
1030 eval "package Dgit::Config; $mapspec;";
1035 #---------- `ftpmasterapi' archive query method (nascent) ----------
1037 sub archive_api_query_cmd ($) {
1039 my @cmd = (@curl, qw(-sS));
1040 my $url = access_cfg('archive-query-url');
1041 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1043 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1044 foreach my $key (split /\:/, $keys) {
1045 $key =~ s/\%HOST\%/$host/g;
1047 fail "for $url: stat $key: $!" unless $!==ENOENT;
1050 fail "config requested specific TLS key but do not know".
1051 " how to get curl to use exactly that EE key ($key)";
1052 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1053 # # Sadly the above line does not work because of changes
1054 # # to gnutls. The real fix for #790093 may involve
1055 # # new curl options.
1058 # Fixing #790093 properly will involve providing a value
1059 # for this on clients.
1060 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1061 push @cmd, split / /, $kargs if defined $kargs;
1063 push @cmd, $url.$subpath;
1067 sub api_query ($$;$) {
1069 my ($data, $subpath, $ok404) = @_;
1070 badcfg "ftpmasterapi archive query method takes no data part"
1072 my @cmd = archive_api_query_cmd($subpath);
1073 my $url = $cmd[$#cmd];
1074 push @cmd, qw(-w %{http_code});
1075 my $json = cmdoutput @cmd;
1076 unless ($json =~ s/\d+\d+\d$//) {
1077 failedcmd_report_cmd undef, @cmd;
1078 fail "curl failed to print 3-digit HTTP code";
1081 return undef if $code eq '404' && $ok404;
1082 fail "fetch of $url gave HTTP code $code"
1083 unless $url =~ m#^file://# or $code =~ m/^2/;
1084 return decode_json($json);
1087 sub canonicalise_suite_ftpmasterapi {
1088 my ($proto,$data) = @_;
1089 my $suites = api_query($data, 'suites');
1091 foreach my $entry (@$suites) {
1093 my $v = $entry->{$_};
1094 defined $v && $v eq $isuite;
1095 } qw(codename name);
1096 push @matched, $entry;
1098 fail "unknown suite $isuite" unless @matched;
1101 @matched==1 or die "multiple matches for suite $isuite\n";
1102 $cn = "$matched[0]{codename}";
1103 defined $cn or die "suite $isuite info has no codename\n";
1104 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1106 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1111 sub archive_query_ftpmasterapi {
1112 my ($proto,$data) = @_;
1113 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1115 my $digester = Digest::SHA->new(256);
1116 foreach my $entry (@$info) {
1118 my $vsn = "$entry->{version}";
1119 my ($ok,$msg) = version_check $vsn;
1120 die "bad version: $msg\n" unless $ok;
1121 my $component = "$entry->{component}";
1122 $component =~ m/^$component_re$/ or die "bad component";
1123 my $filename = "$entry->{filename}";
1124 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1125 or die "bad filename";
1126 my $sha256sum = "$entry->{sha256sum}";
1127 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1128 push @rows, [ $vsn, "/pool/$component/$filename",
1129 $digester, $sha256sum ];
1131 die "bad ftpmaster api response: $@\n".Dumper($entry)
1134 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1135 return archive_query_prepend_mirror @rows;
1138 sub file_in_archive_ftpmasterapi {
1139 my ($proto,$data,$filename) = @_;
1140 my $pat = $filename;
1143 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1144 my $info = api_query($data, "file_in_archive/$pat", 1);
1147 #---------- `aptget' archive query method ----------
1150 our $aptget_releasefile;
1151 our $aptget_configpath;
1153 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1154 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1156 sub aptget_cache_clean {
1157 runcmd_ordryrun_local qw(sh -ec),
1158 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1162 sub aptget_lock_acquire () {
1163 my $lockfile = "$aptget_base/lock";
1164 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1165 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1168 sub aptget_prep ($) {
1170 return if defined $aptget_base;
1172 badcfg "aptget archive query method takes no data part"
1175 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1178 ensuredir "$cache/dgit";
1180 access_cfg('aptget-cachekey','RETURN-UNDEF')
1181 // access_nomdistro();
1183 $aptget_base = "$cache/dgit/aptget";
1184 ensuredir $aptget_base;
1186 my $quoted_base = $aptget_base;
1187 die "$quoted_base contains bad chars, cannot continue"
1188 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1190 ensuredir $aptget_base;
1192 aptget_lock_acquire();
1194 aptget_cache_clean();
1196 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1197 my $sourceslist = "source.list#$cachekey";
1199 my $aptsuites = $isuite;
1200 cfg_apply_map(\$aptsuites, 'suite map',
1201 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1203 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1204 printf SRCS "deb-src %s %s %s\n",
1205 access_cfg('mirror'),
1207 access_cfg('aptget-components')
1210 ensuredir "$aptget_base/cache";
1211 ensuredir "$aptget_base/lists";
1213 open CONF, ">", $aptget_configpath or die $!;
1215 Debug::NoLocking "true";
1216 APT::Get::List-Cleanup "false";
1217 #clear APT::Update::Post-Invoke-Success;
1218 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1219 Dir::State::Lists "$quoted_base/lists";
1220 Dir::Etc::preferences "$quoted_base/preferences";
1221 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1222 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1225 foreach my $key (qw(
1228 Dir::Cache::Archives
1229 Dir::Etc::SourceParts
1230 Dir::Etc::preferencesparts
1232 ensuredir "$aptget_base/$key";
1233 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1236 my $oldatime = (time // die $!) - 1;
1237 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1238 next unless stat_exists $oldlist;
1239 my ($mtime) = (stat _)[9];
1240 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1243 runcmd_ordryrun_local aptget_aptget(), qw(update);
1246 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1247 next unless stat_exists $oldlist;
1248 my ($atime) = (stat _)[8];
1249 next if $atime == $oldatime;
1250 push @releasefiles, $oldlist;
1252 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1253 @releasefiles = @inreleasefiles if @inreleasefiles;
1254 die "apt updated wrong number of Release files (@releasefiles), erk"
1255 unless @releasefiles == 1;
1257 ($aptget_releasefile) = @releasefiles;
1260 sub canonicalise_suite_aptget {
1261 my ($proto,$data) = @_;
1264 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1266 foreach my $name (qw(Codename Suite)) {
1267 my $val = $release->{$name};
1269 printdebug "release file $name: $val\n";
1270 $val =~ m/^$suite_re$/o or fail
1271 "Release file ($aptget_releasefile) specifies intolerable $name";
1272 cfg_apply_map(\$val, 'suite rmap',
1273 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1280 sub archive_query_aptget {
1281 my ($proto,$data) = @_;
1284 ensuredir "$aptget_base/source";
1285 foreach my $old (<$aptget_base/source/*.dsc>) {
1286 unlink $old or die "$old: $!";
1289 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1290 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1291 # avoids apt-get source failing with ambiguous error code
1293 runcmd_ordryrun_local
1294 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1295 aptget_aptget(), qw(--download-only --only-source source), $package;
1297 my @dscs = <$aptget_base/source/*.dsc>;
1298 fail "apt-get source did not produce a .dsc" unless @dscs;
1299 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1301 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1304 my $uri = "file://". uri_escape $dscs[0];
1305 $uri =~ s{\%2f}{/}gi;
1306 return [ (getfield $pre_dsc, 'Version'), $uri ];
1309 #---------- `dummyapicat' archive query method ----------
1311 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1312 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1314 sub file_in_archive_dummycatapi ($$$) {
1315 my ($proto,$data,$filename) = @_;
1316 my $mirror = access_cfg('mirror');
1317 $mirror =~ s#^file://#/# or die "$mirror ?";
1319 my @cmd = (qw(sh -ec), '
1321 find -name "$2" -print0 |
1323 ', qw(x), $mirror, $filename);
1324 debugcmd "-|", @cmd;
1325 open FIA, "-|", @cmd or die $!;
1328 printdebug "| $_\n";
1329 m/^(\w+) (\S+)$/ or die "$_ ?";
1330 push @out, { sha256sum => $1, filename => $2 };
1332 close FIA or die failedcmd @cmd;
1336 #---------- `madison' archive query method ----------
1338 sub archive_query_madison {
1339 return archive_query_prepend_mirror
1340 map { [ @$_[0..1] ] } madison_get_parse(@_);
1343 sub madison_get_parse {
1344 my ($proto,$data) = @_;
1345 die unless $proto eq 'madison';
1346 if (!length $data) {
1347 $data= access_cfg('madison-distro','RETURN-UNDEF');
1348 $data //= access_basedistro();
1350 $rmad{$proto,$data,$package} ||= cmdoutput
1351 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1352 my $rmad = $rmad{$proto,$data,$package};
1355 foreach my $l (split /\n/, $rmad) {
1356 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1357 \s*( [^ \t|]+ )\s* \|
1358 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1359 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1360 $1 eq $package or die "$rmad $package ?";
1367 $component = access_cfg('archive-query-default-component');
1369 $5 eq 'source' or die "$rmad ?";
1370 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1372 return sort { -version_compare($a->[0],$b->[0]); } @out;
1375 sub canonicalise_suite_madison {
1376 # madison canonicalises for us
1377 my @r = madison_get_parse(@_);
1379 "unable to canonicalise suite using package $package".
1380 " which does not appear to exist in suite $isuite;".
1381 " --existing-package may help";
1385 sub file_in_archive_madison { return undef; }
1387 #---------- `sshpsql' archive query method ----------
1390 my ($data,$runeinfo,$sql) = @_;
1391 if (!length $data) {
1392 $data= access_someuserhost('sshpsql').':'.
1393 access_cfg('sshpsql-dbname');
1395 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1396 my ($userhost,$dbname) = ($`,$'); #';
1398 my @cmd = (access_cfg_ssh, $userhost,
1399 access_runeinfo("ssh-psql $runeinfo").
1400 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1401 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1403 open P, "-|", @cmd or die $!;
1406 printdebug(">|$_|\n");
1409 $!=0; $?=0; close P or failedcmd @cmd;
1411 my $nrows = pop @rows;
1412 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1413 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1414 @rows = map { [ split /\|/, $_ ] } @rows;
1415 my $ncols = scalar @{ shift @rows };
1416 die if grep { scalar @$_ != $ncols } @rows;
1420 sub sql_injection_check {
1421 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1424 sub archive_query_sshpsql ($$) {
1425 my ($proto,$data) = @_;
1426 sql_injection_check $isuite, $package;
1427 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1428 SELECT source.version, component.name, files.filename, files.sha256sum
1430 JOIN src_associations ON source.id = src_associations.source
1431 JOIN suite ON suite.id = src_associations.suite
1432 JOIN dsc_files ON dsc_files.source = source.id
1433 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1434 JOIN component ON component.id = files_archive_map.component_id
1435 JOIN files ON files.id = dsc_files.file
1436 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1437 AND source.source='$package'
1438 AND files.filename LIKE '%.dsc';
1440 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1441 my $digester = Digest::SHA->new(256);
1443 my ($vsn,$component,$filename,$sha256sum) = @$_;
1444 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1446 return archive_query_prepend_mirror @rows;
1449 sub canonicalise_suite_sshpsql ($$) {
1450 my ($proto,$data) = @_;
1451 sql_injection_check $isuite;
1452 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1453 SELECT suite.codename
1454 FROM suite where suite_name='$isuite' or codename='$isuite';
1456 @rows = map { $_->[0] } @rows;
1457 fail "unknown suite $isuite" unless @rows;
1458 die "ambiguous $isuite: @rows ?" if @rows>1;
1462 sub file_in_archive_sshpsql ($$$) { return undef; }
1464 #---------- `dummycat' archive query method ----------
1466 sub canonicalise_suite_dummycat ($$) {
1467 my ($proto,$data) = @_;
1468 my $dpath = "$data/suite.$isuite";
1469 if (!open C, "<", $dpath) {
1470 $!==ENOENT or die "$dpath: $!";
1471 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1475 chomp or die "$dpath: $!";
1477 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1481 sub archive_query_dummycat ($$) {
1482 my ($proto,$data) = @_;
1483 canonicalise_suite();
1484 my $dpath = "$data/package.$csuite.$package";
1485 if (!open C, "<", $dpath) {
1486 $!==ENOENT or die "$dpath: $!";
1487 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1495 printdebug "dummycat query $csuite $package $dpath | $_\n";
1496 my @row = split /\s+/, $_;
1497 @row==2 or die "$dpath: $_ ?";
1500 C->error and die "$dpath: $!";
1502 return archive_query_prepend_mirror
1503 sort { -version_compare($a->[0],$b->[0]); } @rows;
1506 sub file_in_archive_dummycat () { return undef; }
1508 #---------- tag format handling ----------
1510 sub access_cfg_tagformats () {
1511 split /\,/, access_cfg('dgit-tag-format');
1514 sub access_cfg_tagformats_can_splitbrain () {
1515 my %y = map { $_ => 1 } access_cfg_tagformats;
1516 foreach my $needtf (qw(new maint)) {
1517 next if $y{$needtf};
1523 sub need_tagformat ($$) {
1524 my ($fmt, $why) = @_;
1525 fail "need to use tag format $fmt ($why) but also need".
1526 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1527 " - no way to proceed"
1528 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1529 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1532 sub select_tagformat () {
1534 return if $tagformatfn && !$tagformat_want;
1535 die 'bug' if $tagformatfn && $tagformat_want;
1536 # ... $tagformat_want assigned after previous select_tagformat
1538 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1539 printdebug "select_tagformat supported @supported\n";
1541 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1542 printdebug "select_tagformat specified @$tagformat_want\n";
1544 my ($fmt,$why,$override) = @$tagformat_want;
1546 fail "target distro supports tag formats @supported".
1547 " but have to use $fmt ($why)"
1549 or grep { $_ eq $fmt } @supported;
1551 $tagformat_want = undef;
1553 $tagformatfn = ${*::}{"debiantag_$fmt"};
1555 fail "trying to use unknown tag format \`$fmt' ($why) !"
1556 unless $tagformatfn;
1559 #---------- archive query entrypoints and rest of program ----------
1561 sub canonicalise_suite () {
1562 return if defined $csuite;
1563 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1564 $csuite = archive_query('canonicalise_suite');
1565 if ($isuite ne $csuite) {
1566 progress "canonical suite name for $isuite is $csuite";
1568 progress "canonical suite name is $csuite";
1572 sub get_archive_dsc () {
1573 canonicalise_suite();
1574 my @vsns = archive_query('archive_query');
1575 foreach my $vinfo (@vsns) {
1576 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1577 $dscurl = $vsn_dscurl;
1578 $dscdata = url_get($dscurl);
1580 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1585 $digester->add($dscdata);
1586 my $got = $digester->hexdigest();
1588 fail "$dscurl has hash $got but".
1589 " archive told us to expect $digest";
1592 my $fmt = getfield $dsc, 'Format';
1593 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1594 "unsupported source format $fmt, sorry";
1596 $dsc_checked = !!$digester;
1597 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1601 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1604 sub check_for_git ();
1605 sub check_for_git () {
1607 my $how = access_cfg('git-check');
1608 if ($how eq 'ssh-cmd') {
1610 (access_cfg_ssh, access_gituserhost(),
1611 access_runeinfo("git-check $package").
1612 " set -e; cd ".access_cfg('git-path').";".
1613 " if test -d $package.git; then echo 1; else echo 0; fi");
1614 my $r= cmdoutput @cmd;
1615 if (defined $r and $r =~ m/^divert (\w+)$/) {
1617 my ($usedistro,) = access_distros();
1618 # NB that if we are pushing, $usedistro will be $distro/push
1619 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1620 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1621 progress "diverting to $divert (using config for $instead_distro)";
1622 return check_for_git();
1624 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1626 } elsif ($how eq 'url') {
1627 my $prefix = access_cfg('git-check-url','git-url');
1628 my $suffix = access_cfg('git-check-suffix','git-suffix',
1629 'RETURN-UNDEF') // '.git';
1630 my $url = "$prefix/$package$suffix";
1631 my @cmd = (@curl, qw(-sS -I), $url);
1632 my $result = cmdoutput @cmd;
1633 $result =~ s/^\S+ 200 .*\n\r?\n//;
1634 # curl -sS -I with https_proxy prints
1635 # HTTP/1.0 200 Connection established
1636 $result =~ m/^\S+ (404|200) /s or
1637 fail "unexpected results from git check query - ".
1638 Dumper($prefix, $result);
1640 if ($code eq '404') {
1642 } elsif ($code eq '200') {
1647 } elsif ($how eq 'true') {
1649 } elsif ($how eq 'false') {
1652 badcfg "unknown git-check \`$how'";
1656 sub create_remote_git_repo () {
1657 my $how = access_cfg('git-create');
1658 if ($how eq 'ssh-cmd') {
1660 (access_cfg_ssh, access_gituserhost(),
1661 access_runeinfo("git-create $package").
1662 "set -e; cd ".access_cfg('git-path').";".
1663 " cp -a _template $package.git");
1664 } elsif ($how eq 'true') {
1667 badcfg "unknown git-create \`$how'";
1671 our ($dsc_hash,$lastpush_mergeinput);
1672 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1674 our $ud = '.git/dgit/unpack';
1684 sub mktree_in_ud_here () {
1685 runcmd qw(git init -q);
1686 runcmd qw(git config gc.auto 0);
1687 rmtree('.git/objects');
1688 symlink '../../../../objects','.git/objects' or die $!;
1691 sub git_write_tree () {
1692 my $tree = cmdoutput @git, qw(write-tree);
1693 $tree =~ m/^\w+$/ or die "$tree ?";
1697 sub git_add_write_tree () {
1698 runcmd @git, qw(add -Af .);
1699 return git_write_tree();
1702 sub remove_stray_gits ($) {
1704 my @gitscmd = qw(find -name .git -prune -print0);
1705 debugcmd "|",@gitscmd;
1706 open GITS, "-|", @gitscmd or die $!;
1711 print STDERR "$us: warning: removing from $what: ",
1712 (messagequote $_), "\n";
1716 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1719 sub mktree_in_ud_from_only_subdir ($;$) {
1720 my ($what,$raw) = @_;
1722 # changes into the subdir
1724 die "expected one subdir but found @dirs ?" unless @dirs==1;
1725 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1729 remove_stray_gits($what);
1730 mktree_in_ud_here();
1732 my ($format, $fopts) = get_source_format();
1733 if (madformat($format)) {
1738 my $tree=git_add_write_tree();
1739 return ($tree,$dir);
1742 our @files_csum_info_fields =
1743 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1744 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1745 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1747 sub dsc_files_info () {
1748 foreach my $csumi (@files_csum_info_fields) {
1749 my ($fname, $module, $method) = @$csumi;
1750 my $field = $dsc->{$fname};
1751 next unless defined $field;
1752 eval "use $module; 1;" or die $@;
1754 foreach (split /\n/, $field) {
1756 m/^(\w+) (\d+) (\S+)$/ or
1757 fail "could not parse .dsc $fname line \`$_'";
1758 my $digester = eval "$module"."->$method;" or die $@;
1763 Digester => $digester,
1768 fail "missing any supported Checksums-* or Files field in ".
1769 $dsc->get_option('name');
1773 map { $_->{Filename} } dsc_files_info();
1776 sub files_compare_inputs (@) {
1781 my $showinputs = sub {
1782 return join "; ", map { $_->get_option('name') } @$inputs;
1785 foreach my $in (@$inputs) {
1787 my $in_name = $in->get_option('name');
1789 printdebug "files_compare_inputs $in_name\n";
1791 foreach my $csumi (@files_csum_info_fields) {
1792 my ($fname) = @$csumi;
1793 printdebug "files_compare_inputs $in_name $fname\n";
1795 my $field = $in->{$fname};
1796 next unless defined $field;
1799 foreach (split /\n/, $field) {
1802 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1803 fail "could not parse $in_name $fname line \`$_'";
1805 printdebug "files_compare_inputs $in_name $fname $f\n";
1809 my $re = \ $record{$f}{$fname};
1811 $fchecked{$f}{$in_name} = 1;
1813 fail "hash or size of $f varies in $fname fields".
1814 " (between: ".$showinputs->().")";
1819 @files = sort @files;
1820 $expected_files //= \@files;
1821 "@$expected_files" eq "@files" or
1822 fail "file list in $in_name varies between hash fields!";
1825 fail "$in_name has no files list field(s)";
1827 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1830 grep { keys %$_ == @$inputs-1 } values %fchecked
1831 or fail "no file appears in all file lists".
1832 " (looked in: ".$showinputs->().")";
1835 sub is_orig_file_in_dsc ($$) {
1836 my ($f, $dsc_files_info) = @_;
1837 return 0 if @$dsc_files_info <= 1;
1838 # One file means no origs, and the filename doesn't have a "what
1839 # part of dsc" component. (Consider versions ending `.orig'.)
1840 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1844 sub is_orig_file_of_vsn ($$) {
1845 my ($f, $upstreamvsn) = @_;
1846 my $base = srcfn $upstreamvsn, '';
1847 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1851 sub changes_update_origs_from_dsc ($$$$) {
1852 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1854 printdebug "checking origs needed ($upstreamvsn)...\n";
1855 $_ = getfield $changes, 'Files';
1856 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1857 fail "cannot find section/priority from .changes Files field";
1858 my $placementinfo = $1;
1860 printdebug "checking origs needed placement '$placementinfo'...\n";
1861 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1862 $l =~ m/\S+$/ or next;
1864 printdebug "origs $file | $l\n";
1865 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1866 printdebug "origs $file is_orig\n";
1867 my $have = archive_query('file_in_archive', $file);
1868 if (!defined $have) {
1870 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1876 printdebug "origs $file \$#\$have=$#$have\n";
1877 foreach my $h (@$have) {
1880 foreach my $csumi (@files_csum_info_fields) {
1881 my ($fname, $module, $method, $archivefield) = @$csumi;
1882 next unless defined $h->{$archivefield};
1883 $_ = $dsc->{$fname};
1884 next unless defined;
1885 m/^(\w+) .* \Q$file\E$/m or
1886 fail ".dsc $fname missing entry for $file";
1887 if ($h->{$archivefield} eq $1) {
1891 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1894 die "$file ".Dumper($h)." ?!" if $same && @differ;
1897 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1900 printdebug "origs $file f.same=$found_same".
1901 " #f._differ=$#found_differ\n";
1902 if (@found_differ && !$found_same) {
1904 "archive contains $file with different checksum",
1907 # Now we edit the changes file to add or remove it
1908 foreach my $csumi (@files_csum_info_fields) {
1909 my ($fname, $module, $method, $archivefield) = @$csumi;
1910 next unless defined $changes->{$fname};
1912 # in archive, delete from .changes if it's there
1913 $changed{$file} = "removed" if
1914 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1915 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1916 # not in archive, but it's here in the .changes
1918 my $dsc_data = getfield $dsc, $fname;
1919 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1921 $extra =~ s/ \d+ /$&$placementinfo /
1922 or die "$fname $extra >$dsc_data< ?"
1923 if $fname eq 'Files';
1924 $changes->{$fname} .= "\n". $extra;
1925 $changed{$file} = "added";
1930 foreach my $file (keys %changed) {
1932 "edited .changes for archive .orig contents: %s %s",
1933 $changed{$file}, $file;
1935 my $chtmp = "$changesfile.tmp";
1936 $changes->save($chtmp);
1938 rename $chtmp,$changesfile or die "$changesfile $!";
1940 progress "[new .changes left in $changesfile]";
1943 progress "$changesfile already has appropriate .orig(s) (if any)";
1947 sub make_commit ($) {
1949 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1952 sub make_commit_text ($) {
1955 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1957 print Dumper($text) if $debuglevel > 1;
1958 my $child = open2($out, $in, @cmd) or die $!;
1961 print $in $text or die $!;
1962 close $in or die $!;
1964 $h =~ m/^\w+$/ or die;
1966 printdebug "=> $h\n";
1969 waitpid $child, 0 == $child or die "$child $!";
1970 $? and failedcmd @cmd;
1974 sub clogp_authline ($) {
1976 my $author = getfield $clogp, 'Maintainer';
1977 $author =~ s#,.*##ms;
1978 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1979 my $authline = "$author $date";
1980 $authline =~ m/$git_authline_re/o or
1981 fail "unexpected commit author line format \`$authline'".
1982 " (was generated from changelog Maintainer field)";
1983 return ($1,$2,$3) if wantarray;
1987 sub vendor_patches_distro ($$) {
1988 my ($checkdistro, $what) = @_;
1989 return unless defined $checkdistro;
1991 my $series = "debian/patches/\L$checkdistro\E.series";
1992 printdebug "checking for vendor-specific $series ($what)\n";
1994 if (!open SERIES, "<", $series) {
1995 die "$series $!" unless $!==ENOENT;
2004 Unfortunately, this source package uses a feature of dpkg-source where
2005 the same source package unpacks to different source code on different
2006 distros. dgit cannot safely operate on such packages on affected
2007 distros, because the meaning of source packages is not stable.
2009 Please ask the distro/maintainer to remove the distro-specific series
2010 files and use a different technique (if necessary, uploading actually
2011 different packages, if different distros are supposed to have
2015 fail "Found active distro-specific series file for".
2016 " $checkdistro ($what): $series, cannot continue";
2018 die "$series $!" if SERIES->error;
2022 sub check_for_vendor_patches () {
2023 # This dpkg-source feature doesn't seem to be documented anywhere!
2024 # But it can be found in the changelog (reformatted):
2026 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2027 # Author: Raphael Hertzog <hertzog@debian.org>
2028 # Date: Sun Oct 3 09:36:48 2010 +0200
2030 # dpkg-source: correctly create .pc/.quilt_series with alternate
2033 # If you have debian/patches/ubuntu.series and you were
2034 # unpacking the source package on ubuntu, quilt was still
2035 # directed to debian/patches/series instead of
2036 # debian/patches/ubuntu.series.
2038 # debian/changelog | 3 +++
2039 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2040 # 2 files changed, 6 insertions(+), 1 deletion(-)
2043 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2044 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2045 "Dpkg::Vendor \`current vendor'");
2046 vendor_patches_distro(access_basedistro(),
2047 "(base) distro being accessed");
2048 vendor_patches_distro(access_nomdistro(),
2049 "(nominal) distro being accessed");
2052 sub generate_commits_from_dsc () {
2053 # See big comment in fetch_from_archive, below.
2054 # See also README.dsc-import.
2058 my @dfi = dsc_files_info();
2059 foreach my $fi (@dfi) {
2060 my $f = $fi->{Filename};
2061 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2063 printdebug "considering linking $f: ";
2065 link_ltarget "../../../../$f", $f
2066 or ((printdebug "($!) "), 0)
2070 printdebug "linked.\n";
2072 complete_file_from_dsc('.', $fi)
2075 if (is_orig_file_in_dsc($f, \@dfi)) {
2076 link $f, "../../../../$f"
2082 # We unpack and record the orig tarballs first, so that we only
2083 # need disk space for one private copy of the unpacked source.
2084 # But we can't make them into commits until we have the metadata
2085 # from the debian/changelog, so we record the tree objects now and
2086 # make them into commits later.
2088 my $upstreamv = upstreamversion $dsc->{version};
2089 my $orig_f_base = srcfn $upstreamv, '';
2091 foreach my $fi (@dfi) {
2092 # We actually import, and record as a commit, every tarball
2093 # (unless there is only one file, in which case there seems
2096 my $f = $fi->{Filename};
2097 printdebug "import considering $f ";
2098 (printdebug "only one dfi\n"), next if @dfi == 1;
2099 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2100 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2104 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2106 printdebug "Y ", (join ' ', map { $_//"(none)" }
2107 $compr_ext, $orig_f_part
2110 my $input = new IO::File $f, '<' or die "$f $!";
2114 if (defined $compr_ext) {
2116 Dpkg::Compression::compression_guess_from_filename $f;
2117 fail "Dpkg::Compression cannot handle file $f in source package"
2118 if defined $compr_ext && !defined $cname;
2120 new Dpkg::Compression::Process compression => $cname;
2121 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2122 my $compr_fh = new IO::Handle;
2123 my $compr_pid = open $compr_fh, "-|" // die $!;
2125 open STDIN, "<&", $input or die $!;
2127 die "dgit (child): exec $compr_cmd[0]: $!\n";
2132 rmtree "_unpack-tar";
2133 mkdir "_unpack-tar" or die $!;
2134 my @tarcmd = qw(tar -x -f -
2135 --no-same-owner --no-same-permissions
2136 --no-acls --no-xattrs --no-selinux);
2137 my $tar_pid = fork // die $!;
2139 chdir "_unpack-tar" or die $!;
2140 open STDIN, "<&", $input or die $!;
2142 die "dgit (child): exec $tarcmd[0]: $!";
2144 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2145 !$? or failedcmd @tarcmd;
2148 (@compr_cmd ? failedcmd @compr_cmd
2150 # finally, we have the results in "tarball", but maybe
2151 # with the wrong permissions
2153 runcmd qw(chmod -R +rwX _unpack-tar);
2154 changedir "_unpack-tar";
2155 remove_stray_gits($f);
2156 mktree_in_ud_here();
2158 my ($tree) = git_add_write_tree();
2159 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2160 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2162 printdebug "one subtree $1\n";
2164 printdebug "multiple subtrees\n";
2167 rmtree "_unpack-tar";
2169 my $ent = [ $f, $tree ];
2171 Orig => !!$orig_f_part,
2172 Sort => (!$orig_f_part ? 2 :
2173 $orig_f_part =~ m/-/g ? 1 :
2181 # put any without "_" first (spec is not clear whether files
2182 # are always in the usual order). Tarballs without "_" are
2183 # the main orig or the debian tarball.
2184 $a->{Sort} <=> $b->{Sort} or
2188 my $any_orig = grep { $_->{Orig} } @tartrees;
2190 my $dscfn = "$package.dsc";
2192 my $treeimporthow = 'package';
2194 open D, ">", $dscfn or die "$dscfn: $!";
2195 print D $dscdata or die "$dscfn: $!";
2196 close D or die "$dscfn: $!";
2197 my @cmd = qw(dpkg-source);
2198 push @cmd, '--no-check' if $dsc_checked;
2199 if (madformat $dsc->{format}) {
2200 push @cmd, '--skip-patches';
2201 $treeimporthow = 'unpatched';
2203 push @cmd, qw(-x --), $dscfn;
2206 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2207 if (madformat $dsc->{format}) {
2208 check_for_vendor_patches();
2212 if (madformat $dsc->{format}) {
2213 my @pcmd = qw(dpkg-source --before-build .);
2214 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2216 $dappliedtree = git_add_write_tree();
2219 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2220 debugcmd "|",@clogcmd;
2221 open CLOGS, "-|", @clogcmd or die $!;
2226 printdebug "import clog search...\n";
2229 my $stanzatext = do { local $/=""; <CLOGS>; };
2230 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2231 last if !defined $stanzatext;
2233 my $desc = "package changelog, entry no.$.";
2234 open my $stanzafh, "<", \$stanzatext or die;
2235 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2236 $clogp //= $thisstanza;
2238 printdebug "import clog $thisstanza->{version} $desc...\n";
2240 last if !$any_orig; # we don't need $r1clogp
2242 # We look for the first (most recent) changelog entry whose
2243 # version number is lower than the upstream version of this
2244 # package. Then the last (least recent) previous changelog
2245 # entry is treated as the one which introduced this upstream
2246 # version and used for the synthetic commits for the upstream
2249 # One might think that a more sophisticated algorithm would be
2250 # necessary. But: we do not want to scan the whole changelog
2251 # file. Stopping when we see an earlier version, which
2252 # necessarily then is an earlier upstream version, is the only
2253 # realistic way to do that. Then, either the earliest
2254 # changelog entry we have seen so far is indeed the earliest
2255 # upload of this upstream version; or there are only changelog
2256 # entries relating to later upstream versions (which is not
2257 # possible unless the changelog and .dsc disagree about the
2258 # version). Then it remains to choose between the physically
2259 # last entry in the file, and the one with the lowest version
2260 # number. If these are not the same, we guess that the
2261 # versions were created in a non-monotic order rather than
2262 # that the changelog entries have been misordered.
2264 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2266 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2267 $r1clogp = $thisstanza;
2269 printdebug "import clog $r1clogp->{version} becomes r1\n";
2271 die $! if CLOGS->error;
2272 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2274 $clogp or fail "package changelog has no entries!";
2276 my $authline = clogp_authline $clogp;
2277 my $changes = getfield $clogp, 'Changes';
2278 my $cversion = getfield $clogp, 'Version';
2281 $r1clogp //= $clogp; # maybe there's only one entry;
2282 my $r1authline = clogp_authline $r1clogp;
2283 # Strictly, r1authline might now be wrong if it's going to be
2284 # unused because !$any_orig. Whatever.
2286 printdebug "import tartrees authline $authline\n";
2287 printdebug "import tartrees r1authline $r1authline\n";
2289 foreach my $tt (@tartrees) {
2290 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2292 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2295 committer $r1authline
2299 [dgit import orig $tt->{F}]
2307 [dgit import tarball $package $cversion $tt->{F}]
2312 printdebug "import main commit\n";
2314 open C, ">../commit.tmp" or die $!;
2315 print C <<END or die $!;
2318 print C <<END or die $! foreach @tartrees;
2321 print C <<END or die $!;
2327 [dgit import $treeimporthow $package $cversion]
2331 my $rawimport_hash = make_commit qw(../commit.tmp);
2333 if (madformat $dsc->{format}) {
2334 printdebug "import apply patches...\n";
2336 # regularise the state of the working tree so that
2337 # the checkout of $rawimport_hash works nicely.
2338 my $dappliedcommit = make_commit_text(<<END);
2345 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2347 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2349 # We need the answers to be reproducible
2350 my @authline = clogp_authline($clogp);
2351 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2352 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2353 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2354 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2355 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2356 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2358 my $path = $ENV{PATH} or die;
2360 foreach my $use_absurd (qw(0 1)) {
2361 runcmd @git, qw(checkout -q unpa);
2362 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2363 local $ENV{PATH} = $path;
2366 progress "warning: $@";
2367 $path = "$absurdity:$path";
2368 progress "$us: trying slow absurd-git-apply...";
2369 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2374 die "forbid absurd git-apply\n" if $use_absurd
2375 && forceing [qw(import-gitapply-no-absurd)];
2376 die "only absurd git-apply!\n" if !$use_absurd
2377 && forceing [qw(import-gitapply-absurd)];
2379 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2380 local $ENV{PATH} = $path if $use_absurd;
2382 my @showcmd = (gbp_pq, qw(import));
2383 my @realcmd = shell_cmd
2384 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2385 debugcmd "+",@realcmd;
2386 if (system @realcmd) {
2387 die +(shellquote @showcmd).
2389 failedcmd_waitstatus()."\n";
2392 my $gapplied = git_rev_parse('HEAD');
2393 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2394 $gappliedtree eq $dappliedtree or
2396 gbp-pq import and dpkg-source disagree!
2397 gbp-pq import gave commit $gapplied
2398 gbp-pq import gave tree $gappliedtree
2399 dpkg-source --before-build gave tree $dappliedtree
2401 $rawimport_hash = $gapplied;
2406 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2411 progress "synthesised git commit from .dsc $cversion";
2413 my $rawimport_mergeinput = {
2414 Commit => $rawimport_hash,
2415 Info => "Import of source package",
2417 my @output = ($rawimport_mergeinput);
2419 if ($lastpush_mergeinput) {
2420 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2421 my $oversion = getfield $oldclogp, 'Version';
2423 version_compare($oversion, $cversion);
2425 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2426 { Message => <<END, ReverseParents => 1 });
2427 Record $package ($cversion) in archive suite $csuite
2429 } elsif ($vcmp > 0) {
2430 print STDERR <<END or die $!;
2432 Version actually in archive: $cversion (older)
2433 Last version pushed with dgit: $oversion (newer or same)
2436 @output = $lastpush_mergeinput;
2438 # Same version. Use what's in the server git branch,
2439 # discarding our own import. (This could happen if the
2440 # server automatically imports all packages into git.)
2441 @output = $lastpush_mergeinput;
2444 changedir '../../../..';
2449 sub complete_file_from_dsc ($$) {
2450 our ($dstdir, $fi) = @_;
2451 # Ensures that we have, in $dir, the file $fi, with the correct
2452 # contents. (Downloading it from alongside $dscurl if necessary.)
2454 my $f = $fi->{Filename};
2455 my $tf = "$dstdir/$f";
2458 if (stat_exists $tf) {
2459 progress "using existing $f";
2461 printdebug "$tf does not exist, need to fetch\n";
2463 $furl =~ s{/[^/]+$}{};
2465 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2466 die "$f ?" if $f =~ m#/#;
2467 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2468 return 0 if !act_local();
2472 open F, "<", "$tf" or die "$tf: $!";
2473 $fi->{Digester}->reset();
2474 $fi->{Digester}->addfile(*F);
2475 F->error and die $!;
2476 my $got = $fi->{Digester}->hexdigest();
2477 $got eq $fi->{Hash} or
2478 fail "file $f has hash $got but .dsc".
2479 " demands hash $fi->{Hash} ".
2480 ($downloaded ? "(got wrong file from archive!)"
2481 : "(perhaps you should delete this file?)");
2486 sub ensure_we_have_orig () {
2487 my @dfi = dsc_files_info();
2488 foreach my $fi (@dfi) {
2489 my $f = $fi->{Filename};
2490 next unless is_orig_file_in_dsc($f, \@dfi);
2491 complete_file_from_dsc('..', $fi)
2496 #---------- git fetch ----------
2498 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2499 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2501 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2502 # locally fetched refs because they have unhelpful names and clutter
2503 # up gitk etc. So we track whether we have "used up" head ref (ie,
2504 # whether we have made another local ref which refers to this object).
2506 # (If we deleted them unconditionally, then we might end up
2507 # re-fetching the same git objects each time dgit fetch was run.)
2509 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
2510 # in git_fetch_us to fetch the refs in question, and possibly a call
2511 # to lrfetchref_used.
2513 our (%lrfetchrefs_f, %lrfetchrefs_d);
2514 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2516 sub lrfetchref_used ($) {
2517 my ($fullrefname) = @_;
2518 my $objid = $lrfetchrefs_f{$fullrefname};
2519 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2522 sub git_lrfetch_sane {
2523 my ($supplementary, @specs) = @_;
2524 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2525 # at least as regards @specs. Also leave the results in
2526 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2527 # able to clean these up.
2529 # With $supplementary==1, @specs must not contain wildcards
2530 # and we add to our previous fetches (non-atomically).
2532 # This is rather miserable:
2533 # When git fetch --prune is passed a fetchspec ending with a *,
2534 # it does a plausible thing. If there is no * then:
2535 # - it matches subpaths too, even if the supplied refspec
2536 # starts refs, and behaves completely madly if the source
2537 # has refs/refs/something. (See, for example, Debian #NNNN.)
2538 # - if there is no matching remote ref, it bombs out the whole
2540 # We want to fetch a fixed ref, and we don't know in advance
2541 # if it exists, so this is not suitable.
2543 # Our workaround is to use git ls-remote. git ls-remote has its
2544 # own qairks. Notably, it has the absurd multi-tail-matching
2545 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2546 # refs/refs/foo etc.
2548 # Also, we want an idempotent snapshot, but we have to make two
2549 # calls to the remote: one to git ls-remote and to git fetch. The
2550 # solution is use git ls-remote to obtain a target state, and
2551 # git fetch to try to generate it. If we don't manage to generate
2552 # the target state, we try again.
2554 my $url = access_giturl();
2556 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2558 my $specre = join '|', map {
2561 my $wildcard = $x =~ s/\\\*$/.*/;
2562 die if $wildcard && $supplementary;
2565 printdebug "git_lrfetch_sane specre=$specre\n";
2566 my $wanted_rref = sub {
2568 return m/^(?:$specre)$/;
2571 my $fetch_iteration = 0;
2574 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2575 if (++$fetch_iteration > 10) {
2576 fail "too many iterations trying to get sane fetch!";
2579 my @look = map { "refs/$_" } @specs;
2580 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2584 open GITLS, "-|", @lcmd or die $!;
2586 printdebug "=> ", $_;
2587 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2588 my ($objid,$rrefname) = ($1,$2);
2589 if (!$wanted_rref->($rrefname)) {
2591 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2595 $wantr{$rrefname} = $objid;
2598 close GITLS or failedcmd @lcmd;
2600 # OK, now %want is exactly what we want for refs in @specs
2602 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2603 "+refs/$_:".lrfetchrefs."/$_";
2606 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2608 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2609 runcmd_ordryrun_local @fcmd if @fspecs;
2611 if (!$supplementary) {
2612 %lrfetchrefs_f = ();
2616 git_for_each_ref(lrfetchrefs, sub {
2617 my ($objid,$objtype,$lrefname,$reftail) = @_;
2618 $lrfetchrefs_f{$lrefname} = $objid;
2619 $objgot{$objid} = 1;
2622 if ($supplementary) {
2626 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2627 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2628 if (!exists $wantr{$rrefname}) {
2629 if ($wanted_rref->($rrefname)) {
2631 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2635 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2638 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2639 delete $lrfetchrefs_f{$lrefname};
2643 foreach my $rrefname (sort keys %wantr) {
2644 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2645 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2646 my $want = $wantr{$rrefname};
2647 next if $got eq $want;
2648 if (!defined $objgot{$want}) {
2650 warning: git ls-remote suggests we want $lrefname
2651 warning: and it should refer to $want
2652 warning: but git fetch didn't fetch that object to any relevant ref.
2653 warning: This may be due to a race with someone updating the server.
2654 warning: Will try again...
2656 next FETCH_ITERATION;
2659 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2661 runcmd_ordryrun_local @git, qw(update-ref -m),
2662 "dgit fetch git fetch fixup", $lrefname, $want;
2663 $lrfetchrefs_f{$lrefname} = $want;
2667 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2668 Dumper(\%lrfetchrefs_f);
2671 sub git_fetch_us () {
2672 # Want to fetch only what we are going to use, unless
2673 # deliberately-not-ff, in which case we must fetch everything.
2675 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2677 (quiltmode_splitbrain
2678 ? (map { $_->('*',access_nomdistro) }
2679 \&debiantag_new, \&debiantag_maintview)
2680 : debiantags('*',access_nomdistro));
2681 push @specs, server_branch($csuite);
2682 push @specs, $rewritemap;
2683 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2685 git_lrfetch_sane 0, @specs;
2688 my @tagpats = debiantags('*',access_nomdistro);
2690 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2691 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2692 printdebug "currently $fullrefname=$objid\n";
2693 $here{$fullrefname} = $objid;
2695 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2696 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2697 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2698 printdebug "offered $lref=$objid\n";
2699 if (!defined $here{$lref}) {
2700 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2701 runcmd_ordryrun_local @upd;
2702 lrfetchref_used $fullrefname;
2703 } elsif ($here{$lref} eq $objid) {
2704 lrfetchref_used $fullrefname;
2707 "Not updateting $lref from $here{$lref} to $objid.\n";
2712 #---------- dsc and archive handling ----------
2714 sub mergeinfo_getclogp ($) {
2715 # Ensures thit $mi->{Clogp} exists and returns it
2717 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2720 sub mergeinfo_version ($) {
2721 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2724 sub fetch_from_archive_record_1 ($) {
2726 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2727 'DGIT_ARCHIVE', $hash;
2728 cmdoutput @git, qw(log -n2), $hash;
2729 # ... gives git a chance to complain if our commit is malformed
2732 sub fetch_from_archive_record_2 ($) {
2734 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2738 dryrun_report @upd_cmd;
2742 sub parse_dsc_field ($$) {
2743 my ($dsc, $what) = @_;
2745 foreach my $field (@ourdscfield) {
2746 $f = $dsc->{$field};
2750 progress "$what: NO git hash";
2751 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2752 = $f =~ m/^(\w+) ($distro_re) ($versiontag_re) (\S+)(?:\s|$)/) {
2753 progress "$what: specified git info ($dsc_distro)";
2754 $dsc_hint_tag = [ $dsc_hint_tag ];
2755 } elsif ($f =~ m/^\w+\s*$/) {
2757 $dsc_distro //= 'debian';
2758 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2760 progress "$what: specified git hash";
2762 fail "$what: invalid Dgit info";
2766 sub resolve_dsc_field_commit ($$) {
2767 my ($already_distro, $already_mapref) = @_;
2769 return unless defined $dsc_hash;
2772 defined $already_mapref &&
2773 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2774 ? $already_mapref : undef;
2778 my ($what, @fetch) = @_;
2780 local $idistro = $dsc_distro;
2781 my $lrf = lrfetchrefs;
2783 if (!$chase_dsc_distro) {
2785 "not chasing .dsc distro $dsc_distro: not fetching $what";
2790 ".dsc names distro $dsc_distro: fetching $what";
2792 my $url = access_giturl();
2793 if (!defined $url) {
2794 defined $dsc_hint_url or fail <<END;
2795 .dsc Dgit metadata is in context of distro $dsc_distro
2796 for which we have no configured url and .dsc provides no hint
2799 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2800 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2801 parse_cfg_bool "dsc-url-proto-ok", 'false',
2802 cfg("dgit.dsc-url-proto-ok.$proto",
2803 "dgit.default.dsc-url-proto-ok")
2805 .dsc Dgit metadata is in context of distro $dsc_distro
2806 for which we have no configured url;
2807 .dsc provices hinted url with protocol $proto which is unsafe.
2808 (can be overridden by config - consult documentation)
2810 $url = $dsc_hint_url;
2813 git_lrfetch_sane 1, @fetch;
2818 if (parse_cfg_bool 'rewrite-map-enable', 'true',
2819 access_cfg('rewrite-map-enable', 'RETURN-UNDEF')) {
2820 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2821 $mapref = $lrf.'/'.$rewritemap;
2822 my $rewritemapdata = git_cat_file $mapref.':map';
2823 if (defined $rewritemapdata
2824 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2826 "server's git history rewrite map contains a relevant entry!";
2829 if (defined $dsc_hash) {
2830 progress "using rewritten git hash in place of .dsc value";
2832 progress "server data says .dsc hash is to be disregarded";
2837 if (!defined git_cat_file $dsc_hash) {
2838 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2839 my $lrf = $do_fetch->("additional commits", @tags) &&
2840 defined git_cat_file $dsc_hash
2842 .dsc Dgit metadata requires commit $dsc_hash
2843 but we could not obtain that object anywhere.
2845 foreach my $t (@tags) {
2846 my $fullrefname = $lrf.'/'.$t;
2847 print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2848 next unless $lrfetchrefs_f{$fullrefname};
2849 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2850 lrfetchref_used $fullrefname;
2855 sub fetch_from_archive () {
2856 ensure_setup_existing_tree();
2858 # Ensures that lrref() is what is actually in the archive, one way
2859 # or another, according to us - ie this client's
2860 # appropritaely-updated archive view. Also returns the commit id.
2861 # If there is nothing in the archive, leaves lrref alone and
2862 # returns undef. git_fetch_us must have already been called.
2866 parse_dsc_field($dsc, 'last upload to archive');
2867 resolve_dsc_field_commit access_basedistro,
2868 lrfetchrefs."/".$rewritemap
2870 progress "no version available from the archive";
2873 # If the archive's .dsc has a Dgit field, there are three
2874 # relevant git commitids we need to choose between and/or merge
2876 # 1. $dsc_hash: the Dgit field from the archive
2877 # 2. $lastpush_hash: the suite branch on the dgit git server
2878 # 3. $lastfetch_hash: our local tracking brach for the suite
2880 # These may all be distinct and need not be in any fast forward
2883 # If the dsc was pushed to this suite, then the server suite
2884 # branch will have been updated; but it might have been pushed to
2885 # a different suite and copied by the archive. Conversely a more
2886 # recent version may have been pushed with dgit but not appeared
2887 # in the archive (yet).
2889 # $lastfetch_hash may be awkward because archive imports
2890 # (particularly, imports of Dgit-less .dscs) are performed only as
2891 # needed on individual clients, so different clients may perform a
2892 # different subset of them - and these imports are only made
2893 # public during push. So $lastfetch_hash may represent a set of
2894 # imports different to a subsequent upload by a different dgit
2897 # Our approach is as follows:
2899 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2900 # descendant of $dsc_hash, then it was pushed by a dgit user who
2901 # had based their work on $dsc_hash, so we should prefer it.
2902 # Otherwise, $dsc_hash was installed into this suite in the
2903 # archive other than by a dgit push, and (necessarily) after the
2904 # last dgit push into that suite (since a dgit push would have
2905 # been descended from the dgit server git branch); thus, in that
2906 # case, we prefer the archive's version (and produce a
2907 # pseudo-merge to overwrite the dgit server git branch).
2909 # (If there is no Dgit field in the archive's .dsc then
2910 # generate_commit_from_dsc uses the version numbers to decide
2911 # whether the suite branch or the archive is newer. If the suite
2912 # branch is newer it ignores the archive's .dsc; otherwise it
2913 # generates an import of the .dsc, and produces a pseudo-merge to
2914 # overwrite the suite branch with the archive contents.)
2916 # The outcome of that part of the algorithm is the `public view',
2917 # and is same for all dgit clients: it does not depend on any
2918 # unpublished history in the local tracking branch.
2920 # As between the public view and the local tracking branch: The
2921 # local tracking branch is only updated by dgit fetch, and
2922 # whenever dgit fetch runs it includes the public view in the
2923 # local tracking branch. Therefore if the public view is not
2924 # descended from the local tracking branch, the local tracking
2925 # branch must contain history which was imported from the archive
2926 # but never pushed; and, its tip is now out of date. So, we make
2927 # a pseudo-merge to overwrite the old imports and stitch the old
2930 # Finally: we do not necessarily reify the public view (as
2931 # described above). This is so that we do not end up stacking two
2932 # pseudo-merges. So what we actually do is figure out the inputs
2933 # to any public view pseudo-merge and put them in @mergeinputs.
2936 # $mergeinputs[]{Commit}
2937 # $mergeinputs[]{Info}
2938 # $mergeinputs[0] is the one whose tree we use
2939 # @mergeinputs is in the order we use in the actual commit)
2942 # $mergeinputs[]{Message} is a commit message to use
2943 # $mergeinputs[]{ReverseParents} if def specifies that parent
2944 # list should be in opposite order
2945 # Such an entry has no Commit or Info. It applies only when found
2946 # in the last entry. (This ugliness is to support making
2947 # identical imports to previous dgit versions.)
2949 my $lastpush_hash = git_get_ref(lrfetchref());
2950 printdebug "previous reference hash=$lastpush_hash\n";
2951 $lastpush_mergeinput = $lastpush_hash && {
2952 Commit => $lastpush_hash,
2953 Info => "dgit suite branch on dgit git server",
2956 my $lastfetch_hash = git_get_ref(lrref());
2957 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2958 my $lastfetch_mergeinput = $lastfetch_hash && {
2959 Commit => $lastfetch_hash,
2960 Info => "dgit client's archive history view",
2963 my $dsc_mergeinput = $dsc_hash && {
2964 Commit => $dsc_hash,
2965 Info => "Dgit field in .dsc from archive",
2969 my $del_lrfetchrefs = sub {
2972 printdebug "del_lrfetchrefs...\n";
2973 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2974 my $objid = $lrfetchrefs_d{$fullrefname};
2975 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2977 $gur ||= new IO::Handle;
2978 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2980 printf $gur "delete %s %s\n", $fullrefname, $objid;
2983 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2987 if (defined $dsc_hash) {
2988 ensure_we_have_orig();
2989 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2990 @mergeinputs = $dsc_mergeinput
2991 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2992 print STDERR <<END or die $!;
2994 Git commit in archive is behind the last version allegedly pushed/uploaded.
2995 Commit referred to by archive: $dsc_hash
2996 Last version pushed with dgit: $lastpush_hash
2999 @mergeinputs = ($lastpush_mergeinput);
3001 # Archive has .dsc which is not a descendant of the last dgit
3002 # push. This can happen if the archive moves .dscs about.
3003 # Just follow its lead.
3004 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3005 progress "archive .dsc names newer git commit";
3006 @mergeinputs = ($dsc_mergeinput);
3008 progress "archive .dsc names other git commit, fixing up";
3009 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3013 @mergeinputs = generate_commits_from_dsc();
3014 # We have just done an import. Now, our import algorithm might
3015 # have been improved. But even so we do not want to generate
3016 # a new different import of the same package. So if the
3017 # version numbers are the same, just use our existing version.
3018 # If the version numbers are different, the archive has changed
3019 # (perhaps, rewound).
3020 if ($lastfetch_mergeinput &&
3021 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3022 (mergeinfo_version $mergeinputs[0]) )) {
3023 @mergeinputs = ($lastfetch_mergeinput);
3025 } elsif ($lastpush_hash) {
3026 # only in git, not in the archive yet
3027 @mergeinputs = ($lastpush_mergeinput);
3028 print STDERR <<END or die $!;
3030 Package not found in the archive, but has allegedly been pushed using dgit.
3034 printdebug "nothing found!\n";
3035 if (defined $skew_warning_vsn) {
3036 print STDERR <<END or die $!;
3038 Warning: relevant archive skew detected.
3039 Archive allegedly contains $skew_warning_vsn
3040 But we were not able to obtain any version from the archive or git.
3044 unshift @end, $del_lrfetchrefs;
3048 if ($lastfetch_hash &&
3050 my $h = $_->{Commit};
3051 $h and is_fast_fwd($lastfetch_hash, $h);
3052 # If true, one of the existing parents of this commit
3053 # is a descendant of the $lastfetch_hash, so we'll
3054 # be ff from that automatically.
3058 push @mergeinputs, $lastfetch_mergeinput;
3061 printdebug "fetch mergeinfos:\n";
3062 foreach my $mi (@mergeinputs) {
3064 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3066 printdebug sprintf " ReverseParents=%d Message=%s",
3067 $mi->{ReverseParents}, $mi->{Message};
3071 my $compat_info= pop @mergeinputs
3072 if $mergeinputs[$#mergeinputs]{Message};
3074 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3077 if (@mergeinputs > 1) {
3079 my $tree_commit = $mergeinputs[0]{Commit};
3081 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3082 $tree =~ m/\n\n/; $tree = $`;
3083 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3086 # We use the changelog author of the package in question the
3087 # author of this pseudo-merge. This is (roughly) correct if
3088 # this commit is simply representing aa non-dgit upload.
3089 # (Roughly because it does not record sponsorship - but we
3090 # don't have sponsorship info because that's in the .changes,
3091 # which isn't in the archivw.)
3093 # But, it might be that we are representing archive history
3094 # updates (including in-archive copies). These are not really
3095 # the responsibility of the person who created the .dsc, but
3096 # there is no-one whose name we should better use. (The
3097 # author of the .dsc-named commit is clearly worse.)
3099 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3100 my $author = clogp_authline $useclogp;
3101 my $cversion = getfield $useclogp, 'Version';
3103 my $mcf = ".git/dgit/mergecommit";
3104 open MC, ">", $mcf or die "$mcf $!";
3105 print MC <<END or die $!;
3109 my @parents = grep { $_->{Commit} } @mergeinputs;
3110 @parents = reverse @parents if $compat_info->{ReverseParents};
3111 print MC <<END or die $! foreach @parents;
3115 print MC <<END or die $!;
3121 if (defined $compat_info->{Message}) {
3122 print MC $compat_info->{Message} or die $!;
3124 print MC <<END or die $!;
3125 Record $package ($cversion) in archive suite $csuite
3129 my $message_add_info = sub {
3131 my $mversion = mergeinfo_version $mi;
3132 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3136 $message_add_info->($mergeinputs[0]);
3137 print MC <<END or die $!;
3138 should be treated as descended from
3140 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3144 $hash = make_commit $mcf;
3146 $hash = $mergeinputs[0]{Commit};
3148 printdebug "fetch hash=$hash\n";
3151 my ($lasth, $what) = @_;
3152 return unless $lasth;
3153 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3156 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3158 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3160 fetch_from_archive_record_1($hash);
3162 if (defined $skew_warning_vsn) {
3164 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3165 my $gotclogp = commit_getclogp($hash);
3166 my $got_vsn = getfield $gotclogp, 'Version';
3167 printdebug "SKEW CHECK GOT $got_vsn\n";
3168 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3169 print STDERR <<END or die $!;
3171 Warning: archive skew detected. Using the available version:
3172 Archive allegedly contains $skew_warning_vsn
3173 We were able to obtain only $got_vsn
3179 if ($lastfetch_hash ne $hash) {
3180 fetch_from_archive_record_2($hash);
3183 lrfetchref_used lrfetchref();
3185 unshift @end, $del_lrfetchrefs;
3189 sub set_local_git_config ($$) {
3191 runcmd @git, qw(config), $k, $v;
3194 sub setup_mergechangelogs (;$) {
3196 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3198 my $driver = 'dpkg-mergechangelogs';
3199 my $cb = "merge.$driver";
3200 my $attrs = '.git/info/attributes';
3201 ensuredir '.git/info';
3203 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3204 if (!open ATTRS, "<", $attrs) {
3205 $!==ENOENT or die "$attrs: $!";
3209 next if m{^debian/changelog\s};
3210 print NATTRS $_, "\n" or die $!;
3212 ATTRS->error and die $!;
3215 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3218 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3219 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3221 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3224 sub setup_useremail (;$) {
3226 return unless $always || access_cfg_bool(1, 'setup-useremail');
3229 my ($k, $envvar) = @_;
3230 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3231 return unless defined $v;
3232 set_local_git_config "user.$k", $v;
3235 $setup->('email', 'DEBEMAIL');
3236 $setup->('name', 'DEBFULLNAME');
3239 sub ensure_setup_existing_tree () {
3240 my $k = "remote.$remotename.skipdefaultupdate";
3241 my $c = git_get_config $k;
3242 return if defined $c;
3243 set_local_git_config $k, 'true';
3246 sub setup_new_tree () {
3247 setup_mergechangelogs();
3251 sub multisuite_suite_child ($$$) {
3252 my ($tsuite, $merginputs, $fn) = @_;
3253 # in child, sets things up, calls $fn->(), and returns undef
3254 # in parent, returns canonical suite name for $tsuite
3255 my $canonsuitefh = IO::File::new_tmpfile;
3256 my $pid = fork // die $!;
3259 $us .= " [$isuite]";
3260 $debugprefix .= " ";
3261 progress "fetching $tsuite...";
3262 canonicalise_suite();
3263 print $canonsuitefh $csuite, "\n" or die $!;
3264 close $canonsuitefh or die $!;
3268 waitpid $pid,0 == $pid or die $!;
3269 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3270 seek $canonsuitefh,0,0 or die $!;
3271 local $csuite = <$canonsuitefh>;
3272 die $! unless defined $csuite && chomp $csuite;
3274 printdebug "multisuite $tsuite missing\n";
3277 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3278 push @$merginputs, {
3285 sub fork_for_multisuite ($) {
3286 my ($before_fetch_merge) = @_;
3287 # if nothing unusual, just returns ''
3290 # returns 0 to caller in child, to do first of the specified suites
3291 # in child, $csuite is not yet set
3293 # returns 1 to caller in parent, to finish up anything needed after
3294 # in parent, $csuite is set to canonicalised portmanteau
3296 my $org_isuite = $isuite;
3297 my @suites = split /\,/, $isuite;
3298 return '' unless @suites > 1;
3299 printdebug "fork_for_multisuite: @suites\n";
3303 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3305 return 0 unless defined $cbasesuite;
3307 fail "package $package missing in (base suite) $cbasesuite"
3308 unless @mergeinputs;
3310 my @csuites = ($cbasesuite);
3312 $before_fetch_merge->();
3314 foreach my $tsuite (@suites[1..$#suites]) {
3315 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3321 # xxx collecte the ref here
3323 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3324 push @csuites, $csubsuite;
3327 foreach my $mi (@mergeinputs) {
3328 my $ref = git_get_ref $mi->{Ref};
3329 die "$mi->{Ref} ?" unless length $ref;
3330 $mi->{Commit} = $ref;
3333 $csuite = join ",", @csuites;
3335 my $previous = git_get_ref lrref;
3337 unshift @mergeinputs, {
3338 Commit => $previous,
3339 Info => "local combined tracking branch",
3341 "archive seems to have rewound: local tracking branch is ahead!",
3345 foreach my $ix (0..$#mergeinputs) {
3346 $mergeinputs[$ix]{Index} = $ix;
3349 @mergeinputs = sort {
3350 -version_compare(mergeinfo_version $a,
3351 mergeinfo_version $b) # highest version first
3353 $a->{Index} <=> $b->{Index}; # earliest in spec first
3359 foreach my $mi (@mergeinputs) {
3360 printdebug "multisuite merge check $mi->{Info}\n";
3361 foreach my $previous (@needed) {
3362 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3363 printdebug "multisuite merge un-needed $previous->{Info}\n";
3367 printdebug "multisuite merge this-needed\n";
3368 $mi->{Character} = '+';
3371 $needed[0]{Character} = '*';
3373 my $output = $needed[0]{Commit};
3376 printdebug "multisuite merge nontrivial\n";
3377 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3379 my $commit = "tree $tree\n";
3380 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3381 "Input branches:\n";
3383 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3384 printdebug "multisuite merge include $mi->{Info}\n";
3385 $mi->{Character} //= ' ';
3386 $commit .= "parent $mi->{Commit}\n";
3387 $msg .= sprintf " %s %-25s %s\n",
3389 (mergeinfo_version $mi),
3392 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3394 " * marks the highest version branch, which choose to use\n".
3395 " + marks each branch which was not already an ancestor\n\n".
3396 "[dgit multi-suite $csuite]\n";
3398 "author $authline\n".
3399 "committer $authline\n\n";
3400 $output = make_commit_text $commit.$msg;
3401 printdebug "multisuite merge generated $output\n";
3404 fetch_from_archive_record_1($output);
3405 fetch_from_archive_record_2($output);
3407 progress "calculated combined tracking suite $csuite";
3412 sub clone_set_head () {
3413 open H, "> .git/HEAD" or die $!;
3414 print H "ref: ".lref()."\n" or die $!;
3417 sub clone_finish ($) {
3419 runcmd @git, qw(reset --hard), lrref();
3420 runcmd qw(bash -ec), <<'END';
3422 git ls-tree -r --name-only -z HEAD | \
3423 xargs -0r touch -h -r . --
3425 printdone "ready for work in $dstdir";
3430 badusage "dry run makes no sense with clone" unless act_local();
3432 my $multi_fetched = fork_for_multisuite(sub {
3433 printdebug "multi clone before fetch merge\n";
3436 if ($multi_fetched) {
3437 printdebug "multi clone after fetch merge\n";
3439 clone_finish($dstdir);
3442 printdebug "clone main body\n";
3444 canonicalise_suite();
3445 my $hasgit = check_for_git();
3446 mkdir $dstdir or fail "create \`$dstdir': $!";
3448 runcmd @git, qw(init -q);
3450 my $giturl = access_giturl(1);
3451 if (defined $giturl) {
3452 runcmd @git, qw(remote add), 'origin', $giturl;
3455 progress "fetching existing git history";
3457 runcmd_ordryrun_local @git, qw(fetch origin);
3459 progress "starting new git history";
3461 fetch_from_archive() or no_such_package;
3462 my $vcsgiturl = $dsc->{'Vcs-Git'};
3463 if (length $vcsgiturl) {
3464 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3465 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3468 clone_finish($dstdir);
3472 canonicalise_suite();
3473 if (check_for_git()) {
3476 fetch_from_archive() or no_such_package();
3477 printdone "fetched into ".lrref();
3481 my $multi_fetched = fork_for_multisuite(sub { });
3482 fetch() unless $multi_fetched; # parent
3483 return if $multi_fetched eq '0'; # child
3484 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3486 printdone "fetched to ".lrref()." and merged into HEAD";
3489 sub check_not_dirty () {
3490 foreach my $f (qw(local-options local-patch-header)) {
3491 if (stat_exists "debian/source/$f") {
3492 fail "git tree contains debian/source/$f";
3496 return if $ignoredirty;
3498 my @cmd = (@git, qw(diff --quiet HEAD));
3500 $!=0; $?=-1; system @cmd;
3503 fail "working tree is dirty (does not match HEAD)";
3509 sub commit_admin ($) {
3512 runcmd_ordryrun_local @git, qw(commit -m), $m;
3515 sub commit_quilty_patch () {
3516 my $output = cmdoutput @git, qw(status --porcelain);
3518 foreach my $l (split /\n/, $output) {
3519 next unless $l =~ m/\S/;
3520 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3524 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3526 progress "nothing quilty to commit, ok.";
3529 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3530 runcmd_ordryrun_local @git, qw(add -f), @adds;
3532 Commit Debian 3.0 (quilt) metadata
3534 [dgit ($our_version) quilt-fixup]
3538 sub get_source_format () {
3540 if (open F, "debian/source/options") {
3544 s/\s+$//; # ignore missing final newline
3546 my ($k, $v) = ($`, $'); #');
3547 $v =~ s/^"(.*)"$/$1/;
3553 F->error and die $!;
3556 die $! unless $!==&ENOENT;
3559 if (!open F, "debian/source/format") {
3560 die $! unless $!==&ENOENT;
3564 F->error and die $!;
3566 return ($_, \%options);
3569 sub madformat_wantfixup ($) {
3571 return 0 unless $format eq '3.0 (quilt)';
3572 our $quilt_mode_warned;
3573 if ($quilt_mode eq 'nocheck') {
3574 progress "Not doing any fixup of \`$format' due to".
3575 " ----no-quilt-fixup or --quilt=nocheck"
3576 unless $quilt_mode_warned++;
3579 progress "Format \`$format', need to check/update patch stack"
3580 unless $quilt_mode_warned++;
3584 sub maybe_split_brain_save ($$$) {
3585 my ($headref, $dgitview, $msg) = @_;
3586 # => message fragment "$saved" describing disposition of $dgitview
3587 return "commit id $dgitview" unless defined $split_brain_save;
3588 my @cmd = (shell_cmd "cd ../../../..",
3589 @git, qw(update-ref -m),
3590 "dgit --dgit-view-save $msg HEAD=$headref",
3591 $split_brain_save, $dgitview);
3593 return "and left in $split_brain_save";
3596 # An "infopair" is a tuple [ $thing, $what ]
3597 # (often $thing is a commit hash; $what is a description)
3599 sub infopair_cond_equal ($$) {
3601 $x->[0] eq $y->[0] or fail <<END;
3602 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3606 sub infopair_lrf_tag_lookup ($$) {
3607 my ($tagnames, $what) = @_;
3608 # $tagname may be an array ref
3609 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3610 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3611 foreach my $tagname (@tagnames) {
3612 my $lrefname = lrfetchrefs."/tags/$tagname";
3613 my $tagobj = $lrfetchrefs_f{$lrefname};
3614 next unless defined $tagobj;
3615 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3616 return [ git_rev_parse($tagobj), $what ];
3618 fail @tagnames==1 ? <<END : <<END;
3619 Wanted tag $what (@tagnames) on dgit server, but not found
3621 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3625 sub infopair_cond_ff ($$) {
3626 my ($anc,$desc) = @_;
3627 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3628 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3632 sub pseudomerge_version_check ($$) {
3633 my ($clogp, $archive_hash) = @_;
3635 my $arch_clogp = commit_getclogp $archive_hash;
3636 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3637 'version currently in archive' ];
3638 if (defined $overwrite_version) {
3639 if (length $overwrite_version) {
3640 infopair_cond_equal([ $overwrite_version,
3641 '--overwrite= version' ],
3644 my $v = $i_arch_v->[0];
3645 progress "Checking package changelog for archive version $v ...";
3647 my @xa = ("-f$v", "-t$v");
3648 my $vclogp = parsechangelog @xa;
3649 my $cv = [ (getfield $vclogp, 'Version'),
3650 "Version field from dpkg-parsechangelog @xa" ];
3651 infopair_cond_equal($i_arch_v, $cv);
3654 $@ =~ s/^dgit: //gm;
3656 "Perhaps debian/changelog does not mention $v ?";
3661 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3665 sub pseudomerge_make_commit ($$$$ $$) {
3666 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3667 $msg_cmd, $msg_msg) = @_;
3668 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3670 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3671 my $authline = clogp_authline $clogp;
3675 !defined $overwrite_version ? ""
3676 : !length $overwrite_version ? " --overwrite"
3677 : " --overwrite=".$overwrite_version;
3680 my $pmf = ".git/dgit/pseudomerge";
3681 open MC, ">", $pmf or die "$pmf $!";
3682 print MC <<END or die $!;
3685 parent $archive_hash
3695 return make_commit($pmf);
3698 sub splitbrain_pseudomerge ($$$$) {
3699 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3700 # => $merged_dgitview
3701 printdebug "splitbrain_pseudomerge...\n";
3703 # We: debian/PREVIOUS HEAD($maintview)
3704 # expect: o ----------------- o
3707 # a/d/PREVIOUS $dgitview
3710 # we do: `------------------ o
3714 return $dgitview unless defined $archive_hash;
3716 printdebug "splitbrain_pseudomerge...\n";
3718 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3720 if (!defined $overwrite_version) {
3721 progress "Checking that HEAD inciudes all changes in archive...";
3724 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3726 if (defined $overwrite_version) {
3728 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3729 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3730 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3731 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3732 my $i_archive = [ $archive_hash, "current archive contents" ];
3734 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3736 infopair_cond_equal($i_dgit, $i_archive);
3737 infopair_cond_ff($i_dep14, $i_dgit);
3738 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3742 $us: check failed (maybe --overwrite is needed, consult documentation)
3747 my $r = pseudomerge_make_commit
3748 $clogp, $dgitview, $archive_hash, $i_arch_v,
3749 "dgit --quilt=$quilt_mode",
3750 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3751 Declare fast forward from $i_arch_v->[0]
3753 Make fast forward from $i_arch_v->[0]
3756 maybe_split_brain_save $maintview, $r, "pseudomerge";
3758 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3762 sub plain_overwrite_pseudomerge ($$$) {
3763 my ($clogp, $head, $archive_hash) = @_;
3765 printdebug "plain_overwrite_pseudomerge...";
3767 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3769 return $head if is_fast_fwd $archive_hash, $head;
3771 my $m = "Declare fast forward from $i_arch_v->[0]";
3773 my $r = pseudomerge_make_commit
3774 $clogp, $head, $archive_hash, $i_arch_v,
3777 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3779 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3783 sub push_parse_changelog ($) {
3786 my $clogp = Dpkg::Control::Hash->new();
3787 $clogp->load($clogpfn) or die;
3789 my $clogpackage = getfield $clogp, 'Source';
3790 $package //= $clogpackage;
3791 fail "-p specified $package but changelog specified $clogpackage"
3792 unless $package eq $clogpackage;
3793 my $cversion = getfield $clogp, 'Version';
3794 my $tag = debiantag($cversion, access_nomdistro);
3795 runcmd @git, qw(check-ref-format), $tag;
3797 my $dscfn = dscfn($cversion);
3799 return ($clogp, $cversion, $dscfn);
3802 sub push_parse_dsc ($$$) {
3803 my ($dscfn,$dscfnwhat, $cversion) = @_;
3804 $dsc = parsecontrol($dscfn,$dscfnwhat);
3805 my $dversion = getfield $dsc, 'Version';
3806 my $dscpackage = getfield $dsc, 'Source';
3807 ($dscpackage eq $package && $dversion eq $cversion) or
3808 fail "$dscfn is for $dscpackage $dversion".
3809 " but debian/changelog is for $package $cversion";
3812 sub push_tagwants ($$$$) {
3813 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3816 TagFn => \&debiantag,
3821 if (defined $maintviewhead) {
3823 TagFn => \&debiantag_maintview,
3824 Objid => $maintviewhead,
3825 TfSuffix => '-maintview',
3828 } elsif ($dodep14tag eq 'no' ? 0
3829 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3830 : $dodep14tag eq 'always'
3831 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3832 --dep14tag-always (or equivalent in config) means server must support
3833 both "new" and "maint" tag formats, but config says it doesn't.
3835 : die "$dodep14tag ?") {
3837 TagFn => \&debiantag_maintview,
3839 TfSuffix => '-dgit',
3843 foreach my $tw (@tagwants) {
3844 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3845 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3847 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3851 sub push_mktags ($$ $$ $) {
3853 $changesfile,$changesfilewhat,
3856 die unless $tagwants->[0]{View} eq 'dgit';
3858 my $declaredistro = access_nomdistro();
3859 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
3860 $dsc->{$ourdscfield[0]} = join " ",
3861 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
3863 $dsc->save("$dscfn.tmp") or die $!;
3865 my $changes = parsecontrol($changesfile,$changesfilewhat);
3866 foreach my $field (qw(Source Distribution Version)) {
3867 $changes->{$field} eq $clogp->{$field} or
3868 fail "changes field $field \`$changes->{$field}'".
3869 " does not match changelog \`$clogp->{$field}'";
3872 my $cversion = getfield $clogp, 'Version';
3873 my $clogsuite = getfield $clogp, 'Distribution';
3875 # We make the git tag by hand because (a) that makes it easier
3876 # to control the "tagger" (b) we can do remote signing
3877 my $authline = clogp_authline $clogp;
3878 my $delibs = join(" ", "",@deliberatelies);
3882 my $tfn = $tw->{Tfn};
3883 my $head = $tw->{Objid};
3884 my $tag = $tw->{Tag};
3886 open TO, '>', $tfn->('.tmp') or die $!;
3887 print TO <<END or die $!;
3894 if ($tw->{View} eq 'dgit') {
3895 print TO <<END or die $!;
3896 $package release $cversion for $clogsuite ($csuite) [dgit]
3897 [dgit distro=$declaredistro$delibs]
3899 foreach my $ref (sort keys %previously) {
3900 print TO <<END or die $!;
3901 [dgit previously:$ref=$previously{$ref}]
3904 } elsif ($tw->{View} eq 'maint') {
3905 print TO <<END or die $!;
3906 $package release $cversion for $clogsuite ($csuite)
3907 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3910 die Dumper($tw)."?";
3915 my $tagobjfn = $tfn->('.tmp');
3917 if (!defined $keyid) {
3918 $keyid = access_cfg('keyid','RETURN-UNDEF');
3920 if (!defined $keyid) {
3921 $keyid = getfield $clogp, 'Maintainer';
3923 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3924 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3925 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3926 push @sign_cmd, $tfn->('.tmp');
3927 runcmd_ordryrun @sign_cmd;
3929 $tagobjfn = $tfn->('.signed.tmp');
3930 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3931 $tfn->('.tmp'), $tfn->('.tmp.asc');
3937 my @r = map { $mktag->($_); } @$tagwants;
3941 sub sign_changes ($) {
3942 my ($changesfile) = @_;
3944 my @debsign_cmd = @debsign;
3945 push @debsign_cmd, "-k$keyid" if defined $keyid;
3946 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3947 push @debsign_cmd, $changesfile;
3948 runcmd_ordryrun @debsign_cmd;
3953 printdebug "actually entering push\n";
3955 supplementary_message(<<'END');
3956 Push failed, while checking state of the archive.
3957 You can retry the push, after fixing the problem, if you like.
3959 if (check_for_git()) {
3962 my $archive_hash = fetch_from_archive();
3963 if (!$archive_hash) {
3965 fail "package appears to be new in this suite;".
3966 " if this is intentional, use --new";
3969 supplementary_message(<<'END');
3970 Push failed, while preparing your push.
3971 You can retry the push, after fixing the problem, if you like.
3974 need_tagformat 'new', "quilt mode $quilt_mode"
3975 if quiltmode_splitbrain;
3979 access_giturl(); # check that success is vaguely likely
3982 my $clogpfn = ".git/dgit/changelog.822.tmp";
3983 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3985 responder_send_file('parsed-changelog', $clogpfn);
3987 my ($clogp, $cversion, $dscfn) =
3988 push_parse_changelog("$clogpfn");
3990 my $dscpath = "$buildproductsdir/$dscfn";
3991 stat_exists $dscpath or
3992 fail "looked for .dsc $dscpath, but $!;".
3993 " maybe you forgot to build";
3995 responder_send_file('dsc', $dscpath);
3997 push_parse_dsc($dscpath, $dscfn, $cversion);
3999 my $format = getfield $dsc, 'Format';
4000 printdebug "format $format\n";
4002 my $actualhead = git_rev_parse('HEAD');
4003 my $dgithead = $actualhead;
4004 my $maintviewhead = undef;
4006 my $upstreamversion = upstreamversion $clogp->{Version};
4008 if (madformat_wantfixup($format)) {
4009 # user might have not used dgit build, so maybe do this now:
4010 if (quiltmode_splitbrain()) {
4012 quilt_make_fake_dsc($upstreamversion);
4014 ($dgithead, $cachekey) =
4015 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4017 "--quilt=$quilt_mode but no cached dgit view:
4018 perhaps tree changed since dgit build[-source] ?";
4020 $dgithead = splitbrain_pseudomerge($clogp,
4021 $actualhead, $dgithead,
4023 $maintviewhead = $actualhead;
4024 changedir '../../../..';
4025 prep_ud(); # so _only_subdir() works, below
4027 commit_quilty_patch();
4031 if (defined $overwrite_version && !defined $maintviewhead) {
4032 $dgithead = plain_overwrite_pseudomerge($clogp,
4040 if ($archive_hash) {
4041 if (is_fast_fwd($archive_hash, $dgithead)) {
4043 } elsif (deliberately_not_fast_forward) {
4046 fail "dgit push: HEAD is not a descendant".
4047 " of the archive's version.\n".
4048 "To overwrite the archive's contents,".
4049 " pass --overwrite[=VERSION].\n".
4050 "To rewind history, if permitted by the archive,".
4051 " use --deliberately-not-fast-forward.";
4056 progress "checking that $dscfn corresponds to HEAD";
4057 runcmd qw(dpkg-source -x --),
4058 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4059 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4060 check_for_vendor_patches() if madformat($dsc->{format});
4061 changedir '../../../..';
4062 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4063 debugcmd "+",@diffcmd;
4065 my $r = system @diffcmd;
4068 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4070 HEAD specifies a different tree to $dscfn:
4072 Perhaps you forgot to build. Or perhaps there is a problem with your
4073 source tree (see dgit(7) for some hints). To see a full diff, run
4080 if (!$changesfile) {
4081 my $pat = changespat $cversion;
4082 my @cs = glob "$buildproductsdir/$pat";
4083 fail "failed to find unique changes file".
4084 " (looked for $pat in $buildproductsdir);".
4085 " perhaps you need to use dgit -C"
4087 ($changesfile) = @cs;
4089 $changesfile = "$buildproductsdir/$changesfile";
4092 # Check that changes and .dsc agree enough
4093 $changesfile =~ m{[^/]*$};
4094 my $changes = parsecontrol($changesfile,$&);
4095 files_compare_inputs($dsc, $changes)
4096 unless forceing [qw(dsc-changes-mismatch)];
4098 # Perhaps adjust .dsc to contain right set of origs
4099 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4101 unless forceing [qw(changes-origs-exactly)];
4103 # Checks complete, we're going to try and go ahead:
4105 responder_send_file('changes',$changesfile);
4106 responder_send_command("param head $dgithead");
4107 responder_send_command("param csuite $csuite");
4108 responder_send_command("param tagformat $tagformat");
4109 if (defined $maintviewhead) {
4110 die unless ($protovsn//4) >= 4;
4111 responder_send_command("param maint-view $maintviewhead");
4114 if (deliberately_not_fast_forward) {
4115 git_for_each_ref(lrfetchrefs, sub {
4116 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4117 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4118 responder_send_command("previously $rrefname=$objid");
4119 $previously{$rrefname} = $objid;
4123 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4127 supplementary_message(<<'END');
4128 Push failed, while signing the tag.
4129 You can retry the push, after fixing the problem, if you like.
4131 # If we manage to sign but fail to record it anywhere, it's fine.
4132 if ($we_are_responder) {
4133 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4134 responder_receive_files('signed-tag', @tagobjfns);
4136 @tagobjfns = push_mktags($clogp,$dscpath,
4137 $changesfile,$changesfile,
4140 supplementary_message(<<'END');
4141 Push failed, *after* signing the tag.
4142 If you want to try again, you should use a new version number.
4145 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4147 foreach my $tw (@tagwants) {
4148 my $tag = $tw->{Tag};
4149 my $tagobjfn = $tw->{TagObjFn};
4151 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4152 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4153 runcmd_ordryrun_local
4154 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4157 supplementary_message(<<'END');
4158 Push failed, while updating the remote git repository - see messages above.
4159 If you want to try again, you should use a new version number.
4161 if (!check_for_git()) {
4162 create_remote_git_repo();
4165 my @pushrefs = $forceflag.$dgithead.":".rrref();
4166 foreach my $tw (@tagwants) {
4167 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4170 runcmd_ordryrun @git,
4171 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4172 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4174 supplementary_message(<<'END');
4175 Push failed, while obtaining signatures on the .changes and .dsc.
4176 If it was just that the signature failed, you may try again by using
4177 debsign by hand to sign the changes
4179 and then dput to complete the upload.
4180 If you need to change the package, you must use a new version number.
4182 if ($we_are_responder) {
4183 my $dryrunsuffix = act_local() ? "" : ".tmp";
4184 responder_receive_files('signed-dsc-changes',
4185 "$dscpath$dryrunsuffix",
4186 "$changesfile$dryrunsuffix");
4189 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4191 progress "[new .dsc left in $dscpath.tmp]";
4193 sign_changes $changesfile;
4196 supplementary_message(<<END);
4197 Push failed, while uploading package(s) to the archive server.
4198 You can retry the upload of exactly these same files with dput of:
4200 If that .changes file is broken, you will need to use a new version
4201 number for your next attempt at the upload.
4203 my $host = access_cfg('upload-host','RETURN-UNDEF');
4204 my @hostarg = defined($host) ? ($host,) : ();
4205 runcmd_ordryrun @dput, @hostarg, $changesfile;
4206 printdone "pushed and uploaded $cversion";
4208 supplementary_message('');
4209 responder_send_command("complete");
4215 badusage "-p is not allowed with clone; specify as argument instead"
4216 if defined $package;
4219 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4220 ($package,$isuite) = @ARGV;
4221 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4222 ($package,$dstdir) = @ARGV;
4223 } elsif (@ARGV==3) {
4224 ($package,$isuite,$dstdir) = @ARGV;
4226 badusage "incorrect arguments to dgit clone";
4230 $dstdir ||= "$package";
4231 if (stat_exists $dstdir) {
4232 fail "$dstdir already exists";
4236 if ($rmonerror && !$dryrun_level) {
4237 $cwd_remove= getcwd();
4239 return unless defined $cwd_remove;
4240 if (!chdir "$cwd_remove") {
4241 return if $!==&ENOENT;
4242 die "chdir $cwd_remove: $!";
4244 printdebug "clone rmonerror removing $dstdir\n";
4246 rmtree($dstdir) or die "remove $dstdir: $!\n";
4247 } elsif (grep { $! == $_ }
4248 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4250 print STDERR "check whether to remove $dstdir: $!\n";
4256 $cwd_remove = undef;
4259 sub branchsuite () {
4260 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4261 if ($branch =~ m#$lbranch_re#o) {
4268 sub fetchpullargs () {
4269 if (!defined $package) {
4270 my $sourcep = parsecontrol('debian/control','debian/control');
4271 $package = getfield $sourcep, 'Source';
4274 $isuite = branchsuite();
4276 my $clogp = parsechangelog();
4277 $isuite = getfield $clogp, 'Distribution';
4279 } elsif (@ARGV==1) {
4282 badusage "incorrect arguments to dgit fetch or dgit pull";
4290 my $multi_fetched = fork_for_multisuite(sub { });
4291 exit 0 if $multi_fetched;
4298 if (quiltmode_splitbrain()) {
4299 my ($format, $fopts) = get_source_format();
4300 madformat($format) and fail <<END
4301 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4310 badusage "-p is not allowed with dgit push" if defined $package;
4312 my $clogp = parsechangelog();
4313 $package = getfield $clogp, 'Source';
4316 } elsif (@ARGV==1) {
4317 ($specsuite) = (@ARGV);
4319 badusage "incorrect arguments to dgit push";
4321 $isuite = getfield $clogp, 'Distribution';
4323 local ($package) = $existing_package; # this is a hack
4324 canonicalise_suite();
4326 canonicalise_suite();
4328 if (defined $specsuite &&
4329 $specsuite ne $isuite &&
4330 $specsuite ne $csuite) {
4331 fail "dgit push: changelog specifies $isuite ($csuite)".
4332 " but command line specifies $specsuite";
4337 #---------- remote commands' implementation ----------
4339 sub cmd_remote_push_build_host {
4340 my ($nrargs) = shift @ARGV;
4341 my (@rargs) = @ARGV[0..$nrargs-1];
4342 @ARGV = @ARGV[$nrargs..$#ARGV];
4344 my ($dir,$vsnwant) = @rargs;
4345 # vsnwant is a comma-separated list; we report which we have
4346 # chosen in our ready response (so other end can tell if they
4349 $we_are_responder = 1;
4350 $us .= " (build host)";
4354 open PI, "<&STDIN" or die $!;
4355 open STDIN, "/dev/null" or die $!;
4356 open PO, ">&STDOUT" or die $!;
4358 open STDOUT, ">&STDERR" or die $!;
4362 ($protovsn) = grep {
4363 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4364 } @rpushprotovsn_support;
4366 fail "build host has dgit rpush protocol versions ".
4367 (join ",", @rpushprotovsn_support).
4368 " but invocation host has $vsnwant"
4369 unless defined $protovsn;
4371 responder_send_command("dgit-remote-push-ready $protovsn");
4372 rpush_handle_protovsn_bothends();
4377 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4378 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4379 # a good error message)
4381 sub rpush_handle_protovsn_bothends () {
4382 if ($protovsn < 4) {
4383 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4392 my $report = i_child_report();
4393 if (defined $report) {
4394 printdebug "($report)\n";
4395 } elsif ($i_child_pid) {
4396 printdebug "(killing build host child $i_child_pid)\n";
4397 kill 15, $i_child_pid;
4399 if (defined $i_tmp && !defined $initiator_tempdir) {
4401 eval { rmtree $i_tmp; };
4405 END { i_cleanup(); }
4408 my ($base,$selector,@args) = @_;
4409 $selector =~ s/\-/_/g;
4410 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4417 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4425 push @rargs, join ",", @rpushprotovsn_support;
4428 push @rdgit, @ropts;
4429 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4431 my @cmd = (@ssh, $host, shellquote @rdgit);
4434 if (defined $initiator_tempdir) {
4435 rmtree $initiator_tempdir;
4436 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4437 $i_tmp = $initiator_tempdir;
4441 $i_child_pid = open2(\*RO, \*RI, @cmd);
4443 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4444 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4445 $supplementary_message = '' unless $protovsn >= 3;
4447 fail "rpush negotiated protocol version $protovsn".
4448 " which does not support quilt mode $quilt_mode"
4449 if quiltmode_splitbrain;
4451 rpush_handle_protovsn_bothends();
4453 my ($icmd,$iargs) = initiator_expect {
4454 m/^(\S+)(?: (.*))?$/;
4457 i_method "i_resp", $icmd, $iargs;
4461 sub i_resp_progress ($) {
4463 my $msg = protocol_read_bytes \*RO, $rhs;
4467 sub i_resp_supplementary_message ($) {
4469 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4472 sub i_resp_complete {
4473 my $pid = $i_child_pid;
4474 $i_child_pid = undef; # prevents killing some other process with same pid
4475 printdebug "waiting for build host child $pid...\n";
4476 my $got = waitpid $pid, 0;
4477 die $! unless $got == $pid;
4478 die "build host child failed $?" if $?;
4481 printdebug "all done\n";
4485 sub i_resp_file ($) {
4487 my $localname = i_method "i_localname", $keyword;
4488 my $localpath = "$i_tmp/$localname";
4489 stat_exists $localpath and
4490 badproto \*RO, "file $keyword ($localpath) twice";
4491 protocol_receive_file \*RO, $localpath;
4492 i_method "i_file", $keyword;
4497 sub i_resp_param ($) {
4498 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4502 sub i_resp_previously ($) {
4503 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4504 or badproto \*RO, "bad previously spec";
4505 my $r = system qw(git check-ref-format), $1;
4506 die "bad previously ref spec ($r)" if $r;
4507 $previously{$1} = $2;
4512 sub i_resp_want ($) {
4514 die "$keyword ?" if $i_wanted{$keyword}++;
4515 my @localpaths = i_method "i_want", $keyword;
4516 printdebug "[[ $keyword @localpaths\n";
4517 foreach my $localpath (@localpaths) {
4518 protocol_send_file \*RI, $localpath;
4520 print RI "files-end\n" or die $!;
4523 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4525 sub i_localname_parsed_changelog {
4526 return "remote-changelog.822";
4528 sub i_file_parsed_changelog {
4529 ($i_clogp, $i_version, $i_dscfn) =
4530 push_parse_changelog "$i_tmp/remote-changelog.822";
4531 die if $i_dscfn =~ m#/|^\W#;
4534 sub i_localname_dsc {
4535 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4540 sub i_localname_changes {
4541 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4542 $i_changesfn = $i_dscfn;
4543 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4544 return $i_changesfn;
4546 sub i_file_changes { }
4548 sub i_want_signed_tag {
4549 printdebug Dumper(\%i_param, $i_dscfn);
4550 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4551 && defined $i_param{'csuite'}
4552 or badproto \*RO, "premature desire for signed-tag";
4553 my $head = $i_param{'head'};
4554 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4556 my $maintview = $i_param{'maint-view'};
4557 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4560 if ($protovsn >= 4) {
4561 my $p = $i_param{'tagformat'} // '<undef>';
4563 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4566 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4568 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4570 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4573 push_mktags $i_clogp, $i_dscfn,
4574 $i_changesfn, 'remote changes',
4578 sub i_want_signed_dsc_changes {
4579 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4580 sign_changes $i_changesfn;
4581 return ($i_dscfn, $i_changesfn);
4584 #---------- building etc. ----------
4590 #----- `3.0 (quilt)' handling -----
4592 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4594 sub quiltify_dpkg_commit ($$$;$) {
4595 my ($patchname,$author,$msg, $xinfo) = @_;
4599 my $descfn = ".git/dgit/quilt-description.tmp";
4600 open O, '>', $descfn or die "$descfn: $!";
4601 $msg =~ s/\n+/\n\n/;
4602 print O <<END or die $!;
4604 ${xinfo}Subject: $msg
4611 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4612 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4613 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4614 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4618 sub quiltify_trees_differ ($$;$$$) {
4619 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4620 # returns true iff the two tree objects differ other than in debian/
4621 # with $finegrained,
4622 # returns bitmask 01 - differ in upstream files except .gitignore
4623 # 02 - differ in .gitignore
4624 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4625 # is set for each modified .gitignore filename $fn
4626 # if $unrepres is defined, array ref to which is appeneded
4627 # a list of unrepresentable changes (removals of upstream files
4630 my @cmd = (@git, qw(diff-tree -z));
4631 push @cmd, qw(--name-only) unless $unrepres;
4632 push @cmd, qw(-r) if $finegrained || $unrepres;
4634 my $diffs= cmdoutput @cmd;
4637 foreach my $f (split /\0/, $diffs) {
4638 if ($unrepres && !@lmodes) {
4639 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4642 my ($oldmode,$newmode) = @lmodes;
4645 next if $f =~ m#^debian(?:/.*)?$#s;
4649 die "not a plain file\n"
4650 unless $newmode =~ m/^10\d{4}$/ ||
4651 $oldmode =~ m/^10\d{4}$/;
4652 if ($oldmode =~ m/[^0]/ &&
4653 $newmode =~ m/[^0]/) {
4654 die "mode changed\n" if $oldmode ne $newmode;
4656 die "non-default mode\n"
4657 unless $newmode =~ m/^100644$/ ||
4658 $oldmode =~ m/^100644$/;
4662 local $/="\n"; chomp $@;
4663 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4667 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4668 $r |= $isignore ? 02 : 01;
4669 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4671 printdebug "quiltify_trees_differ $x $y => $r\n";
4675 sub quiltify_tree_sentinelfiles ($) {
4676 # lists the `sentinel' files present in the tree
4678 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4679 qw(-- debian/rules debian/control);
4684 sub quiltify_splitbrain_needed () {
4685 if (!$split_brain) {
4686 progress "dgit view: changes are required...";
4687 runcmd @git, qw(checkout -q -b dgit-view);
4692 sub quiltify_splitbrain ($$$$$$) {
4693 my ($clogp, $unapplied, $headref, $diffbits,
4694 $editedignores, $cachekey) = @_;
4695 if ($quilt_mode !~ m/gbp|dpm/) {
4696 # treat .gitignore just like any other upstream file
4697 $diffbits = { %$diffbits };
4698 $_ = !!$_ foreach values %$diffbits;
4700 # We would like any commits we generate to be reproducible
4701 my @authline = clogp_authline($clogp);
4702 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4703 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4704 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4705 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4706 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4707 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4709 if ($quilt_mode =~ m/gbp|unapplied/ &&
4710 ($diffbits->{O2H} & 01)) {
4712 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4713 " but git tree differs from orig in upstream files.";
4714 if (!stat_exists "debian/patches") {
4716 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4720 if ($quilt_mode =~ m/dpm/ &&
4721 ($diffbits->{H2A} & 01)) {
4723 --quilt=$quilt_mode specified, implying patches-applied git tree
4724 but git tree differs from result of applying debian/patches to upstream
4727 if ($quilt_mode =~ m/gbp|unapplied/ &&
4728 ($diffbits->{O2A} & 01)) { # some patches
4729 quiltify_splitbrain_needed();
4730 progress "dgit view: creating patches-applied version using gbp pq";
4731 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4732 # gbp pq import creates a fresh branch; push back to dgit-view
4733 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4734 runcmd @git, qw(checkout -q dgit-view);
4736 if ($quilt_mode =~ m/gbp|dpm/ &&
4737 ($diffbits->{O2A} & 02)) {
4739 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4740 tool which does not create patches for changes to upstream
4741 .gitignores: but, such patches exist in debian/patches.
4744 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4745 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4746 quiltify_splitbrain_needed();
4747 progress "dgit view: creating patch to represent .gitignore changes";
4748 ensuredir "debian/patches";
4749 my $gipatch = "debian/patches/auto-gitignore";
4750 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4751 stat GIPATCH or die "$gipatch: $!";
4752 fail "$gipatch already exists; but want to create it".
4753 " to record .gitignore changes" if (stat _)[7];
4754 print GIPATCH <<END or die "$gipatch: $!";
4755 Subject: Update .gitignore from Debian packaging branch
4757 The Debian packaging git branch contains these updates to the upstream
4758 .gitignore file(s). This patch is autogenerated, to provide these
4759 updates to users of the official Debian archive view of the package.
4761 [dgit ($our_version) update-gitignore]
4764 close GIPATCH or die "$gipatch: $!";
4765 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4766 $unapplied, $headref, "--", sort keys %$editedignores;
4767 open SERIES, "+>>", "debian/patches/series" or die $!;
4768 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4770 defined read SERIES, $newline, 1 or die $!;
4771 print SERIES "\n" or die $! unless $newline eq "\n";
4772 print SERIES "auto-gitignore\n" or die $!;
4773 close SERIES or die $!;
4774 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4776 Commit patch to update .gitignore
4778 [dgit ($our_version) update-gitignore-quilt-fixup]
4782 my $dgitview = git_rev_parse 'HEAD';
4784 changedir '../../../..';
4785 # When we no longer need to support squeeze, use --create-reflog
4787 ensuredir ".git/logs/refs/dgit-intern";
4788 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4791 my $oldcache = git_get_ref "refs/$splitbraincache";
4792 if ($oldcache eq $dgitview) {
4793 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4794 # git update-ref doesn't always update, in this case. *sigh*
4795 my $dummy = make_commit_text <<END;
4798 author Dgit <dgit\@example.com> 1000000000 +0000
4799 committer Dgit <dgit\@example.com> 1000000000 +0000
4801 Dummy commit - do not use
4803 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4804 "refs/$splitbraincache", $dummy;
4806 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4809 changedir '.git/dgit/unpack/work';
4811 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4812 progress "dgit view: created ($saved)";
4815 sub quiltify ($$$$) {
4816 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4818 # Quilt patchification algorithm
4820 # We search backwards through the history of the main tree's HEAD
4821 # (T) looking for a start commit S whose tree object is identical
4822 # to to the patch tip tree (ie the tree corresponding to the
4823 # current dpkg-committed patch series). For these purposes
4824 # `identical' disregards anything in debian/ - this wrinkle is
4825 # necessary because dpkg-source treates debian/ specially.
4827 # We can only traverse edges where at most one of the ancestors'
4828 # trees differs (in changes outside in debian/). And we cannot
4829 # handle edges which change .pc/ or debian/patches. To avoid
4830 # going down a rathole we avoid traversing edges which introduce
4831 # debian/rules or debian/control. And we set a limit on the
4832 # number of edges we are willing to look at.
4834 # If we succeed, we walk forwards again. For each traversed edge
4835 # PC (with P parent, C child) (starting with P=S and ending with
4836 # C=T) to we do this:
4838 # - dpkg-source --commit with a patch name and message derived from C
4839 # After traversing PT, we git commit the changes which
4840 # should be contained within debian/patches.
4842 # The search for the path S..T is breadth-first. We maintain a
4843 # todo list containing search nodes. A search node identifies a
4844 # commit, and looks something like this:
4846 # Commit => $git_commit_id,
4847 # Child => $c, # or undef if P=T
4848 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4849 # Nontrivial => true iff $p..$c has relevant changes
4856 my %considered; # saves being exponential on some weird graphs
4858 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4861 my ($search,$whynot) = @_;
4862 printdebug " search NOT $search->{Commit} $whynot\n";
4863 $search->{Whynot} = $whynot;
4864 push @nots, $search;
4865 no warnings qw(exiting);
4874 my $c = shift @todo;
4875 next if $considered{$c->{Commit}}++;
4877 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4879 printdebug "quiltify investigate $c->{Commit}\n";
4882 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4883 printdebug " search finished hooray!\n";
4888 if ($quilt_mode eq 'nofix') {
4889 fail "quilt fixup required but quilt mode is \`nofix'\n".
4890 "HEAD commit $c->{Commit} differs from tree implied by ".
4891 " debian/patches (tree object $oldtiptree)";
4893 if ($quilt_mode eq 'smash') {
4894 printdebug " search quitting smash\n";
4898 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4899 $not->($c, "has $c_sentinels not $t_sentinels")
4900 if $c_sentinels ne $t_sentinels;
4902 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4903 $commitdata =~ m/\n\n/;
4905 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4906 @parents = map { { Commit => $_, Child => $c } } @parents;
4908 $not->($c, "root commit") if !@parents;
4910 foreach my $p (@parents) {
4911 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4913 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4914 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4916 foreach my $p (@parents) {
4917 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4919 my @cmd= (@git, qw(diff-tree -r --name-only),
4920 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4921 my $patchstackchange = cmdoutput @cmd;
4922 if (length $patchstackchange) {
4923 $patchstackchange =~ s/\n/,/g;
4924 $not->($p, "changed $patchstackchange");
4927 printdebug " search queue P=$p->{Commit} ",
4928 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4934 printdebug "quiltify want to smash\n";
4937 my $x = $_[0]{Commit};
4938 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4941 my $reportnot = sub {
4943 my $s = $abbrev->($notp);
4944 my $c = $notp->{Child};
4945 $s .= "..".$abbrev->($c) if $c;
4946 $s .= ": ".$notp->{Whynot};
4949 if ($quilt_mode eq 'linear') {
4950 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4951 foreach my $notp (@nots) {
4952 print STDERR "$us: ", $reportnot->($notp), "\n";
4954 print STDERR "$us: $_\n" foreach @$failsuggestion;
4955 fail "quilt fixup naive history linearisation failed.\n".
4956 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4957 } elsif ($quilt_mode eq 'smash') {
4958 } elsif ($quilt_mode eq 'auto') {
4959 progress "quilt fixup cannot be linear, smashing...";
4961 die "$quilt_mode ?";
4964 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4965 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4967 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4969 quiltify_dpkg_commit "auto-$version-$target-$time",
4970 (getfield $clogp, 'Maintainer'),
4971 "Automatically generated patch ($clogp->{Version})\n".
4972 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4976 progress "quiltify linearisation planning successful, executing...";
4978 for (my $p = $sref_S;
4979 my $c = $p->{Child};
4981 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4982 next unless $p->{Nontrivial};
4984 my $cc = $c->{Commit};
4986 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4987 $commitdata =~ m/\n\n/ or die "$c ?";
4990 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4993 my $commitdate = cmdoutput
4994 @git, qw(log -n1 --pretty=format:%aD), $cc;
4996 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4998 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5005 my $gbp_check_suitable = sub {
5010 die "contains unexpected slashes\n" if m{//} || m{/$};
5011 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5012 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5013 die "too long" if length > 200;
5015 return $_ unless $@;
5016 print STDERR "quiltifying commit $cc:".
5017 " ignoring/dropping Gbp-Pq $what: $@";
5021 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5023 (\S+) \s* \n //ixm) {
5024 $patchname = $gbp_check_suitable->($1, 'Name');
5026 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5028 (\S+) \s* \n //ixm) {
5029 $patchdir = $gbp_check_suitable->($1, 'Topic');
5034 if (!defined $patchname) {
5035 $patchname = $title;
5036 $patchname =~ s/[.:]$//;
5039 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5040 my $translitname = $converter->convert($patchname);
5041 die unless defined $translitname;
5042 $patchname = $translitname;
5045 "dgit: patch title transliteration error: $@"
5047 $patchname =~ y/ A-Z/-a-z/;
5048 $patchname =~ y/-a-z0-9_.+=~//cd;
5049 $patchname =~ s/^\W/x-$&/;
5050 $patchname = substr($patchname,0,40);
5052 if (!defined $patchdir) {
5055 if (length $patchdir) {
5056 $patchname = "$patchdir/$patchname";
5058 if ($patchname =~ m{^(.*)/}) {
5059 mkpath "debian/patches/$1";
5064 stat "debian/patches/$patchname$index";
5066 $!==ENOENT or die "$patchname$index $!";
5068 runcmd @git, qw(checkout -q), $cc;
5070 # We use the tip's changelog so that dpkg-source doesn't
5071 # produce complaining messages from dpkg-parsechangelog. None
5072 # of the information dpkg-source gets from the changelog is
5073 # actually relevant - it gets put into the original message
5074 # which dpkg-source provides our stunt editor, and then
5076 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5078 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5079 "Date: $commitdate\n".
5080 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5082 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5085 runcmd @git, qw(checkout -q master);
5088 sub build_maybe_quilt_fixup () {
5089 my ($format,$fopts) = get_source_format;
5090 return unless madformat_wantfixup $format;
5093 check_for_vendor_patches();
5095 if (quiltmode_splitbrain) {
5096 fail <<END unless access_cfg_tagformats_can_splitbrain;
5097 quilt mode $quilt_mode requires split view so server needs to support
5098 both "new" and "maint" tag formats, but config says it doesn't.
5102 my $clogp = parsechangelog();
5103 my $headref = git_rev_parse('HEAD');
5108 my $upstreamversion = upstreamversion $version;
5110 if ($fopts->{'single-debian-patch'}) {
5111 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5113 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5116 die 'bug' if $split_brain && !$need_split_build_invocation;
5118 changedir '../../../..';
5119 runcmd_ordryrun_local
5120 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5123 sub quilt_fixup_mkwork ($) {
5126 mkdir "work" or die $!;
5128 mktree_in_ud_here();
5129 runcmd @git, qw(reset -q --hard), $headref;
5132 sub quilt_fixup_linkorigs ($$) {
5133 my ($upstreamversion, $fn) = @_;
5134 # calls $fn->($leafname);
5136 foreach my $f (<../../../../*>) { #/){
5137 my $b=$f; $b =~ s{.*/}{};
5139 local ($debuglevel) = $debuglevel-1;
5140 printdebug "QF linkorigs $b, $f ?\n";
5142 next unless is_orig_file_of_vsn $b, $upstreamversion;
5143 printdebug "QF linkorigs $b, $f Y\n";
5144 link_ltarget $f, $b or die "$b $!";
5149 sub quilt_fixup_delete_pc () {
5150 runcmd @git, qw(rm -rqf .pc);
5152 Commit removal of .pc (quilt series tracking data)
5154 [dgit ($our_version) upgrade quilt-remove-pc]
5158 sub quilt_fixup_singlepatch ($$$) {
5159 my ($clogp, $headref, $upstreamversion) = @_;
5161 progress "starting quiltify (single-debian-patch)";
5163 # dpkg-source --commit generates new patches even if
5164 # single-debian-patch is in debian/source/options. In order to
5165 # get it to generate debian/patches/debian-changes, it is
5166 # necessary to build the source package.
5168 quilt_fixup_linkorigs($upstreamversion, sub { });
5169 quilt_fixup_mkwork($headref);
5171 rmtree("debian/patches");
5173 runcmd @dpkgsource, qw(-b .);
5175 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5176 rename srcfn("$upstreamversion", "/debian/patches"),
5177 "work/debian/patches";
5180 commit_quilty_patch();
5183 sub quilt_make_fake_dsc ($) {
5184 my ($upstreamversion) = @_;
5186 my $fakeversion="$upstreamversion-~~DGITFAKE";
5188 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5189 print $fakedsc <<END or die $!;
5192 Version: $fakeversion
5196 my $dscaddfile=sub {
5199 my $md = new Digest::MD5;
5201 my $fh = new IO::File $b, '<' or die "$b $!";
5206 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5209 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5211 my @files=qw(debian/source/format debian/rules
5212 debian/control debian/changelog);
5213 foreach my $maybe (qw(debian/patches debian/source/options
5214 debian/tests/control)) {
5215 next unless stat_exists "../../../$maybe";
5216 push @files, $maybe;
5219 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5220 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5222 $dscaddfile->($debtar);
5223 close $fakedsc or die $!;
5226 sub quilt_check_splitbrain_cache ($$) {
5227 my ($headref, $upstreamversion) = @_;
5228 # Called only if we are in (potentially) split brain mode.
5230 # Computes the cache key and looks in the cache.
5231 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5233 my $splitbrain_cachekey;
5236 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5237 # we look in the reflog of dgit-intern/quilt-cache
5238 # we look for an entry whose message is the key for the cache lookup
5239 my @cachekey = (qw(dgit), $our_version);
5240 push @cachekey, $upstreamversion;
5241 push @cachekey, $quilt_mode;
5242 push @cachekey, $headref;
5244 push @cachekey, hashfile('fake.dsc');
5246 my $srcshash = Digest::SHA->new(256);
5247 my %sfs = ( %INC, '$0(dgit)' => $0 );
5248 foreach my $sfk (sort keys %sfs) {
5249 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5250 $srcshash->add($sfk," ");
5251 $srcshash->add(hashfile($sfs{$sfk}));
5252 $srcshash->add("\n");
5254 push @cachekey, $srcshash->hexdigest();
5255 $splitbrain_cachekey = "@cachekey";
5257 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5259 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5260 debugcmd "|(probably)",@cmd;
5261 my $child = open GC, "-|"; defined $child or die $!;
5263 chdir '../../..' or die $!;
5264 if (!stat ".git/logs/refs/$splitbraincache") {
5265 $! == ENOENT or die $!;
5266 printdebug ">(no reflog)\n";
5273 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5274 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5277 quilt_fixup_mkwork($headref);
5278 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5279 if ($cachehit ne $headref) {
5280 progress "dgit view: found cached ($saved)";
5281 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5283 return ($cachehit, $splitbrain_cachekey);
5285 progress "dgit view: found cached, no changes required";
5286 return ($headref, $splitbrain_cachekey);
5288 die $! if GC->error;
5289 failedcmd unless close GC;
5291 printdebug "splitbrain cache miss\n";
5292 return (undef, $splitbrain_cachekey);
5295 sub quilt_fixup_multipatch ($$$) {
5296 my ($clogp, $headref, $upstreamversion) = @_;
5298 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5301 # - honour any existing .pc in case it has any strangeness
5302 # - determine the git commit corresponding to the tip of
5303 # the patch stack (if there is one)
5304 # - if there is such a git commit, convert each subsequent
5305 # git commit into a quilt patch with dpkg-source --commit
5306 # - otherwise convert all the differences in the tree into
5307 # a single git commit
5311 # Our git tree doesn't necessarily contain .pc. (Some versions of
5312 # dgit would include the .pc in the git tree.) If there isn't
5313 # one, we need to generate one by unpacking the patches that we
5316 # We first look for a .pc in the git tree. If there is one, we
5317 # will use it. (This is not the normal case.)
5319 # Otherwise need to regenerate .pc so that dpkg-source --commit
5320 # can work. We do this as follows:
5321 # 1. Collect all relevant .orig from parent directory
5322 # 2. Generate a debian.tar.gz out of
5323 # debian/{patches,rules,source/format,source/options}
5324 # 3. Generate a fake .dsc containing just these fields:
5325 # Format Source Version Files
5326 # 4. Extract the fake .dsc
5327 # Now the fake .dsc has a .pc directory.
5328 # (In fact we do this in every case, because in future we will
5329 # want to search for a good base commit for generating patches.)
5331 # Then we can actually do the dpkg-source --commit
5332 # 1. Make a new working tree with the same object
5333 # store as our main tree and check out the main
5335 # 2. Copy .pc from the fake's extraction, if necessary
5336 # 3. Run dpkg-source --commit
5337 # 4. If the result has changes to debian/, then
5338 # - git add them them
5339 # - git add .pc if we had a .pc in-tree
5341 # 5. If we had a .pc in-tree, delete it, and git commit
5342 # 6. Back in the main tree, fast forward to the new HEAD
5344 # Another situation we may have to cope with is gbp-style
5345 # patches-unapplied trees.
5347 # We would want to detect these, so we know to escape into
5348 # quilt_fixup_gbp. However, this is in general not possible.
5349 # Consider a package with a one patch which the dgit user reverts
5350 # (with git revert or the moral equivalent).
5352 # That is indistinguishable in contents from a patches-unapplied
5353 # tree. And looking at the history to distinguish them is not
5354 # useful because the user might have made a confusing-looking git
5355 # history structure (which ought to produce an error if dgit can't
5356 # cope, not a silent reintroduction of an unwanted patch).
5358 # So gbp users will have to pass an option. But we can usually
5359 # detect their failure to do so: if the tree is not a clean
5360 # patches-applied tree, quilt linearisation fails, but the tree
5361 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5362 # they want --quilt=unapplied.
5364 # To help detect this, when we are extracting the fake dsc, we
5365 # first extract it with --skip-patches, and then apply the patches
5366 # afterwards with dpkg-source --before-build. That lets us save a
5367 # tree object corresponding to .origs.
5369 my $splitbrain_cachekey;
5371 quilt_make_fake_dsc($upstreamversion);
5373 if (quiltmode_splitbrain()) {
5375 ($cachehit, $splitbrain_cachekey) =
5376 quilt_check_splitbrain_cache($headref, $upstreamversion);
5377 return if $cachehit;
5381 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5383 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5384 rename $fakexdir, "fake" or die "$fakexdir $!";
5388 remove_stray_gits("source package");
5389 mktree_in_ud_here();
5393 my $unapplied=git_add_write_tree();
5394 printdebug "fake orig tree object $unapplied\n";
5398 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5400 if (system @bbcmd) {
5401 failedcmd @bbcmd if $? < 0;
5403 failed to apply your git tree's patch stack (from debian/patches/) to
5404 the corresponding upstream tarball(s). Your source tree and .orig
5405 are probably too inconsistent. dgit can only fix up certain kinds of
5406 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5412 quilt_fixup_mkwork($headref);
5415 if (stat_exists ".pc") {
5417 progress "Tree already contains .pc - will use it then delete it.";
5420 rename '../fake/.pc','.pc' or die $!;
5423 changedir '../fake';
5425 my $oldtiptree=git_add_write_tree();
5426 printdebug "fake o+d/p tree object $unapplied\n";
5427 changedir '../work';
5430 # We calculate some guesswork now about what kind of tree this might
5431 # be. This is mostly for error reporting.
5437 # O = orig, without patches applied
5438 # A = "applied", ie orig with H's debian/patches applied
5439 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5440 \%editedignores, \@unrepres),
5441 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5442 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5446 foreach my $b (qw(01 02)) {
5447 foreach my $v (qw(O2H O2A H2A)) {
5448 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5451 printdebug "differences \@dl @dl.\n";
5454 "$us: base trees orig=%.20s o+d/p=%.20s",
5455 $unapplied, $oldtiptree;
5457 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5458 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5459 $dl[0], $dl[1], $dl[3], $dl[4],
5463 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5465 forceable_fail [qw(unrepresentable)], <<END;
5466 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5471 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5472 push @failsuggestion, "This might be a patches-unapplied branch.";
5473 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5474 push @failsuggestion, "This might be a patches-applied branch.";
5476 push @failsuggestion, "Maybe you need to specify one of".
5477 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5479 if (quiltmode_splitbrain()) {
5480 quiltify_splitbrain($clogp, $unapplied, $headref,
5481 $diffbits, \%editedignores,
5482 $splitbrain_cachekey);
5486 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5487 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5489 if (!open P, '>>', ".pc/applied-patches") {
5490 $!==&ENOENT or die $!;
5495 commit_quilty_patch();
5497 if ($mustdeletepc) {
5498 quilt_fixup_delete_pc();
5502 sub quilt_fixup_editor () {
5503 my $descfn = $ENV{$fakeeditorenv};
5504 my $editing = $ARGV[$#ARGV];
5505 open I1, '<', $descfn or die "$descfn: $!";
5506 open I2, '<', $editing or die "$editing: $!";
5507 unlink $editing or die "$editing: $!";
5508 open O, '>', $editing or die "$editing: $!";
5509 while (<I1>) { print O or die $!; } I1->error and die $!;
5512 $copying ||= m/^\-\-\- /;
5513 next unless $copying;
5516 I2->error and die $!;
5521 sub maybe_apply_patches_dirtily () {
5522 return unless $quilt_mode =~ m/gbp|unapplied/;
5523 print STDERR <<END or die $!;
5525 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5526 dgit: Have to apply the patches - making the tree dirty.
5527 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5530 $patches_applied_dirtily = 01;
5531 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5532 runcmd qw(dpkg-source --before-build .);
5535 sub maybe_unapply_patches_again () {
5536 progress "dgit: Unapplying patches again to tidy up the tree."
5537 if $patches_applied_dirtily;
5538 runcmd qw(dpkg-source --after-build .)
5539 if $patches_applied_dirtily & 01;
5541 if $patches_applied_dirtily & 02;
5542 $patches_applied_dirtily = 0;
5545 #----- other building -----
5547 our $clean_using_builder;
5548 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5549 # clean the tree before building (perhaps invoked indirectly by
5550 # whatever we are using to run the build), rather than separately
5551 # and explicitly by us.
5554 return if $clean_using_builder;
5555 if ($cleanmode eq 'dpkg-source') {
5556 maybe_apply_patches_dirtily();
5557 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5558 } elsif ($cleanmode eq 'dpkg-source-d') {
5559 maybe_apply_patches_dirtily();
5560 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5561 } elsif ($cleanmode eq 'git') {
5562 runcmd_ordryrun_local @git, qw(clean -xdf);
5563 } elsif ($cleanmode eq 'git-ff') {
5564 runcmd_ordryrun_local @git, qw(clean -xdff);
5565 } elsif ($cleanmode eq 'check') {
5566 my $leftovers = cmdoutput @git, qw(clean -xdn);
5567 if (length $leftovers) {
5568 print STDERR $leftovers, "\n" or die $!;
5569 fail "tree contains uncommitted files and --clean=check specified";
5571 } elsif ($cleanmode eq 'none') {
5578 badusage "clean takes no additional arguments" if @ARGV;
5581 maybe_unapply_patches_again();
5584 sub build_prep_early () {
5585 our $build_prep_early_done //= 0;
5586 return if $build_prep_early_done++;
5588 badusage "-p is not allowed when building" if defined $package;
5589 my $clogp = parsechangelog();
5590 $isuite = getfield $clogp, 'Distribution';
5591 $package = getfield $clogp, 'Source';
5592 $version = getfield $clogp, 'Version';
5599 build_maybe_quilt_fixup();
5601 my $pat = changespat $version;
5602 foreach my $f (glob "$buildproductsdir/$pat") {
5604 unlink $f or fail "remove old changes file $f: $!";
5606 progress "would remove $f";
5612 sub changesopts_initial () {
5613 my @opts =@changesopts[1..$#changesopts];
5616 sub changesopts_version () {
5617 if (!defined $changes_since_version) {
5618 my @vsns = archive_query('archive_query');
5619 my @quirk = access_quirk();
5620 if ($quirk[0] eq 'backports') {
5621 local $isuite = $quirk[2];
5623 canonicalise_suite();
5624 push @vsns, archive_query('archive_query');
5627 @vsns = map { $_->[0] } @vsns;
5628 @vsns = sort { -version_compare($a, $b) } @vsns;
5629 $changes_since_version = $vsns[0];
5630 progress "changelog will contain changes since $vsns[0]";
5632 $changes_since_version = '_';
5633 progress "package seems new, not specifying -v<version>";
5636 if ($changes_since_version ne '_') {
5637 return ("-v$changes_since_version");
5643 sub changesopts () {
5644 return (changesopts_initial(), changesopts_version());
5647 sub massage_dbp_args ($;$) {
5648 my ($cmd,$xargs) = @_;
5651 # - if we're going to split the source build out so we can
5652 # do strange things to it, massage the arguments to dpkg-buildpackage
5653 # so that the main build doessn't build source (or add an argument
5654 # to stop it building source by default).
5656 # - add -nc to stop dpkg-source cleaning the source tree,
5657 # unless we're not doing a split build and want dpkg-source
5658 # as cleanmode, in which case we can do nothing
5661 # 0 - source will NOT need to be built separately by caller
5662 # +1 - source will need to be built separately by caller
5663 # +2 - source will need to be built separately by caller AND
5664 # dpkg-buildpackage should not in fact be run at all!
5665 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5666 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5667 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5668 $clean_using_builder = 1;
5671 # -nc has the side effect of specifying -b if nothing else specified
5672 # and some combinations of -S, -b, et al, are errors, rather than
5673 # later simply overriding earlie. So we need to:
5674 # - search the command line for these options
5675 # - pick the last one
5676 # - perhaps add our own as a default
5677 # - perhaps adjust it to the corresponding non-source-building version
5679 foreach my $l ($cmd, $xargs) {
5681 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5684 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5686 if ($need_split_build_invocation) {
5687 printdebug "massage split $dmode.\n";
5688 $r = $dmode =~ m/[S]/ ? +2 :
5689 $dmode =~ y/gGF/ABb/ ? +1 :
5690 $dmode =~ m/[ABb]/ ? 0 :
5693 printdebug "massage done $r $dmode.\n";
5695 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5701 my $wasdir = must_getcwd();
5707 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5708 my ($msg_if_onlyone) = @_;
5709 # If there is only one .changes file, fail with $msg_if_onlyone,
5710 # or if that is undef, be a no-op.
5711 # Returns the changes file to report to the user.
5712 my $pat = changespat $version;
5713 my @changesfiles = glob $pat;
5714 @changesfiles = sort {
5715 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5719 if (@changesfiles==1) {
5720 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5721 only one changes file from build (@changesfiles)
5723 $result = $changesfiles[0];
5724 } elsif (@changesfiles==2) {
5725 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5726 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5727 fail "$l found in binaries changes file $binchanges"
5730 runcmd_ordryrun_local @mergechanges, @changesfiles;
5731 my $multichanges = changespat $version,'multi';
5733 stat_exists $multichanges or fail "$multichanges: $!";
5734 foreach my $cf (glob $pat) {
5735 next if $cf eq $multichanges;
5736 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5739 $result = $multichanges;
5741 fail "wrong number of different changes files (@changesfiles)";
5743 printdone "build successful, results in $result\n" or die $!;
5746 sub midbuild_checkchanges () {
5747 my $pat = changespat $version;
5748 return if $rmchanges;
5749 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5750 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5752 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5753 Suggest you delete @unwanted.
5758 sub midbuild_checkchanges_vanilla ($) {
5760 midbuild_checkchanges() if $wantsrc == 1;
5763 sub postbuild_mergechanges_vanilla ($) {
5765 if ($wantsrc == 1) {
5767 postbuild_mergechanges(undef);
5770 printdone "build successful\n";
5776 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5777 my $wantsrc = massage_dbp_args \@dbp;
5780 midbuild_checkchanges_vanilla $wantsrc;
5785 push @dbp, changesopts_version();
5786 maybe_apply_patches_dirtily();
5787 runcmd_ordryrun_local @dbp;
5789 maybe_unapply_patches_again();
5790 postbuild_mergechanges_vanilla $wantsrc;
5794 $quilt_mode //= 'gbp';
5800 # gbp can make .origs out of thin air. In my tests it does this
5801 # even for a 1.0 format package, with no origs present. So I
5802 # guess it keys off just the version number. We don't know
5803 # exactly what .origs ought to exist, but let's assume that we
5804 # should run gbp if: the version has an upstream part and the main
5806 my $upstreamversion = upstreamversion $version;
5807 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5808 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5810 if ($gbp_make_orig) {
5812 $cleanmode = 'none'; # don't do it again
5813 $need_split_build_invocation = 1;
5816 my @dbp = @dpkgbuildpackage;
5818 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5820 if (!length $gbp_build[0]) {
5821 if (length executable_on_path('git-buildpackage')) {
5822 $gbp_build[0] = qw(git-buildpackage);
5824 $gbp_build[0] = 'gbp buildpackage';
5827 my @cmd = opts_opt_multi_cmd @gbp_build;
5829 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5831 if ($gbp_make_orig) {
5832 ensuredir '.git/dgit';
5833 my $ok = '.git/dgit/origs-gen-ok';
5834 unlink $ok or $!==&ENOENT or die $!;
5835 my @origs_cmd = @cmd;
5836 push @origs_cmd, qw(--git-cleaner=true);
5837 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5838 push @origs_cmd, @ARGV;
5840 debugcmd @origs_cmd;
5842 do { local $!; stat_exists $ok; }
5843 or failedcmd @origs_cmd;
5845 dryrun_report @origs_cmd;
5851 midbuild_checkchanges_vanilla $wantsrc;
5853 if (!$clean_using_builder) {
5854 push @cmd, '--git-cleaner=true';
5858 maybe_unapply_patches_again();
5860 push @cmd, changesopts();
5861 runcmd_ordryrun_local @cmd, @ARGV;
5863 postbuild_mergechanges_vanilla $wantsrc;
5865 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5869 my $our_cleanmode = $cleanmode;
5870 if ($need_split_build_invocation) {
5871 # Pretend that clean is being done some other way. This
5872 # forces us not to try to use dpkg-buildpackage to clean and
5873 # build source all in one go; and instead we run dpkg-source
5874 # (and build_prep() will do the clean since $clean_using_builder
5876 $our_cleanmode = 'ELSEWHERE';
5878 if ($our_cleanmode =~ m/^dpkg-source/) {
5879 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5880 $clean_using_builder = 1;
5883 $sourcechanges = changespat $version,'source';
5885 unlink "../$sourcechanges" or $!==ENOENT
5886 or fail "remove $sourcechanges: $!";
5888 $dscfn = dscfn($version);
5889 if ($our_cleanmode eq 'dpkg-source') {
5890 maybe_apply_patches_dirtily();
5891 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5893 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5894 maybe_apply_patches_dirtily();
5895 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5898 my @cmd = (@dpkgsource, qw(-b --));
5901 runcmd_ordryrun_local @cmd, "work";
5902 my @udfiles = <${package}_*>;
5903 changedir "../../..";
5904 foreach my $f (@udfiles) {
5905 printdebug "source copy, found $f\n";
5908 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5909 $f eq srcfn($version, $&));
5910 printdebug "source copy, found $f - renaming\n";
5911 rename "$ud/$f", "../$f" or $!==ENOENT
5912 or fail "put in place new source file ($f): $!";
5915 my $pwd = must_getcwd();
5916 my $leafdir = basename $pwd;
5918 runcmd_ordryrun_local @cmd, $leafdir;
5921 runcmd_ordryrun_local qw(sh -ec),
5922 'exec >$1; shift; exec "$@"','x',
5923 "../$sourcechanges",
5924 @dpkggenchanges, qw(-S), changesopts();
5928 sub cmd_build_source {
5930 badusage "build-source takes no additional arguments" if @ARGV;
5932 maybe_unapply_patches_again();
5933 printdone "source built, results in $dscfn and $sourcechanges";
5938 midbuild_checkchanges();
5941 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5942 stat_exists $sourcechanges
5943 or fail "$sourcechanges (in parent directory): $!";
5945 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5947 maybe_unapply_patches_again();
5949 postbuild_mergechanges(<<END);
5950 perhaps you need to pass -A ? (sbuild's default is to build only
5951 arch-specific binaries; dgit 1.4 used to override that.)
5956 sub cmd_quilt_fixup {
5957 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5960 build_maybe_quilt_fixup();
5963 sub cmd_import_dsc {
5967 last unless $ARGV[0] =~ m/^-/;
5970 if (m/^--require-valid-signature$/) {
5973 badusage "unknown dgit import-dsc sub-option \`$_'";
5977 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5978 my ($dscfn, $dstbranch) = @ARGV;
5980 badusage "dry run makes no sense with import-dsc" unless act_local();
5982 my $force = $dstbranch =~ s/^\+// ? +1 :
5983 $dstbranch =~ s/^\.\.// ? -1 :
5985 my $info = $force ? " $&" : '';
5986 $info = "$dscfn$info";
5988 my $specbranch = $dstbranch;
5989 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5990 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5992 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5993 my $chead = cmdoutput_errok @symcmd;
5994 defined $chead or $?==256 or failedcmd @symcmd;
5996 fail "$dstbranch is checked out - will not update it"
5997 if defined $chead and $chead eq $dstbranch;
5999 my $oldhash = git_get_ref $dstbranch;
6001 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6002 $dscdata = do { local $/ = undef; <D>; };
6003 D->error and fail "read $dscfn: $!";
6006 # we don't normally need this so import it here
6007 use Dpkg::Source::Package;
6008 my $dp = new Dpkg::Source::Package filename => $dscfn,
6009 require_valid_signature => $needsig;
6011 local $SIG{__WARN__} = sub {
6013 return unless $needsig;
6014 fail "import-dsc signature check failed";
6016 if (!$dp->is_signed()) {
6017 warn "$us: warning: importing unsigned .dsc\n";
6019 my $r = $dp->check_signature();
6020 die "->check_signature => $r" if $needsig && $r;
6026 $package = getfield $dsc, 'Source';
6028 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6029 unless forceing [qw(import-dsc-with-dgit-field)];
6031 if (defined $dsc_hash) {
6032 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6033 resolve_dsc_field_commit undef, undef;
6035 if (defined $dsc_hash) {
6036 my @cmd = (qw(sh -ec),
6037 "echo $dsc_hash | git cat-file --batch-check");
6038 my $objgot = cmdoutput @cmd;
6039 if ($objgot =~ m#^\w+ missing\b#) {
6041 .dsc contains Dgit field referring to object $dsc_hash
6042 Your git tree does not have that object. Try `git fetch' from a
6043 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6046 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6048 progress "Not fast forward, forced update.";
6050 fail "Not fast forward to $dsc_hash";
6053 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
6054 $dstbranch, $dsc_hash);
6056 progress "dgit: import-dsc updated git ref $dstbranch";
6061 Branch $dstbranch already exists
6062 Specify ..$specbranch for a pseudo-merge, binding in existing history
6063 Specify +$specbranch to overwrite, discarding existing history
6065 if $oldhash && !$force;
6067 my @dfi = dsc_files_info();
6068 foreach my $fi (@dfi) {
6069 my $f = $fi->{Filename};
6071 next if lstat $here;
6072 fail "stat $here: $!" unless $! == ENOENT;
6074 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6076 } elsif ($dscfn =~ m#^/#) {
6079 fail "cannot import $dscfn which seems to be inside working tree!";
6081 $there =~ s#/+[^/]+$## or
6082 fail "cannot import $dscfn which seems to not have a basename";
6084 symlink $there, $here or fail "symlink $there to $here: $!";
6085 progress "made symlink $here -> $there";
6086 # print STDERR Dumper($fi);
6088 my @mergeinputs = generate_commits_from_dsc();
6089 die unless @mergeinputs == 1;
6091 my $newhash = $mergeinputs[0]{Commit};
6095 progress "Import, forced update - synthetic orphan git history.";
6096 } elsif ($force < 0) {
6097 progress "Import, merging.";
6098 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6099 my $version = getfield $dsc, 'Version';
6100 my $clogp = commit_getclogp $newhash;
6101 my $authline = clogp_authline $clogp;
6102 $newhash = make_commit_text <<END;
6109 Merge $package ($version) import into $dstbranch
6112 die; # caught earlier
6116 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
6117 $dstbranch, $newhash);
6119 progress "dgit: import-dsc results are in in git ref $dstbranch";
6122 sub cmd_archive_api_query {
6123 badusage "need only 1 subpath argument" unless @ARGV==1;
6124 my ($subpath) = @ARGV;
6125 my @cmd = archive_api_query_cmd($subpath);
6128 exec @cmd or fail "exec curl: $!\n";
6131 sub cmd_clone_dgit_repos_server {
6132 badusage "need destination argument" unless @ARGV==1;
6133 my ($destdir) = @ARGV;
6134 $package = '_dgit-repos-server';
6135 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6137 exec @cmd or fail "exec git clone: $!\n";
6140 sub cmd_setup_mergechangelogs {
6141 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6142 setup_mergechangelogs(1);
6145 sub cmd_setup_useremail {
6146 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6150 sub cmd_setup_new_tree {
6151 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6155 #---------- argument parsing and main program ----------
6158 print "dgit version $our_version\n" or die $!;
6162 our (%valopts_long, %valopts_short);
6165 sub defvalopt ($$$$) {
6166 my ($long,$short,$val_re,$how) = @_;
6167 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6168 $valopts_long{$long} = $oi;
6169 $valopts_short{$short} = $oi;
6170 # $how subref should:
6171 # do whatever assignemnt or thing it likes with $_[0]
6172 # if the option should not be passed on to remote, @rvalopts=()
6173 # or $how can be a scalar ref, meaning simply assign the value
6176 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6177 defvalopt '--distro', '-d', '.+', \$idistro;
6178 defvalopt '', '-k', '.+', \$keyid;
6179 defvalopt '--existing-package','', '.*', \$existing_package;
6180 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6181 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6182 defvalopt '--package', '-p', $package_re, \$package;
6183 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6185 defvalopt '', '-C', '.+', sub {
6186 ($changesfile) = (@_);
6187 if ($changesfile =~ s#^(.*)/##) {
6188 $buildproductsdir = $1;
6192 defvalopt '--initiator-tempdir','','.*', sub {
6193 ($initiator_tempdir) = (@_);
6194 $initiator_tempdir =~ m#^/# or
6195 badusage "--initiator-tempdir must be used specify an".
6196 " absolute, not relative, directory."
6202 if (defined $ENV{'DGIT_SSH'}) {
6203 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6204 } elsif (defined $ENV{'GIT_SSH'}) {
6205 @ssh = ($ENV{'GIT_SSH'});
6213 if (!defined $val) {
6214 badusage "$what needs a value" unless @ARGV;
6216 push @rvalopts, $val;
6218 badusage "bad value \`$val' for $what" unless
6219 $val =~ m/^$oi->{Re}$(?!\n)/s;
6220 my $how = $oi->{How};
6221 if (ref($how) eq 'SCALAR') {
6226 push @ropts, @rvalopts;
6230 last unless $ARGV[0] =~ m/^-/;
6234 if (m/^--dry-run$/) {
6237 } elsif (m/^--damp-run$/) {
6240 } elsif (m/^--no-sign$/) {
6243 } elsif (m/^--help$/) {
6245 } elsif (m/^--version$/) {
6247 } elsif (m/^--new$/) {
6250 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6251 ($om = $opts_opt_map{$1}) &&
6255 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6256 !$opts_opt_cmdonly{$1} &&
6257 ($om = $opts_opt_map{$1})) {
6260 } elsif (m/^--(gbp|dpm)$/s) {
6261 push @ropts, "--quilt=$1";
6263 } elsif (m/^--ignore-dirty$/s) {
6266 } elsif (m/^--no-quilt-fixup$/s) {
6268 $quilt_mode = 'nocheck';
6269 } elsif (m/^--no-rm-on-error$/s) {
6272 } elsif (m/^--overwrite$/s) {
6274 $overwrite_version = '';
6275 } elsif (m/^--overwrite=(.+)$/s) {
6277 $overwrite_version = $1;
6278 } elsif (m/^--dep14tag$/s) {
6280 $dodep14tag= 'want';
6281 } elsif (m/^--no-dep14tag$/s) {
6284 } elsif (m/^--always-dep14tag$/s) {
6286 $dodep14tag= 'always';
6287 } elsif (m/^--delayed=(\d+)$/s) {
6290 } elsif (m/^--dgit-view-save=(.+)$/s) {
6292 $split_brain_save = $1;
6293 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6294 } elsif (m/^--(no-)?rm-old-changes$/s) {
6297 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6299 push @deliberatelies, $&;
6300 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6304 } elsif (m/^--force-/) {
6306 "$us: warning: ignoring unknown force option $_\n";
6308 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6309 # undocumented, for testing
6311 $tagformat_want = [ $1, 'command line', 1 ];
6312 # 1 menas overrides distro configuration
6313 } elsif (m/^--always-split-source-build$/s) {
6314 # undocumented, for testing
6316 $need_split_build_invocation = 1;
6317 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6318 $val = $2 ? $' : undef; #';
6319 $valopt->($oi->{Long});
6321 badusage "unknown long option \`$_'";
6328 } elsif (s/^-L/-/) {
6331 } elsif (s/^-h/-/) {
6333 } elsif (s/^-D/-/) {
6337 } elsif (s/^-N/-/) {
6342 push @changesopts, $_;
6344 } elsif (s/^-wn$//s) {
6346 $cleanmode = 'none';
6347 } elsif (s/^-wg$//s) {
6350 } elsif (s/^-wgf$//s) {
6352 $cleanmode = 'git-ff';
6353 } elsif (s/^-wd$//s) {
6355 $cleanmode = 'dpkg-source';
6356 } elsif (s/^-wdd$//s) {
6358 $cleanmode = 'dpkg-source-d';
6359 } elsif (s/^-wc$//s) {
6361 $cleanmode = 'check';
6362 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6363 push @git, '-c', $&;
6364 $gitcfgs{cmdline}{$1} = [ $2 ];
6365 } elsif (s/^-c([^=]+)$//s) {
6366 push @git, '-c', $&;
6367 $gitcfgs{cmdline}{$1} = [ 'true' ];
6368 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6370 $val = undef unless length $val;
6371 $valopt->($oi->{Short});
6374 badusage "unknown short option \`$_'";
6381 sub check_env_sanity () {
6382 my $blocked = new POSIX::SigSet;
6383 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6386 foreach my $name (qw(PIPE CHLD)) {
6387 my $signame = "SIG$name";
6388 my $signum = eval "POSIX::$signame" // die;
6389 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6390 die "$signame is set to something other than SIG_DFL\n";
6391 $blocked->ismember($signum) and
6392 die "$signame is blocked\n";
6398 On entry to dgit, $@
6399 This is a bug produced by something in in your execution environment.
6405 sub parseopts_late_defaults () {
6406 foreach my $k (keys %opts_opt_map) {
6407 my $om = $opts_opt_map{$k};
6409 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6411 badcfg "cannot set command for $k"
6412 unless length $om->[0];
6416 foreach my $c (access_cfg_cfgs("opts-$k")) {
6418 map { $_ ? @$_ : () }
6419 map { $gitcfgs{$_}{$c} }
6420 reverse @gitcfgsources;
6421 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6422 "\n" if $debuglevel >= 4;
6424 badcfg "cannot configure options for $k"
6425 if $opts_opt_cmdonly{$k};
6426 my $insertpos = $opts_cfg_insertpos{$k};
6427 @$om = ( @$om[0..$insertpos-1],
6429 @$om[$insertpos..$#$om] );
6433 if (!defined $rmchanges) {
6434 local $access_forpush;
6435 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6438 if (!defined $quilt_mode) {
6439 local $access_forpush;
6440 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6441 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6443 $quilt_mode =~ m/^($quilt_modes_re)$/
6444 or badcfg "unknown quilt-mode \`$quilt_mode'";
6448 if (!defined $dodep14tag) {
6449 local $access_forpush;
6450 $dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
6451 $dodep14tag =~ m/^($dodep14tag_re)$/
6452 or badcfg "unknown dep14tag setting \`$dodep14tag'";
6456 $need_split_build_invocation ||= quiltmode_splitbrain();
6458 if (!defined $cleanmode) {
6459 local $access_forpush;
6460 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6461 $cleanmode //= 'dpkg-source';
6463 badcfg "unknown clean-mode \`$cleanmode'" unless
6464 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6468 if ($ENV{$fakeeditorenv}) {
6470 quilt_fixup_editor();
6477 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6478 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6479 if $dryrun_level == 1;
6481 print STDERR $helpmsg or die $!;
6484 my $cmd = shift @ARGV;
6487 my $pre_fn = ${*::}{"pre_$cmd"};
6488 $pre_fn->() if $pre_fn;
6490 my $fn = ${*::}{"cmd_$cmd"};
6491 $fn or badusage "unknown operation $cmd";