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;
82 our %forceopts = map { $_=>0 }
83 qw(unrepresentable unsupported-source-format
84 dsc-changes-mismatch changes-origs-exactly
85 import-gitapply-absurd
86 import-gitapply-no-absurd
87 import-dsc-with-dgit-field);
89 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
91 our $suite_re = '[-+.0-9a-z]+';
92 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
93 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
94 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
95 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
97 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
98 our $splitbraincache = 'dgit-intern/quilt-cache';
99 our $rewritemap = 'dgit-rewrite/map';
101 our (@git) = qw(git);
102 our (@dget) = qw(dget);
103 our (@curl) = qw(curl);
104 our (@dput) = qw(dput);
105 our (@debsign) = qw(debsign);
106 our (@gpg) = qw(gpg);
107 our (@sbuild) = qw(sbuild);
109 our (@dgit) = qw(dgit);
110 our (@aptget) = qw(apt-get);
111 our (@aptcache) = qw(apt-cache);
112 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
113 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
114 our (@dpkggenchanges) = qw(dpkg-genchanges);
115 our (@mergechanges) = qw(mergechanges -f);
116 our (@gbp_build) = ('');
117 our (@gbp_pq) = ('gbp pq');
118 our (@changesopts) = ('');
120 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
123 'debsign' => \@debsign,
125 'sbuild' => \@sbuild,
129 'apt-get' => \@aptget,
130 'apt-cache' => \@aptcache,
131 'dpkg-source' => \@dpkgsource,
132 'dpkg-buildpackage' => \@dpkgbuildpackage,
133 'dpkg-genchanges' => \@dpkggenchanges,
134 'gbp-build' => \@gbp_build,
135 'gbp-pq' => \@gbp_pq,
136 'ch' => \@changesopts,
137 'mergechanges' => \@mergechanges);
139 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
140 our %opts_cfg_insertpos = map {
142 scalar @{ $opts_opt_map{$_} }
143 } keys %opts_opt_map;
145 sub parseopts_late_defaults();
151 our $supplementary_message = '';
152 our $need_split_build_invocation = 0;
153 our $split_brain = 0;
157 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
160 our $remotename = 'dgit';
161 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
165 if (!defined $absurdity) {
167 $absurdity =~ s{/[^/]+$}{/absurd} or die;
171 my ($v,$distro) = @_;
172 return $tagformatfn->($v, $distro);
175 sub debiantag_maintview ($$) {
176 my ($v,$distro) = @_;
177 return "$distro/".dep14_version_mangle $v;
180 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
182 sub lbranch () { return "$branchprefix/$csuite"; }
183 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
184 sub lref () { return "refs/heads/".lbranch(); }
185 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
186 sub rrref () { return server_ref($csuite); }
188 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
189 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
191 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
192 # locally fetched refs because they have unhelpful names and clutter
193 # up gitk etc. So we track whether we have "used up" head ref (ie,
194 # whether we have made another local ref which refers to this object).
196 # (If we deleted them unconditionally, then we might end up
197 # re-fetching the same git objects each time dgit fetch was run.)
199 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
200 # in git_fetch_us to fetch the refs in question, and possibly a call
201 # to lrfetchref_used.
203 our (%lrfetchrefs_f, %lrfetchrefs_d);
204 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
206 sub lrfetchref_used ($) {
207 my ($fullrefname) = @_;
208 my $objid = $lrfetchrefs_f{$fullrefname};
209 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
220 return "${package}_".(stripepoch $vsn).$sfx
225 return srcfn($vsn,".dsc");
228 sub changespat ($;$) {
229 my ($vsn, $arch) = @_;
230 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
233 sub upstreamversion ($) {
245 foreach my $f (@end) {
247 print STDERR "$us: cleanup: $@" if length $@;
251 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
253 sub forceable_fail ($$) {
254 my ($forceoptsl, $msg) = @_;
255 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
256 print STDERR "warning: overriding problem due to --force:\n". $msg;
260 my ($forceoptsl) = @_;
261 my @got = grep { $forceopts{$_} } @$forceoptsl;
262 return 0 unless @got;
264 "warning: skipping checks or functionality due to --force-$got[0]\n";
267 sub no_such_package () {
268 print STDERR "$us: package $package does not exist in suite $isuite\n";
274 printdebug "CD $newdir\n";
275 chdir $newdir or confess "chdir: $newdir: $!";
278 sub deliberately ($) {
280 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
283 sub deliberately_not_fast_forward () {
284 foreach (qw(not-fast-forward fresh-repo)) {
285 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
289 sub quiltmode_splitbrain () {
290 $quilt_mode =~ m/gbp|dpm|unapplied/;
293 sub opts_opt_multi_cmd {
295 push @cmd, split /\s+/, shift @_;
301 return opts_opt_multi_cmd @gbp_pq;
304 #---------- remote protocol support, common ----------
306 # remote push initiator/responder protocol:
307 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
308 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
309 # < dgit-remote-push-ready <actual-proto-vsn>
316 # > supplementary-message NBYTES # $protovsn >= 3
321 # > file parsed-changelog
322 # [indicates that output of dpkg-parsechangelog follows]
323 # > data-block NBYTES
324 # > [NBYTES bytes of data (no newline)]
325 # [maybe some more blocks]
334 # > param head DGIT-VIEW-HEAD
335 # > param csuite SUITE
336 # > param tagformat old|new
337 # > param maint-view MAINT-VIEW-HEAD
339 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
340 # # goes into tag, for replay prevention
343 # [indicates that signed tag is wanted]
344 # < data-block NBYTES
345 # < [NBYTES bytes of data (no newline)]
346 # [maybe some more blocks]
350 # > want signed-dsc-changes
351 # < data-block NBYTES [transfer of signed dsc]
353 # < data-block NBYTES [transfer of signed changes]
361 sub i_child_report () {
362 # Sees if our child has died, and reap it if so. Returns a string
363 # describing how it died if it failed, or undef otherwise.
364 return undef unless $i_child_pid;
365 my $got = waitpid $i_child_pid, WNOHANG;
366 return undef if $got <= 0;
367 die unless $got == $i_child_pid;
368 $i_child_pid = undef;
369 return undef unless $?;
370 return "build host child ".waitstatusmsg();
375 fail "connection lost: $!" if $fh->error;
376 fail "protocol violation; $m not expected";
379 sub badproto_badread ($$) {
381 fail "connection lost: $!" if $!;
382 my $report = i_child_report();
383 fail $report if defined $report;
384 badproto $fh, "eof (reading $wh)";
387 sub protocol_expect (&$) {
388 my ($match, $fh) = @_;
391 defined && chomp or badproto_badread $fh, "protocol message";
399 badproto $fh, "\`$_'";
402 sub protocol_send_file ($$) {
403 my ($fh, $ourfn) = @_;
404 open PF, "<", $ourfn or die "$ourfn: $!";
407 my $got = read PF, $d, 65536;
408 die "$ourfn: $!" unless defined $got;
410 print $fh "data-block ".length($d)."\n" or die $!;
411 print $fh $d or die $!;
413 PF->error and die "$ourfn $!";
414 print $fh "data-end\n" or die $!;
418 sub protocol_read_bytes ($$) {
419 my ($fh, $nbytes) = @_;
420 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
422 my $got = read $fh, $d, $nbytes;
423 $got==$nbytes or badproto_badread $fh, "data block";
427 sub protocol_receive_file ($$) {
428 my ($fh, $ourfn) = @_;
429 printdebug "() $ourfn\n";
430 open PF, ">", $ourfn or die "$ourfn: $!";
432 my ($y,$l) = protocol_expect {
433 m/^data-block (.*)$/ ? (1,$1) :
434 m/^data-end$/ ? (0,) :
438 my $d = protocol_read_bytes $fh, $l;
439 print PF $d or die $!;
444 #---------- remote protocol support, responder ----------
446 sub responder_send_command ($) {
448 return unless $we_are_responder;
449 # called even without $we_are_responder
450 printdebug ">> $command\n";
451 print PO $command, "\n" or die $!;
454 sub responder_send_file ($$) {
455 my ($keyword, $ourfn) = @_;
456 return unless $we_are_responder;
457 printdebug "]] $keyword $ourfn\n";
458 responder_send_command "file $keyword";
459 protocol_send_file \*PO, $ourfn;
462 sub responder_receive_files ($@) {
463 my ($keyword, @ourfns) = @_;
464 die unless $we_are_responder;
465 printdebug "[[ $keyword @ourfns\n";
466 responder_send_command "want $keyword";
467 foreach my $fn (@ourfns) {
468 protocol_receive_file \*PI, $fn;
471 protocol_expect { m/^files-end$/ } \*PI;
474 #---------- remote protocol support, initiator ----------
476 sub initiator_expect (&) {
478 protocol_expect { &$match } \*RO;
481 #---------- end remote code ----------
484 if ($we_are_responder) {
486 responder_send_command "progress ".length($m) or die $!;
487 print PO $m or die $!;
497 $ua = LWP::UserAgent->new();
501 progress "downloading $what...";
502 my $r = $ua->get(@_) or die $!;
503 return undef if $r->code == 404;
504 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
505 return $r->decoded_content(charset => 'none');
508 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
513 failedcmd @_ if system @_;
516 sub act_local () { return $dryrun_level <= 1; }
517 sub act_scary () { return !$dryrun_level; }
520 if (!$dryrun_level) {
521 progress "$us ok: @_";
523 progress "would be ok: @_ (but dry run only)";
528 printcmd(\*STDERR,$debugprefix."#",@_);
531 sub runcmd_ordryrun {
539 sub runcmd_ordryrun_local {
548 my ($first_shell, @cmd) = @_;
549 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
552 our $helpmsg = <<END;
554 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
555 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
556 dgit [dgit-opts] build [dpkg-buildpackage-opts]
557 dgit [dgit-opts] sbuild [sbuild-opts]
558 dgit [dgit-opts] push [dgit-opts] [suite]
559 dgit [dgit-opts] rpush build-host:build-dir ...
560 important dgit options:
561 -k<keyid> sign tag and package with <keyid> instead of default
562 --dry-run -n do not change anything, but go through the motions
563 --damp-run -L like --dry-run but make local changes, without signing
564 --new -N allow introducing a new package
565 --debug -D increase debug level
566 -c<name>=<value> set git config option (used directly by dgit too)
569 our $later_warning_msg = <<END;
570 Perhaps the upload is stuck in incoming. Using the version from git.
574 print STDERR "$us: @_\n", $helpmsg or die $!;
579 @ARGV or badusage "too few arguments";
580 return scalar shift @ARGV;
584 print $helpmsg or die $!;
588 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
590 our %defcfg = ('dgit.default.distro' => 'debian',
591 'dgit-suite.*-security.distro' => 'debian-security',
592 'dgit.default.username' => '',
593 'dgit.default.archive-query-default-component' => 'main',
594 'dgit.default.ssh' => 'ssh',
595 'dgit.default.archive-query' => 'madison:',
596 'dgit.default.sshpsql-dbname' => 'service=projectb',
597 'dgit.default.aptget-components' => 'main',
598 'dgit.default.dgit-tag-format' => 'new,old,maint',
599 # old means "repo server accepts pushes with old dgit tags"
600 # new means "repo server accepts pushes with new dgit tags"
601 # maint means "repo server accepts split brain pushes"
602 # hist means "repo server may have old pushes without new tag"
603 # ("hist" is implied by "old")
604 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
605 'dgit-distro.debian.git-check' => 'url',
606 'dgit-distro.debian.git-check-suffix' => '/info/refs',
607 'dgit-distro.debian.new-private-pushers' => 't',
608 'dgit-distro.debian/push.git-url' => '',
609 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
610 'dgit-distro.debian/push.git-user-force' => 'dgit',
611 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
612 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
613 'dgit-distro.debian/push.git-create' => 'true',
614 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
615 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
616 # 'dgit-distro.debian.archive-query-tls-key',
617 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
618 # ^ this does not work because curl is broken nowadays
619 # Fixing #790093 properly will involve providing providing the key
620 # in some pacagke and maybe updating these paths.
622 # 'dgit-distro.debian.archive-query-tls-curl-args',
623 # '--ca-path=/etc/ssl/ca-debian',
624 # ^ this is a workaround but works (only) on DSA-administered machines
625 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
626 'dgit-distro.debian.git-url-suffix' => '',
627 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
628 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
629 'dgit-distro.debian-security.archive-query' => 'aptget:',
630 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
631 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
632 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
633 'dgit-distro.debian-security.nominal-distro' => 'debian',
634 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
635 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
636 'dgit-distro.ubuntu.git-check' => 'false',
637 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
638 'dgit-distro.test-dummy.ssh' => "$td/ssh",
639 'dgit-distro.test-dummy.username' => "alice",
640 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
641 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
642 'dgit-distro.test-dummy.git-url' => "$td/git",
643 'dgit-distro.test-dummy.git-host' => "git",
644 'dgit-distro.test-dummy.git-path' => "$td/git",
645 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
646 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
647 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
648 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
652 our @gitcfgsources = qw(cmdline local global system);
654 sub git_slurp_config () {
655 local ($debuglevel) = $debuglevel-2;
658 # This algoritm is a bit subtle, but this is needed so that for
659 # options which we want to be single-valued, we allow the
660 # different config sources to override properly. See #835858.
661 foreach my $src (@gitcfgsources) {
662 next if $src eq 'cmdline';
663 # we do this ourselves since git doesn't handle it
665 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
668 open GITS, "-|", @cmd or die $!;
671 printdebug "=> ", (messagequote $_), "\n";
673 push @{ $gitcfgs{$src}{$`} }, $'; #';
677 or ($!==0 && $?==256)
682 sub git_get_config ($) {
684 foreach my $src (@gitcfgsources) {
685 my $l = $gitcfgs{$src}{$c};
686 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
689 @$l==1 or badcfg "multiple values for $c".
690 " (in $src git config)" if @$l > 1;
698 return undef if $c =~ /RETURN-UNDEF/;
699 my $v = git_get_config($c);
700 return $v if defined $v;
701 my $dv = $defcfg{$c};
702 return $dv if defined $dv;
704 badcfg "need value for one of: @_\n".
705 "$us: distro or suite appears not to be (properly) supported";
708 sub access_basedistro () {
709 if (defined $idistro) {
712 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
713 return $def if defined $def;
714 foreach my $src (@gitcfgsources, 'internal') {
715 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
717 foreach my $k (keys %$kl) {
718 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
720 next unless match_glob $dpat, $isuite;
724 return cfg("dgit.default.distro");
728 sub access_nomdistro () {
729 my $base = access_basedistro();
730 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
731 $r =~ m/^$distro_re$/ or badcfg
732 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
736 sub access_quirk () {
737 # returns (quirk name, distro to use instead or undef, quirk-specific info)
738 my $basedistro = access_basedistro();
739 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
741 if (defined $backports_quirk) {
742 my $re = $backports_quirk;
743 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
745 $re =~ s/\%/([-0-9a-z_]+)/
746 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
747 if ($isuite =~ m/^$re$/) {
748 return ('backports',"$basedistro-backports",$1);
751 return ('none',undef);
756 sub parse_cfg_bool ($$$) {
757 my ($what,$def,$v) = @_;
760 $v =~ m/^[ty1]/ ? 1 :
761 $v =~ m/^[fn0]/ ? 0 :
762 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
765 sub access_forpush_config () {
766 my $d = access_basedistro();
770 parse_cfg_bool('new-private-pushers', 0,
771 cfg("dgit-distro.$d.new-private-pushers",
774 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
777 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
778 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
779 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
780 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
783 sub access_forpush () {
784 $access_forpush //= access_forpush_config();
785 return $access_forpush;
789 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
790 badcfg "pushing but distro is configured readonly"
791 if access_forpush_config() eq '0';
793 $supplementary_message = <<'END' unless $we_are_responder;
794 Push failed, before we got started.
795 You can retry the push, after fixing the problem, if you like.
797 parseopts_late_defaults();
801 parseopts_late_defaults();
804 sub supplementary_message ($) {
806 if (!$we_are_responder) {
807 $supplementary_message = $msg;
809 } elsif ($protovsn >= 3) {
810 responder_send_command "supplementary-message ".length($msg)
812 print PO $msg or die $!;
816 sub access_distros () {
817 # Returns list of distros to try, in order
820 # 0. `instead of' distro name(s) we have been pointed to
821 # 1. the access_quirk distro, if any
822 # 2a. the user's specified distro, or failing that } basedistro
823 # 2b. the distro calculated from the suite }
824 my @l = access_basedistro();
826 my (undef,$quirkdistro) = access_quirk();
827 unshift @l, $quirkdistro;
828 unshift @l, $instead_distro;
829 @l = grep { defined } @l;
831 push @l, access_nomdistro();
833 if (access_forpush()) {
834 @l = map { ("$_/push", $_) } @l;
839 sub access_cfg_cfgs (@) {
842 # The nesting of these loops determines the search order. We put
843 # the key loop on the outside so that we search all the distros
844 # for each key, before going on to the next key. That means that
845 # if access_cfg is called with a more specific, and then a less
846 # specific, key, an earlier distro can override the less specific
847 # without necessarily overriding any more specific keys. (If the
848 # distro wants to override the more specific keys it can simply do
849 # so; whereas if we did the loop the other way around, it would be
850 # impossible to for an earlier distro to override a less specific
851 # key but not the more specific ones without restating the unknown
852 # values of the more specific keys.
855 # We have to deal with RETURN-UNDEF specially, so that we don't
856 # terminate the search prematurely.
858 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
861 foreach my $d (access_distros()) {
862 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
864 push @cfgs, map { "dgit.default.$_" } @realkeys;
871 my (@cfgs) = access_cfg_cfgs(@keys);
872 my $value = cfg(@cfgs);
876 sub access_cfg_bool ($$) {
877 my ($def, @keys) = @_;
878 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
881 sub string_to_ssh ($) {
883 if ($spec =~ m/\s/) {
884 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
890 sub access_cfg_ssh () {
891 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
892 if (!defined $gitssh) {
895 return string_to_ssh $gitssh;
899 sub access_runeinfo ($) {
901 return ": dgit ".access_basedistro()." $info ;";
904 sub access_someuserhost ($) {
906 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
907 defined($user) && length($user) or
908 $user = access_cfg("$some-user",'username');
909 my $host = access_cfg("$some-host");
910 return length($user) ? "$user\@$host" : $host;
913 sub access_gituserhost () {
914 return access_someuserhost('git');
917 sub access_giturl (;$) {
919 my $url = access_cfg('git-url','RETURN-UNDEF');
922 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
923 return undef unless defined $proto;
926 access_gituserhost().
927 access_cfg('git-path');
929 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
932 return "$url/$package$suffix";
935 sub parsecontrolfh ($$;$) {
936 my ($fh, $desc, $allowsigned) = @_;
937 our $dpkgcontrolhash_noissigned;
940 my %opts = ('name' => $desc);
941 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
942 $c = Dpkg::Control::Hash->new(%opts);
943 $c->parse($fh,$desc) or die "parsing of $desc failed";
944 last if $allowsigned;
945 last if $dpkgcontrolhash_noissigned;
946 my $issigned= $c->get_option('is_pgp_signed');
947 if (!defined $issigned) {
948 $dpkgcontrolhash_noissigned= 1;
949 seek $fh, 0,0 or die "seek $desc: $!";
950 } elsif ($issigned) {
951 fail "control file $desc is (already) PGP-signed. ".
952 " Note that dgit push needs to modify the .dsc and then".
953 " do the signature itself";
962 my ($file, $desc, $allowsigned) = @_;
963 my $fh = new IO::Handle;
964 open $fh, '<', $file or die "$file: $!";
965 my $c = parsecontrolfh($fh,$desc,$allowsigned);
966 $fh->error and die $!;
972 my ($dctrl,$field) = @_;
973 my $v = $dctrl->{$field};
974 return $v if defined $v;
975 fail "missing field $field in ".$dctrl->get_option('name');
979 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
980 my $p = new IO::Handle;
981 my @cmd = (qw(dpkg-parsechangelog), @_);
982 open $p, '-|', @cmd or die $!;
984 $?=0; $!=0; close $p or failedcmd @cmd;
988 sub commit_getclogp ($) {
989 # Returns the parsed changelog hashref for a particular commit
991 our %commit_getclogp_memo;
992 my $memo = $commit_getclogp_memo{$objid};
993 return $memo if $memo;
995 my $mclog = ".git/dgit/clog-$objid";
996 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
997 "$objid:debian/changelog";
998 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1001 sub must_getcwd () {
1003 defined $d or fail "getcwd failed: $!";
1007 sub parse_dscdata () {
1008 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1009 printdebug Dumper($dscdata) if $debuglevel>1;
1010 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1011 printdebug Dumper($dsc) if $debuglevel>1;
1016 sub archive_query ($;@) {
1017 my ($method) = shift @_;
1018 fail "this operation does not support multiple comma-separated suites"
1020 my $query = access_cfg('archive-query','RETURN-UNDEF');
1021 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1024 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1027 sub archive_query_prepend_mirror {
1028 my $m = access_cfg('mirror');
1029 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1032 sub pool_dsc_subpath ($$) {
1033 my ($vsn,$component) = @_; # $package is implict arg
1034 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1035 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1038 sub cfg_apply_map ($$$) {
1039 my ($varref, $what, $mapspec) = @_;
1040 return unless $mapspec;
1042 printdebug "config $what EVAL{ $mapspec; }\n";
1044 eval "package Dgit::Config; $mapspec;";
1049 #---------- `ftpmasterapi' archive query method (nascent) ----------
1051 sub archive_api_query_cmd ($) {
1053 my @cmd = (@curl, qw(-sS));
1054 my $url = access_cfg('archive-query-url');
1055 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1057 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1058 foreach my $key (split /\:/, $keys) {
1059 $key =~ s/\%HOST\%/$host/g;
1061 fail "for $url: stat $key: $!" unless $!==ENOENT;
1064 fail "config requested specific TLS key but do not know".
1065 " how to get curl to use exactly that EE key ($key)";
1066 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1067 # # Sadly the above line does not work because of changes
1068 # # to gnutls. The real fix for #790093 may involve
1069 # # new curl options.
1072 # Fixing #790093 properly will involve providing a value
1073 # for this on clients.
1074 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1075 push @cmd, split / /, $kargs if defined $kargs;
1077 push @cmd, $url.$subpath;
1081 sub api_query ($$;$) {
1083 my ($data, $subpath, $ok404) = @_;
1084 badcfg "ftpmasterapi archive query method takes no data part"
1086 my @cmd = archive_api_query_cmd($subpath);
1087 my $url = $cmd[$#cmd];
1088 push @cmd, qw(-w %{http_code});
1089 my $json = cmdoutput @cmd;
1090 unless ($json =~ s/\d+\d+\d$//) {
1091 failedcmd_report_cmd undef, @cmd;
1092 fail "curl failed to print 3-digit HTTP code";
1095 return undef if $code eq '404' && $ok404;
1096 fail "fetch of $url gave HTTP code $code"
1097 unless $url =~ m#^file://# or $code =~ m/^2/;
1098 return decode_json($json);
1101 sub canonicalise_suite_ftpmasterapi {
1102 my ($proto,$data) = @_;
1103 my $suites = api_query($data, 'suites');
1105 foreach my $entry (@$suites) {
1107 my $v = $entry->{$_};
1108 defined $v && $v eq $isuite;
1109 } qw(codename name);
1110 push @matched, $entry;
1112 fail "unknown suite $isuite" unless @matched;
1115 @matched==1 or die "multiple matches for suite $isuite\n";
1116 $cn = "$matched[0]{codename}";
1117 defined $cn or die "suite $isuite info has no codename\n";
1118 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1120 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1125 sub archive_query_ftpmasterapi {
1126 my ($proto,$data) = @_;
1127 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1129 my $digester = Digest::SHA->new(256);
1130 foreach my $entry (@$info) {
1132 my $vsn = "$entry->{version}";
1133 my ($ok,$msg) = version_check $vsn;
1134 die "bad version: $msg\n" unless $ok;
1135 my $component = "$entry->{component}";
1136 $component =~ m/^$component_re$/ or die "bad component";
1137 my $filename = "$entry->{filename}";
1138 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1139 or die "bad filename";
1140 my $sha256sum = "$entry->{sha256sum}";
1141 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1142 push @rows, [ $vsn, "/pool/$component/$filename",
1143 $digester, $sha256sum ];
1145 die "bad ftpmaster api response: $@\n".Dumper($entry)
1148 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1149 return archive_query_prepend_mirror @rows;
1152 sub file_in_archive_ftpmasterapi {
1153 my ($proto,$data,$filename) = @_;
1154 my $pat = $filename;
1157 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1158 my $info = api_query($data, "file_in_archive/$pat", 1);
1161 #---------- `aptget' archive query method ----------
1164 our $aptget_releasefile;
1165 our $aptget_configpath;
1167 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1168 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1170 sub aptget_cache_clean {
1171 runcmd_ordryrun_local qw(sh -ec),
1172 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1176 sub aptget_lock_acquire () {
1177 my $lockfile = "$aptget_base/lock";
1178 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1179 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1182 sub aptget_prep ($) {
1184 return if defined $aptget_base;
1186 badcfg "aptget archive query method takes no data part"
1189 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1192 ensuredir "$cache/dgit";
1194 access_cfg('aptget-cachekey','RETURN-UNDEF')
1195 // access_nomdistro();
1197 $aptget_base = "$cache/dgit/aptget";
1198 ensuredir $aptget_base;
1200 my $quoted_base = $aptget_base;
1201 die "$quoted_base contains bad chars, cannot continue"
1202 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1204 ensuredir $aptget_base;
1206 aptget_lock_acquire();
1208 aptget_cache_clean();
1210 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1211 my $sourceslist = "source.list#$cachekey";
1213 my $aptsuites = $isuite;
1214 cfg_apply_map(\$aptsuites, 'suite map',
1215 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1217 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1218 printf SRCS "deb-src %s %s %s\n",
1219 access_cfg('mirror'),
1221 access_cfg('aptget-components')
1224 ensuredir "$aptget_base/cache";
1225 ensuredir "$aptget_base/lists";
1227 open CONF, ">", $aptget_configpath or die $!;
1229 Debug::NoLocking "true";
1230 APT::Get::List-Cleanup "false";
1231 #clear APT::Update::Post-Invoke-Success;
1232 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1233 Dir::State::Lists "$quoted_base/lists";
1234 Dir::Etc::preferences "$quoted_base/preferences";
1235 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1236 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1239 foreach my $key (qw(
1242 Dir::Cache::Archives
1243 Dir::Etc::SourceParts
1244 Dir::Etc::preferencesparts
1246 ensuredir "$aptget_base/$key";
1247 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1250 my $oldatime = (time // die $!) - 1;
1251 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1252 next unless stat_exists $oldlist;
1253 my ($mtime) = (stat _)[9];
1254 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1257 runcmd_ordryrun_local aptget_aptget(), qw(update);
1260 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1261 next unless stat_exists $oldlist;
1262 my ($atime) = (stat _)[8];
1263 next if $atime == $oldatime;
1264 push @releasefiles, $oldlist;
1266 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1267 @releasefiles = @inreleasefiles if @inreleasefiles;
1268 die "apt updated wrong number of Release files (@releasefiles), erk"
1269 unless @releasefiles == 1;
1271 ($aptget_releasefile) = @releasefiles;
1274 sub canonicalise_suite_aptget {
1275 my ($proto,$data) = @_;
1278 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1280 foreach my $name (qw(Codename Suite)) {
1281 my $val = $release->{$name};
1283 printdebug "release file $name: $val\n";
1284 $val =~ m/^$suite_re$/o or fail
1285 "Release file ($aptget_releasefile) specifies intolerable $name";
1286 cfg_apply_map(\$val, 'suite rmap',
1287 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1294 sub archive_query_aptget {
1295 my ($proto,$data) = @_;
1298 ensuredir "$aptget_base/source";
1299 foreach my $old (<$aptget_base/source/*.dsc>) {
1300 unlink $old or die "$old: $!";
1303 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1304 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1305 # avoids apt-get source failing with ambiguous error code
1307 runcmd_ordryrun_local
1308 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1309 aptget_aptget(), qw(--download-only --only-source source), $package;
1311 my @dscs = <$aptget_base/source/*.dsc>;
1312 fail "apt-get source did not produce a .dsc" unless @dscs;
1313 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1315 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1318 my $uri = "file://". uri_escape $dscs[0];
1319 $uri =~ s{\%2f}{/}gi;
1320 return [ (getfield $pre_dsc, 'Version'), $uri ];
1323 #---------- `dummyapicat' archive query method ----------
1325 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1326 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1328 sub file_in_archive_dummycatapi ($$$) {
1329 my ($proto,$data,$filename) = @_;
1330 my $mirror = access_cfg('mirror');
1331 $mirror =~ s#^file://#/# or die "$mirror ?";
1333 my @cmd = (qw(sh -ec), '
1335 find -name "$2" -print0 |
1337 ', qw(x), $mirror, $filename);
1338 debugcmd "-|", @cmd;
1339 open FIA, "-|", @cmd or die $!;
1342 printdebug "| $_\n";
1343 m/^(\w+) (\S+)$/ or die "$_ ?";
1344 push @out, { sha256sum => $1, filename => $2 };
1346 close FIA or die failedcmd @cmd;
1350 #---------- `madison' archive query method ----------
1352 sub archive_query_madison {
1353 return archive_query_prepend_mirror
1354 map { [ @$_[0..1] ] } madison_get_parse(@_);
1357 sub madison_get_parse {
1358 my ($proto,$data) = @_;
1359 die unless $proto eq 'madison';
1360 if (!length $data) {
1361 $data= access_cfg('madison-distro','RETURN-UNDEF');
1362 $data //= access_basedistro();
1364 $rmad{$proto,$data,$package} ||= cmdoutput
1365 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1366 my $rmad = $rmad{$proto,$data,$package};
1369 foreach my $l (split /\n/, $rmad) {
1370 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1371 \s*( [^ \t|]+ )\s* \|
1372 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1373 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1374 $1 eq $package or die "$rmad $package ?";
1381 $component = access_cfg('archive-query-default-component');
1383 $5 eq 'source' or die "$rmad ?";
1384 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1386 return sort { -version_compare($a->[0],$b->[0]); } @out;
1389 sub canonicalise_suite_madison {
1390 # madison canonicalises for us
1391 my @r = madison_get_parse(@_);
1393 "unable to canonicalise suite using package $package".
1394 " which does not appear to exist in suite $isuite;".
1395 " --existing-package may help";
1399 sub file_in_archive_madison { return undef; }
1401 #---------- `sshpsql' archive query method ----------
1404 my ($data,$runeinfo,$sql) = @_;
1405 if (!length $data) {
1406 $data= access_someuserhost('sshpsql').':'.
1407 access_cfg('sshpsql-dbname');
1409 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1410 my ($userhost,$dbname) = ($`,$'); #';
1412 my @cmd = (access_cfg_ssh, $userhost,
1413 access_runeinfo("ssh-psql $runeinfo").
1414 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1415 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1417 open P, "-|", @cmd or die $!;
1420 printdebug(">|$_|\n");
1423 $!=0; $?=0; close P or failedcmd @cmd;
1425 my $nrows = pop @rows;
1426 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1427 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1428 @rows = map { [ split /\|/, $_ ] } @rows;
1429 my $ncols = scalar @{ shift @rows };
1430 die if grep { scalar @$_ != $ncols } @rows;
1434 sub sql_injection_check {
1435 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1438 sub archive_query_sshpsql ($$) {
1439 my ($proto,$data) = @_;
1440 sql_injection_check $isuite, $package;
1441 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1442 SELECT source.version, component.name, files.filename, files.sha256sum
1444 JOIN src_associations ON source.id = src_associations.source
1445 JOIN suite ON suite.id = src_associations.suite
1446 JOIN dsc_files ON dsc_files.source = source.id
1447 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1448 JOIN component ON component.id = files_archive_map.component_id
1449 JOIN files ON files.id = dsc_files.file
1450 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1451 AND source.source='$package'
1452 AND files.filename LIKE '%.dsc';
1454 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1455 my $digester = Digest::SHA->new(256);
1457 my ($vsn,$component,$filename,$sha256sum) = @$_;
1458 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1460 return archive_query_prepend_mirror @rows;
1463 sub canonicalise_suite_sshpsql ($$) {
1464 my ($proto,$data) = @_;
1465 sql_injection_check $isuite;
1466 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1467 SELECT suite.codename
1468 FROM suite where suite_name='$isuite' or codename='$isuite';
1470 @rows = map { $_->[0] } @rows;
1471 fail "unknown suite $isuite" unless @rows;
1472 die "ambiguous $isuite: @rows ?" if @rows>1;
1476 sub file_in_archive_sshpsql ($$$) { return undef; }
1478 #---------- `dummycat' archive query method ----------
1480 sub canonicalise_suite_dummycat ($$) {
1481 my ($proto,$data) = @_;
1482 my $dpath = "$data/suite.$isuite";
1483 if (!open C, "<", $dpath) {
1484 $!==ENOENT or die "$dpath: $!";
1485 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1489 chomp or die "$dpath: $!";
1491 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1495 sub archive_query_dummycat ($$) {
1496 my ($proto,$data) = @_;
1497 canonicalise_suite();
1498 my $dpath = "$data/package.$csuite.$package";
1499 if (!open C, "<", $dpath) {
1500 $!==ENOENT or die "$dpath: $!";
1501 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1509 printdebug "dummycat query $csuite $package $dpath | $_\n";
1510 my @row = split /\s+/, $_;
1511 @row==2 or die "$dpath: $_ ?";
1514 C->error and die "$dpath: $!";
1516 return archive_query_prepend_mirror
1517 sort { -version_compare($a->[0],$b->[0]); } @rows;
1520 sub file_in_archive_dummycat () { return undef; }
1522 #---------- tag format handling ----------
1524 sub access_cfg_tagformats () {
1525 split /\,/, access_cfg('dgit-tag-format');
1528 sub access_cfg_tagformats_can_splitbrain () {
1529 my %y = map { $_ => 1 } access_cfg_tagformats;
1530 foreach my $needtf (qw(new maint)) {
1531 next if $y{$needtf};
1537 sub need_tagformat ($$) {
1538 my ($fmt, $why) = @_;
1539 fail "need to use tag format $fmt ($why) but also need".
1540 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1541 " - no way to proceed"
1542 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1543 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1546 sub select_tagformat () {
1548 return if $tagformatfn && !$tagformat_want;
1549 die 'bug' if $tagformatfn && $tagformat_want;
1550 # ... $tagformat_want assigned after previous select_tagformat
1552 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1553 printdebug "select_tagformat supported @supported\n";
1555 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1556 printdebug "select_tagformat specified @$tagformat_want\n";
1558 my ($fmt,$why,$override) = @$tagformat_want;
1560 fail "target distro supports tag formats @supported".
1561 " but have to use $fmt ($why)"
1563 or grep { $_ eq $fmt } @supported;
1565 $tagformat_want = undef;
1567 $tagformatfn = ${*::}{"debiantag_$fmt"};
1569 fail "trying to use unknown tag format \`$fmt' ($why) !"
1570 unless $tagformatfn;
1573 #---------- archive query entrypoints and rest of program ----------
1575 sub canonicalise_suite () {
1576 return if defined $csuite;
1577 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1578 $csuite = archive_query('canonicalise_suite');
1579 if ($isuite ne $csuite) {
1580 progress "canonical suite name for $isuite is $csuite";
1582 progress "canonical suite name is $csuite";
1586 sub get_archive_dsc () {
1587 canonicalise_suite();
1588 my @vsns = archive_query('archive_query');
1589 foreach my $vinfo (@vsns) {
1590 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1591 $dscurl = $vsn_dscurl;
1592 $dscdata = url_get($dscurl);
1594 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1599 $digester->add($dscdata);
1600 my $got = $digester->hexdigest();
1602 fail "$dscurl has hash $got but".
1603 " archive told us to expect $digest";
1606 my $fmt = getfield $dsc, 'Format';
1607 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1608 "unsupported source format $fmt, sorry";
1610 $dsc_checked = !!$digester;
1611 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1615 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1618 sub check_for_git ();
1619 sub check_for_git () {
1621 my $how = access_cfg('git-check');
1622 if ($how eq 'ssh-cmd') {
1624 (access_cfg_ssh, access_gituserhost(),
1625 access_runeinfo("git-check $package").
1626 " set -e; cd ".access_cfg('git-path').";".
1627 " if test -d $package.git; then echo 1; else echo 0; fi");
1628 my $r= cmdoutput @cmd;
1629 if (defined $r and $r =~ m/^divert (\w+)$/) {
1631 my ($usedistro,) = access_distros();
1632 # NB that if we are pushing, $usedistro will be $distro/push
1633 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1634 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1635 progress "diverting to $divert (using config for $instead_distro)";
1636 return check_for_git();
1638 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1640 } elsif ($how eq 'url') {
1641 my $prefix = access_cfg('git-check-url','git-url');
1642 my $suffix = access_cfg('git-check-suffix','git-suffix',
1643 'RETURN-UNDEF') // '.git';
1644 my $url = "$prefix/$package$suffix";
1645 my @cmd = (@curl, qw(-sS -I), $url);
1646 my $result = cmdoutput @cmd;
1647 $result =~ s/^\S+ 200 .*\n\r?\n//;
1648 # curl -sS -I with https_proxy prints
1649 # HTTP/1.0 200 Connection established
1650 $result =~ m/^\S+ (404|200) /s or
1651 fail "unexpected results from git check query - ".
1652 Dumper($prefix, $result);
1654 if ($code eq '404') {
1656 } elsif ($code eq '200') {
1661 } elsif ($how eq 'true') {
1663 } elsif ($how eq 'false') {
1666 badcfg "unknown git-check \`$how'";
1670 sub create_remote_git_repo () {
1671 my $how = access_cfg('git-create');
1672 if ($how eq 'ssh-cmd') {
1674 (access_cfg_ssh, access_gituserhost(),
1675 access_runeinfo("git-create $package").
1676 "set -e; cd ".access_cfg('git-path').";".
1677 " cp -a _template $package.git");
1678 } elsif ($how eq 'true') {
1681 badcfg "unknown git-create \`$how'";
1685 our ($dsc_hash,$lastpush_mergeinput);
1686 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1688 our $ud = '.git/dgit/unpack';
1698 sub mktree_in_ud_here () {
1699 runcmd qw(git init -q);
1700 runcmd qw(git config gc.auto 0);
1701 rmtree('.git/objects');
1702 symlink '../../../../objects','.git/objects' or die $!;
1705 sub git_write_tree () {
1706 my $tree = cmdoutput @git, qw(write-tree);
1707 $tree =~ m/^\w+$/ or die "$tree ?";
1711 sub git_add_write_tree () {
1712 runcmd @git, qw(add -Af .);
1713 return git_write_tree();
1716 sub remove_stray_gits ($) {
1718 my @gitscmd = qw(find -name .git -prune -print0);
1719 debugcmd "|",@gitscmd;
1720 open GITS, "-|", @gitscmd or die $!;
1725 print STDERR "$us: warning: removing from $what: ",
1726 (messagequote $_), "\n";
1730 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1733 sub mktree_in_ud_from_only_subdir ($;$) {
1734 my ($what,$raw) = @_;
1736 # changes into the subdir
1738 die "expected one subdir but found @dirs ?" unless @dirs==1;
1739 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1743 remove_stray_gits($what);
1744 mktree_in_ud_here();
1746 my ($format, $fopts) = get_source_format();
1747 if (madformat($format)) {
1752 my $tree=git_add_write_tree();
1753 return ($tree,$dir);
1756 our @files_csum_info_fields =
1757 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1758 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1759 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1761 sub dsc_files_info () {
1762 foreach my $csumi (@files_csum_info_fields) {
1763 my ($fname, $module, $method) = @$csumi;
1764 my $field = $dsc->{$fname};
1765 next unless defined $field;
1766 eval "use $module; 1;" or die $@;
1768 foreach (split /\n/, $field) {
1770 m/^(\w+) (\d+) (\S+)$/ or
1771 fail "could not parse .dsc $fname line \`$_'";
1772 my $digester = eval "$module"."->$method;" or die $@;
1777 Digester => $digester,
1782 fail "missing any supported Checksums-* or Files field in ".
1783 $dsc->get_option('name');
1787 map { $_->{Filename} } dsc_files_info();
1790 sub files_compare_inputs (@) {
1795 my $showinputs = sub {
1796 return join "; ", map { $_->get_option('name') } @$inputs;
1799 foreach my $in (@$inputs) {
1801 my $in_name = $in->get_option('name');
1803 printdebug "files_compare_inputs $in_name\n";
1805 foreach my $csumi (@files_csum_info_fields) {
1806 my ($fname) = @$csumi;
1807 printdebug "files_compare_inputs $in_name $fname\n";
1809 my $field = $in->{$fname};
1810 next unless defined $field;
1813 foreach (split /\n/, $field) {
1816 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1817 fail "could not parse $in_name $fname line \`$_'";
1819 printdebug "files_compare_inputs $in_name $fname $f\n";
1823 my $re = \ $record{$f}{$fname};
1825 $fchecked{$f}{$in_name} = 1;
1827 fail "hash or size of $f varies in $fname fields".
1828 " (between: ".$showinputs->().")";
1833 @files = sort @files;
1834 $expected_files //= \@files;
1835 "@$expected_files" eq "@files" or
1836 fail "file list in $in_name varies between hash fields!";
1839 fail "$in_name has no files list field(s)";
1841 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1844 grep { keys %$_ == @$inputs-1 } values %fchecked
1845 or fail "no file appears in all file lists".
1846 " (looked in: ".$showinputs->().")";
1849 sub is_orig_file_in_dsc ($$) {
1850 my ($f, $dsc_files_info) = @_;
1851 return 0 if @$dsc_files_info <= 1;
1852 # One file means no origs, and the filename doesn't have a "what
1853 # part of dsc" component. (Consider versions ending `.orig'.)
1854 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1858 sub is_orig_file_of_vsn ($$) {
1859 my ($f, $upstreamvsn) = @_;
1860 my $base = srcfn $upstreamvsn, '';
1861 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1865 sub changes_update_origs_from_dsc ($$$$) {
1866 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1868 printdebug "checking origs needed ($upstreamvsn)...\n";
1869 $_ = getfield $changes, 'Files';
1870 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1871 fail "cannot find section/priority from .changes Files field";
1872 my $placementinfo = $1;
1874 printdebug "checking origs needed placement '$placementinfo'...\n";
1875 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1876 $l =~ m/\S+$/ or next;
1878 printdebug "origs $file | $l\n";
1879 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1880 printdebug "origs $file is_orig\n";
1881 my $have = archive_query('file_in_archive', $file);
1882 if (!defined $have) {
1884 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1890 printdebug "origs $file \$#\$have=$#$have\n";
1891 foreach my $h (@$have) {
1894 foreach my $csumi (@files_csum_info_fields) {
1895 my ($fname, $module, $method, $archivefield) = @$csumi;
1896 next unless defined $h->{$archivefield};
1897 $_ = $dsc->{$fname};
1898 next unless defined;
1899 m/^(\w+) .* \Q$file\E$/m or
1900 fail ".dsc $fname missing entry for $file";
1901 if ($h->{$archivefield} eq $1) {
1905 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1908 die "$file ".Dumper($h)." ?!" if $same && @differ;
1911 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1914 printdebug "origs $file f.same=$found_same".
1915 " #f._differ=$#found_differ\n";
1916 if (@found_differ && !$found_same) {
1918 "archive contains $file with different checksum",
1921 # Now we edit the changes file to add or remove it
1922 foreach my $csumi (@files_csum_info_fields) {
1923 my ($fname, $module, $method, $archivefield) = @$csumi;
1924 next unless defined $changes->{$fname};
1926 # in archive, delete from .changes if it's there
1927 $changed{$file} = "removed" if
1928 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1929 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1930 # not in archive, but it's here in the .changes
1932 my $dsc_data = getfield $dsc, $fname;
1933 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1935 $extra =~ s/ \d+ /$&$placementinfo /
1936 or die "$fname $extra >$dsc_data< ?"
1937 if $fname eq 'Files';
1938 $changes->{$fname} .= "\n". $extra;
1939 $changed{$file} = "added";
1944 foreach my $file (keys %changed) {
1946 "edited .changes for archive .orig contents: %s %s",
1947 $changed{$file}, $file;
1949 my $chtmp = "$changesfile.tmp";
1950 $changes->save($chtmp);
1952 rename $chtmp,$changesfile or die "$changesfile $!";
1954 progress "[new .changes left in $changesfile]";
1957 progress "$changesfile already has appropriate .orig(s) (if any)";
1961 sub make_commit ($) {
1963 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1966 sub make_commit_text ($) {
1969 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1971 print Dumper($text) if $debuglevel > 1;
1972 my $child = open2($out, $in, @cmd) or die $!;
1975 print $in $text or die $!;
1976 close $in or die $!;
1978 $h =~ m/^\w+$/ or die;
1980 printdebug "=> $h\n";
1983 waitpid $child, 0 == $child or die "$child $!";
1984 $? and failedcmd @cmd;
1988 sub clogp_authline ($) {
1990 my $author = getfield $clogp, 'Maintainer';
1991 $author =~ s#,.*##ms;
1992 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1993 my $authline = "$author $date";
1994 $authline =~ m/$git_authline_re/o or
1995 fail "unexpected commit author line format \`$authline'".
1996 " (was generated from changelog Maintainer field)";
1997 return ($1,$2,$3) if wantarray;
2001 sub vendor_patches_distro ($$) {
2002 my ($checkdistro, $what) = @_;
2003 return unless defined $checkdistro;
2005 my $series = "debian/patches/\L$checkdistro\E.series";
2006 printdebug "checking for vendor-specific $series ($what)\n";
2008 if (!open SERIES, "<", $series) {
2009 die "$series $!" unless $!==ENOENT;
2018 Unfortunately, this source package uses a feature of dpkg-source where
2019 the same source package unpacks to different source code on different
2020 distros. dgit cannot safely operate on such packages on affected
2021 distros, because the meaning of source packages is not stable.
2023 Please ask the distro/maintainer to remove the distro-specific series
2024 files and use a different technique (if necessary, uploading actually
2025 different packages, if different distros are supposed to have
2029 fail "Found active distro-specific series file for".
2030 " $checkdistro ($what): $series, cannot continue";
2032 die "$series $!" if SERIES->error;
2036 sub check_for_vendor_patches () {
2037 # This dpkg-source feature doesn't seem to be documented anywhere!
2038 # But it can be found in the changelog (reformatted):
2040 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2041 # Author: Raphael Hertzog <hertzog@debian.org>
2042 # Date: Sun Oct 3 09:36:48 2010 +0200
2044 # dpkg-source: correctly create .pc/.quilt_series with alternate
2047 # If you have debian/patches/ubuntu.series and you were
2048 # unpacking the source package on ubuntu, quilt was still
2049 # directed to debian/patches/series instead of
2050 # debian/patches/ubuntu.series.
2052 # debian/changelog | 3 +++
2053 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2054 # 2 files changed, 6 insertions(+), 1 deletion(-)
2057 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2058 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2059 "Dpkg::Vendor \`current vendor'");
2060 vendor_patches_distro(access_basedistro(),
2061 "(base) distro being accessed");
2062 vendor_patches_distro(access_nomdistro(),
2063 "(nominal) distro being accessed");
2066 sub generate_commits_from_dsc () {
2067 # See big comment in fetch_from_archive, below.
2068 # See also README.dsc-import.
2072 my @dfi = dsc_files_info();
2073 foreach my $fi (@dfi) {
2074 my $f = $fi->{Filename};
2075 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2077 printdebug "considering linking $f: ";
2079 link_ltarget "../../../../$f", $f
2080 or ((printdebug "($!) "), 0)
2084 printdebug "linked.\n";
2086 complete_file_from_dsc('.', $fi)
2089 if (is_orig_file_in_dsc($f, \@dfi)) {
2090 link $f, "../../../../$f"
2096 # We unpack and record the orig tarballs first, so that we only
2097 # need disk space for one private copy of the unpacked source.
2098 # But we can't make them into commits until we have the metadata
2099 # from the debian/changelog, so we record the tree objects now and
2100 # make them into commits later.
2102 my $upstreamv = upstreamversion $dsc->{version};
2103 my $orig_f_base = srcfn $upstreamv, '';
2105 foreach my $fi (@dfi) {
2106 # We actually import, and record as a commit, every tarball
2107 # (unless there is only one file, in which case there seems
2110 my $f = $fi->{Filename};
2111 printdebug "import considering $f ";
2112 (printdebug "only one dfi\n"), next if @dfi == 1;
2113 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2114 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2118 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2120 printdebug "Y ", (join ' ', map { $_//"(none)" }
2121 $compr_ext, $orig_f_part
2124 my $input = new IO::File $f, '<' or die "$f $!";
2128 if (defined $compr_ext) {
2130 Dpkg::Compression::compression_guess_from_filename $f;
2131 fail "Dpkg::Compression cannot handle file $f in source package"
2132 if defined $compr_ext && !defined $cname;
2134 new Dpkg::Compression::Process compression => $cname;
2135 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2136 my $compr_fh = new IO::Handle;
2137 my $compr_pid = open $compr_fh, "-|" // die $!;
2139 open STDIN, "<&", $input or die $!;
2141 die "dgit (child): exec $compr_cmd[0]: $!\n";
2146 rmtree "_unpack-tar";
2147 mkdir "_unpack-tar" or die $!;
2148 my @tarcmd = qw(tar -x -f -
2149 --no-same-owner --no-same-permissions
2150 --no-acls --no-xattrs --no-selinux);
2151 my $tar_pid = fork // die $!;
2153 chdir "_unpack-tar" or die $!;
2154 open STDIN, "<&", $input or die $!;
2156 die "dgit (child): exec $tarcmd[0]: $!";
2158 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2159 !$? or failedcmd @tarcmd;
2162 (@compr_cmd ? failedcmd @compr_cmd
2164 # finally, we have the results in "tarball", but maybe
2165 # with the wrong permissions
2167 runcmd qw(chmod -R +rwX _unpack-tar);
2168 changedir "_unpack-tar";
2169 remove_stray_gits($f);
2170 mktree_in_ud_here();
2172 my ($tree) = git_add_write_tree();
2173 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2174 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2176 printdebug "one subtree $1\n";
2178 printdebug "multiple subtrees\n";
2181 rmtree "_unpack-tar";
2183 my $ent = [ $f, $tree ];
2185 Orig => !!$orig_f_part,
2186 Sort => (!$orig_f_part ? 2 :
2187 $orig_f_part =~ m/-/g ? 1 :
2195 # put any without "_" first (spec is not clear whether files
2196 # are always in the usual order). Tarballs without "_" are
2197 # the main orig or the debian tarball.
2198 $a->{Sort} <=> $b->{Sort} or
2202 my $any_orig = grep { $_->{Orig} } @tartrees;
2204 my $dscfn = "$package.dsc";
2206 my $treeimporthow = 'package';
2208 open D, ">", $dscfn or die "$dscfn: $!";
2209 print D $dscdata or die "$dscfn: $!";
2210 close D or die "$dscfn: $!";
2211 my @cmd = qw(dpkg-source);
2212 push @cmd, '--no-check' if $dsc_checked;
2213 if (madformat $dsc->{format}) {
2214 push @cmd, '--skip-patches';
2215 $treeimporthow = 'unpatched';
2217 push @cmd, qw(-x --), $dscfn;
2220 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2221 if (madformat $dsc->{format}) {
2222 check_for_vendor_patches();
2226 if (madformat $dsc->{format}) {
2227 my @pcmd = qw(dpkg-source --before-build .);
2228 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2230 $dappliedtree = git_add_write_tree();
2233 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2234 debugcmd "|",@clogcmd;
2235 open CLOGS, "-|", @clogcmd or die $!;
2240 printdebug "import clog search...\n";
2243 my $stanzatext = do { local $/=""; <CLOGS>; };
2244 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2245 last if !defined $stanzatext;
2247 my $desc = "package changelog, entry no.$.";
2248 open my $stanzafh, "<", \$stanzatext or die;
2249 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2250 $clogp //= $thisstanza;
2252 printdebug "import clog $thisstanza->{version} $desc...\n";
2254 last if !$any_orig; # we don't need $r1clogp
2256 # We look for the first (most recent) changelog entry whose
2257 # version number is lower than the upstream version of this
2258 # package. Then the last (least recent) previous changelog
2259 # entry is treated as the one which introduced this upstream
2260 # version and used for the synthetic commits for the upstream
2263 # One might think that a more sophisticated algorithm would be
2264 # necessary. But: we do not want to scan the whole changelog
2265 # file. Stopping when we see an earlier version, which
2266 # necessarily then is an earlier upstream version, is the only
2267 # realistic way to do that. Then, either the earliest
2268 # changelog entry we have seen so far is indeed the earliest
2269 # upload of this upstream version; or there are only changelog
2270 # entries relating to later upstream versions (which is not
2271 # possible unless the changelog and .dsc disagree about the
2272 # version). Then it remains to choose between the physically
2273 # last entry in the file, and the one with the lowest version
2274 # number. If these are not the same, we guess that the
2275 # versions were created in a non-monotic order rather than
2276 # that the changelog entries have been misordered.
2278 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2280 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2281 $r1clogp = $thisstanza;
2283 printdebug "import clog $r1clogp->{version} becomes r1\n";
2285 die $! if CLOGS->error;
2286 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2288 $clogp or fail "package changelog has no entries!";
2290 my $authline = clogp_authline $clogp;
2291 my $changes = getfield $clogp, 'Changes';
2292 my $cversion = getfield $clogp, 'Version';
2295 $r1clogp //= $clogp; # maybe there's only one entry;
2296 my $r1authline = clogp_authline $r1clogp;
2297 # Strictly, r1authline might now be wrong if it's going to be
2298 # unused because !$any_orig. Whatever.
2300 printdebug "import tartrees authline $authline\n";
2301 printdebug "import tartrees r1authline $r1authline\n";
2303 foreach my $tt (@tartrees) {
2304 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2306 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2309 committer $r1authline
2313 [dgit import orig $tt->{F}]
2321 [dgit import tarball $package $cversion $tt->{F}]
2326 printdebug "import main commit\n";
2328 open C, ">../commit.tmp" or die $!;
2329 print C <<END or die $!;
2332 print C <<END or die $! foreach @tartrees;
2335 print C <<END or die $!;
2341 [dgit import $treeimporthow $package $cversion]
2345 my $rawimport_hash = make_commit qw(../commit.tmp);
2347 if (madformat $dsc->{format}) {
2348 printdebug "import apply patches...\n";
2350 # regularise the state of the working tree so that
2351 # the checkout of $rawimport_hash works nicely.
2352 my $dappliedcommit = make_commit_text(<<END);
2359 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2361 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2363 # We need the answers to be reproducible
2364 my @authline = clogp_authline($clogp);
2365 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2366 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2367 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2368 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2369 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2370 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2372 my $path = $ENV{PATH} or die;
2374 foreach my $use_absurd (qw(0 1)) {
2375 runcmd @git, qw(checkout -q unpa);
2376 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2377 local $ENV{PATH} = $path;
2380 progress "warning: $@";
2381 $path = "$absurdity:$path";
2382 progress "$us: trying slow absurd-git-apply...";
2383 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2388 die "forbid absurd git-apply\n" if $use_absurd
2389 && forceing [qw(import-gitapply-no-absurd)];
2390 die "only absurd git-apply!\n" if !$use_absurd
2391 && forceing [qw(import-gitapply-absurd)];
2393 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2394 local $ENV{PATH} = $path if $use_absurd;
2396 my @showcmd = (gbp_pq, qw(import));
2397 my @realcmd = shell_cmd
2398 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2399 debugcmd "+",@realcmd;
2400 if (system @realcmd) {
2401 die +(shellquote @showcmd).
2403 failedcmd_waitstatus()."\n";
2406 my $gapplied = git_rev_parse('HEAD');
2407 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2408 $gappliedtree eq $dappliedtree or
2410 gbp-pq import and dpkg-source disagree!
2411 gbp-pq import gave commit $gapplied
2412 gbp-pq import gave tree $gappliedtree
2413 dpkg-source --before-build gave tree $dappliedtree
2415 $rawimport_hash = $gapplied;
2420 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2425 progress "synthesised git commit from .dsc $cversion";
2427 my $rawimport_mergeinput = {
2428 Commit => $rawimport_hash,
2429 Info => "Import of source package",
2431 my @output = ($rawimport_mergeinput);
2433 if ($lastpush_mergeinput) {
2434 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2435 my $oversion = getfield $oldclogp, 'Version';
2437 version_compare($oversion, $cversion);
2439 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2440 { Message => <<END, ReverseParents => 1 });
2441 Record $package ($cversion) in archive suite $csuite
2443 } elsif ($vcmp > 0) {
2444 print STDERR <<END or die $!;
2446 Version actually in archive: $cversion (older)
2447 Last version pushed with dgit: $oversion (newer or same)
2450 @output = $lastpush_mergeinput;
2452 # Same version. Use what's in the server git branch,
2453 # discarding our own import. (This could happen if the
2454 # server automatically imports all packages into git.)
2455 @output = $lastpush_mergeinput;
2458 changedir '../../../..';
2463 sub complete_file_from_dsc ($$) {
2464 our ($dstdir, $fi) = @_;
2465 # Ensures that we have, in $dir, the file $fi, with the correct
2466 # contents. (Downloading it from alongside $dscurl if necessary.)
2468 my $f = $fi->{Filename};
2469 my $tf = "$dstdir/$f";
2472 if (stat_exists $tf) {
2473 progress "using existing $f";
2475 printdebug "$tf does not exist, need to fetch\n";
2477 $furl =~ s{/[^/]+$}{};
2479 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2480 die "$f ?" if $f =~ m#/#;
2481 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2482 return 0 if !act_local();
2486 open F, "<", "$tf" or die "$tf: $!";
2487 $fi->{Digester}->reset();
2488 $fi->{Digester}->addfile(*F);
2489 F->error and die $!;
2490 my $got = $fi->{Digester}->hexdigest();
2491 $got eq $fi->{Hash} or
2492 fail "file $f has hash $got but .dsc".
2493 " demands hash $fi->{Hash} ".
2494 ($downloaded ? "(got wrong file from archive!)"
2495 : "(perhaps you should delete this file?)");
2500 sub ensure_we_have_orig () {
2501 my @dfi = dsc_files_info();
2502 foreach my $fi (@dfi) {
2503 my $f = $fi->{Filename};
2504 next unless is_orig_file_in_dsc($f, \@dfi);
2505 complete_file_from_dsc('..', $fi)
2510 sub git_fetch_us () {
2511 # Want to fetch only what we are going to use, unless
2512 # deliberately-not-ff, in which case we must fetch everything.
2514 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2516 (quiltmode_splitbrain
2517 ? (map { $_->('*',access_nomdistro) }
2518 \&debiantag_new, \&debiantag_maintview)
2519 : debiantags('*',access_nomdistro));
2520 push @specs, server_branch($csuite);
2521 push @specs, $rewritemap;
2522 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2524 # This is rather miserable:
2525 # When git fetch --prune is passed a fetchspec ending with a *,
2526 # it does a plausible thing. If there is no * then:
2527 # - it matches subpaths too, even if the supplied refspec
2528 # starts refs, and behaves completely madly if the source
2529 # has refs/refs/something. (See, for example, Debian #NNNN.)
2530 # - if there is no matching remote ref, it bombs out the whole
2532 # We want to fetch a fixed ref, and we don't know in advance
2533 # if it exists, so this is not suitable.
2535 # Our workaround is to use git ls-remote. git ls-remote has its
2536 # own qairks. Notably, it has the absurd multi-tail-matching
2537 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2538 # refs/refs/foo etc.
2540 # Also, we want an idempotent snapshot, but we have to make two
2541 # calls to the remote: one to git ls-remote and to git fetch. The
2542 # solution is use git ls-remote to obtain a target state, and
2543 # git fetch to try to generate it. If we don't manage to generate
2544 # the target state, we try again.
2546 printdebug "git_fetch_us specs @specs\n";
2548 my $specre = join '|', map {
2554 printdebug "git_fetch_us specre=$specre\n";
2555 my $wanted_rref = sub {
2557 return m/^(?:$specre)$/o;
2560 my $fetch_iteration = 0;
2563 printdebug "git_fetch_us iteration $fetch_iteration\n";
2564 if (++$fetch_iteration > 10) {
2565 fail "too many iterations trying to get sane fetch!";
2568 my @look = map { "refs/$_" } @specs;
2569 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2573 open GITLS, "-|", @lcmd or die $!;
2575 printdebug "=> ", $_;
2576 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2577 my ($objid,$rrefname) = ($1,$2);
2578 if (!$wanted_rref->($rrefname)) {
2580 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2584 $wantr{$rrefname} = $objid;
2587 close GITLS or failedcmd @lcmd;
2589 # OK, now %want is exactly what we want for refs in @specs
2591 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2592 "+refs/$_:".lrfetchrefs."/$_";
2595 printdebug "git_fetch_us fspecs @fspecs\n";
2597 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2598 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2601 %lrfetchrefs_f = ();
2604 git_for_each_ref(lrfetchrefs, sub {
2605 my ($objid,$objtype,$lrefname,$reftail) = @_;
2606 $lrfetchrefs_f{$lrefname} = $objid;
2607 $objgot{$objid} = 1;
2610 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2611 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2612 if (!exists $wantr{$rrefname}) {
2613 if ($wanted_rref->($rrefname)) {
2615 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2619 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2622 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2623 delete $lrfetchrefs_f{$lrefname};
2627 foreach my $rrefname (sort keys %wantr) {
2628 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2629 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2630 my $want = $wantr{$rrefname};
2631 next if $got eq $want;
2632 if (!defined $objgot{$want}) {
2634 warning: git ls-remote suggests we want $lrefname
2635 warning: and it should refer to $want
2636 warning: but git fetch didn't fetch that object to any relevant ref.
2637 warning: This may be due to a race with someone updating the server.
2638 warning: Will try again...
2640 next FETCH_ITERATION;
2643 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2645 runcmd_ordryrun_local @git, qw(update-ref -m),
2646 "dgit fetch git fetch fixup", $lrefname, $want;
2647 $lrfetchrefs_f{$lrefname} = $want;
2651 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2652 Dumper(\%lrfetchrefs_f);
2655 my @tagpats = debiantags('*',access_nomdistro);
2657 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2658 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2659 printdebug "currently $fullrefname=$objid\n";
2660 $here{$fullrefname} = $objid;
2662 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2663 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2664 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2665 printdebug "offered $lref=$objid\n";
2666 if (!defined $here{$lref}) {
2667 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2668 runcmd_ordryrun_local @upd;
2669 lrfetchref_used $fullrefname;
2670 } elsif ($here{$lref} eq $objid) {
2671 lrfetchref_used $fullrefname;
2674 "Not updateting $lref from $here{$lref} to $objid.\n";
2679 sub mergeinfo_getclogp ($) {
2680 # Ensures thit $mi->{Clogp} exists and returns it
2682 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2685 sub mergeinfo_version ($) {
2686 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2689 sub fetch_from_archive_record_1 ($) {
2691 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2692 'DGIT_ARCHIVE', $hash;
2693 cmdoutput @git, qw(log -n2), $hash;
2694 # ... gives git a chance to complain if our commit is malformed
2697 sub fetch_from_archive_record_2 ($) {
2699 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2703 dryrun_report @upd_cmd;
2707 sub parse_dsc_field ($$) {
2708 my ($dsc, $what) = @_;
2710 foreach my $field (@ourdscfield) {
2711 $f = $dsc->{$field};
2715 progress "$what: NO git hash";
2716 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2717 = $f =~ m/^(\w+) ($distro_re) ($versiontag_re) (\S+)(?:\s|$)/) {
2718 progress "$what: specified git info ($dsc_distro)";
2719 $dsc_hint_tag = [ $dsc_hint_tag ];
2720 } elsif ($f =~ m/^\w+\s*$/) {
2722 $dsc_distro //= 'debian';
2723 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2725 progress "$what: specified git hash";
2727 fail "$what: invalid Dgit info";
2731 sub fetch_from_archive () {
2732 ensure_setup_existing_tree();
2734 # Ensures that lrref() is what is actually in the archive, one way
2735 # or another, according to us - ie this client's
2736 # appropritaely-updated archive view. Also returns the commit id.
2737 # If there is nothing in the archive, leaves lrref alone and
2738 # returns undef. git_fetch_us must have already been called.
2742 parse_dsc_field($dsc, 'last upload to archive');
2744 progress "no version available from the archive";
2747 my $rewritemapdata = git_cat_file lrfetchrefs."/".$rewritemap.':map';
2748 if (defined $rewritemapdata
2749 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2750 progress "server's git history rewrite map contains a relevant entry!";
2752 if (defined $dsc_hash) {
2753 progress "using rewritten git hash in place of .dsc value";
2755 progress "server data says .dsc hash is to be disregarded";
2759 # If the archive's .dsc has a Dgit field, there are three
2760 # relevant git commitids we need to choose between and/or merge
2762 # 1. $dsc_hash: the Dgit field from the archive
2763 # 2. $lastpush_hash: the suite branch on the dgit git server
2764 # 3. $lastfetch_hash: our local tracking brach for the suite
2766 # These may all be distinct and need not be in any fast forward
2769 # If the dsc was pushed to this suite, then the server suite
2770 # branch will have been updated; but it might have been pushed to
2771 # a different suite and copied by the archive. Conversely a more
2772 # recent version may have been pushed with dgit but not appeared
2773 # in the archive (yet).
2775 # $lastfetch_hash may be awkward because archive imports
2776 # (particularly, imports of Dgit-less .dscs) are performed only as
2777 # needed on individual clients, so different clients may perform a
2778 # different subset of them - and these imports are only made
2779 # public during push. So $lastfetch_hash may represent a set of
2780 # imports different to a subsequent upload by a different dgit
2783 # Our approach is as follows:
2785 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2786 # descendant of $dsc_hash, then it was pushed by a dgit user who
2787 # had based their work on $dsc_hash, so we should prefer it.
2788 # Otherwise, $dsc_hash was installed into this suite in the
2789 # archive other than by a dgit push, and (necessarily) after the
2790 # last dgit push into that suite (since a dgit push would have
2791 # been descended from the dgit server git branch); thus, in that
2792 # case, we prefer the archive's version (and produce a
2793 # pseudo-merge to overwrite the dgit server git branch).
2795 # (If there is no Dgit field in the archive's .dsc then
2796 # generate_commit_from_dsc uses the version numbers to decide
2797 # whether the suite branch or the archive is newer. If the suite
2798 # branch is newer it ignores the archive's .dsc; otherwise it
2799 # generates an import of the .dsc, and produces a pseudo-merge to
2800 # overwrite the suite branch with the archive contents.)
2802 # The outcome of that part of the algorithm is the `public view',
2803 # and is same for all dgit clients: it does not depend on any
2804 # unpublished history in the local tracking branch.
2806 # As between the public view and the local tracking branch: The
2807 # local tracking branch is only updated by dgit fetch, and
2808 # whenever dgit fetch runs it includes the public view in the
2809 # local tracking branch. Therefore if the public view is not
2810 # descended from the local tracking branch, the local tracking
2811 # branch must contain history which was imported from the archive
2812 # but never pushed; and, its tip is now out of date. So, we make
2813 # a pseudo-merge to overwrite the old imports and stitch the old
2816 # Finally: we do not necessarily reify the public view (as
2817 # described above). This is so that we do not end up stacking two
2818 # pseudo-merges. So what we actually do is figure out the inputs
2819 # to any public view pseudo-merge and put them in @mergeinputs.
2822 # $mergeinputs[]{Commit}
2823 # $mergeinputs[]{Info}
2824 # $mergeinputs[0] is the one whose tree we use
2825 # @mergeinputs is in the order we use in the actual commit)
2828 # $mergeinputs[]{Message} is a commit message to use
2829 # $mergeinputs[]{ReverseParents} if def specifies that parent
2830 # list should be in opposite order
2831 # Such an entry has no Commit or Info. It applies only when found
2832 # in the last entry. (This ugliness is to support making
2833 # identical imports to previous dgit versions.)
2835 my $lastpush_hash = git_get_ref(lrfetchref());
2836 printdebug "previous reference hash=$lastpush_hash\n";
2837 $lastpush_mergeinput = $lastpush_hash && {
2838 Commit => $lastpush_hash,
2839 Info => "dgit suite branch on dgit git server",
2842 my $lastfetch_hash = git_get_ref(lrref());
2843 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2844 my $lastfetch_mergeinput = $lastfetch_hash && {
2845 Commit => $lastfetch_hash,
2846 Info => "dgit client's archive history view",
2849 my $dsc_mergeinput = $dsc_hash && {
2850 Commit => $dsc_hash,
2851 Info => "Dgit field in .dsc from archive",
2855 my $del_lrfetchrefs = sub {
2858 printdebug "del_lrfetchrefs...\n";
2859 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2860 my $objid = $lrfetchrefs_d{$fullrefname};
2861 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2863 $gur ||= new IO::Handle;
2864 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2866 printf $gur "delete %s %s\n", $fullrefname, $objid;
2869 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2873 if (defined $dsc_hash) {
2874 ensure_we_have_orig();
2875 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2876 @mergeinputs = $dsc_mergeinput
2877 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2878 print STDERR <<END or die $!;
2880 Git commit in archive is behind the last version allegedly pushed/uploaded.
2881 Commit referred to by archive: $dsc_hash
2882 Last version pushed with dgit: $lastpush_hash
2885 @mergeinputs = ($lastpush_mergeinput);
2887 # Archive has .dsc which is not a descendant of the last dgit
2888 # push. This can happen if the archive moves .dscs about.
2889 # Just follow its lead.
2890 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2891 progress "archive .dsc names newer git commit";
2892 @mergeinputs = ($dsc_mergeinput);
2894 progress "archive .dsc names other git commit, fixing up";
2895 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2899 @mergeinputs = generate_commits_from_dsc();
2900 # We have just done an import. Now, our import algorithm might
2901 # have been improved. But even so we do not want to generate
2902 # a new different import of the same package. So if the
2903 # version numbers are the same, just use our existing version.
2904 # If the version numbers are different, the archive has changed
2905 # (perhaps, rewound).
2906 if ($lastfetch_mergeinput &&
2907 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2908 (mergeinfo_version $mergeinputs[0]) )) {
2909 @mergeinputs = ($lastfetch_mergeinput);
2911 } elsif ($lastpush_hash) {
2912 # only in git, not in the archive yet
2913 @mergeinputs = ($lastpush_mergeinput);
2914 print STDERR <<END or die $!;
2916 Package not found in the archive, but has allegedly been pushed using dgit.
2920 printdebug "nothing found!\n";
2921 if (defined $skew_warning_vsn) {
2922 print STDERR <<END or die $!;
2924 Warning: relevant archive skew detected.
2925 Archive allegedly contains $skew_warning_vsn
2926 But we were not able to obtain any version from the archive or git.
2930 unshift @end, $del_lrfetchrefs;
2934 if ($lastfetch_hash &&
2936 my $h = $_->{Commit};
2937 $h and is_fast_fwd($lastfetch_hash, $h);
2938 # If true, one of the existing parents of this commit
2939 # is a descendant of the $lastfetch_hash, so we'll
2940 # be ff from that automatically.
2944 push @mergeinputs, $lastfetch_mergeinput;
2947 printdebug "fetch mergeinfos:\n";
2948 foreach my $mi (@mergeinputs) {
2950 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2952 printdebug sprintf " ReverseParents=%d Message=%s",
2953 $mi->{ReverseParents}, $mi->{Message};
2957 my $compat_info= pop @mergeinputs
2958 if $mergeinputs[$#mergeinputs]{Message};
2960 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2963 if (@mergeinputs > 1) {
2965 my $tree_commit = $mergeinputs[0]{Commit};
2967 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2968 $tree =~ m/\n\n/; $tree = $`;
2969 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2972 # We use the changelog author of the package in question the
2973 # author of this pseudo-merge. This is (roughly) correct if
2974 # this commit is simply representing aa non-dgit upload.
2975 # (Roughly because it does not record sponsorship - but we
2976 # don't have sponsorship info because that's in the .changes,
2977 # which isn't in the archivw.)
2979 # But, it might be that we are representing archive history
2980 # updates (including in-archive copies). These are not really
2981 # the responsibility of the person who created the .dsc, but
2982 # there is no-one whose name we should better use. (The
2983 # author of the .dsc-named commit is clearly worse.)
2985 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2986 my $author = clogp_authline $useclogp;
2987 my $cversion = getfield $useclogp, 'Version';
2989 my $mcf = ".git/dgit/mergecommit";
2990 open MC, ">", $mcf or die "$mcf $!";
2991 print MC <<END or die $!;
2995 my @parents = grep { $_->{Commit} } @mergeinputs;
2996 @parents = reverse @parents if $compat_info->{ReverseParents};
2997 print MC <<END or die $! foreach @parents;
3001 print MC <<END or die $!;
3007 if (defined $compat_info->{Message}) {
3008 print MC $compat_info->{Message} or die $!;
3010 print MC <<END or die $!;
3011 Record $package ($cversion) in archive suite $csuite
3015 my $message_add_info = sub {
3017 my $mversion = mergeinfo_version $mi;
3018 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3022 $message_add_info->($mergeinputs[0]);
3023 print MC <<END or die $!;
3024 should be treated as descended from
3026 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3030 $hash = make_commit $mcf;
3032 $hash = $mergeinputs[0]{Commit};
3034 printdebug "fetch hash=$hash\n";
3037 my ($lasth, $what) = @_;
3038 return unless $lasth;
3039 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3042 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3044 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3046 fetch_from_archive_record_1($hash);
3048 if (defined $skew_warning_vsn) {
3050 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3051 my $gotclogp = commit_getclogp($hash);
3052 my $got_vsn = getfield $gotclogp, 'Version';
3053 printdebug "SKEW CHECK GOT $got_vsn\n";
3054 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3055 print STDERR <<END or die $!;
3057 Warning: archive skew detected. Using the available version:
3058 Archive allegedly contains $skew_warning_vsn
3059 We were able to obtain only $got_vsn
3065 if ($lastfetch_hash ne $hash) {
3066 fetch_from_archive_record_2($hash);
3069 lrfetchref_used lrfetchref();
3071 unshift @end, $del_lrfetchrefs;
3075 sub set_local_git_config ($$) {
3077 runcmd @git, qw(config), $k, $v;
3080 sub setup_mergechangelogs (;$) {
3082 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3084 my $driver = 'dpkg-mergechangelogs';
3085 my $cb = "merge.$driver";
3086 my $attrs = '.git/info/attributes';
3087 ensuredir '.git/info';
3089 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3090 if (!open ATTRS, "<", $attrs) {
3091 $!==ENOENT or die "$attrs: $!";
3095 next if m{^debian/changelog\s};
3096 print NATTRS $_, "\n" or die $!;
3098 ATTRS->error and die $!;
3101 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3104 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3105 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3107 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3110 sub setup_useremail (;$) {
3112 return unless $always || access_cfg_bool(1, 'setup-useremail');
3115 my ($k, $envvar) = @_;
3116 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3117 return unless defined $v;
3118 set_local_git_config "user.$k", $v;
3121 $setup->('email', 'DEBEMAIL');
3122 $setup->('name', 'DEBFULLNAME');
3125 sub ensure_setup_existing_tree () {
3126 my $k = "remote.$remotename.skipdefaultupdate";
3127 my $c = git_get_config $k;
3128 return if defined $c;
3129 set_local_git_config $k, 'true';
3132 sub setup_new_tree () {
3133 setup_mergechangelogs();
3137 sub multisuite_suite_child ($$$) {
3138 my ($tsuite, $merginputs, $fn) = @_;
3139 # in child, sets things up, calls $fn->(), and returns undef
3140 # in parent, returns canonical suite name for $tsuite
3141 my $canonsuitefh = IO::File::new_tmpfile;
3142 my $pid = fork // die $!;
3145 $us .= " [$isuite]";
3146 $debugprefix .= " ";
3147 progress "fetching $tsuite...";
3148 canonicalise_suite();
3149 print $canonsuitefh $csuite, "\n" or die $!;
3150 close $canonsuitefh or die $!;
3154 waitpid $pid,0 == $pid or die $!;
3155 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3156 seek $canonsuitefh,0,0 or die $!;
3157 local $csuite = <$canonsuitefh>;
3158 die $! unless defined $csuite && chomp $csuite;
3160 printdebug "multisuite $tsuite missing\n";
3163 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3164 push @$merginputs, {
3171 sub fork_for_multisuite ($) {
3172 my ($before_fetch_merge) = @_;
3173 # if nothing unusual, just returns ''
3176 # returns 0 to caller in child, to do first of the specified suites
3177 # in child, $csuite is not yet set
3179 # returns 1 to caller in parent, to finish up anything needed after
3180 # in parent, $csuite is set to canonicalised portmanteau
3182 my $org_isuite = $isuite;
3183 my @suites = split /\,/, $isuite;
3184 return '' unless @suites > 1;
3185 printdebug "fork_for_multisuite: @suites\n";
3189 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3191 return 0 unless defined $cbasesuite;
3193 fail "package $package missing in (base suite) $cbasesuite"
3194 unless @mergeinputs;
3196 my @csuites = ($cbasesuite);
3198 $before_fetch_merge->();
3200 foreach my $tsuite (@suites[1..$#suites]) {
3201 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3207 # xxx collecte the ref here
3209 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3210 push @csuites, $csubsuite;
3213 foreach my $mi (@mergeinputs) {
3214 my $ref = git_get_ref $mi->{Ref};
3215 die "$mi->{Ref} ?" unless length $ref;
3216 $mi->{Commit} = $ref;
3219 $csuite = join ",", @csuites;
3221 my $previous = git_get_ref lrref;
3223 unshift @mergeinputs, {
3224 Commit => $previous,
3225 Info => "local combined tracking branch",
3227 "archive seems to have rewound: local tracking branch is ahead!",
3231 foreach my $ix (0..$#mergeinputs) {
3232 $mergeinputs[$ix]{Index} = $ix;
3235 @mergeinputs = sort {
3236 -version_compare(mergeinfo_version $a,
3237 mergeinfo_version $b) # highest version first
3239 $a->{Index} <=> $b->{Index}; # earliest in spec first
3245 foreach my $mi (@mergeinputs) {
3246 printdebug "multisuite merge check $mi->{Info}\n";
3247 foreach my $previous (@needed) {
3248 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3249 printdebug "multisuite merge un-needed $previous->{Info}\n";
3253 printdebug "multisuite merge this-needed\n";
3254 $mi->{Character} = '+';
3257 $needed[0]{Character} = '*';
3259 my $output = $needed[0]{Commit};
3262 printdebug "multisuite merge nontrivial\n";
3263 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3265 my $commit = "tree $tree\n";
3266 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3267 "Input branches:\n";
3269 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3270 printdebug "multisuite merge include $mi->{Info}\n";
3271 $mi->{Character} //= ' ';
3272 $commit .= "parent $mi->{Commit}\n";
3273 $msg .= sprintf " %s %-25s %s\n",
3275 (mergeinfo_version $mi),
3278 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3280 " * marks the highest version branch, which choose to use\n".
3281 " + marks each branch which was not already an ancestor\n\n".
3282 "[dgit multi-suite $csuite]\n";
3284 "author $authline\n".
3285 "committer $authline\n\n";
3286 $output = make_commit_text $commit.$msg;
3287 printdebug "multisuite merge generated $output\n";
3290 fetch_from_archive_record_1($output);
3291 fetch_from_archive_record_2($output);
3293 progress "calculated combined tracking suite $csuite";
3298 sub clone_set_head () {
3299 open H, "> .git/HEAD" or die $!;
3300 print H "ref: ".lref()."\n" or die $!;
3303 sub clone_finish ($) {
3305 runcmd @git, qw(reset --hard), lrref();
3306 runcmd qw(bash -ec), <<'END';
3308 git ls-tree -r --name-only -z HEAD | \
3309 xargs -0r touch -h -r . --
3311 printdone "ready for work in $dstdir";
3316 badusage "dry run makes no sense with clone" unless act_local();
3318 my $multi_fetched = fork_for_multisuite(sub {
3319 printdebug "multi clone before fetch merge\n";
3322 if ($multi_fetched) {
3323 printdebug "multi clone after fetch merge\n";
3325 clone_finish($dstdir);
3328 printdebug "clone main body\n";
3330 canonicalise_suite();
3331 my $hasgit = check_for_git();
3332 mkdir $dstdir or fail "create \`$dstdir': $!";
3334 runcmd @git, qw(init -q);
3336 my $giturl = access_giturl(1);
3337 if (defined $giturl) {
3338 runcmd @git, qw(remote add), 'origin', $giturl;
3341 progress "fetching existing git history";
3343 runcmd_ordryrun_local @git, qw(fetch origin);
3345 progress "starting new git history";
3347 fetch_from_archive() or no_such_package;
3348 my $vcsgiturl = $dsc->{'Vcs-Git'};
3349 if (length $vcsgiturl) {
3350 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3351 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3354 clone_finish($dstdir);
3358 canonicalise_suite();
3359 if (check_for_git()) {
3362 fetch_from_archive() or no_such_package();
3363 printdone "fetched into ".lrref();
3367 my $multi_fetched = fork_for_multisuite(sub { });
3368 fetch() unless $multi_fetched; # parent
3369 return if $multi_fetched eq '0'; # child
3370 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3372 printdone "fetched to ".lrref()." and merged into HEAD";
3375 sub check_not_dirty () {
3376 foreach my $f (qw(local-options local-patch-header)) {
3377 if (stat_exists "debian/source/$f") {
3378 fail "git tree contains debian/source/$f";
3382 return if $ignoredirty;
3384 my @cmd = (@git, qw(diff --quiet HEAD));
3386 $!=0; $?=-1; system @cmd;
3389 fail "working tree is dirty (does not match HEAD)";
3395 sub commit_admin ($) {
3398 runcmd_ordryrun_local @git, qw(commit -m), $m;
3401 sub commit_quilty_patch () {
3402 my $output = cmdoutput @git, qw(status --porcelain);
3404 foreach my $l (split /\n/, $output) {
3405 next unless $l =~ m/\S/;
3406 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3410 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3412 progress "nothing quilty to commit, ok.";
3415 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3416 runcmd_ordryrun_local @git, qw(add -f), @adds;
3418 Commit Debian 3.0 (quilt) metadata
3420 [dgit ($our_version) quilt-fixup]
3424 sub get_source_format () {
3426 if (open F, "debian/source/options") {
3430 s/\s+$//; # ignore missing final newline
3432 my ($k, $v) = ($`, $'); #');
3433 $v =~ s/^"(.*)"$/$1/;
3439 F->error and die $!;
3442 die $! unless $!==&ENOENT;
3445 if (!open F, "debian/source/format") {
3446 die $! unless $!==&ENOENT;
3450 F->error and die $!;
3452 return ($_, \%options);
3455 sub madformat_wantfixup ($) {
3457 return 0 unless $format eq '3.0 (quilt)';
3458 our $quilt_mode_warned;
3459 if ($quilt_mode eq 'nocheck') {
3460 progress "Not doing any fixup of \`$format' due to".
3461 " ----no-quilt-fixup or --quilt=nocheck"
3462 unless $quilt_mode_warned++;
3465 progress "Format \`$format', need to check/update patch stack"
3466 unless $quilt_mode_warned++;
3470 sub maybe_split_brain_save ($$$) {
3471 my ($headref, $dgitview, $msg) = @_;
3472 # => message fragment "$saved" describing disposition of $dgitview
3473 return "commit id $dgitview" unless defined $split_brain_save;
3474 my @cmd = (shell_cmd "cd ../../../..",
3475 @git, qw(update-ref -m),
3476 "dgit --dgit-view-save $msg HEAD=$headref",
3477 $split_brain_save, $dgitview);
3479 return "and left in $split_brain_save";
3482 # An "infopair" is a tuple [ $thing, $what ]
3483 # (often $thing is a commit hash; $what is a description)
3485 sub infopair_cond_equal ($$) {
3487 $x->[0] eq $y->[0] or fail <<END;
3488 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3492 sub infopair_lrf_tag_lookup ($$) {
3493 my ($tagnames, $what) = @_;
3494 # $tagname may be an array ref
3495 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3496 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3497 foreach my $tagname (@tagnames) {
3498 my $lrefname = lrfetchrefs."/tags/$tagname";
3499 my $tagobj = $lrfetchrefs_f{$lrefname};
3500 next unless defined $tagobj;
3501 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3502 return [ git_rev_parse($tagobj), $what ];
3504 fail @tagnames==1 ? <<END : <<END;
3505 Wanted tag $what (@tagnames) on dgit server, but not found
3507 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3511 sub infopair_cond_ff ($$) {
3512 my ($anc,$desc) = @_;
3513 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3514 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3518 sub pseudomerge_version_check ($$) {
3519 my ($clogp, $archive_hash) = @_;
3521 my $arch_clogp = commit_getclogp $archive_hash;
3522 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3523 'version currently in archive' ];
3524 if (defined $overwrite_version) {
3525 if (length $overwrite_version) {
3526 infopair_cond_equal([ $overwrite_version,
3527 '--overwrite= version' ],
3530 my $v = $i_arch_v->[0];
3531 progress "Checking package changelog for archive version $v ...";
3533 my @xa = ("-f$v", "-t$v");
3534 my $vclogp = parsechangelog @xa;
3535 my $cv = [ (getfield $vclogp, 'Version'),
3536 "Version field from dpkg-parsechangelog @xa" ];
3537 infopair_cond_equal($i_arch_v, $cv);
3540 $@ =~ s/^dgit: //gm;
3542 "Perhaps debian/changelog does not mention $v ?";
3547 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3551 sub pseudomerge_make_commit ($$$$ $$) {
3552 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3553 $msg_cmd, $msg_msg) = @_;
3554 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3556 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3557 my $authline = clogp_authline $clogp;
3561 !defined $overwrite_version ? ""
3562 : !length $overwrite_version ? " --overwrite"
3563 : " --overwrite=".$overwrite_version;
3566 my $pmf = ".git/dgit/pseudomerge";
3567 open MC, ">", $pmf or die "$pmf $!";
3568 print MC <<END or die $!;
3571 parent $archive_hash
3581 return make_commit($pmf);
3584 sub splitbrain_pseudomerge ($$$$) {
3585 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3586 # => $merged_dgitview
3587 printdebug "splitbrain_pseudomerge...\n";
3589 # We: debian/PREVIOUS HEAD($maintview)
3590 # expect: o ----------------- o
3593 # a/d/PREVIOUS $dgitview
3596 # we do: `------------------ o
3600 return $dgitview unless defined $archive_hash;
3602 printdebug "splitbrain_pseudomerge...\n";
3604 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3606 if (!defined $overwrite_version) {
3607 progress "Checking that HEAD inciudes all changes in archive...";
3610 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3612 if (defined $overwrite_version) {
3614 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3615 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3616 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3617 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3618 my $i_archive = [ $archive_hash, "current archive contents" ];
3620 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3622 infopair_cond_equal($i_dgit, $i_archive);
3623 infopair_cond_ff($i_dep14, $i_dgit);
3624 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3628 $us: check failed (maybe --overwrite is needed, consult documentation)
3633 my $r = pseudomerge_make_commit
3634 $clogp, $dgitview, $archive_hash, $i_arch_v,
3635 "dgit --quilt=$quilt_mode",
3636 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3637 Declare fast forward from $i_arch_v->[0]
3639 Make fast forward from $i_arch_v->[0]
3642 maybe_split_brain_save $maintview, $r, "pseudomerge";
3644 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3648 sub plain_overwrite_pseudomerge ($$$) {
3649 my ($clogp, $head, $archive_hash) = @_;
3651 printdebug "plain_overwrite_pseudomerge...";
3653 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3655 return $head if is_fast_fwd $archive_hash, $head;
3657 my $m = "Declare fast forward from $i_arch_v->[0]";
3659 my $r = pseudomerge_make_commit
3660 $clogp, $head, $archive_hash, $i_arch_v,
3663 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3665 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3669 sub push_parse_changelog ($) {
3672 my $clogp = Dpkg::Control::Hash->new();
3673 $clogp->load($clogpfn) or die;
3675 my $clogpackage = getfield $clogp, 'Source';
3676 $package //= $clogpackage;
3677 fail "-p specified $package but changelog specified $clogpackage"
3678 unless $package eq $clogpackage;
3679 my $cversion = getfield $clogp, 'Version';
3680 my $tag = debiantag($cversion, access_nomdistro);
3681 runcmd @git, qw(check-ref-format), $tag;
3683 my $dscfn = dscfn($cversion);
3685 return ($clogp, $cversion, $dscfn);
3688 sub push_parse_dsc ($$$) {
3689 my ($dscfn,$dscfnwhat, $cversion) = @_;
3690 $dsc = parsecontrol($dscfn,$dscfnwhat);
3691 my $dversion = getfield $dsc, 'Version';
3692 my $dscpackage = getfield $dsc, 'Source';
3693 ($dscpackage eq $package && $dversion eq $cversion) or
3694 fail "$dscfn is for $dscpackage $dversion".
3695 " but debian/changelog is for $package $cversion";
3698 sub push_tagwants ($$$$) {
3699 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3702 TagFn => \&debiantag,
3707 if (defined $maintviewhead) {
3709 TagFn => \&debiantag_maintview,
3710 Objid => $maintviewhead,
3711 TfSuffix => '-maintview',
3714 } elsif ($dodep14tag eq 'no' ? 0
3715 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3716 : $dodep14tag eq 'always'
3717 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3718 --dep14tag-always (or equivalent in config) means server must support
3719 both "new" and "maint" tag formats, but config says it doesn't.
3721 : die "$dodep14tag ?") {
3723 TagFn => \&debiantag_maintview,
3725 TfSuffix => '-dgit',
3729 foreach my $tw (@tagwants) {
3730 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3731 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3733 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3737 sub push_mktags ($$ $$ $) {
3739 $changesfile,$changesfilewhat,
3742 die unless $tagwants->[0]{View} eq 'dgit';
3744 my $declaredistro = access_nomdistro();
3745 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
3746 $dsc->{$ourdscfield[0]} = join " ",
3747 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
3749 $dsc->save("$dscfn.tmp") or die $!;
3751 my $changes = parsecontrol($changesfile,$changesfilewhat);
3752 foreach my $field (qw(Source Distribution Version)) {
3753 $changes->{$field} eq $clogp->{$field} or
3754 fail "changes field $field \`$changes->{$field}'".
3755 " does not match changelog \`$clogp->{$field}'";
3758 my $cversion = getfield $clogp, 'Version';
3759 my $clogsuite = getfield $clogp, 'Distribution';
3761 # We make the git tag by hand because (a) that makes it easier
3762 # to control the "tagger" (b) we can do remote signing
3763 my $authline = clogp_authline $clogp;
3764 my $delibs = join(" ", "",@deliberatelies);
3768 my $tfn = $tw->{Tfn};
3769 my $head = $tw->{Objid};
3770 my $tag = $tw->{Tag};
3772 open TO, '>', $tfn->('.tmp') or die $!;
3773 print TO <<END or die $!;
3780 if ($tw->{View} eq 'dgit') {
3781 print TO <<END or die $!;
3782 $package release $cversion for $clogsuite ($csuite) [dgit]
3783 [dgit distro=$declaredistro$delibs]
3785 foreach my $ref (sort keys %previously) {
3786 print TO <<END or die $!;
3787 [dgit previously:$ref=$previously{$ref}]
3790 } elsif ($tw->{View} eq 'maint') {
3791 print TO <<END or die $!;
3792 $package release $cversion for $clogsuite ($csuite)
3793 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3796 die Dumper($tw)."?";
3801 my $tagobjfn = $tfn->('.tmp');
3803 if (!defined $keyid) {
3804 $keyid = access_cfg('keyid','RETURN-UNDEF');
3806 if (!defined $keyid) {
3807 $keyid = getfield $clogp, 'Maintainer';
3809 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3810 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3811 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3812 push @sign_cmd, $tfn->('.tmp');
3813 runcmd_ordryrun @sign_cmd;
3815 $tagobjfn = $tfn->('.signed.tmp');
3816 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3817 $tfn->('.tmp'), $tfn->('.tmp.asc');
3823 my @r = map { $mktag->($_); } @$tagwants;
3827 sub sign_changes ($) {
3828 my ($changesfile) = @_;
3830 my @debsign_cmd = @debsign;
3831 push @debsign_cmd, "-k$keyid" if defined $keyid;
3832 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3833 push @debsign_cmd, $changesfile;
3834 runcmd_ordryrun @debsign_cmd;
3839 printdebug "actually entering push\n";
3841 supplementary_message(<<'END');
3842 Push failed, while checking state of the archive.
3843 You can retry the push, after fixing the problem, if you like.
3845 if (check_for_git()) {
3848 my $archive_hash = fetch_from_archive();
3849 if (!$archive_hash) {
3851 fail "package appears to be new in this suite;".
3852 " if this is intentional, use --new";
3855 supplementary_message(<<'END');
3856 Push failed, while preparing your push.
3857 You can retry the push, after fixing the problem, if you like.
3860 need_tagformat 'new', "quilt mode $quilt_mode"
3861 if quiltmode_splitbrain;
3865 access_giturl(); # check that success is vaguely likely
3868 my $clogpfn = ".git/dgit/changelog.822.tmp";
3869 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3871 responder_send_file('parsed-changelog', $clogpfn);
3873 my ($clogp, $cversion, $dscfn) =
3874 push_parse_changelog("$clogpfn");
3876 my $dscpath = "$buildproductsdir/$dscfn";
3877 stat_exists $dscpath or
3878 fail "looked for .dsc $dscpath, but $!;".
3879 " maybe you forgot to build";
3881 responder_send_file('dsc', $dscpath);
3883 push_parse_dsc($dscpath, $dscfn, $cversion);
3885 my $format = getfield $dsc, 'Format';
3886 printdebug "format $format\n";
3888 my $actualhead = git_rev_parse('HEAD');
3889 my $dgithead = $actualhead;
3890 my $maintviewhead = undef;
3892 my $upstreamversion = upstreamversion $clogp->{Version};
3894 if (madformat_wantfixup($format)) {
3895 # user might have not used dgit build, so maybe do this now:
3896 if (quiltmode_splitbrain()) {
3898 quilt_make_fake_dsc($upstreamversion);
3900 ($dgithead, $cachekey) =
3901 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3903 "--quilt=$quilt_mode but no cached dgit view:
3904 perhaps tree changed since dgit build[-source] ?";
3906 $dgithead = splitbrain_pseudomerge($clogp,
3907 $actualhead, $dgithead,
3909 $maintviewhead = $actualhead;
3910 changedir '../../../..';
3911 prep_ud(); # so _only_subdir() works, below
3913 commit_quilty_patch();
3917 if (defined $overwrite_version && !defined $maintviewhead) {
3918 $dgithead = plain_overwrite_pseudomerge($clogp,
3926 if ($archive_hash) {
3927 if (is_fast_fwd($archive_hash, $dgithead)) {
3929 } elsif (deliberately_not_fast_forward) {
3932 fail "dgit push: HEAD is not a descendant".
3933 " of the archive's version.\n".
3934 "To overwrite the archive's contents,".
3935 " pass --overwrite[=VERSION].\n".
3936 "To rewind history, if permitted by the archive,".
3937 " use --deliberately-not-fast-forward.";
3942 progress "checking that $dscfn corresponds to HEAD";
3943 runcmd qw(dpkg-source -x --),
3944 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3945 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
3946 check_for_vendor_patches() if madformat($dsc->{format});
3947 changedir '../../../..';
3948 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3949 debugcmd "+",@diffcmd;
3951 my $r = system @diffcmd;
3954 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3956 HEAD specifies a different tree to $dscfn:
3958 Perhaps you forgot to build. Or perhaps there is a problem with your
3959 source tree (see dgit(7) for some hints). To see a full diff, run
3966 if (!$changesfile) {
3967 my $pat = changespat $cversion;
3968 my @cs = glob "$buildproductsdir/$pat";
3969 fail "failed to find unique changes file".
3970 " (looked for $pat in $buildproductsdir);".
3971 " perhaps you need to use dgit -C"
3973 ($changesfile) = @cs;
3975 $changesfile = "$buildproductsdir/$changesfile";
3978 # Check that changes and .dsc agree enough
3979 $changesfile =~ m{[^/]*$};
3980 my $changes = parsecontrol($changesfile,$&);
3981 files_compare_inputs($dsc, $changes)
3982 unless forceing [qw(dsc-changes-mismatch)];
3984 # Perhaps adjust .dsc to contain right set of origs
3985 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3987 unless forceing [qw(changes-origs-exactly)];
3989 # Checks complete, we're going to try and go ahead:
3991 responder_send_file('changes',$changesfile);
3992 responder_send_command("param head $dgithead");
3993 responder_send_command("param csuite $csuite");
3994 responder_send_command("param tagformat $tagformat");
3995 if (defined $maintviewhead) {
3996 die unless ($protovsn//4) >= 4;
3997 responder_send_command("param maint-view $maintviewhead");
4000 if (deliberately_not_fast_forward) {
4001 git_for_each_ref(lrfetchrefs, sub {
4002 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4003 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4004 responder_send_command("previously $rrefname=$objid");
4005 $previously{$rrefname} = $objid;
4009 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4013 supplementary_message(<<'END');
4014 Push failed, while signing the tag.
4015 You can retry the push, after fixing the problem, if you like.
4017 # If we manage to sign but fail to record it anywhere, it's fine.
4018 if ($we_are_responder) {
4019 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4020 responder_receive_files('signed-tag', @tagobjfns);
4022 @tagobjfns = push_mktags($clogp,$dscpath,
4023 $changesfile,$changesfile,
4026 supplementary_message(<<'END');
4027 Push failed, *after* signing the tag.
4028 If you want to try again, you should use a new version number.
4031 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4033 foreach my $tw (@tagwants) {
4034 my $tag = $tw->{Tag};
4035 my $tagobjfn = $tw->{TagObjFn};
4037 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4038 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4039 runcmd_ordryrun_local
4040 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4043 supplementary_message(<<'END');
4044 Push failed, while updating the remote git repository - see messages above.
4045 If you want to try again, you should use a new version number.
4047 if (!check_for_git()) {
4048 create_remote_git_repo();
4051 my @pushrefs = $forceflag.$dgithead.":".rrref();
4052 foreach my $tw (@tagwants) {
4053 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4056 runcmd_ordryrun @git,
4057 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4058 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4060 supplementary_message(<<'END');
4061 Push failed, while obtaining signatures on the .changes and .dsc.
4062 If it was just that the signature failed, you may try again by using
4063 debsign by hand to sign the changes
4065 and then dput to complete the upload.
4066 If you need to change the package, you must use a new version number.
4068 if ($we_are_responder) {
4069 my $dryrunsuffix = act_local() ? "" : ".tmp";
4070 responder_receive_files('signed-dsc-changes',
4071 "$dscpath$dryrunsuffix",
4072 "$changesfile$dryrunsuffix");
4075 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4077 progress "[new .dsc left in $dscpath.tmp]";
4079 sign_changes $changesfile;
4082 supplementary_message(<<END);
4083 Push failed, while uploading package(s) to the archive server.
4084 You can retry the upload of exactly these same files with dput of:
4086 If that .changes file is broken, you will need to use a new version
4087 number for your next attempt at the upload.
4089 my $host = access_cfg('upload-host','RETURN-UNDEF');
4090 my @hostarg = defined($host) ? ($host,) : ();
4091 runcmd_ordryrun @dput, @hostarg, $changesfile;
4092 printdone "pushed and uploaded $cversion";
4094 supplementary_message('');
4095 responder_send_command("complete");
4101 badusage "-p is not allowed with clone; specify as argument instead"
4102 if defined $package;
4105 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4106 ($package,$isuite) = @ARGV;
4107 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4108 ($package,$dstdir) = @ARGV;
4109 } elsif (@ARGV==3) {
4110 ($package,$isuite,$dstdir) = @ARGV;
4112 badusage "incorrect arguments to dgit clone";
4116 $dstdir ||= "$package";
4117 if (stat_exists $dstdir) {
4118 fail "$dstdir already exists";
4122 if ($rmonerror && !$dryrun_level) {
4123 $cwd_remove= getcwd();
4125 return unless defined $cwd_remove;
4126 if (!chdir "$cwd_remove") {
4127 return if $!==&ENOENT;
4128 die "chdir $cwd_remove: $!";
4130 printdebug "clone rmonerror removing $dstdir\n";
4132 rmtree($dstdir) or die "remove $dstdir: $!\n";
4133 } elsif (grep { $! == $_ }
4134 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4136 print STDERR "check whether to remove $dstdir: $!\n";
4142 $cwd_remove = undef;
4145 sub branchsuite () {
4146 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4147 if ($branch =~ m#$lbranch_re#o) {
4154 sub fetchpullargs () {
4155 if (!defined $package) {
4156 my $sourcep = parsecontrol('debian/control','debian/control');
4157 $package = getfield $sourcep, 'Source';
4160 $isuite = branchsuite();
4162 my $clogp = parsechangelog();
4163 $isuite = getfield $clogp, 'Distribution';
4165 } elsif (@ARGV==1) {
4168 badusage "incorrect arguments to dgit fetch or dgit pull";
4176 my $multi_fetched = fork_for_multisuite(sub { });
4177 exit 0 if $multi_fetched;
4184 if (quiltmode_splitbrain()) {
4185 my ($format, $fopts) = get_source_format();
4186 madformat($format) and fail <<END
4187 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4196 badusage "-p is not allowed with dgit push" if defined $package;
4198 my $clogp = parsechangelog();
4199 $package = getfield $clogp, 'Source';
4202 } elsif (@ARGV==1) {
4203 ($specsuite) = (@ARGV);
4205 badusage "incorrect arguments to dgit push";
4207 $isuite = getfield $clogp, 'Distribution';
4209 local ($package) = $existing_package; # this is a hack
4210 canonicalise_suite();
4212 canonicalise_suite();
4214 if (defined $specsuite &&
4215 $specsuite ne $isuite &&
4216 $specsuite ne $csuite) {
4217 fail "dgit push: changelog specifies $isuite ($csuite)".
4218 " but command line specifies $specsuite";
4223 #---------- remote commands' implementation ----------
4225 sub cmd_remote_push_build_host {
4226 my ($nrargs) = shift @ARGV;
4227 my (@rargs) = @ARGV[0..$nrargs-1];
4228 @ARGV = @ARGV[$nrargs..$#ARGV];
4230 my ($dir,$vsnwant) = @rargs;
4231 # vsnwant is a comma-separated list; we report which we have
4232 # chosen in our ready response (so other end can tell if they
4235 $we_are_responder = 1;
4236 $us .= " (build host)";
4240 open PI, "<&STDIN" or die $!;
4241 open STDIN, "/dev/null" or die $!;
4242 open PO, ">&STDOUT" or die $!;
4244 open STDOUT, ">&STDERR" or die $!;
4248 ($protovsn) = grep {
4249 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4250 } @rpushprotovsn_support;
4252 fail "build host has dgit rpush protocol versions ".
4253 (join ",", @rpushprotovsn_support).
4254 " but invocation host has $vsnwant"
4255 unless defined $protovsn;
4257 responder_send_command("dgit-remote-push-ready $protovsn");
4258 rpush_handle_protovsn_bothends();
4263 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4264 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4265 # a good error message)
4267 sub rpush_handle_protovsn_bothends () {
4268 if ($protovsn < 4) {
4269 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4278 my $report = i_child_report();
4279 if (defined $report) {
4280 printdebug "($report)\n";
4281 } elsif ($i_child_pid) {
4282 printdebug "(killing build host child $i_child_pid)\n";
4283 kill 15, $i_child_pid;
4285 if (defined $i_tmp && !defined $initiator_tempdir) {
4287 eval { rmtree $i_tmp; };
4291 END { i_cleanup(); }
4294 my ($base,$selector,@args) = @_;
4295 $selector =~ s/\-/_/g;
4296 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4303 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4311 push @rargs, join ",", @rpushprotovsn_support;
4314 push @rdgit, @ropts;
4315 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4317 my @cmd = (@ssh, $host, shellquote @rdgit);
4320 if (defined $initiator_tempdir) {
4321 rmtree $initiator_tempdir;
4322 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4323 $i_tmp = $initiator_tempdir;
4327 $i_child_pid = open2(\*RO, \*RI, @cmd);
4329 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4330 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4331 $supplementary_message = '' unless $protovsn >= 3;
4333 fail "rpush negotiated protocol version $protovsn".
4334 " which does not support quilt mode $quilt_mode"
4335 if quiltmode_splitbrain;
4337 rpush_handle_protovsn_bothends();
4339 my ($icmd,$iargs) = initiator_expect {
4340 m/^(\S+)(?: (.*))?$/;
4343 i_method "i_resp", $icmd, $iargs;
4347 sub i_resp_progress ($) {
4349 my $msg = protocol_read_bytes \*RO, $rhs;
4353 sub i_resp_supplementary_message ($) {
4355 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4358 sub i_resp_complete {
4359 my $pid = $i_child_pid;
4360 $i_child_pid = undef; # prevents killing some other process with same pid
4361 printdebug "waiting for build host child $pid...\n";
4362 my $got = waitpid $pid, 0;
4363 die $! unless $got == $pid;
4364 die "build host child failed $?" if $?;
4367 printdebug "all done\n";
4371 sub i_resp_file ($) {
4373 my $localname = i_method "i_localname", $keyword;
4374 my $localpath = "$i_tmp/$localname";
4375 stat_exists $localpath and
4376 badproto \*RO, "file $keyword ($localpath) twice";
4377 protocol_receive_file \*RO, $localpath;
4378 i_method "i_file", $keyword;
4383 sub i_resp_param ($) {
4384 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4388 sub i_resp_previously ($) {
4389 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4390 or badproto \*RO, "bad previously spec";
4391 my $r = system qw(git check-ref-format), $1;
4392 die "bad previously ref spec ($r)" if $r;
4393 $previously{$1} = $2;
4398 sub i_resp_want ($) {
4400 die "$keyword ?" if $i_wanted{$keyword}++;
4401 my @localpaths = i_method "i_want", $keyword;
4402 printdebug "[[ $keyword @localpaths\n";
4403 foreach my $localpath (@localpaths) {
4404 protocol_send_file \*RI, $localpath;
4406 print RI "files-end\n" or die $!;
4409 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4411 sub i_localname_parsed_changelog {
4412 return "remote-changelog.822";
4414 sub i_file_parsed_changelog {
4415 ($i_clogp, $i_version, $i_dscfn) =
4416 push_parse_changelog "$i_tmp/remote-changelog.822";
4417 die if $i_dscfn =~ m#/|^\W#;
4420 sub i_localname_dsc {
4421 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4426 sub i_localname_changes {
4427 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4428 $i_changesfn = $i_dscfn;
4429 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4430 return $i_changesfn;
4432 sub i_file_changes { }
4434 sub i_want_signed_tag {
4435 printdebug Dumper(\%i_param, $i_dscfn);
4436 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4437 && defined $i_param{'csuite'}
4438 or badproto \*RO, "premature desire for signed-tag";
4439 my $head = $i_param{'head'};
4440 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4442 my $maintview = $i_param{'maint-view'};
4443 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4446 if ($protovsn >= 4) {
4447 my $p = $i_param{'tagformat'} // '<undef>';
4449 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4452 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4454 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4456 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4459 push_mktags $i_clogp, $i_dscfn,
4460 $i_changesfn, 'remote changes',
4464 sub i_want_signed_dsc_changes {
4465 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4466 sign_changes $i_changesfn;
4467 return ($i_dscfn, $i_changesfn);
4470 #---------- building etc. ----------
4476 #----- `3.0 (quilt)' handling -----
4478 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4480 sub quiltify_dpkg_commit ($$$;$) {
4481 my ($patchname,$author,$msg, $xinfo) = @_;
4485 my $descfn = ".git/dgit/quilt-description.tmp";
4486 open O, '>', $descfn or die "$descfn: $!";
4487 $msg =~ s/\n+/\n\n/;
4488 print O <<END or die $!;
4490 ${xinfo}Subject: $msg
4497 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4498 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4499 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4500 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4504 sub quiltify_trees_differ ($$;$$$) {
4505 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4506 # returns true iff the two tree objects differ other than in debian/
4507 # with $finegrained,
4508 # returns bitmask 01 - differ in upstream files except .gitignore
4509 # 02 - differ in .gitignore
4510 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4511 # is set for each modified .gitignore filename $fn
4512 # if $unrepres is defined, array ref to which is appeneded
4513 # a list of unrepresentable changes (removals of upstream files
4516 my @cmd = (@git, qw(diff-tree -z));
4517 push @cmd, qw(--name-only) unless $unrepres;
4518 push @cmd, qw(-r) if $finegrained || $unrepres;
4520 my $diffs= cmdoutput @cmd;
4523 foreach my $f (split /\0/, $diffs) {
4524 if ($unrepres && !@lmodes) {
4525 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4528 my ($oldmode,$newmode) = @lmodes;
4531 next if $f =~ m#^debian(?:/.*)?$#s;
4535 die "not a plain file\n"
4536 unless $newmode =~ m/^10\d{4}$/ ||
4537 $oldmode =~ m/^10\d{4}$/;
4538 if ($oldmode =~ m/[^0]/ &&
4539 $newmode =~ m/[^0]/) {
4540 die "mode changed\n" if $oldmode ne $newmode;
4542 die "non-default mode\n"
4543 unless $newmode =~ m/^100644$/ ||
4544 $oldmode =~ m/^100644$/;
4548 local $/="\n"; chomp $@;
4549 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4553 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4554 $r |= $isignore ? 02 : 01;
4555 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4557 printdebug "quiltify_trees_differ $x $y => $r\n";
4561 sub quiltify_tree_sentinelfiles ($) {
4562 # lists the `sentinel' files present in the tree
4564 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4565 qw(-- debian/rules debian/control);
4570 sub quiltify_splitbrain_needed () {
4571 if (!$split_brain) {
4572 progress "dgit view: changes are required...";
4573 runcmd @git, qw(checkout -q -b dgit-view);
4578 sub quiltify_splitbrain ($$$$$$) {
4579 my ($clogp, $unapplied, $headref, $diffbits,
4580 $editedignores, $cachekey) = @_;
4581 if ($quilt_mode !~ m/gbp|dpm/) {
4582 # treat .gitignore just like any other upstream file
4583 $diffbits = { %$diffbits };
4584 $_ = !!$_ foreach values %$diffbits;
4586 # We would like any commits we generate to be reproducible
4587 my @authline = clogp_authline($clogp);
4588 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4589 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4590 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4591 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4592 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4593 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4595 if ($quilt_mode =~ m/gbp|unapplied/ &&
4596 ($diffbits->{O2H} & 01)) {
4598 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4599 " but git tree differs from orig in upstream files.";
4600 if (!stat_exists "debian/patches") {
4602 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4606 if ($quilt_mode =~ m/dpm/ &&
4607 ($diffbits->{H2A} & 01)) {
4609 --quilt=$quilt_mode specified, implying patches-applied git tree
4610 but git tree differs from result of applying debian/patches to upstream
4613 if ($quilt_mode =~ m/gbp|unapplied/ &&
4614 ($diffbits->{O2A} & 01)) { # some patches
4615 quiltify_splitbrain_needed();
4616 progress "dgit view: creating patches-applied version using gbp pq";
4617 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4618 # gbp pq import creates a fresh branch; push back to dgit-view
4619 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4620 runcmd @git, qw(checkout -q dgit-view);
4622 if ($quilt_mode =~ m/gbp|dpm/ &&
4623 ($diffbits->{O2A} & 02)) {
4625 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4626 tool which does not create patches for changes to upstream
4627 .gitignores: but, such patches exist in debian/patches.
4630 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4631 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4632 quiltify_splitbrain_needed();
4633 progress "dgit view: creating patch to represent .gitignore changes";
4634 ensuredir "debian/patches";
4635 my $gipatch = "debian/patches/auto-gitignore";
4636 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4637 stat GIPATCH or die "$gipatch: $!";
4638 fail "$gipatch already exists; but want to create it".
4639 " to record .gitignore changes" if (stat _)[7];
4640 print GIPATCH <<END or die "$gipatch: $!";
4641 Subject: Update .gitignore from Debian packaging branch
4643 The Debian packaging git branch contains these updates to the upstream
4644 .gitignore file(s). This patch is autogenerated, to provide these
4645 updates to users of the official Debian archive view of the package.
4647 [dgit ($our_version) update-gitignore]
4650 close GIPATCH or die "$gipatch: $!";
4651 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4652 $unapplied, $headref, "--", sort keys %$editedignores;
4653 open SERIES, "+>>", "debian/patches/series" or die $!;
4654 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4656 defined read SERIES, $newline, 1 or die $!;
4657 print SERIES "\n" or die $! unless $newline eq "\n";
4658 print SERIES "auto-gitignore\n" or die $!;
4659 close SERIES or die $!;
4660 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4662 Commit patch to update .gitignore
4664 [dgit ($our_version) update-gitignore-quilt-fixup]
4668 my $dgitview = git_rev_parse 'HEAD';
4670 changedir '../../../..';
4671 # When we no longer need to support squeeze, use --create-reflog
4673 ensuredir ".git/logs/refs/dgit-intern";
4674 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4677 my $oldcache = git_get_ref "refs/$splitbraincache";
4678 if ($oldcache eq $dgitview) {
4679 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4680 # git update-ref doesn't always update, in this case. *sigh*
4681 my $dummy = make_commit_text <<END;
4684 author Dgit <dgit\@example.com> 1000000000 +0000
4685 committer Dgit <dgit\@example.com> 1000000000 +0000
4687 Dummy commit - do not use
4689 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4690 "refs/$splitbraincache", $dummy;
4692 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4695 changedir '.git/dgit/unpack/work';
4697 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4698 progress "dgit view: created ($saved)";
4701 sub quiltify ($$$$) {
4702 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4704 # Quilt patchification algorithm
4706 # We search backwards through the history of the main tree's HEAD
4707 # (T) looking for a start commit S whose tree object is identical
4708 # to to the patch tip tree (ie the tree corresponding to the
4709 # current dpkg-committed patch series). For these purposes
4710 # `identical' disregards anything in debian/ - this wrinkle is
4711 # necessary because dpkg-source treates debian/ specially.
4713 # We can only traverse edges where at most one of the ancestors'
4714 # trees differs (in changes outside in debian/). And we cannot
4715 # handle edges which change .pc/ or debian/patches. To avoid
4716 # going down a rathole we avoid traversing edges which introduce
4717 # debian/rules or debian/control. And we set a limit on the
4718 # number of edges we are willing to look at.
4720 # If we succeed, we walk forwards again. For each traversed edge
4721 # PC (with P parent, C child) (starting with P=S and ending with
4722 # C=T) to we do this:
4724 # - dpkg-source --commit with a patch name and message derived from C
4725 # After traversing PT, we git commit the changes which
4726 # should be contained within debian/patches.
4728 # The search for the path S..T is breadth-first. We maintain a
4729 # todo list containing search nodes. A search node identifies a
4730 # commit, and looks something like this:
4732 # Commit => $git_commit_id,
4733 # Child => $c, # or undef if P=T
4734 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4735 # Nontrivial => true iff $p..$c has relevant changes
4742 my %considered; # saves being exponential on some weird graphs
4744 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4747 my ($search,$whynot) = @_;
4748 printdebug " search NOT $search->{Commit} $whynot\n";
4749 $search->{Whynot} = $whynot;
4750 push @nots, $search;
4751 no warnings qw(exiting);
4760 my $c = shift @todo;
4761 next if $considered{$c->{Commit}}++;
4763 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4765 printdebug "quiltify investigate $c->{Commit}\n";
4768 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4769 printdebug " search finished hooray!\n";
4774 if ($quilt_mode eq 'nofix') {
4775 fail "quilt fixup required but quilt mode is \`nofix'\n".
4776 "HEAD commit $c->{Commit} differs from tree implied by ".
4777 " debian/patches (tree object $oldtiptree)";
4779 if ($quilt_mode eq 'smash') {
4780 printdebug " search quitting smash\n";
4784 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4785 $not->($c, "has $c_sentinels not $t_sentinels")
4786 if $c_sentinels ne $t_sentinels;
4788 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4789 $commitdata =~ m/\n\n/;
4791 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4792 @parents = map { { Commit => $_, Child => $c } } @parents;
4794 $not->($c, "root commit") if !@parents;
4796 foreach my $p (@parents) {
4797 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4799 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4800 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4802 foreach my $p (@parents) {
4803 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4805 my @cmd= (@git, qw(diff-tree -r --name-only),
4806 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4807 my $patchstackchange = cmdoutput @cmd;
4808 if (length $patchstackchange) {
4809 $patchstackchange =~ s/\n/,/g;
4810 $not->($p, "changed $patchstackchange");
4813 printdebug " search queue P=$p->{Commit} ",
4814 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4820 printdebug "quiltify want to smash\n";
4823 my $x = $_[0]{Commit};
4824 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4827 my $reportnot = sub {
4829 my $s = $abbrev->($notp);
4830 my $c = $notp->{Child};
4831 $s .= "..".$abbrev->($c) if $c;
4832 $s .= ": ".$notp->{Whynot};
4835 if ($quilt_mode eq 'linear') {
4836 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4837 foreach my $notp (@nots) {
4838 print STDERR "$us: ", $reportnot->($notp), "\n";
4840 print STDERR "$us: $_\n" foreach @$failsuggestion;
4841 fail "quilt fixup naive history linearisation failed.\n".
4842 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4843 } elsif ($quilt_mode eq 'smash') {
4844 } elsif ($quilt_mode eq 'auto') {
4845 progress "quilt fixup cannot be linear, smashing...";
4847 die "$quilt_mode ?";
4850 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4851 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4853 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4855 quiltify_dpkg_commit "auto-$version-$target-$time",
4856 (getfield $clogp, 'Maintainer'),
4857 "Automatically generated patch ($clogp->{Version})\n".
4858 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4862 progress "quiltify linearisation planning successful, executing...";
4864 for (my $p = $sref_S;
4865 my $c = $p->{Child};
4867 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4868 next unless $p->{Nontrivial};
4870 my $cc = $c->{Commit};
4872 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4873 $commitdata =~ m/\n\n/ or die "$c ?";
4876 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4879 my $commitdate = cmdoutput
4880 @git, qw(log -n1 --pretty=format:%aD), $cc;
4882 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4884 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4891 my $gbp_check_suitable = sub {
4896 die "contains unexpected slashes\n" if m{//} || m{/$};
4897 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4898 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4899 die "too long" if length > 200;
4901 return $_ unless $@;
4902 print STDERR "quiltifying commit $cc:".
4903 " ignoring/dropping Gbp-Pq $what: $@";
4907 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4909 (\S+) \s* \n //ixm) {
4910 $patchname = $gbp_check_suitable->($1, 'Name');
4912 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4914 (\S+) \s* \n //ixm) {
4915 $patchdir = $gbp_check_suitable->($1, 'Topic');
4920 if (!defined $patchname) {
4921 $patchname = $title;
4922 $patchname =~ s/[.:]$//;
4925 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4926 my $translitname = $converter->convert($patchname);
4927 die unless defined $translitname;
4928 $patchname = $translitname;
4931 "dgit: patch title transliteration error: $@"
4933 $patchname =~ y/ A-Z/-a-z/;
4934 $patchname =~ y/-a-z0-9_.+=~//cd;
4935 $patchname =~ s/^\W/x-$&/;
4936 $patchname = substr($patchname,0,40);
4938 if (!defined $patchdir) {
4941 if (length $patchdir) {
4942 $patchname = "$patchdir/$patchname";
4944 if ($patchname =~ m{^(.*)/}) {
4945 mkpath "debian/patches/$1";
4950 stat "debian/patches/$patchname$index";
4952 $!==ENOENT or die "$patchname$index $!";
4954 runcmd @git, qw(checkout -q), $cc;
4956 # We use the tip's changelog so that dpkg-source doesn't
4957 # produce complaining messages from dpkg-parsechangelog. None
4958 # of the information dpkg-source gets from the changelog is
4959 # actually relevant - it gets put into the original message
4960 # which dpkg-source provides our stunt editor, and then
4962 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4964 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4965 "Date: $commitdate\n".
4966 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4968 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4971 runcmd @git, qw(checkout -q master);
4974 sub build_maybe_quilt_fixup () {
4975 my ($format,$fopts) = get_source_format;
4976 return unless madformat_wantfixup $format;
4979 check_for_vendor_patches();
4981 if (quiltmode_splitbrain) {
4982 fail <<END unless access_cfg_tagformats_can_splitbrain;
4983 quilt mode $quilt_mode requires split view so server needs to support
4984 both "new" and "maint" tag formats, but config says it doesn't.
4988 my $clogp = parsechangelog();
4989 my $headref = git_rev_parse('HEAD');
4994 my $upstreamversion = upstreamversion $version;
4996 if ($fopts->{'single-debian-patch'}) {
4997 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4999 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5002 die 'bug' if $split_brain && !$need_split_build_invocation;
5004 changedir '../../../..';
5005 runcmd_ordryrun_local
5006 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5009 sub quilt_fixup_mkwork ($) {
5012 mkdir "work" or die $!;
5014 mktree_in_ud_here();
5015 runcmd @git, qw(reset -q --hard), $headref;
5018 sub quilt_fixup_linkorigs ($$) {
5019 my ($upstreamversion, $fn) = @_;
5020 # calls $fn->($leafname);
5022 foreach my $f (<../../../../*>) { #/){
5023 my $b=$f; $b =~ s{.*/}{};
5025 local ($debuglevel) = $debuglevel-1;
5026 printdebug "QF linkorigs $b, $f ?\n";
5028 next unless is_orig_file_of_vsn $b, $upstreamversion;
5029 printdebug "QF linkorigs $b, $f Y\n";
5030 link_ltarget $f, $b or die "$b $!";
5035 sub quilt_fixup_delete_pc () {
5036 runcmd @git, qw(rm -rqf .pc);
5038 Commit removal of .pc (quilt series tracking data)
5040 [dgit ($our_version) upgrade quilt-remove-pc]
5044 sub quilt_fixup_singlepatch ($$$) {
5045 my ($clogp, $headref, $upstreamversion) = @_;
5047 progress "starting quiltify (single-debian-patch)";
5049 # dpkg-source --commit generates new patches even if
5050 # single-debian-patch is in debian/source/options. In order to
5051 # get it to generate debian/patches/debian-changes, it is
5052 # necessary to build the source package.
5054 quilt_fixup_linkorigs($upstreamversion, sub { });
5055 quilt_fixup_mkwork($headref);
5057 rmtree("debian/patches");
5059 runcmd @dpkgsource, qw(-b .);
5061 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5062 rename srcfn("$upstreamversion", "/debian/patches"),
5063 "work/debian/patches";
5066 commit_quilty_patch();
5069 sub quilt_make_fake_dsc ($) {
5070 my ($upstreamversion) = @_;
5072 my $fakeversion="$upstreamversion-~~DGITFAKE";
5074 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5075 print $fakedsc <<END or die $!;
5078 Version: $fakeversion
5082 my $dscaddfile=sub {
5085 my $md = new Digest::MD5;
5087 my $fh = new IO::File $b, '<' or die "$b $!";
5092 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5095 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5097 my @files=qw(debian/source/format debian/rules
5098 debian/control debian/changelog);
5099 foreach my $maybe (qw(debian/patches debian/source/options
5100 debian/tests/control)) {
5101 next unless stat_exists "../../../$maybe";
5102 push @files, $maybe;
5105 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5106 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5108 $dscaddfile->($debtar);
5109 close $fakedsc or die $!;
5112 sub quilt_check_splitbrain_cache ($$) {
5113 my ($headref, $upstreamversion) = @_;
5114 # Called only if we are in (potentially) split brain mode.
5116 # Computes the cache key and looks in the cache.
5117 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5119 my $splitbrain_cachekey;
5122 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5123 # we look in the reflog of dgit-intern/quilt-cache
5124 # we look for an entry whose message is the key for the cache lookup
5125 my @cachekey = (qw(dgit), $our_version);
5126 push @cachekey, $upstreamversion;
5127 push @cachekey, $quilt_mode;
5128 push @cachekey, $headref;
5130 push @cachekey, hashfile('fake.dsc');
5132 my $srcshash = Digest::SHA->new(256);
5133 my %sfs = ( %INC, '$0(dgit)' => $0 );
5134 foreach my $sfk (sort keys %sfs) {
5135 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5136 $srcshash->add($sfk," ");
5137 $srcshash->add(hashfile($sfs{$sfk}));
5138 $srcshash->add("\n");
5140 push @cachekey, $srcshash->hexdigest();
5141 $splitbrain_cachekey = "@cachekey";
5143 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5145 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5146 debugcmd "|(probably)",@cmd;
5147 my $child = open GC, "-|"; defined $child or die $!;
5149 chdir '../../..' or die $!;
5150 if (!stat ".git/logs/refs/$splitbraincache") {
5151 $! == ENOENT or die $!;
5152 printdebug ">(no reflog)\n";
5159 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5160 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5163 quilt_fixup_mkwork($headref);
5164 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5165 if ($cachehit ne $headref) {
5166 progress "dgit view: found cached ($saved)";
5167 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5169 return ($cachehit, $splitbrain_cachekey);
5171 progress "dgit view: found cached, no changes required";
5172 return ($headref, $splitbrain_cachekey);
5174 die $! if GC->error;
5175 failedcmd unless close GC;
5177 printdebug "splitbrain cache miss\n";
5178 return (undef, $splitbrain_cachekey);
5181 sub quilt_fixup_multipatch ($$$) {
5182 my ($clogp, $headref, $upstreamversion) = @_;
5184 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5187 # - honour any existing .pc in case it has any strangeness
5188 # - determine the git commit corresponding to the tip of
5189 # the patch stack (if there is one)
5190 # - if there is such a git commit, convert each subsequent
5191 # git commit into a quilt patch with dpkg-source --commit
5192 # - otherwise convert all the differences in the tree into
5193 # a single git commit
5197 # Our git tree doesn't necessarily contain .pc. (Some versions of
5198 # dgit would include the .pc in the git tree.) If there isn't
5199 # one, we need to generate one by unpacking the patches that we
5202 # We first look for a .pc in the git tree. If there is one, we
5203 # will use it. (This is not the normal case.)
5205 # Otherwise need to regenerate .pc so that dpkg-source --commit
5206 # can work. We do this as follows:
5207 # 1. Collect all relevant .orig from parent directory
5208 # 2. Generate a debian.tar.gz out of
5209 # debian/{patches,rules,source/format,source/options}
5210 # 3. Generate a fake .dsc containing just these fields:
5211 # Format Source Version Files
5212 # 4. Extract the fake .dsc
5213 # Now the fake .dsc has a .pc directory.
5214 # (In fact we do this in every case, because in future we will
5215 # want to search for a good base commit for generating patches.)
5217 # Then we can actually do the dpkg-source --commit
5218 # 1. Make a new working tree with the same object
5219 # store as our main tree and check out the main
5221 # 2. Copy .pc from the fake's extraction, if necessary
5222 # 3. Run dpkg-source --commit
5223 # 4. If the result has changes to debian/, then
5224 # - git add them them
5225 # - git add .pc if we had a .pc in-tree
5227 # 5. If we had a .pc in-tree, delete it, and git commit
5228 # 6. Back in the main tree, fast forward to the new HEAD
5230 # Another situation we may have to cope with is gbp-style
5231 # patches-unapplied trees.
5233 # We would want to detect these, so we know to escape into
5234 # quilt_fixup_gbp. However, this is in general not possible.
5235 # Consider a package with a one patch which the dgit user reverts
5236 # (with git revert or the moral equivalent).
5238 # That is indistinguishable in contents from a patches-unapplied
5239 # tree. And looking at the history to distinguish them is not
5240 # useful because the user might have made a confusing-looking git
5241 # history structure (which ought to produce an error if dgit can't
5242 # cope, not a silent reintroduction of an unwanted patch).
5244 # So gbp users will have to pass an option. But we can usually
5245 # detect their failure to do so: if the tree is not a clean
5246 # patches-applied tree, quilt linearisation fails, but the tree
5247 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5248 # they want --quilt=unapplied.
5250 # To help detect this, when we are extracting the fake dsc, we
5251 # first extract it with --skip-patches, and then apply the patches
5252 # afterwards with dpkg-source --before-build. That lets us save a
5253 # tree object corresponding to .origs.
5255 my $splitbrain_cachekey;
5257 quilt_make_fake_dsc($upstreamversion);
5259 if (quiltmode_splitbrain()) {
5261 ($cachehit, $splitbrain_cachekey) =
5262 quilt_check_splitbrain_cache($headref, $upstreamversion);
5263 return if $cachehit;
5267 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5269 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5270 rename $fakexdir, "fake" or die "$fakexdir $!";
5274 remove_stray_gits("source package");
5275 mktree_in_ud_here();
5279 my $unapplied=git_add_write_tree();
5280 printdebug "fake orig tree object $unapplied\n";
5284 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5286 if (system @bbcmd) {
5287 failedcmd @bbcmd if $? < 0;
5289 failed to apply your git tree's patch stack (from debian/patches/) to
5290 the corresponding upstream tarball(s). Your source tree and .orig
5291 are probably too inconsistent. dgit can only fix up certain kinds of
5292 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5298 quilt_fixup_mkwork($headref);
5301 if (stat_exists ".pc") {
5303 progress "Tree already contains .pc - will use it then delete it.";
5306 rename '../fake/.pc','.pc' or die $!;
5309 changedir '../fake';
5311 my $oldtiptree=git_add_write_tree();
5312 printdebug "fake o+d/p tree object $unapplied\n";
5313 changedir '../work';
5316 # We calculate some guesswork now about what kind of tree this might
5317 # be. This is mostly for error reporting.
5323 # O = orig, without patches applied
5324 # A = "applied", ie orig with H's debian/patches applied
5325 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5326 \%editedignores, \@unrepres),
5327 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5328 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5332 foreach my $b (qw(01 02)) {
5333 foreach my $v (qw(O2H O2A H2A)) {
5334 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5337 printdebug "differences \@dl @dl.\n";
5340 "$us: base trees orig=%.20s o+d/p=%.20s",
5341 $unapplied, $oldtiptree;
5343 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5344 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5345 $dl[0], $dl[1], $dl[3], $dl[4],
5349 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5351 forceable_fail [qw(unrepresentable)], <<END;
5352 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5357 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5358 push @failsuggestion, "This might be a patches-unapplied branch.";
5359 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5360 push @failsuggestion, "This might be a patches-applied branch.";
5362 push @failsuggestion, "Maybe you need to specify one of".
5363 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5365 if (quiltmode_splitbrain()) {
5366 quiltify_splitbrain($clogp, $unapplied, $headref,
5367 $diffbits, \%editedignores,
5368 $splitbrain_cachekey);
5372 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5373 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5375 if (!open P, '>>', ".pc/applied-patches") {
5376 $!==&ENOENT or die $!;
5381 commit_quilty_patch();
5383 if ($mustdeletepc) {
5384 quilt_fixup_delete_pc();
5388 sub quilt_fixup_editor () {
5389 my $descfn = $ENV{$fakeeditorenv};
5390 my $editing = $ARGV[$#ARGV];
5391 open I1, '<', $descfn or die "$descfn: $!";
5392 open I2, '<', $editing or die "$editing: $!";
5393 unlink $editing or die "$editing: $!";
5394 open O, '>', $editing or die "$editing: $!";
5395 while (<I1>) { print O or die $!; } I1->error and die $!;
5398 $copying ||= m/^\-\-\- /;
5399 next unless $copying;
5402 I2->error and die $!;
5407 sub maybe_apply_patches_dirtily () {
5408 return unless $quilt_mode =~ m/gbp|unapplied/;
5409 print STDERR <<END or die $!;
5411 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5412 dgit: Have to apply the patches - making the tree dirty.
5413 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5416 $patches_applied_dirtily = 01;
5417 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5418 runcmd qw(dpkg-source --before-build .);
5421 sub maybe_unapply_patches_again () {
5422 progress "dgit: Unapplying patches again to tidy up the tree."
5423 if $patches_applied_dirtily;
5424 runcmd qw(dpkg-source --after-build .)
5425 if $patches_applied_dirtily & 01;
5427 if $patches_applied_dirtily & 02;
5428 $patches_applied_dirtily = 0;
5431 #----- other building -----
5433 our $clean_using_builder;
5434 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5435 # clean the tree before building (perhaps invoked indirectly by
5436 # whatever we are using to run the build), rather than separately
5437 # and explicitly by us.
5440 return if $clean_using_builder;
5441 if ($cleanmode eq 'dpkg-source') {
5442 maybe_apply_patches_dirtily();
5443 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5444 } elsif ($cleanmode eq 'dpkg-source-d') {
5445 maybe_apply_patches_dirtily();
5446 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5447 } elsif ($cleanmode eq 'git') {
5448 runcmd_ordryrun_local @git, qw(clean -xdf);
5449 } elsif ($cleanmode eq 'git-ff') {
5450 runcmd_ordryrun_local @git, qw(clean -xdff);
5451 } elsif ($cleanmode eq 'check') {
5452 my $leftovers = cmdoutput @git, qw(clean -xdn);
5453 if (length $leftovers) {
5454 print STDERR $leftovers, "\n" or die $!;
5455 fail "tree contains uncommitted files and --clean=check specified";
5457 } elsif ($cleanmode eq 'none') {
5464 badusage "clean takes no additional arguments" if @ARGV;
5467 maybe_unapply_patches_again();
5470 sub build_prep_early () {
5471 our $build_prep_early_done //= 0;
5472 return if $build_prep_early_done++;
5474 badusage "-p is not allowed when building" if defined $package;
5475 my $clogp = parsechangelog();
5476 $isuite = getfield $clogp, 'Distribution';
5477 $package = getfield $clogp, 'Source';
5478 $version = getfield $clogp, 'Version';
5485 build_maybe_quilt_fixup();
5487 my $pat = changespat $version;
5488 foreach my $f (glob "$buildproductsdir/$pat") {
5490 unlink $f or fail "remove old changes file $f: $!";
5492 progress "would remove $f";
5498 sub changesopts_initial () {
5499 my @opts =@changesopts[1..$#changesopts];
5502 sub changesopts_version () {
5503 if (!defined $changes_since_version) {
5504 my @vsns = archive_query('archive_query');
5505 my @quirk = access_quirk();
5506 if ($quirk[0] eq 'backports') {
5507 local $isuite = $quirk[2];
5509 canonicalise_suite();
5510 push @vsns, archive_query('archive_query');
5513 @vsns = map { $_->[0] } @vsns;
5514 @vsns = sort { -version_compare($a, $b) } @vsns;
5515 $changes_since_version = $vsns[0];
5516 progress "changelog will contain changes since $vsns[0]";
5518 $changes_since_version = '_';
5519 progress "package seems new, not specifying -v<version>";
5522 if ($changes_since_version ne '_') {
5523 return ("-v$changes_since_version");
5529 sub changesopts () {
5530 return (changesopts_initial(), changesopts_version());
5533 sub massage_dbp_args ($;$) {
5534 my ($cmd,$xargs) = @_;
5537 # - if we're going to split the source build out so we can
5538 # do strange things to it, massage the arguments to dpkg-buildpackage
5539 # so that the main build doessn't build source (or add an argument
5540 # to stop it building source by default).
5542 # - add -nc to stop dpkg-source cleaning the source tree,
5543 # unless we're not doing a split build and want dpkg-source
5544 # as cleanmode, in which case we can do nothing
5547 # 0 - source will NOT need to be built separately by caller
5548 # +1 - source will need to be built separately by caller
5549 # +2 - source will need to be built separately by caller AND
5550 # dpkg-buildpackage should not in fact be run at all!
5551 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5552 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5553 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5554 $clean_using_builder = 1;
5557 # -nc has the side effect of specifying -b if nothing else specified
5558 # and some combinations of -S, -b, et al, are errors, rather than
5559 # later simply overriding earlie. So we need to:
5560 # - search the command line for these options
5561 # - pick the last one
5562 # - perhaps add our own as a default
5563 # - perhaps adjust it to the corresponding non-source-building version
5565 foreach my $l ($cmd, $xargs) {
5567 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5570 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5572 if ($need_split_build_invocation) {
5573 printdebug "massage split $dmode.\n";
5574 $r = $dmode =~ m/[S]/ ? +2 :
5575 $dmode =~ y/gGF/ABb/ ? +1 :
5576 $dmode =~ m/[ABb]/ ? 0 :
5579 printdebug "massage done $r $dmode.\n";
5581 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5587 my $wasdir = must_getcwd();
5593 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5594 my ($msg_if_onlyone) = @_;
5595 # If there is only one .changes file, fail with $msg_if_onlyone,
5596 # or if that is undef, be a no-op.
5597 # Returns the changes file to report to the user.
5598 my $pat = changespat $version;
5599 my @changesfiles = glob $pat;
5600 @changesfiles = sort {
5601 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5605 if (@changesfiles==1) {
5606 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5607 only one changes file from build (@changesfiles)
5609 $result = $changesfiles[0];
5610 } elsif (@changesfiles==2) {
5611 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5612 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5613 fail "$l found in binaries changes file $binchanges"
5616 runcmd_ordryrun_local @mergechanges, @changesfiles;
5617 my $multichanges = changespat $version,'multi';
5619 stat_exists $multichanges or fail "$multichanges: $!";
5620 foreach my $cf (glob $pat) {
5621 next if $cf eq $multichanges;
5622 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5625 $result = $multichanges;
5627 fail "wrong number of different changes files (@changesfiles)";
5629 printdone "build successful, results in $result\n" or die $!;
5632 sub midbuild_checkchanges () {
5633 my $pat = changespat $version;
5634 return if $rmchanges;
5635 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5636 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5638 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5639 Suggest you delete @unwanted.
5644 sub midbuild_checkchanges_vanilla ($) {
5646 midbuild_checkchanges() if $wantsrc == 1;
5649 sub postbuild_mergechanges_vanilla ($) {
5651 if ($wantsrc == 1) {
5653 postbuild_mergechanges(undef);
5656 printdone "build successful\n";
5662 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5663 my $wantsrc = massage_dbp_args \@dbp;
5666 midbuild_checkchanges_vanilla $wantsrc;
5671 push @dbp, changesopts_version();
5672 maybe_apply_patches_dirtily();
5673 runcmd_ordryrun_local @dbp;
5675 maybe_unapply_patches_again();
5676 postbuild_mergechanges_vanilla $wantsrc;
5680 $quilt_mode //= 'gbp';
5686 # gbp can make .origs out of thin air. In my tests it does this
5687 # even for a 1.0 format package, with no origs present. So I
5688 # guess it keys off just the version number. We don't know
5689 # exactly what .origs ought to exist, but let's assume that we
5690 # should run gbp if: the version has an upstream part and the main
5692 my $upstreamversion = upstreamversion $version;
5693 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5694 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5696 if ($gbp_make_orig) {
5698 $cleanmode = 'none'; # don't do it again
5699 $need_split_build_invocation = 1;
5702 my @dbp = @dpkgbuildpackage;
5704 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5706 if (!length $gbp_build[0]) {
5707 if (length executable_on_path('git-buildpackage')) {
5708 $gbp_build[0] = qw(git-buildpackage);
5710 $gbp_build[0] = 'gbp buildpackage';
5713 my @cmd = opts_opt_multi_cmd @gbp_build;
5715 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5717 if ($gbp_make_orig) {
5718 ensuredir '.git/dgit';
5719 my $ok = '.git/dgit/origs-gen-ok';
5720 unlink $ok or $!==&ENOENT or die $!;
5721 my @origs_cmd = @cmd;
5722 push @origs_cmd, qw(--git-cleaner=true);
5723 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5724 push @origs_cmd, @ARGV;
5726 debugcmd @origs_cmd;
5728 do { local $!; stat_exists $ok; }
5729 or failedcmd @origs_cmd;
5731 dryrun_report @origs_cmd;
5737 midbuild_checkchanges_vanilla $wantsrc;
5739 if (!$clean_using_builder) {
5740 push @cmd, '--git-cleaner=true';
5744 maybe_unapply_patches_again();
5746 push @cmd, changesopts();
5747 runcmd_ordryrun_local @cmd, @ARGV;
5749 postbuild_mergechanges_vanilla $wantsrc;
5751 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5755 my $our_cleanmode = $cleanmode;
5756 if ($need_split_build_invocation) {
5757 # Pretend that clean is being done some other way. This
5758 # forces us not to try to use dpkg-buildpackage to clean and
5759 # build source all in one go; and instead we run dpkg-source
5760 # (and build_prep() will do the clean since $clean_using_builder
5762 $our_cleanmode = 'ELSEWHERE';
5764 if ($our_cleanmode =~ m/^dpkg-source/) {
5765 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5766 $clean_using_builder = 1;
5769 $sourcechanges = changespat $version,'source';
5771 unlink "../$sourcechanges" or $!==ENOENT
5772 or fail "remove $sourcechanges: $!";
5774 $dscfn = dscfn($version);
5775 if ($our_cleanmode eq 'dpkg-source') {
5776 maybe_apply_patches_dirtily();
5777 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5779 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5780 maybe_apply_patches_dirtily();
5781 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5784 my @cmd = (@dpkgsource, qw(-b --));
5787 runcmd_ordryrun_local @cmd, "work";
5788 my @udfiles = <${package}_*>;
5789 changedir "../../..";
5790 foreach my $f (@udfiles) {
5791 printdebug "source copy, found $f\n";
5794 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5795 $f eq srcfn($version, $&));
5796 printdebug "source copy, found $f - renaming\n";
5797 rename "$ud/$f", "../$f" or $!==ENOENT
5798 or fail "put in place new source file ($f): $!";
5801 my $pwd = must_getcwd();
5802 my $leafdir = basename $pwd;
5804 runcmd_ordryrun_local @cmd, $leafdir;
5807 runcmd_ordryrun_local qw(sh -ec),
5808 'exec >$1; shift; exec "$@"','x',
5809 "../$sourcechanges",
5810 @dpkggenchanges, qw(-S), changesopts();
5814 sub cmd_build_source {
5816 badusage "build-source takes no additional arguments" if @ARGV;
5818 maybe_unapply_patches_again();
5819 printdone "source built, results in $dscfn and $sourcechanges";
5824 midbuild_checkchanges();
5827 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5828 stat_exists $sourcechanges
5829 or fail "$sourcechanges (in parent directory): $!";
5831 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5833 maybe_unapply_patches_again();
5835 postbuild_mergechanges(<<END);
5836 perhaps you need to pass -A ? (sbuild's default is to build only
5837 arch-specific binaries; dgit 1.4 used to override that.)
5842 sub cmd_quilt_fixup {
5843 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5846 build_maybe_quilt_fixup();
5849 sub cmd_import_dsc {
5853 last unless $ARGV[0] =~ m/^-/;
5856 if (m/^--require-valid-signature$/) {
5859 badusage "unknown dgit import-dsc sub-option \`$_'";
5863 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5864 my ($dscfn, $dstbranch) = @ARGV;
5866 badusage "dry run makes no sense with import-dsc" unless act_local();
5868 my $force = $dstbranch =~ s/^\+// ? +1 :
5869 $dstbranch =~ s/^\.\.// ? -1 :
5871 my $info = $force ? " $&" : '';
5872 $info = "$dscfn$info";
5874 my $specbranch = $dstbranch;
5875 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5876 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5878 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5879 my $chead = cmdoutput_errok @symcmd;
5880 defined $chead or $?==256 or failedcmd @symcmd;
5882 fail "$dstbranch is checked out - will not update it"
5883 if defined $chead and $chead eq $dstbranch;
5885 my $oldhash = git_get_ref $dstbranch;
5887 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5888 $dscdata = do { local $/ = undef; <D>; };
5889 D->error and fail "read $dscfn: $!";
5892 # we don't normally need this so import it here
5893 use Dpkg::Source::Package;
5894 my $dp = new Dpkg::Source::Package filename => $dscfn,
5895 require_valid_signature => $needsig;
5897 local $SIG{__WARN__} = sub {
5899 return unless $needsig;
5900 fail "import-dsc signature check failed";
5902 if (!$dp->is_signed()) {
5903 warn "$us: warning: importing unsigned .dsc\n";
5905 my $r = $dp->check_signature();
5906 die "->check_signature => $r" if $needsig && $r;
5912 parse_dsc_field($dsc, "Dgit metadata in .dsc");
5914 if (defined $dsc_hash
5915 && !forceing [qw(import-dsc-with-dgit-field)]) {
5916 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5917 my @cmd = (qw(sh -ec),
5918 "echo $dsc_hash | git cat-file --batch-check");
5919 my $objgot = cmdoutput @cmd;
5920 if ($objgot =~ m#^\w+ missing\b#) {
5922 .dsc contains Dgit field referring to object $dsc_hash
5923 Your git tree does not have that object. Try `git fetch' from a
5924 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5927 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
5929 progress "Not fast forward, forced update.";
5931 fail "Not fast forward to $dsc_hash";
5934 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5935 $dstbranch, $dsc_hash);
5937 progress "dgit: import-dsc updated git ref $dstbranch";
5942 Branch $dstbranch already exists
5943 Specify ..$specbranch for a pseudo-merge, binding in existing history
5944 Specify +$specbranch to overwrite, discarding existing history
5946 if $oldhash && !$force;
5948 $package = getfield $dsc, 'Source';
5949 my @dfi = dsc_files_info();
5950 foreach my $fi (@dfi) {
5951 my $f = $fi->{Filename};
5953 next if lstat $here;
5954 fail "stat $here: $!" unless $! == ENOENT;
5956 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5958 } elsif ($dscfn =~ m#^/#) {
5961 fail "cannot import $dscfn which seems to be inside working tree!";
5963 $there =~ s#/+[^/]+$## or
5964 fail "cannot import $dscfn which seems to not have a basename";
5966 symlink $there, $here or fail "symlink $there to $here: $!";
5967 progress "made symlink $here -> $there";
5968 # print STDERR Dumper($fi);
5970 my @mergeinputs = generate_commits_from_dsc();
5971 die unless @mergeinputs == 1;
5973 my $newhash = $mergeinputs[0]{Commit};
5977 progress "Import, forced update - synthetic orphan git history.";
5978 } elsif ($force < 0) {
5979 progress "Import, merging.";
5980 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5981 my $version = getfield $dsc, 'Version';
5982 my $clogp = commit_getclogp $newhash;
5983 my $authline = clogp_authline $clogp;
5984 $newhash = make_commit_text <<END;
5991 Merge $package ($version) import into $dstbranch
5994 die; # caught earlier
5998 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5999 $dstbranch, $newhash);
6001 progress "dgit: import-dsc results are in in git ref $dstbranch";
6004 sub cmd_archive_api_query {
6005 badusage "need only 1 subpath argument" unless @ARGV==1;
6006 my ($subpath) = @ARGV;
6007 my @cmd = archive_api_query_cmd($subpath);
6010 exec @cmd or fail "exec curl: $!\n";
6013 sub cmd_clone_dgit_repos_server {
6014 badusage "need destination argument" unless @ARGV==1;
6015 my ($destdir) = @ARGV;
6016 $package = '_dgit-repos-server';
6017 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6019 exec @cmd or fail "exec git clone: $!\n";
6022 sub cmd_setup_mergechangelogs {
6023 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6024 setup_mergechangelogs(1);
6027 sub cmd_setup_useremail {
6028 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6032 sub cmd_setup_new_tree {
6033 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6037 #---------- argument parsing and main program ----------
6040 print "dgit version $our_version\n" or die $!;
6044 our (%valopts_long, %valopts_short);
6047 sub defvalopt ($$$$) {
6048 my ($long,$short,$val_re,$how) = @_;
6049 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6050 $valopts_long{$long} = $oi;
6051 $valopts_short{$short} = $oi;
6052 # $how subref should:
6053 # do whatever assignemnt or thing it likes with $_[0]
6054 # if the option should not be passed on to remote, @rvalopts=()
6055 # or $how can be a scalar ref, meaning simply assign the value
6058 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6059 defvalopt '--distro', '-d', '.+', \$idistro;
6060 defvalopt '', '-k', '.+', \$keyid;
6061 defvalopt '--existing-package','', '.*', \$existing_package;
6062 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6063 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6064 defvalopt '--package', '-p', $package_re, \$package;
6065 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6067 defvalopt '', '-C', '.+', sub {
6068 ($changesfile) = (@_);
6069 if ($changesfile =~ s#^(.*)/##) {
6070 $buildproductsdir = $1;
6074 defvalopt '--initiator-tempdir','','.*', sub {
6075 ($initiator_tempdir) = (@_);
6076 $initiator_tempdir =~ m#^/# or
6077 badusage "--initiator-tempdir must be used specify an".
6078 " absolute, not relative, directory."
6084 if (defined $ENV{'DGIT_SSH'}) {
6085 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6086 } elsif (defined $ENV{'GIT_SSH'}) {
6087 @ssh = ($ENV{'GIT_SSH'});
6095 if (!defined $val) {
6096 badusage "$what needs a value" unless @ARGV;
6098 push @rvalopts, $val;
6100 badusage "bad value \`$val' for $what" unless
6101 $val =~ m/^$oi->{Re}$(?!\n)/s;
6102 my $how = $oi->{How};
6103 if (ref($how) eq 'SCALAR') {
6108 push @ropts, @rvalopts;
6112 last unless $ARGV[0] =~ m/^-/;
6116 if (m/^--dry-run$/) {
6119 } elsif (m/^--damp-run$/) {
6122 } elsif (m/^--no-sign$/) {
6125 } elsif (m/^--help$/) {
6127 } elsif (m/^--version$/) {
6129 } elsif (m/^--new$/) {
6132 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6133 ($om = $opts_opt_map{$1}) &&
6137 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6138 !$opts_opt_cmdonly{$1} &&
6139 ($om = $opts_opt_map{$1})) {
6142 } elsif (m/^--(gbp|dpm)$/s) {
6143 push @ropts, "--quilt=$1";
6145 } elsif (m/^--ignore-dirty$/s) {
6148 } elsif (m/^--no-quilt-fixup$/s) {
6150 $quilt_mode = 'nocheck';
6151 } elsif (m/^--no-rm-on-error$/s) {
6154 } elsif (m/^--overwrite$/s) {
6156 $overwrite_version = '';
6157 } elsif (m/^--overwrite=(.+)$/s) {
6159 $overwrite_version = $1;
6160 } elsif (m/^--dep14tag$/s) {
6162 $dodep14tag= 'want';
6163 } elsif (m/^--no-dep14tag$/s) {
6166 } elsif (m/^--always-dep14tag$/s) {
6168 $dodep14tag= 'always';
6169 } elsif (m/^--delayed=(\d+)$/s) {
6172 } elsif (m/^--dgit-view-save=(.+)$/s) {
6174 $split_brain_save = $1;
6175 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6176 } elsif (m/^--(no-)?rm-old-changes$/s) {
6179 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6181 push @deliberatelies, $&;
6182 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6186 } elsif (m/^--force-/) {
6188 "$us: warning: ignoring unknown force option $_\n";
6190 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6191 # undocumented, for testing
6193 $tagformat_want = [ $1, 'command line', 1 ];
6194 # 1 menas overrides distro configuration
6195 } elsif (m/^--always-split-source-build$/s) {
6196 # undocumented, for testing
6198 $need_split_build_invocation = 1;
6199 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6200 $val = $2 ? $' : undef; #';
6201 $valopt->($oi->{Long});
6203 badusage "unknown long option \`$_'";
6210 } elsif (s/^-L/-/) {
6213 } elsif (s/^-h/-/) {
6215 } elsif (s/^-D/-/) {
6219 } elsif (s/^-N/-/) {
6224 push @changesopts, $_;
6226 } elsif (s/^-wn$//s) {
6228 $cleanmode = 'none';
6229 } elsif (s/^-wg$//s) {
6232 } elsif (s/^-wgf$//s) {
6234 $cleanmode = 'git-ff';
6235 } elsif (s/^-wd$//s) {
6237 $cleanmode = 'dpkg-source';
6238 } elsif (s/^-wdd$//s) {
6240 $cleanmode = 'dpkg-source-d';
6241 } elsif (s/^-wc$//s) {
6243 $cleanmode = 'check';
6244 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6245 push @git, '-c', $&;
6246 $gitcfgs{cmdline}{$1} = [ $2 ];
6247 } elsif (s/^-c([^=]+)$//s) {
6248 push @git, '-c', $&;
6249 $gitcfgs{cmdline}{$1} = [ 'true' ];
6250 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6252 $val = undef unless length $val;
6253 $valopt->($oi->{Short});
6256 badusage "unknown short option \`$_'";
6263 sub check_env_sanity () {
6264 my $blocked = new POSIX::SigSet;
6265 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6268 foreach my $name (qw(PIPE CHLD)) {
6269 my $signame = "SIG$name";
6270 my $signum = eval "POSIX::$signame" // die;
6271 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6272 die "$signame is set to something other than SIG_DFL\n";
6273 $blocked->ismember($signum) and
6274 die "$signame is blocked\n";
6280 On entry to dgit, $@
6281 This is a bug produced by something in in your execution environment.
6287 sub parseopts_late_defaults () {
6288 foreach my $k (keys %opts_opt_map) {
6289 my $om = $opts_opt_map{$k};
6291 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6293 badcfg "cannot set command for $k"
6294 unless length $om->[0];
6298 foreach my $c (access_cfg_cfgs("opts-$k")) {
6300 map { $_ ? @$_ : () }
6301 map { $gitcfgs{$_}{$c} }
6302 reverse @gitcfgsources;
6303 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6304 "\n" if $debuglevel >= 4;
6306 badcfg "cannot configure options for $k"
6307 if $opts_opt_cmdonly{$k};
6308 my $insertpos = $opts_cfg_insertpos{$k};
6309 @$om = ( @$om[0..$insertpos-1],
6311 @$om[$insertpos..$#$om] );
6315 if (!defined $rmchanges) {
6316 local $access_forpush;
6317 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6320 if (!defined $quilt_mode) {
6321 local $access_forpush;
6322 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6323 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6325 $quilt_mode =~ m/^($quilt_modes_re)$/
6326 or badcfg "unknown quilt-mode \`$quilt_mode'";
6330 if (!defined $dodep14tag) {
6331 local $access_forpush;
6332 $dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
6333 $dodep14tag =~ m/^($dodep14tag_re)$/
6334 or badcfg "unknown dep14tag setting \`$dodep14tag'";
6338 $need_split_build_invocation ||= quiltmode_splitbrain();
6340 if (!defined $cleanmode) {
6341 local $access_forpush;
6342 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6343 $cleanmode //= 'dpkg-source';
6345 badcfg "unknown clean-mode \`$cleanmode'" unless
6346 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6350 if ($ENV{$fakeeditorenv}) {
6352 quilt_fixup_editor();
6359 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6360 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6361 if $dryrun_level == 1;
6363 print STDERR $helpmsg or die $!;
6366 my $cmd = shift @ARGV;
6369 my $pre_fn = ${*::}{"pre_$cmd"};
6370 $pre_fn->() if $pre_fn;
6372 my $fn = ${*::}{"cmd_$cmd"};
6373 $fn or badusage "unknown operation $cmd";