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';
72 our $split_brain_save;
73 our $we_are_responder;
74 our $initiator_tempdir;
75 our $patches_applied_dirtily = 00;
80 our %forceopts = map { $_=>0 }
81 qw(unrepresentable unsupported-source-format
82 dsc-changes-mismatch changes-origs-exactly
83 import-gitapply-absurd
84 import-gitapply-no-absurd
85 import-dsc-with-dgit-field);
87 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
89 our $suite_re = '[-+.0-9a-z]+';
90 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
91 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
92 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
93 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
95 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
96 our $splitbraincache = 'dgit-intern/quilt-cache';
99 our (@dget) = qw(dget);
100 our (@curl) = qw(curl);
101 our (@dput) = qw(dput);
102 our (@debsign) = qw(debsign);
103 our (@gpg) = qw(gpg);
104 our (@sbuild) = qw(sbuild);
106 our (@dgit) = qw(dgit);
107 our (@aptget) = qw(apt-get);
108 our (@aptcache) = qw(apt-cache);
109 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
110 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
111 our (@dpkggenchanges) = qw(dpkg-genchanges);
112 our (@mergechanges) = qw(mergechanges -f);
113 our (@gbp_build) = ('');
114 our (@gbp_pq) = ('gbp pq');
115 our (@changesopts) = ('');
117 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
120 'debsign' => \@debsign,
122 'sbuild' => \@sbuild,
126 'apt-get' => \@aptget,
127 'apt-cache' => \@aptcache,
128 'dpkg-source' => \@dpkgsource,
129 'dpkg-buildpackage' => \@dpkgbuildpackage,
130 'dpkg-genchanges' => \@dpkggenchanges,
131 'gbp-build' => \@gbp_build,
132 'gbp-pq' => \@gbp_pq,
133 'ch' => \@changesopts,
134 'mergechanges' => \@mergechanges);
136 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
137 our %opts_cfg_insertpos = map {
139 scalar @{ $opts_opt_map{$_} }
140 } keys %opts_opt_map;
142 sub finalise_opts_opts();
148 our $supplementary_message = '';
149 our $need_split_build_invocation = 0;
150 our $split_brain = 0;
154 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
157 our $remotename = 'dgit';
158 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
162 if (!defined $absurdity) {
164 $absurdity =~ s{/[^/]+$}{/absurd} or die;
168 my ($v,$distro) = @_;
169 return $tagformatfn->($v, $distro);
172 sub debiantag_maintview ($$) {
173 my ($v,$distro) = @_;
178 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
180 sub lbranch () { return "$branchprefix/$csuite"; }
181 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
182 sub lref () { return "refs/heads/".lbranch(); }
183 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
184 sub rrref () { return server_ref($csuite); }
186 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
187 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
189 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
190 # locally fetched refs because they have unhelpful names and clutter
191 # up gitk etc. So we track whether we have "used up" head ref (ie,
192 # whether we have made another local ref which refers to this object).
194 # (If we deleted them unconditionally, then we might end up
195 # re-fetching the same git objects each time dgit fetch was run.)
197 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
198 # in git_fetch_us to fetch the refs in question, and possibly a call
199 # to lrfetchref_used.
201 our (%lrfetchrefs_f, %lrfetchrefs_d);
202 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
204 sub lrfetchref_used ($) {
205 my ($fullrefname) = @_;
206 my $objid = $lrfetchrefs_f{$fullrefname};
207 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
218 return "${package}_".(stripepoch $vsn).$sfx
223 return srcfn($vsn,".dsc");
226 sub changespat ($;$) {
227 my ($vsn, $arch) = @_;
228 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
231 sub upstreamversion ($) {
243 foreach my $f (@end) {
245 print STDERR "$us: cleanup: $@" if length $@;
249 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
251 sub forceable_fail ($$) {
252 my ($forceoptsl, $msg) = @_;
253 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
254 print STDERR "warning: overriding problem due to --force:\n". $msg;
258 my ($forceoptsl) = @_;
259 my @got = grep { $forceopts{$_} } @$forceoptsl;
260 return 0 unless @got;
262 "warning: skipping checks or functionality due to --force-$got[0]\n";
265 sub no_such_package () {
266 print STDERR "$us: package $package does not exist in suite $isuite\n";
272 printdebug "CD $newdir\n";
273 chdir $newdir or confess "chdir: $newdir: $!";
276 sub deliberately ($) {
278 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
281 sub deliberately_not_fast_forward () {
282 foreach (qw(not-fast-forward fresh-repo)) {
283 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
287 sub quiltmode_splitbrain () {
288 $quilt_mode =~ m/gbp|dpm|unapplied/;
291 sub opts_opt_multi_cmd {
293 push @cmd, split /\s+/, shift @_;
299 return opts_opt_multi_cmd @gbp_pq;
302 #---------- remote protocol support, common ----------
304 # remote push initiator/responder protocol:
305 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
306 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
307 # < dgit-remote-push-ready <actual-proto-vsn>
314 # > supplementary-message NBYTES # $protovsn >= 3
319 # > file parsed-changelog
320 # [indicates that output of dpkg-parsechangelog follows]
321 # > data-block NBYTES
322 # > [NBYTES bytes of data (no newline)]
323 # [maybe some more blocks]
332 # > param head DGIT-VIEW-HEAD
333 # > param csuite SUITE
334 # > param tagformat old|new
335 # > param maint-view MAINT-VIEW-HEAD
337 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
338 # # goes into tag, for replay prevention
341 # [indicates that signed tag is wanted]
342 # < data-block NBYTES
343 # < [NBYTES bytes of data (no newline)]
344 # [maybe some more blocks]
348 # > want signed-dsc-changes
349 # < data-block NBYTES [transfer of signed dsc]
351 # < data-block NBYTES [transfer of signed changes]
359 sub i_child_report () {
360 # Sees if our child has died, and reap it if so. Returns a string
361 # describing how it died if it failed, or undef otherwise.
362 return undef unless $i_child_pid;
363 my $got = waitpid $i_child_pid, WNOHANG;
364 return undef if $got <= 0;
365 die unless $got == $i_child_pid;
366 $i_child_pid = undef;
367 return undef unless $?;
368 return "build host child ".waitstatusmsg();
373 fail "connection lost: $!" if $fh->error;
374 fail "protocol violation; $m not expected";
377 sub badproto_badread ($$) {
379 fail "connection lost: $!" if $!;
380 my $report = i_child_report();
381 fail $report if defined $report;
382 badproto $fh, "eof (reading $wh)";
385 sub protocol_expect (&$) {
386 my ($match, $fh) = @_;
389 defined && chomp or badproto_badread $fh, "protocol message";
397 badproto $fh, "\`$_'";
400 sub protocol_send_file ($$) {
401 my ($fh, $ourfn) = @_;
402 open PF, "<", $ourfn or die "$ourfn: $!";
405 my $got = read PF, $d, 65536;
406 die "$ourfn: $!" unless defined $got;
408 print $fh "data-block ".length($d)."\n" or die $!;
409 print $fh $d or die $!;
411 PF->error and die "$ourfn $!";
412 print $fh "data-end\n" or die $!;
416 sub protocol_read_bytes ($$) {
417 my ($fh, $nbytes) = @_;
418 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
420 my $got = read $fh, $d, $nbytes;
421 $got==$nbytes or badproto_badread $fh, "data block";
425 sub protocol_receive_file ($$) {
426 my ($fh, $ourfn) = @_;
427 printdebug "() $ourfn\n";
428 open PF, ">", $ourfn or die "$ourfn: $!";
430 my ($y,$l) = protocol_expect {
431 m/^data-block (.*)$/ ? (1,$1) :
432 m/^data-end$/ ? (0,) :
436 my $d = protocol_read_bytes $fh, $l;
437 print PF $d or die $!;
442 #---------- remote protocol support, responder ----------
444 sub responder_send_command ($) {
446 return unless $we_are_responder;
447 # called even without $we_are_responder
448 printdebug ">> $command\n";
449 print PO $command, "\n" or die $!;
452 sub responder_send_file ($$) {
453 my ($keyword, $ourfn) = @_;
454 return unless $we_are_responder;
455 printdebug "]] $keyword $ourfn\n";
456 responder_send_command "file $keyword";
457 protocol_send_file \*PO, $ourfn;
460 sub responder_receive_files ($@) {
461 my ($keyword, @ourfns) = @_;
462 die unless $we_are_responder;
463 printdebug "[[ $keyword @ourfns\n";
464 responder_send_command "want $keyword";
465 foreach my $fn (@ourfns) {
466 protocol_receive_file \*PI, $fn;
469 protocol_expect { m/^files-end$/ } \*PI;
472 #---------- remote protocol support, initiator ----------
474 sub initiator_expect (&) {
476 protocol_expect { &$match } \*RO;
479 #---------- end remote code ----------
482 if ($we_are_responder) {
484 responder_send_command "progress ".length($m) or die $!;
485 print PO $m or die $!;
495 $ua = LWP::UserAgent->new();
499 progress "downloading $what...";
500 my $r = $ua->get(@_) or die $!;
501 return undef if $r->code == 404;
502 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
503 return $r->decoded_content(charset => 'none');
506 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
511 failedcmd @_ if system @_;
514 sub act_local () { return $dryrun_level <= 1; }
515 sub act_scary () { return !$dryrun_level; }
518 if (!$dryrun_level) {
519 progress "$us ok: @_";
521 progress "would be ok: @_ (but dry run only)";
526 printcmd(\*STDERR,$debugprefix."#",@_);
529 sub runcmd_ordryrun {
537 sub runcmd_ordryrun_local {
546 my ($first_shell, @cmd) = @_;
547 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
550 our $helpmsg = <<END;
552 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
553 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
554 dgit [dgit-opts] build [dpkg-buildpackage-opts]
555 dgit [dgit-opts] sbuild [sbuild-opts]
556 dgit [dgit-opts] push [dgit-opts] [suite]
557 dgit [dgit-opts] rpush build-host:build-dir ...
558 important dgit options:
559 -k<keyid> sign tag and package with <keyid> instead of default
560 --dry-run -n do not change anything, but go through the motions
561 --damp-run -L like --dry-run but make local changes, without signing
562 --new -N allow introducing a new package
563 --debug -D increase debug level
564 -c<name>=<value> set git config option (used directly by dgit too)
567 our $later_warning_msg = <<END;
568 Perhaps the upload is stuck in incoming. Using the version from git.
572 print STDERR "$us: @_\n", $helpmsg or die $!;
577 @ARGV or badusage "too few arguments";
578 return scalar shift @ARGV;
582 print $helpmsg or die $!;
586 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
588 our %defcfg = ('dgit.default.distro' => 'debian',
589 'dgit-suite.*-security.distro' => 'debian-security',
590 'dgit.default.username' => '',
591 'dgit.default.archive-query-default-component' => 'main',
592 'dgit.default.ssh' => 'ssh',
593 'dgit.default.archive-query' => 'madison:',
594 'dgit.default.sshpsql-dbname' => 'service=projectb',
595 'dgit.default.aptget-components' => 'main',
596 'dgit.default.dgit-tag-format' => 'new,old,maint',
597 # old means "repo server accepts pushes with old dgit tags"
598 # new means "repo server accepts pushes with new dgit tags"
599 # maint means "repo server accepts split brain pushes"
600 # hist means "repo server may have old pushes without new tag"
601 # ("hist" is implied by "old")
602 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
603 'dgit-distro.debian.git-check' => 'url',
604 'dgit-distro.debian.git-check-suffix' => '/info/refs',
605 'dgit-distro.debian.new-private-pushers' => 't',
606 'dgit-distro.debian/push.git-url' => '',
607 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
608 'dgit-distro.debian/push.git-user-force' => 'dgit',
609 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
610 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
611 'dgit-distro.debian/push.git-create' => 'true',
612 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
613 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
614 # 'dgit-distro.debian.archive-query-tls-key',
615 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
616 # ^ this does not work because curl is broken nowadays
617 # Fixing #790093 properly will involve providing providing the key
618 # in some pacagke and maybe updating these paths.
620 # 'dgit-distro.debian.archive-query-tls-curl-args',
621 # '--ca-path=/etc/ssl/ca-debian',
622 # ^ this is a workaround but works (only) on DSA-administered machines
623 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
624 'dgit-distro.debian.git-url-suffix' => '',
625 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
626 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
627 'dgit-distro.debian-security.archive-query' => 'aptget:',
628 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
629 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
630 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
631 'dgit-distro.debian-security.nominal-distro' => 'debian',
632 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
633 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
634 'dgit-distro.ubuntu.git-check' => 'false',
635 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
636 'dgit-distro.test-dummy.ssh' => "$td/ssh",
637 'dgit-distro.test-dummy.username' => "alice",
638 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
639 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
640 'dgit-distro.test-dummy.git-url' => "$td/git",
641 'dgit-distro.test-dummy.git-host' => "git",
642 'dgit-distro.test-dummy.git-path' => "$td/git",
643 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
644 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
645 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
646 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
650 our @gitcfgsources = qw(cmdline local global system);
652 sub git_slurp_config () {
653 local ($debuglevel) = $debuglevel-2;
656 # This algoritm is a bit subtle, but this is needed so that for
657 # options which we want to be single-valued, we allow the
658 # different config sources to override properly. See #835858.
659 foreach my $src (@gitcfgsources) {
660 next if $src eq 'cmdline';
661 # we do this ourselves since git doesn't handle it
663 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
666 open GITS, "-|", @cmd or die $!;
669 printdebug "=> ", (messagequote $_), "\n";
671 push @{ $gitcfgs{$src}{$`} }, $'; #';
675 or ($!==0 && $?==256)
680 sub git_get_config ($) {
682 foreach my $src (@gitcfgsources) {
683 my $l = $gitcfgs{$src}{$c};
684 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
687 @$l==1 or badcfg "multiple values for $c".
688 " (in $src git config)" if @$l > 1;
696 return undef if $c =~ /RETURN-UNDEF/;
697 my $v = git_get_config($c);
698 return $v if defined $v;
699 my $dv = $defcfg{$c};
700 return $dv if defined $dv;
702 badcfg "need value for one of: @_\n".
703 "$us: distro or suite appears not to be (properly) supported";
706 sub access_basedistro () {
707 if (defined $idistro) {
710 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
711 return $def if defined $def;
712 foreach my $src (@gitcfgsources, 'internal') {
713 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
715 foreach my $k (keys %$kl) {
716 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
718 next unless match_glob $dpat, $isuite;
722 return cfg("dgit.default.distro");
726 sub access_nomdistro () {
727 my $base = access_basedistro();
728 return cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
731 sub access_quirk () {
732 # returns (quirk name, distro to use instead or undef, quirk-specific info)
733 my $basedistro = access_basedistro();
734 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
736 if (defined $backports_quirk) {
737 my $re = $backports_quirk;
738 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
740 $re =~ s/\%/([-0-9a-z_]+)/
741 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
742 if ($isuite =~ m/^$re$/) {
743 return ('backports',"$basedistro-backports",$1);
746 return ('none',undef);
751 sub parse_cfg_bool ($$$) {
752 my ($what,$def,$v) = @_;
755 $v =~ m/^[ty1]/ ? 1 :
756 $v =~ m/^[fn0]/ ? 0 :
757 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
760 sub access_forpush_config () {
761 my $d = access_basedistro();
765 parse_cfg_bool('new-private-pushers', 0,
766 cfg("dgit-distro.$d.new-private-pushers",
769 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
772 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
773 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
774 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
775 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
778 sub access_forpush () {
779 $access_forpush //= access_forpush_config();
780 return $access_forpush;
784 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
785 badcfg "pushing but distro is configured readonly"
786 if access_forpush_config() eq '0';
788 $supplementary_message = <<'END' unless $we_are_responder;
789 Push failed, before we got started.
790 You can retry the push, after fixing the problem, if you like.
792 finalise_opts_opts();
796 finalise_opts_opts();
799 sub supplementary_message ($) {
801 if (!$we_are_responder) {
802 $supplementary_message = $msg;
804 } elsif ($protovsn >= 3) {
805 responder_send_command "supplementary-message ".length($msg)
807 print PO $msg or die $!;
811 sub access_distros () {
812 # Returns list of distros to try, in order
815 # 0. `instead of' distro name(s) we have been pointed to
816 # 1. the access_quirk distro, if any
817 # 2a. the user's specified distro, or failing that } basedistro
818 # 2b. the distro calculated from the suite }
819 my @l = access_basedistro();
821 my (undef,$quirkdistro) = access_quirk();
822 unshift @l, $quirkdistro;
823 unshift @l, $instead_distro;
824 @l = grep { defined } @l;
826 push @l, access_nomdistro();
828 if (access_forpush()) {
829 @l = map { ("$_/push", $_) } @l;
834 sub access_cfg_cfgs (@) {
837 # The nesting of these loops determines the search order. We put
838 # the key loop on the outside so that we search all the distros
839 # for each key, before going on to the next key. That means that
840 # if access_cfg is called with a more specific, and then a less
841 # specific, key, an earlier distro can override the less specific
842 # without necessarily overriding any more specific keys. (If the
843 # distro wants to override the more specific keys it can simply do
844 # so; whereas if we did the loop the other way around, it would be
845 # impossible to for an earlier distro to override a less specific
846 # key but not the more specific ones without restating the unknown
847 # values of the more specific keys.
850 # We have to deal with RETURN-UNDEF specially, so that we don't
851 # terminate the search prematurely.
853 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
856 foreach my $d (access_distros()) {
857 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
859 push @cfgs, map { "dgit.default.$_" } @realkeys;
866 my (@cfgs) = access_cfg_cfgs(@keys);
867 my $value = cfg(@cfgs);
871 sub access_cfg_bool ($$) {
872 my ($def, @keys) = @_;
873 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
876 sub string_to_ssh ($) {
878 if ($spec =~ m/\s/) {
879 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
885 sub access_cfg_ssh () {
886 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
887 if (!defined $gitssh) {
890 return string_to_ssh $gitssh;
894 sub access_runeinfo ($) {
896 return ": dgit ".access_basedistro()." $info ;";
899 sub access_someuserhost ($) {
901 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
902 defined($user) && length($user) or
903 $user = access_cfg("$some-user",'username');
904 my $host = access_cfg("$some-host");
905 return length($user) ? "$user\@$host" : $host;
908 sub access_gituserhost () {
909 return access_someuserhost('git');
912 sub access_giturl (;$) {
914 my $url = access_cfg('git-url','RETURN-UNDEF');
917 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
918 return undef unless defined $proto;
921 access_gituserhost().
922 access_cfg('git-path');
924 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
927 return "$url/$package$suffix";
930 sub parsecontrolfh ($$;$) {
931 my ($fh, $desc, $allowsigned) = @_;
932 our $dpkgcontrolhash_noissigned;
935 my %opts = ('name' => $desc);
936 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
937 $c = Dpkg::Control::Hash->new(%opts);
938 $c->parse($fh,$desc) or die "parsing of $desc failed";
939 last if $allowsigned;
940 last if $dpkgcontrolhash_noissigned;
941 my $issigned= $c->get_option('is_pgp_signed');
942 if (!defined $issigned) {
943 $dpkgcontrolhash_noissigned= 1;
944 seek $fh, 0,0 or die "seek $desc: $!";
945 } elsif ($issigned) {
946 fail "control file $desc is (already) PGP-signed. ".
947 " Note that dgit push needs to modify the .dsc and then".
948 " do the signature itself";
957 my ($file, $desc, $allowsigned) = @_;
958 my $fh = new IO::Handle;
959 open $fh, '<', $file or die "$file: $!";
960 my $c = parsecontrolfh($fh,$desc,$allowsigned);
961 $fh->error and die $!;
967 my ($dctrl,$field) = @_;
968 my $v = $dctrl->{$field};
969 return $v if defined $v;
970 fail "missing field $field in ".$dctrl->get_option('name');
974 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
975 my $p = new IO::Handle;
976 my @cmd = (qw(dpkg-parsechangelog), @_);
977 open $p, '-|', @cmd or die $!;
979 $?=0; $!=0; close $p or failedcmd @cmd;
983 sub commit_getclogp ($) {
984 # Returns the parsed changelog hashref for a particular commit
986 our %commit_getclogp_memo;
987 my $memo = $commit_getclogp_memo{$objid};
988 return $memo if $memo;
990 my $mclog = ".git/dgit/clog-$objid";
991 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
992 "$objid:debian/changelog";
993 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
998 defined $d or fail "getcwd failed: $!";
1002 sub parse_dscdata () {
1003 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1004 printdebug Dumper($dscdata) if $debuglevel>1;
1005 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1006 printdebug Dumper($dsc) if $debuglevel>1;
1011 sub archive_query ($;@) {
1012 my ($method) = shift @_;
1013 fail "this operation does not support multiple comma-separated suites"
1015 my $query = access_cfg('archive-query','RETURN-UNDEF');
1016 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1019 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1022 sub archive_query_prepend_mirror {
1023 my $m = access_cfg('mirror');
1024 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1027 sub pool_dsc_subpath ($$) {
1028 my ($vsn,$component) = @_; # $package is implict arg
1029 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1030 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1033 sub cfg_apply_map ($$$) {
1034 my ($varref, $what, $mapspec) = @_;
1035 return unless $mapspec;
1037 printdebug "config $what EVAL{ $mapspec; }\n";
1039 eval "package Dgit::Config; $mapspec;";
1044 #---------- `ftpmasterapi' archive query method (nascent) ----------
1046 sub archive_api_query_cmd ($) {
1048 my @cmd = (@curl, qw(-sS));
1049 my $url = access_cfg('archive-query-url');
1050 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1052 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1053 foreach my $key (split /\:/, $keys) {
1054 $key =~ s/\%HOST\%/$host/g;
1056 fail "for $url: stat $key: $!" unless $!==ENOENT;
1059 fail "config requested specific TLS key but do not know".
1060 " how to get curl to use exactly that EE key ($key)";
1061 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1062 # # Sadly the above line does not work because of changes
1063 # # to gnutls. The real fix for #790093 may involve
1064 # # new curl options.
1067 # Fixing #790093 properly will involve providing a value
1068 # for this on clients.
1069 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1070 push @cmd, split / /, $kargs if defined $kargs;
1072 push @cmd, $url.$subpath;
1076 sub api_query ($$;$) {
1078 my ($data, $subpath, $ok404) = @_;
1079 badcfg "ftpmasterapi archive query method takes no data part"
1081 my @cmd = archive_api_query_cmd($subpath);
1082 my $url = $cmd[$#cmd];
1083 push @cmd, qw(-w %{http_code});
1084 my $json = cmdoutput @cmd;
1085 unless ($json =~ s/\d+\d+\d$//) {
1086 failedcmd_report_cmd undef, @cmd;
1087 fail "curl failed to print 3-digit HTTP code";
1090 return undef if $code eq '404' && $ok404;
1091 fail "fetch of $url gave HTTP code $code"
1092 unless $url =~ m#^file://# or $code =~ m/^2/;
1093 return decode_json($json);
1096 sub canonicalise_suite_ftpmasterapi {
1097 my ($proto,$data) = @_;
1098 my $suites = api_query($data, 'suites');
1100 foreach my $entry (@$suites) {
1102 my $v = $entry->{$_};
1103 defined $v && $v eq $isuite;
1104 } qw(codename name);
1105 push @matched, $entry;
1107 fail "unknown suite $isuite" unless @matched;
1110 @matched==1 or die "multiple matches for suite $isuite\n";
1111 $cn = "$matched[0]{codename}";
1112 defined $cn or die "suite $isuite info has no codename\n";
1113 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1115 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1120 sub archive_query_ftpmasterapi {
1121 my ($proto,$data) = @_;
1122 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1124 my $digester = Digest::SHA->new(256);
1125 foreach my $entry (@$info) {
1127 my $vsn = "$entry->{version}";
1128 my ($ok,$msg) = version_check $vsn;
1129 die "bad version: $msg\n" unless $ok;
1130 my $component = "$entry->{component}";
1131 $component =~ m/^$component_re$/ or die "bad component";
1132 my $filename = "$entry->{filename}";
1133 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1134 or die "bad filename";
1135 my $sha256sum = "$entry->{sha256sum}";
1136 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1137 push @rows, [ $vsn, "/pool/$component/$filename",
1138 $digester, $sha256sum ];
1140 die "bad ftpmaster api response: $@\n".Dumper($entry)
1143 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1144 return archive_query_prepend_mirror @rows;
1147 sub file_in_archive_ftpmasterapi {
1148 my ($proto,$data,$filename) = @_;
1149 my $pat = $filename;
1152 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1153 my $info = api_query($data, "file_in_archive/$pat", 1);
1156 #---------- `aptget' archive query method ----------
1159 our $aptget_releasefile;
1160 our $aptget_configpath;
1162 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1163 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1165 sub aptget_cache_clean {
1166 runcmd_ordryrun_local qw(sh -ec),
1167 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1171 sub aptget_lock_acquire () {
1172 my $lockfile = "$aptget_base/lock";
1173 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1174 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1177 sub aptget_prep ($) {
1179 return if defined $aptget_base;
1181 badcfg "aptget archive query method takes no data part"
1184 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1187 ensuredir "$cache/dgit";
1189 access_cfg('aptget-cachekey','RETURN-UNDEF')
1190 // access_nomdistro();
1192 $aptget_base = "$cache/dgit/aptget";
1193 ensuredir $aptget_base;
1195 my $quoted_base = $aptget_base;
1196 die "$quoted_base contains bad chars, cannot continue"
1197 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1199 ensuredir $aptget_base;
1201 aptget_lock_acquire();
1203 aptget_cache_clean();
1205 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1206 my $sourceslist = "source.list#$cachekey";
1208 my $aptsuites = $isuite;
1209 cfg_apply_map(\$aptsuites, 'suite map',
1210 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1212 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1213 printf SRCS "deb-src %s %s %s\n",
1214 access_cfg('mirror'),
1216 access_cfg('aptget-components')
1219 ensuredir "$aptget_base/cache";
1220 ensuredir "$aptget_base/lists";
1222 open CONF, ">", $aptget_configpath or die $!;
1224 Debug::NoLocking "true";
1225 APT::Get::List-Cleanup "false";
1226 #clear APT::Update::Post-Invoke-Success;
1227 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1228 Dir::State::Lists "$quoted_base/lists";
1229 Dir::Etc::preferences "$quoted_base/preferences";
1230 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1231 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1234 foreach my $key (qw(
1237 Dir::Cache::Archives
1238 Dir::Etc::SourceParts
1239 Dir::Etc::preferencesparts
1241 ensuredir "$aptget_base/$key";
1242 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1245 my $oldatime = (time // die $!) - 1;
1246 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1247 next unless stat_exists $oldlist;
1248 my ($mtime) = (stat _)[9];
1249 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1252 runcmd_ordryrun_local aptget_aptget(), qw(update);
1255 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1256 next unless stat_exists $oldlist;
1257 my ($atime) = (stat _)[8];
1258 next if $atime == $oldatime;
1259 push @releasefiles, $oldlist;
1261 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1262 @releasefiles = @inreleasefiles if @inreleasefiles;
1263 die "apt updated wrong number of Release files (@releasefiles), erk"
1264 unless @releasefiles == 1;
1266 ($aptget_releasefile) = @releasefiles;
1269 sub canonicalise_suite_aptget {
1270 my ($proto,$data) = @_;
1273 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1275 foreach my $name (qw(Codename Suite)) {
1276 my $val = $release->{$name};
1278 printdebug "release file $name: $val\n";
1279 $val =~ m/^$suite_re$/o or fail
1280 "Release file ($aptget_releasefile) specifies intolerable $name";
1281 cfg_apply_map(\$val, 'suite rmap',
1282 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1289 sub archive_query_aptget {
1290 my ($proto,$data) = @_;
1293 ensuredir "$aptget_base/source";
1294 foreach my $old (<$aptget_base/source/*.dsc>) {
1295 unlink $old or die "$old: $!";
1298 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1299 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1300 # avoids apt-get source failing with ambiguous error code
1302 runcmd_ordryrun_local
1303 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1304 aptget_aptget(), qw(--download-only --only-source source), $package;
1306 my @dscs = <$aptget_base/source/*.dsc>;
1307 fail "apt-get source did not produce a .dsc" unless @dscs;
1308 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1310 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1313 my $uri = "file://". uri_escape $dscs[0];
1314 $uri =~ s{\%2f}{/}gi;
1315 return [ (getfield $pre_dsc, 'Version'), $uri ];
1318 #---------- `dummyapicat' archive query method ----------
1320 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1321 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1323 sub file_in_archive_dummycatapi ($$$) {
1324 my ($proto,$data,$filename) = @_;
1325 my $mirror = access_cfg('mirror');
1326 $mirror =~ s#^file://#/# or die "$mirror ?";
1328 my @cmd = (qw(sh -ec), '
1330 find -name "$2" -print0 |
1332 ', qw(x), $mirror, $filename);
1333 debugcmd "-|", @cmd;
1334 open FIA, "-|", @cmd or die $!;
1337 printdebug "| $_\n";
1338 m/^(\w+) (\S+)$/ or die "$_ ?";
1339 push @out, { sha256sum => $1, filename => $2 };
1341 close FIA or die failedcmd @cmd;
1345 #---------- `madison' archive query method ----------
1347 sub archive_query_madison {
1348 return archive_query_prepend_mirror
1349 map { [ @$_[0..1] ] } madison_get_parse(@_);
1352 sub madison_get_parse {
1353 my ($proto,$data) = @_;
1354 die unless $proto eq 'madison';
1355 if (!length $data) {
1356 $data= access_cfg('madison-distro','RETURN-UNDEF');
1357 $data //= access_basedistro();
1359 $rmad{$proto,$data,$package} ||= cmdoutput
1360 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1361 my $rmad = $rmad{$proto,$data,$package};
1364 foreach my $l (split /\n/, $rmad) {
1365 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1366 \s*( [^ \t|]+ )\s* \|
1367 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1368 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1369 $1 eq $package or die "$rmad $package ?";
1376 $component = access_cfg('archive-query-default-component');
1378 $5 eq 'source' or die "$rmad ?";
1379 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1381 return sort { -version_compare($a->[0],$b->[0]); } @out;
1384 sub canonicalise_suite_madison {
1385 # madison canonicalises for us
1386 my @r = madison_get_parse(@_);
1388 "unable to canonicalise suite using package $package".
1389 " which does not appear to exist in suite $isuite;".
1390 " --existing-package may help";
1394 sub file_in_archive_madison { return undef; }
1396 #---------- `sshpsql' archive query method ----------
1399 my ($data,$runeinfo,$sql) = @_;
1400 if (!length $data) {
1401 $data= access_someuserhost('sshpsql').':'.
1402 access_cfg('sshpsql-dbname');
1404 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1405 my ($userhost,$dbname) = ($`,$'); #';
1407 my @cmd = (access_cfg_ssh, $userhost,
1408 access_runeinfo("ssh-psql $runeinfo").
1409 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1410 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1412 open P, "-|", @cmd or die $!;
1415 printdebug(">|$_|\n");
1418 $!=0; $?=0; close P or failedcmd @cmd;
1420 my $nrows = pop @rows;
1421 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1422 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1423 @rows = map { [ split /\|/, $_ ] } @rows;
1424 my $ncols = scalar @{ shift @rows };
1425 die if grep { scalar @$_ != $ncols } @rows;
1429 sub sql_injection_check {
1430 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1433 sub archive_query_sshpsql ($$) {
1434 my ($proto,$data) = @_;
1435 sql_injection_check $isuite, $package;
1436 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1437 SELECT source.version, component.name, files.filename, files.sha256sum
1439 JOIN src_associations ON source.id = src_associations.source
1440 JOIN suite ON suite.id = src_associations.suite
1441 JOIN dsc_files ON dsc_files.source = source.id
1442 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1443 JOIN component ON component.id = files_archive_map.component_id
1444 JOIN files ON files.id = dsc_files.file
1445 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1446 AND source.source='$package'
1447 AND files.filename LIKE '%.dsc';
1449 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1450 my $digester = Digest::SHA->new(256);
1452 my ($vsn,$component,$filename,$sha256sum) = @$_;
1453 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1455 return archive_query_prepend_mirror @rows;
1458 sub canonicalise_suite_sshpsql ($$) {
1459 my ($proto,$data) = @_;
1460 sql_injection_check $isuite;
1461 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1462 SELECT suite.codename
1463 FROM suite where suite_name='$isuite' or codename='$isuite';
1465 @rows = map { $_->[0] } @rows;
1466 fail "unknown suite $isuite" unless @rows;
1467 die "ambiguous $isuite: @rows ?" if @rows>1;
1471 sub file_in_archive_sshpsql ($$$) { return undef; }
1473 #---------- `dummycat' archive query method ----------
1475 sub canonicalise_suite_dummycat ($$) {
1476 my ($proto,$data) = @_;
1477 my $dpath = "$data/suite.$isuite";
1478 if (!open C, "<", $dpath) {
1479 $!==ENOENT or die "$dpath: $!";
1480 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1484 chomp or die "$dpath: $!";
1486 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1490 sub archive_query_dummycat ($$) {
1491 my ($proto,$data) = @_;
1492 canonicalise_suite();
1493 my $dpath = "$data/package.$csuite.$package";
1494 if (!open C, "<", $dpath) {
1495 $!==ENOENT or die "$dpath: $!";
1496 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1504 printdebug "dummycat query $csuite $package $dpath | $_\n";
1505 my @row = split /\s+/, $_;
1506 @row==2 or die "$dpath: $_ ?";
1509 C->error and die "$dpath: $!";
1511 return archive_query_prepend_mirror
1512 sort { -version_compare($a->[0],$b->[0]); } @rows;
1515 sub file_in_archive_dummycat () { return undef; }
1517 #---------- tag format handling ----------
1519 sub access_cfg_tagformats () {
1520 split /\,/, access_cfg('dgit-tag-format');
1523 sub need_tagformat ($$) {
1524 my ($fmt, $why) = @_;
1525 fail "need to use tag format $fmt ($why) but also need".
1526 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1527 " - no way to proceed"
1528 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1529 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1532 sub select_tagformat () {
1534 return if $tagformatfn && !$tagformat_want;
1535 die 'bug' if $tagformatfn && $tagformat_want;
1536 # ... $tagformat_want assigned after previous select_tagformat
1538 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1539 printdebug "select_tagformat supported @supported\n";
1541 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1542 printdebug "select_tagformat specified @$tagformat_want\n";
1544 my ($fmt,$why,$override) = @$tagformat_want;
1546 fail "target distro supports tag formats @supported".
1547 " but have to use $fmt ($why)"
1549 or grep { $_ eq $fmt } @supported;
1551 $tagformat_want = undef;
1553 $tagformatfn = ${*::}{"debiantag_$fmt"};
1555 fail "trying to use unknown tag format \`$fmt' ($why) !"
1556 unless $tagformatfn;
1559 #---------- archive query entrypoints and rest of program ----------
1561 sub canonicalise_suite () {
1562 return if defined $csuite;
1563 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1564 $csuite = archive_query('canonicalise_suite');
1565 if ($isuite ne $csuite) {
1566 progress "canonical suite name for $isuite is $csuite";
1568 progress "canonical suite name is $csuite";
1572 sub get_archive_dsc () {
1573 canonicalise_suite();
1574 my @vsns = archive_query('archive_query');
1575 foreach my $vinfo (@vsns) {
1576 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1577 $dscurl = $vsn_dscurl;
1578 $dscdata = url_get($dscurl);
1580 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1585 $digester->add($dscdata);
1586 my $got = $digester->hexdigest();
1588 fail "$dscurl has hash $got but".
1589 " archive told us to expect $digest";
1592 my $fmt = getfield $dsc, 'Format';
1593 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1594 "unsupported source format $fmt, sorry";
1596 $dsc_checked = !!$digester;
1597 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1601 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1604 sub check_for_git ();
1605 sub check_for_git () {
1607 my $how = access_cfg('git-check');
1608 if ($how eq 'ssh-cmd') {
1610 (access_cfg_ssh, access_gituserhost(),
1611 access_runeinfo("git-check $package").
1612 " set -e; cd ".access_cfg('git-path').";".
1613 " if test -d $package.git; then echo 1; else echo 0; fi");
1614 my $r= cmdoutput @cmd;
1615 if (defined $r and $r =~ m/^divert (\w+)$/) {
1617 my ($usedistro,) = access_distros();
1618 # NB that if we are pushing, $usedistro will be $distro/push
1619 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1620 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1621 progress "diverting to $divert (using config for $instead_distro)";
1622 return check_for_git();
1624 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1626 } elsif ($how eq 'url') {
1627 my $prefix = access_cfg('git-check-url','git-url');
1628 my $suffix = access_cfg('git-check-suffix','git-suffix',
1629 'RETURN-UNDEF') // '.git';
1630 my $url = "$prefix/$package$suffix";
1631 my @cmd = (@curl, qw(-sS -I), $url);
1632 my $result = cmdoutput @cmd;
1633 $result =~ s/^\S+ 200 .*\n\r?\n//;
1634 # curl -sS -I with https_proxy prints
1635 # HTTP/1.0 200 Connection established
1636 $result =~ m/^\S+ (404|200) /s or
1637 fail "unexpected results from git check query - ".
1638 Dumper($prefix, $result);
1640 if ($code eq '404') {
1642 } elsif ($code eq '200') {
1647 } elsif ($how eq 'true') {
1649 } elsif ($how eq 'false') {
1652 badcfg "unknown git-check \`$how'";
1656 sub create_remote_git_repo () {
1657 my $how = access_cfg('git-create');
1658 if ($how eq 'ssh-cmd') {
1660 (access_cfg_ssh, access_gituserhost(),
1661 access_runeinfo("git-create $package").
1662 "set -e; cd ".access_cfg('git-path').";".
1663 " cp -a _template $package.git");
1664 } elsif ($how eq 'true') {
1667 badcfg "unknown git-create \`$how'";
1671 our ($dsc_hash,$lastpush_mergeinput);
1673 our $ud = '.git/dgit/unpack';
1683 sub mktree_in_ud_here () {
1684 runcmd qw(git init -q);
1685 runcmd qw(git config gc.auto 0);
1686 rmtree('.git/objects');
1687 symlink '../../../../objects','.git/objects' or die $!;
1690 sub git_write_tree () {
1691 my $tree = cmdoutput @git, qw(write-tree);
1692 $tree =~ m/^\w+$/ or die "$tree ?";
1696 sub remove_stray_gits () {
1697 my @gitscmd = qw(find -name .git -prune -print0);
1698 debugcmd "|",@gitscmd;
1699 open GITS, "-|", @gitscmd or die $!;
1704 print STDERR "$us: warning: removing from source package: ",
1705 (messagequote $_), "\n";
1709 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1712 sub mktree_in_ud_from_only_subdir (;$) {
1715 # changes into the subdir
1717 die "expected one subdir but found @dirs ?" unless @dirs==1;
1718 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1722 remove_stray_gits();
1723 mktree_in_ud_here();
1725 my ($format, $fopts) = get_source_format();
1726 if (madformat($format)) {
1731 runcmd @git, qw(add -Af);
1732 my $tree=git_write_tree();
1733 return ($tree,$dir);
1736 our @files_csum_info_fields =
1737 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1738 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1739 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1741 sub dsc_files_info () {
1742 foreach my $csumi (@files_csum_info_fields) {
1743 my ($fname, $module, $method) = @$csumi;
1744 my $field = $dsc->{$fname};
1745 next unless defined $field;
1746 eval "use $module; 1;" or die $@;
1748 foreach (split /\n/, $field) {
1750 m/^(\w+) (\d+) (\S+)$/ or
1751 fail "could not parse .dsc $fname line \`$_'";
1752 my $digester = eval "$module"."->$method;" or die $@;
1757 Digester => $digester,
1762 fail "missing any supported Checksums-* or Files field in ".
1763 $dsc->get_option('name');
1767 map { $_->{Filename} } dsc_files_info();
1770 sub files_compare_inputs (@) {
1775 my $showinputs = sub {
1776 return join "; ", map { $_->get_option('name') } @$inputs;
1779 foreach my $in (@$inputs) {
1781 my $in_name = $in->get_option('name');
1783 printdebug "files_compare_inputs $in_name\n";
1785 foreach my $csumi (@files_csum_info_fields) {
1786 my ($fname) = @$csumi;
1787 printdebug "files_compare_inputs $in_name $fname\n";
1789 my $field = $in->{$fname};
1790 next unless defined $field;
1793 foreach (split /\n/, $field) {
1796 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1797 fail "could not parse $in_name $fname line \`$_'";
1799 printdebug "files_compare_inputs $in_name $fname $f\n";
1803 my $re = \ $record{$f}{$fname};
1805 $fchecked{$f}{$in_name} = 1;
1807 fail "hash or size of $f varies in $fname fields".
1808 " (between: ".$showinputs->().")";
1813 @files = sort @files;
1814 $expected_files //= \@files;
1815 "@$expected_files" eq "@files" or
1816 fail "file list in $in_name varies between hash fields!";
1819 fail "$in_name has no files list field(s)";
1821 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1824 grep { keys %$_ == @$inputs-1 } values %fchecked
1825 or fail "no file appears in all file lists".
1826 " (looked in: ".$showinputs->().")";
1829 sub is_orig_file_in_dsc ($$) {
1830 my ($f, $dsc_files_info) = @_;
1831 return 0 if @$dsc_files_info <= 1;
1832 # One file means no origs, and the filename doesn't have a "what
1833 # part of dsc" component. (Consider versions ending `.orig'.)
1834 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1838 sub is_orig_file_of_vsn ($$) {
1839 my ($f, $upstreamvsn) = @_;
1840 my $base = srcfn $upstreamvsn, '';
1841 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1845 sub changes_update_origs_from_dsc ($$$$) {
1846 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1848 printdebug "checking origs needed ($upstreamvsn)...\n";
1849 $_ = getfield $changes, 'Files';
1850 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1851 fail "cannot find section/priority from .changes Files field";
1852 my $placementinfo = $1;
1854 printdebug "checking origs needed placement '$placementinfo'...\n";
1855 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1856 $l =~ m/\S+$/ or next;
1858 printdebug "origs $file | $l\n";
1859 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1860 printdebug "origs $file is_orig\n";
1861 my $have = archive_query('file_in_archive', $file);
1862 if (!defined $have) {
1864 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1870 printdebug "origs $file \$#\$have=$#$have\n";
1871 foreach my $h (@$have) {
1874 foreach my $csumi (@files_csum_info_fields) {
1875 my ($fname, $module, $method, $archivefield) = @$csumi;
1876 next unless defined $h->{$archivefield};
1877 $_ = $dsc->{$fname};
1878 next unless defined;
1879 m/^(\w+) .* \Q$file\E$/m or
1880 fail ".dsc $fname missing entry for $file";
1881 if ($h->{$archivefield} eq $1) {
1885 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1888 die "$file ".Dumper($h)." ?!" if $same && @differ;
1891 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1894 print "origs $file f.same=$found_same #f._differ=$#found_differ\n";
1895 if (@found_differ && !$found_same) {
1897 "archive contains $file with different checksum",
1900 # Now we edit the changes file to add or remove it
1901 foreach my $csumi (@files_csum_info_fields) {
1902 my ($fname, $module, $method, $archivefield) = @$csumi;
1903 next unless defined $changes->{$fname};
1905 # in archive, delete from .changes if it's there
1906 $changed{$file} = "removed" if
1907 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1908 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1909 # not in archive, but it's here in the .changes
1911 my $dsc_data = getfield $dsc, $fname;
1912 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1914 $extra =~ s/ \d+ /$&$placementinfo /
1915 or die "$fname $extra >$dsc_data< ?"
1916 if $fname eq 'Files';
1917 $changes->{$fname} .= "\n". $extra;
1918 $changed{$file} = "added";
1923 foreach my $file (keys %changed) {
1925 "edited .changes for archive .orig contents: %s %s",
1926 $changed{$file}, $file;
1928 my $chtmp = "$changesfile.tmp";
1929 $changes->save($chtmp);
1931 rename $chtmp,$changesfile or die "$changesfile $!";
1933 progress "[new .changes left in $changesfile]";
1936 progress "$changesfile already has appropriate .orig(s) (if any)";
1940 sub make_commit ($) {
1942 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1945 sub make_commit_text ($) {
1948 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1950 print Dumper($text) if $debuglevel > 1;
1951 my $child = open2($out, $in, @cmd) or die $!;
1954 print $in $text or die $!;
1955 close $in or die $!;
1957 $h =~ m/^\w+$/ or die;
1959 printdebug "=> $h\n";
1962 waitpid $child, 0 == $child or die "$child $!";
1963 $? and failedcmd @cmd;
1967 sub clogp_authline ($) {
1969 my $author = getfield $clogp, 'Maintainer';
1970 $author =~ s#,.*##ms;
1971 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1972 my $authline = "$author $date";
1973 $authline =~ m/$git_authline_re/o or
1974 fail "unexpected commit author line format \`$authline'".
1975 " (was generated from changelog Maintainer field)";
1976 return ($1,$2,$3) if wantarray;
1980 sub vendor_patches_distro ($$) {
1981 my ($checkdistro, $what) = @_;
1982 return unless defined $checkdistro;
1984 my $series = "debian/patches/\L$checkdistro\E.series";
1985 printdebug "checking for vendor-specific $series ($what)\n";
1987 if (!open SERIES, "<", $series) {
1988 die "$series $!" unless $!==ENOENT;
1997 Unfortunately, this source package uses a feature of dpkg-source where
1998 the same source package unpacks to different source code on different
1999 distros. dgit cannot safely operate on such packages on affected
2000 distros, because the meaning of source packages is not stable.
2002 Please ask the distro/maintainer to remove the distro-specific series
2003 files and use a different technique (if necessary, uploading actually
2004 different packages, if different distros are supposed to have
2008 fail "Found active distro-specific series file for".
2009 " $checkdistro ($what): $series, cannot continue";
2011 die "$series $!" if SERIES->error;
2015 sub check_for_vendor_patches () {
2016 # This dpkg-source feature doesn't seem to be documented anywhere!
2017 # But it can be found in the changelog (reformatted):
2019 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2020 # Author: Raphael Hertzog <hertzog@debian.org>
2021 # Date: Sun Oct 3 09:36:48 2010 +0200
2023 # dpkg-source: correctly create .pc/.quilt_series with alternate
2026 # If you have debian/patches/ubuntu.series and you were
2027 # unpacking the source package on ubuntu, quilt was still
2028 # directed to debian/patches/series instead of
2029 # debian/patches/ubuntu.series.
2031 # debian/changelog | 3 +++
2032 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2033 # 2 files changed, 6 insertions(+), 1 deletion(-)
2036 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2037 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2038 "Dpkg::Vendor \`current vendor'");
2039 vendor_patches_distro(access_basedistro(),
2040 "(base) distro being accessed");
2041 vendor_patches_distro(access_nomdistro(),
2042 "(nominal) distro being accessed");
2045 sub generate_commits_from_dsc () {
2046 # See big comment in fetch_from_archive, below.
2047 # See also README.dsc-import.
2051 my @dfi = dsc_files_info();
2052 foreach my $fi (@dfi) {
2053 my $f = $fi->{Filename};
2054 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2056 printdebug "considering linking $f: ";
2058 link_ltarget "../../../../$f", $f
2059 or ((printdebug "($!) "), 0)
2063 printdebug "linked.\n";
2065 complete_file_from_dsc('.', $fi)
2068 if (is_orig_file_in_dsc($f, \@dfi)) {
2069 link $f, "../../../../$f"
2075 # We unpack and record the orig tarballs first, so that we only
2076 # need disk space for one private copy of the unpacked source.
2077 # But we can't make them into commits until we have the metadata
2078 # from the debian/changelog, so we record the tree objects now and
2079 # make them into commits later.
2081 my $upstreamv = upstreamversion $dsc->{version};
2082 my $orig_f_base = srcfn $upstreamv, '';
2084 foreach my $fi (@dfi) {
2085 # We actually import, and record as a commit, every tarball
2086 # (unless there is only one file, in which case there seems
2089 my $f = $fi->{Filename};
2090 printdebug "import considering $f ";
2091 (printdebug "only one dfi\n"), next if @dfi == 1;
2092 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2093 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2097 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2099 printdebug "Y ", (join ' ', map { $_//"(none)" }
2100 $compr_ext, $orig_f_part
2103 my $input = new IO::File $f, '<' or die "$f $!";
2107 if (defined $compr_ext) {
2109 Dpkg::Compression::compression_guess_from_filename $f;
2110 fail "Dpkg::Compression cannot handle file $f in source package"
2111 if defined $compr_ext && !defined $cname;
2113 new Dpkg::Compression::Process compression => $cname;
2114 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2115 my $compr_fh = new IO::Handle;
2116 my $compr_pid = open $compr_fh, "-|" // die $!;
2118 open STDIN, "<&", $input or die $!;
2120 die "dgit (child): exec $compr_cmd[0]: $!\n";
2125 rmtree "../unpack-tar";
2126 mkdir "../unpack-tar" or die $!;
2127 my @tarcmd = qw(tar -x -f -
2128 --no-same-owner --no-same-permissions
2129 --no-acls --no-xattrs --no-selinux);
2130 my $tar_pid = fork // die $!;
2132 chdir "../unpack-tar" or die $!;
2133 open STDIN, "<&", $input or die $!;
2135 die "dgit (child): exec $tarcmd[0]: $!";
2137 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2138 !$? or failedcmd @tarcmd;
2141 (@compr_cmd ? failedcmd @compr_cmd
2143 # finally, we have the results in "tarball", but maybe
2144 # with the wrong permissions
2146 runcmd qw(chmod -R +rwX ../unpack-tar);
2147 changedir "../unpack-tar";
2148 my ($tree) = mktree_in_ud_from_only_subdir(1);
2149 changedir "../../unpack";
2150 rmtree "../unpack-tar";
2152 my $ent = [ $f, $tree ];
2154 Orig => !!$orig_f_part,
2155 Sort => (!$orig_f_part ? 2 :
2156 $orig_f_part =~ m/-/g ? 1 :
2164 # put any without "_" first (spec is not clear whether files
2165 # are always in the usual order). Tarballs without "_" are
2166 # the main orig or the debian tarball.
2167 $a->{Sort} <=> $b->{Sort} or
2171 my $any_orig = grep { $_->{Orig} } @tartrees;
2173 my $dscfn = "$package.dsc";
2175 my $treeimporthow = 'package';
2177 open D, ">", $dscfn or die "$dscfn: $!";
2178 print D $dscdata or die "$dscfn: $!";
2179 close D or die "$dscfn: $!";
2180 my @cmd = qw(dpkg-source);
2181 push @cmd, '--no-check' if $dsc_checked;
2182 if (madformat $dsc->{format}) {
2183 push @cmd, '--skip-patches';
2184 $treeimporthow = 'unpatched';
2186 push @cmd, qw(-x --), $dscfn;
2189 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
2190 if (madformat $dsc->{format}) {
2191 check_for_vendor_patches();
2195 if (madformat $dsc->{format}) {
2196 my @pcmd = qw(dpkg-source --before-build .);
2197 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2199 runcmd @git, qw(add -Af);
2200 $dappliedtree = git_write_tree();
2203 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2204 debugcmd "|",@clogcmd;
2205 open CLOGS, "-|", @clogcmd or die $!;
2210 printdebug "import clog search...\n";
2213 my $stanzatext = do { local $/=""; <CLOGS>; };
2214 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2215 last if !defined $stanzatext;
2217 my $desc = "package changelog, entry no.$.";
2218 open my $stanzafh, "<", \$stanzatext or die;
2219 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2220 $clogp //= $thisstanza;
2222 printdebug "import clog $thisstanza->{version} $desc...\n";
2224 last if !$any_orig; # we don't need $r1clogp
2226 # We look for the first (most recent) changelog entry whose
2227 # version number is lower than the upstream version of this
2228 # package. Then the last (least recent) previous changelog
2229 # entry is treated as the one which introduced this upstream
2230 # version and used for the synthetic commits for the upstream
2233 # One might think that a more sophisticated algorithm would be
2234 # necessary. But: we do not want to scan the whole changelog
2235 # file. Stopping when we see an earlier version, which
2236 # necessarily then is an earlier upstream version, is the only
2237 # realistic way to do that. Then, either the earliest
2238 # changelog entry we have seen so far is indeed the earliest
2239 # upload of this upstream version; or there are only changelog
2240 # entries relating to later upstream versions (which is not
2241 # possible unless the changelog and .dsc disagree about the
2242 # version). Then it remains to choose between the physically
2243 # last entry in the file, and the one with the lowest version
2244 # number. If these are not the same, we guess that the
2245 # versions were created in a non-monotic order rather than
2246 # that the changelog entries have been misordered.
2248 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2250 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2251 $r1clogp = $thisstanza;
2253 printdebug "import clog $r1clogp->{version} becomes r1\n";
2255 die $! if CLOGS->error;
2256 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2258 $clogp or fail "package changelog has no entries!";
2260 my $authline = clogp_authline $clogp;
2261 my $changes = getfield $clogp, 'Changes';
2262 my $cversion = getfield $clogp, 'Version';
2265 $r1clogp //= $clogp; # maybe there's only one entry;
2266 my $r1authline = clogp_authline $r1clogp;
2267 # Strictly, r1authline might now be wrong if it's going to be
2268 # unused because !$any_orig. Whatever.
2270 printdebug "import tartrees authline $authline\n";
2271 printdebug "import tartrees r1authline $r1authline\n";
2273 foreach my $tt (@tartrees) {
2274 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2276 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2279 committer $r1authline
2283 [dgit import orig $tt->{F}]
2291 [dgit import tarball $package $cversion $tt->{F}]
2296 printdebug "import main commit\n";
2298 open C, ">../commit.tmp" or die $!;
2299 print C <<END or die $!;
2302 print C <<END or die $! foreach @tartrees;
2305 print C <<END or die $!;
2311 [dgit import $treeimporthow $package $cversion]
2315 my $rawimport_hash = make_commit qw(../commit.tmp);
2317 if (madformat $dsc->{format}) {
2318 printdebug "import apply patches...\n";
2320 # regularise the state of the working tree so that
2321 # the checkout of $rawimport_hash works nicely.
2322 my $dappliedcommit = make_commit_text(<<END);
2329 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2331 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2333 # We need the answers to be reproducible
2334 my @authline = clogp_authline($clogp);
2335 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2336 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2337 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2338 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2339 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2340 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2342 my $path = $ENV{PATH} or die;
2344 foreach my $use_absurd (qw(0 1)) {
2345 local $ENV{PATH} = $path;
2348 progress "warning: $@";
2349 $path = "$absurdity:$path";
2350 progress "$us: trying slow absurd-git-apply...";
2351 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2356 die "forbid absurd git-apply\n" if $use_absurd
2357 && forceing [qw(import-gitapply-no-absurd)];
2358 die "only absurd git-apply!\n" if !$use_absurd
2359 && forceing [qw(import-gitapply-absurd)];
2361 local $ENV{PATH} = $path if $use_absurd;
2363 my @showcmd = (gbp_pq, qw(import));
2364 my @realcmd = shell_cmd
2365 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2366 debugcmd "+",@realcmd;
2367 if (system @realcmd) {
2368 die +(shellquote @showcmd).
2370 failedcmd_waitstatus()."\n";
2373 my $gapplied = git_rev_parse('HEAD');
2374 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2375 $gappliedtree eq $dappliedtree or
2377 gbp-pq import and dpkg-source disagree!
2378 gbp-pq import gave commit $gapplied
2379 gbp-pq import gave tree $gappliedtree
2380 dpkg-source --before-build gave tree $dappliedtree
2382 $rawimport_hash = $gapplied;
2387 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2392 progress "synthesised git commit from .dsc $cversion";
2394 my $rawimport_mergeinput = {
2395 Commit => $rawimport_hash,
2396 Info => "Import of source package",
2398 my @output = ($rawimport_mergeinput);
2400 if ($lastpush_mergeinput) {
2401 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2402 my $oversion = getfield $oldclogp, 'Version';
2404 version_compare($oversion, $cversion);
2406 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2407 { Message => <<END, ReverseParents => 1 });
2408 Record $package ($cversion) in archive suite $csuite
2410 } elsif ($vcmp > 0) {
2411 print STDERR <<END or die $!;
2413 Version actually in archive: $cversion (older)
2414 Last version pushed with dgit: $oversion (newer or same)
2417 @output = $lastpush_mergeinput;
2419 # Same version. Use what's in the server git branch,
2420 # discarding our own import. (This could happen if the
2421 # server automatically imports all packages into git.)
2422 @output = $lastpush_mergeinput;
2425 changedir '../../../..';
2430 sub complete_file_from_dsc ($$) {
2431 our ($dstdir, $fi) = @_;
2432 # Ensures that we have, in $dir, the file $fi, with the correct
2433 # contents. (Downloading it from alongside $dscurl if necessary.)
2435 my $f = $fi->{Filename};
2436 my $tf = "$dstdir/$f";
2439 if (stat_exists $tf) {
2440 progress "using existing $f";
2442 printdebug "$tf does not exist, need to fetch\n";
2444 $furl =~ s{/[^/]+$}{};
2446 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2447 die "$f ?" if $f =~ m#/#;
2448 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2449 return 0 if !act_local();
2453 open F, "<", "$tf" or die "$tf: $!";
2454 $fi->{Digester}->reset();
2455 $fi->{Digester}->addfile(*F);
2456 F->error and die $!;
2457 my $got = $fi->{Digester}->hexdigest();
2458 $got eq $fi->{Hash} or
2459 fail "file $f has hash $got but .dsc".
2460 " demands hash $fi->{Hash} ".
2461 ($downloaded ? "(got wrong file from archive!)"
2462 : "(perhaps you should delete this file?)");
2467 sub ensure_we_have_orig () {
2468 my @dfi = dsc_files_info();
2469 foreach my $fi (@dfi) {
2470 my $f = $fi->{Filename};
2471 next unless is_orig_file_in_dsc($f, \@dfi);
2472 complete_file_from_dsc('..', $fi)
2477 sub git_fetch_us () {
2478 # Want to fetch only what we are going to use, unless
2479 # deliberately-not-ff, in which case we must fetch everything.
2481 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2483 (quiltmode_splitbrain
2484 ? (map { $_->('*',access_nomdistro) }
2485 \&debiantag_new, \&debiantag_maintview)
2486 : debiantags('*',access_nomdistro));
2487 push @specs, server_branch($csuite);
2488 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2490 # This is rather miserable:
2491 # When git fetch --prune is passed a fetchspec ending with a *,
2492 # it does a plausible thing. If there is no * then:
2493 # - it matches subpaths too, even if the supplied refspec
2494 # starts refs, and behaves completely madly if the source
2495 # has refs/refs/something. (See, for example, Debian #NNNN.)
2496 # - if there is no matching remote ref, it bombs out the whole
2498 # We want to fetch a fixed ref, and we don't know in advance
2499 # if it exists, so this is not suitable.
2501 # Our workaround is to use git ls-remote. git ls-remote has its
2502 # own qairks. Notably, it has the absurd multi-tail-matching
2503 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2504 # refs/refs/foo etc.
2506 # Also, we want an idempotent snapshot, but we have to make two
2507 # calls to the remote: one to git ls-remote and to git fetch. The
2508 # solution is use git ls-remote to obtain a target state, and
2509 # git fetch to try to generate it. If we don't manage to generate
2510 # the target state, we try again.
2512 printdebug "git_fetch_us specs @specs\n";
2514 my $specre = join '|', map {
2520 printdebug "git_fetch_us specre=$specre\n";
2521 my $wanted_rref = sub {
2523 return m/^(?:$specre)$/o;
2526 my $fetch_iteration = 0;
2529 printdebug "git_fetch_us iteration $fetch_iteration\n";
2530 if (++$fetch_iteration > 10) {
2531 fail "too many iterations trying to get sane fetch!";
2534 my @look = map { "refs/$_" } @specs;
2535 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2539 open GITLS, "-|", @lcmd or die $!;
2541 printdebug "=> ", $_;
2542 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2543 my ($objid,$rrefname) = ($1,$2);
2544 if (!$wanted_rref->($rrefname)) {
2546 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2550 $wantr{$rrefname} = $objid;
2553 close GITLS or failedcmd @lcmd;
2555 # OK, now %want is exactly what we want for refs in @specs
2557 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2558 "+refs/$_:".lrfetchrefs."/$_";
2561 printdebug "git_fetch_us fspecs @fspecs\n";
2563 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2564 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2567 %lrfetchrefs_f = ();
2570 git_for_each_ref(lrfetchrefs, sub {
2571 my ($objid,$objtype,$lrefname,$reftail) = @_;
2572 $lrfetchrefs_f{$lrefname} = $objid;
2573 $objgot{$objid} = 1;
2576 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2577 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2578 if (!exists $wantr{$rrefname}) {
2579 if ($wanted_rref->($rrefname)) {
2581 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2585 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2588 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2589 delete $lrfetchrefs_f{$lrefname};
2593 foreach my $rrefname (sort keys %wantr) {
2594 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2595 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2596 my $want = $wantr{$rrefname};
2597 next if $got eq $want;
2598 if (!defined $objgot{$want}) {
2600 warning: git ls-remote suggests we want $lrefname
2601 warning: and it should refer to $want
2602 warning: but git fetch didn't fetch that object to any relevant ref.
2603 warning: This may be due to a race with someone updating the server.
2604 warning: Will try again...
2606 next FETCH_ITERATION;
2609 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2611 runcmd_ordryrun_local @git, qw(update-ref -m),
2612 "dgit fetch git fetch fixup", $lrefname, $want;
2613 $lrfetchrefs_f{$lrefname} = $want;
2617 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2618 Dumper(\%lrfetchrefs_f);
2621 my @tagpats = debiantags('*',access_nomdistro);
2623 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2624 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2625 printdebug "currently $fullrefname=$objid\n";
2626 $here{$fullrefname} = $objid;
2628 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2629 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2630 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2631 printdebug "offered $lref=$objid\n";
2632 if (!defined $here{$lref}) {
2633 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2634 runcmd_ordryrun_local @upd;
2635 lrfetchref_used $fullrefname;
2636 } elsif ($here{$lref} eq $objid) {
2637 lrfetchref_used $fullrefname;
2640 "Not updateting $lref from $here{$lref} to $objid.\n";
2645 sub mergeinfo_getclogp ($) {
2646 # Ensures thit $mi->{Clogp} exists and returns it
2648 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2651 sub mergeinfo_version ($) {
2652 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2655 sub fetch_from_archive_record_1 ($) {
2657 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2658 'DGIT_ARCHIVE', $hash;
2659 cmdoutput @git, qw(log -n2), $hash;
2660 # ... gives git a chance to complain if our commit is malformed
2663 sub fetch_from_archive_record_2 ($) {
2665 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2669 dryrun_report @upd_cmd;
2673 sub fetch_from_archive () {
2674 ensure_setup_existing_tree();
2676 # Ensures that lrref() is what is actually in the archive, one way
2677 # or another, according to us - ie this client's
2678 # appropritaely-updated archive view. Also returns the commit id.
2679 # If there is nothing in the archive, leaves lrref alone and
2680 # returns undef. git_fetch_us must have already been called.
2684 foreach my $field (@ourdscfield) {
2685 $dsc_hash = $dsc->{$field};
2686 last if defined $dsc_hash;
2688 if (defined $dsc_hash) {
2689 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2691 progress "last upload to archive specified git hash";
2693 progress "last upload to archive has NO git hash";
2696 progress "no version available from the archive";
2699 # If the archive's .dsc has a Dgit field, there are three
2700 # relevant git commitids we need to choose between and/or merge
2702 # 1. $dsc_hash: the Dgit field from the archive
2703 # 2. $lastpush_hash: the suite branch on the dgit git server
2704 # 3. $lastfetch_hash: our local tracking brach for the suite
2706 # These may all be distinct and need not be in any fast forward
2709 # If the dsc was pushed to this suite, then the server suite
2710 # branch will have been updated; but it might have been pushed to
2711 # a different suite and copied by the archive. Conversely a more
2712 # recent version may have been pushed with dgit but not appeared
2713 # in the archive (yet).
2715 # $lastfetch_hash may be awkward because archive imports
2716 # (particularly, imports of Dgit-less .dscs) are performed only as
2717 # needed on individual clients, so different clients may perform a
2718 # different subset of them - and these imports are only made
2719 # public during push. So $lastfetch_hash may represent a set of
2720 # imports different to a subsequent upload by a different dgit
2723 # Our approach is as follows:
2725 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2726 # descendant of $dsc_hash, then it was pushed by a dgit user who
2727 # had based their work on $dsc_hash, so we should prefer it.
2728 # Otherwise, $dsc_hash was installed into this suite in the
2729 # archive other than by a dgit push, and (necessarily) after the
2730 # last dgit push into that suite (since a dgit push would have
2731 # been descended from the dgit server git branch); thus, in that
2732 # case, we prefer the archive's version (and produce a
2733 # pseudo-merge to overwrite the dgit server git branch).
2735 # (If there is no Dgit field in the archive's .dsc then
2736 # generate_commit_from_dsc uses the version numbers to decide
2737 # whether the suite branch or the archive is newer. If the suite
2738 # branch is newer it ignores the archive's .dsc; otherwise it
2739 # generates an import of the .dsc, and produces a pseudo-merge to
2740 # overwrite the suite branch with the archive contents.)
2742 # The outcome of that part of the algorithm is the `public view',
2743 # and is same for all dgit clients: it does not depend on any
2744 # unpublished history in the local tracking branch.
2746 # As between the public view and the local tracking branch: The
2747 # local tracking branch is only updated by dgit fetch, and
2748 # whenever dgit fetch runs it includes the public view in the
2749 # local tracking branch. Therefore if the public view is not
2750 # descended from the local tracking branch, the local tracking
2751 # branch must contain history which was imported from the archive
2752 # but never pushed; and, its tip is now out of date. So, we make
2753 # a pseudo-merge to overwrite the old imports and stitch the old
2756 # Finally: we do not necessarily reify the public view (as
2757 # described above). This is so that we do not end up stacking two
2758 # pseudo-merges. So what we actually do is figure out the inputs
2759 # to any public view pseudo-merge and put them in @mergeinputs.
2762 # $mergeinputs[]{Commit}
2763 # $mergeinputs[]{Info}
2764 # $mergeinputs[0] is the one whose tree we use
2765 # @mergeinputs is in the order we use in the actual commit)
2768 # $mergeinputs[]{Message} is a commit message to use
2769 # $mergeinputs[]{ReverseParents} if def specifies that parent
2770 # list should be in opposite order
2771 # Such an entry has no Commit or Info. It applies only when found
2772 # in the last entry. (This ugliness is to support making
2773 # identical imports to previous dgit versions.)
2775 my $lastpush_hash = git_get_ref(lrfetchref());
2776 printdebug "previous reference hash=$lastpush_hash\n";
2777 $lastpush_mergeinput = $lastpush_hash && {
2778 Commit => $lastpush_hash,
2779 Info => "dgit suite branch on dgit git server",
2782 my $lastfetch_hash = git_get_ref(lrref());
2783 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2784 my $lastfetch_mergeinput = $lastfetch_hash && {
2785 Commit => $lastfetch_hash,
2786 Info => "dgit client's archive history view",
2789 my $dsc_mergeinput = $dsc_hash && {
2790 Commit => $dsc_hash,
2791 Info => "Dgit field in .dsc from archive",
2795 my $del_lrfetchrefs = sub {
2798 printdebug "del_lrfetchrefs...\n";
2799 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2800 my $objid = $lrfetchrefs_d{$fullrefname};
2801 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2803 $gur ||= new IO::Handle;
2804 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2806 printf $gur "delete %s %s\n", $fullrefname, $objid;
2809 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2813 if (defined $dsc_hash) {
2814 ensure_we_have_orig();
2815 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2816 @mergeinputs = $dsc_mergeinput
2817 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2818 print STDERR <<END or die $!;
2820 Git commit in archive is behind the last version allegedly pushed/uploaded.
2821 Commit referred to by archive: $dsc_hash
2822 Last version pushed with dgit: $lastpush_hash
2825 @mergeinputs = ($lastpush_mergeinput);
2827 # Archive has .dsc which is not a descendant of the last dgit
2828 # push. This can happen if the archive moves .dscs about.
2829 # Just follow its lead.
2830 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2831 progress "archive .dsc names newer git commit";
2832 @mergeinputs = ($dsc_mergeinput);
2834 progress "archive .dsc names other git commit, fixing up";
2835 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2839 @mergeinputs = generate_commits_from_dsc();
2840 # We have just done an import. Now, our import algorithm might
2841 # have been improved. But even so we do not want to generate
2842 # a new different import of the same package. So if the
2843 # version numbers are the same, just use our existing version.
2844 # If the version numbers are different, the archive has changed
2845 # (perhaps, rewound).
2846 if ($lastfetch_mergeinput &&
2847 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2848 (mergeinfo_version $mergeinputs[0]) )) {
2849 @mergeinputs = ($lastfetch_mergeinput);
2851 } elsif ($lastpush_hash) {
2852 # only in git, not in the archive yet
2853 @mergeinputs = ($lastpush_mergeinput);
2854 print STDERR <<END or die $!;
2856 Package not found in the archive, but has allegedly been pushed using dgit.
2860 printdebug "nothing found!\n";
2861 if (defined $skew_warning_vsn) {
2862 print STDERR <<END or die $!;
2864 Warning: relevant archive skew detected.
2865 Archive allegedly contains $skew_warning_vsn
2866 But we were not able to obtain any version from the archive or git.
2870 unshift @end, $del_lrfetchrefs;
2874 if ($lastfetch_hash &&
2876 my $h = $_->{Commit};
2877 $h and is_fast_fwd($lastfetch_hash, $h);
2878 # If true, one of the existing parents of this commit
2879 # is a descendant of the $lastfetch_hash, so we'll
2880 # be ff from that automatically.
2884 push @mergeinputs, $lastfetch_mergeinput;
2887 printdebug "fetch mergeinfos:\n";
2888 foreach my $mi (@mergeinputs) {
2890 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2892 printdebug sprintf " ReverseParents=%d Message=%s",
2893 $mi->{ReverseParents}, $mi->{Message};
2897 my $compat_info= pop @mergeinputs
2898 if $mergeinputs[$#mergeinputs]{Message};
2900 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2903 if (@mergeinputs > 1) {
2905 my $tree_commit = $mergeinputs[0]{Commit};
2907 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2908 $tree =~ m/\n\n/; $tree = $`;
2909 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2912 # We use the changelog author of the package in question the
2913 # author of this pseudo-merge. This is (roughly) correct if
2914 # this commit is simply representing aa non-dgit upload.
2915 # (Roughly because it does not record sponsorship - but we
2916 # don't have sponsorship info because that's in the .changes,
2917 # which isn't in the archivw.)
2919 # But, it might be that we are representing archive history
2920 # updates (including in-archive copies). These are not really
2921 # the responsibility of the person who created the .dsc, but
2922 # there is no-one whose name we should better use. (The
2923 # author of the .dsc-named commit is clearly worse.)
2925 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2926 my $author = clogp_authline $useclogp;
2927 my $cversion = getfield $useclogp, 'Version';
2929 my $mcf = ".git/dgit/mergecommit";
2930 open MC, ">", $mcf or die "$mcf $!";
2931 print MC <<END or die $!;
2935 my @parents = grep { $_->{Commit} } @mergeinputs;
2936 @parents = reverse @parents if $compat_info->{ReverseParents};
2937 print MC <<END or die $! foreach @parents;
2941 print MC <<END or die $!;
2947 if (defined $compat_info->{Message}) {
2948 print MC $compat_info->{Message} or die $!;
2950 print MC <<END or die $!;
2951 Record $package ($cversion) in archive suite $csuite
2955 my $message_add_info = sub {
2957 my $mversion = mergeinfo_version $mi;
2958 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2962 $message_add_info->($mergeinputs[0]);
2963 print MC <<END or die $!;
2964 should be treated as descended from
2966 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2970 $hash = make_commit $mcf;
2972 $hash = $mergeinputs[0]{Commit};
2974 printdebug "fetch hash=$hash\n";
2977 my ($lasth, $what) = @_;
2978 return unless $lasth;
2979 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2982 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
2984 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2986 fetch_from_archive_record_1($hash);
2988 if (defined $skew_warning_vsn) {
2990 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2991 my $gotclogp = commit_getclogp($hash);
2992 my $got_vsn = getfield $gotclogp, 'Version';
2993 printdebug "SKEW CHECK GOT $got_vsn\n";
2994 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2995 print STDERR <<END or die $!;
2997 Warning: archive skew detected. Using the available version:
2998 Archive allegedly contains $skew_warning_vsn
2999 We were able to obtain only $got_vsn
3005 if ($lastfetch_hash ne $hash) {
3006 fetch_from_archive_record_2($hash);
3009 lrfetchref_used lrfetchref();
3011 unshift @end, $del_lrfetchrefs;
3015 sub set_local_git_config ($$) {
3017 runcmd @git, qw(config), $k, $v;
3020 sub setup_mergechangelogs (;$) {
3022 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3024 my $driver = 'dpkg-mergechangelogs';
3025 my $cb = "merge.$driver";
3026 my $attrs = '.git/info/attributes';
3027 ensuredir '.git/info';
3029 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3030 if (!open ATTRS, "<", $attrs) {
3031 $!==ENOENT or die "$attrs: $!";
3035 next if m{^debian/changelog\s};
3036 print NATTRS $_, "\n" or die $!;
3038 ATTRS->error and die $!;
3041 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3044 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3045 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3047 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3050 sub setup_useremail (;$) {
3052 return unless $always || access_cfg_bool(1, 'setup-useremail');
3055 my ($k, $envvar) = @_;
3056 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3057 return unless defined $v;
3058 set_local_git_config "user.$k", $v;
3061 $setup->('email', 'DEBEMAIL');
3062 $setup->('name', 'DEBFULLNAME');
3065 sub ensure_setup_existing_tree () {
3066 my $k = "remote.$remotename.skipdefaultupdate";
3067 my $c = git_get_config $k;
3068 return if defined $c;
3069 set_local_git_config $k, 'true';
3072 sub setup_new_tree () {
3073 setup_mergechangelogs();
3077 sub multisuite_suite_child ($$$) {
3078 my ($tsuite, $merginputs, $fn) = @_;
3079 # in child, sets things up, calls $fn->(), and returns undef
3080 # in parent, returns canonical suite name for $tsuite
3081 my $canonsuitefh = IO::File::new_tmpfile;
3082 my $pid = fork // die $!;
3085 $us .= " [$isuite]";
3086 $debugprefix .= " ";
3087 progress "fetching $tsuite...";
3088 canonicalise_suite();
3089 print $canonsuitefh $csuite, "\n" or die $!;
3090 close $canonsuitefh or die $!;
3094 waitpid $pid,0 == $pid or die $!;
3095 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3096 seek $canonsuitefh,0,0 or die $!;
3097 local $csuite = <$canonsuitefh>;
3098 die $! unless defined $csuite && chomp $csuite;
3100 printdebug "multisuite $tsuite missing\n";
3103 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3104 push @$merginputs, {
3111 sub fork_for_multisuite ($) {
3112 my ($before_fetch_merge) = @_;
3113 # if nothing unusual, just returns ''
3116 # returns 0 to caller in child, to do first of the specified suites
3117 # in child, $csuite is not yet set
3119 # returns 1 to caller in parent, to finish up anything needed after
3120 # in parent, $csuite is set to canonicalised portmanteau
3122 my $org_isuite = $isuite;
3123 my @suites = split /\,/, $isuite;
3124 return '' unless @suites > 1;
3125 printdebug "fork_for_multisuite: @suites\n";
3129 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3131 return 0 unless defined $cbasesuite;
3133 fail "package $package missing in (base suite) $cbasesuite"
3134 unless @mergeinputs;
3136 my @csuites = ($cbasesuite);
3138 $before_fetch_merge->();
3140 foreach my $tsuite (@suites[1..$#suites]) {
3141 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3147 # xxx collecte the ref here
3149 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3150 push @csuites, $csubsuite;
3153 foreach my $mi (@mergeinputs) {
3154 my $ref = git_get_ref $mi->{Ref};
3155 die "$mi->{Ref} ?" unless length $ref;
3156 $mi->{Commit} = $ref;
3159 $csuite = join ",", @csuites;
3161 my $previous = git_get_ref lrref;
3163 unshift @mergeinputs, {
3164 Commit => $previous,
3165 Info => "local combined tracking branch",
3167 "archive seems to have rewound: local tracking branch is ahead!",
3171 foreach my $ix (0..$#mergeinputs) {
3172 $mergeinputs[$ix]{Index} = $ix;
3175 @mergeinputs = sort {
3176 -version_compare(mergeinfo_version $a,
3177 mergeinfo_version $b) # highest version first
3179 $a->{Index} <=> $b->{Index}; # earliest in spec first
3185 foreach my $mi (@mergeinputs) {
3186 printdebug "multisuite merge check $mi->{Info}\n";
3187 foreach my $previous (@needed) {
3188 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3189 printdebug "multisuite merge un-needed $previous->{Info}\n";
3193 printdebug "multisuite merge this-needed\n";
3194 $mi->{Character} = '+';
3197 $needed[0]{Character} = '*';
3199 my $output = $needed[0]{Commit};
3202 printdebug "multisuite merge nontrivial\n";
3203 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3205 my $commit = "tree $tree\n";
3206 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3207 "Input branches:\n";
3209 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3210 printdebug "multisuite merge include $mi->{Info}\n";
3211 $mi->{Character} //= ' ';
3212 $commit .= "parent $mi->{Commit}\n";
3213 $msg .= sprintf " %s %-25s %s\n",
3215 (mergeinfo_version $mi),
3218 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3220 " * marks the highest version branch, which choose to use\n".
3221 " + marks each branch which was not already an ancestor\n\n".
3222 "[dgit multi-suite $csuite]\n";
3224 "author $authline\n".
3225 "committer $authline\n\n";
3226 $output = make_commit_text $commit.$msg;
3227 printdebug "multisuite merge generated $output\n";
3230 fetch_from_archive_record_1($output);
3231 fetch_from_archive_record_2($output);
3233 progress "calculated combined tracking suite $csuite";
3238 sub clone_set_head () {
3239 open H, "> .git/HEAD" or die $!;
3240 print H "ref: ".lref()."\n" or die $!;
3243 sub clone_finish ($) {
3245 runcmd @git, qw(reset --hard), lrref();
3246 runcmd qw(bash -ec), <<'END';
3248 git ls-tree -r --name-only -z HEAD | \
3249 xargs -0r touch -r . --
3251 printdone "ready for work in $dstdir";
3256 badusage "dry run makes no sense with clone" unless act_local();
3258 my $multi_fetched = fork_for_multisuite(sub {
3259 printdebug "multi clone before fetch merge\n";
3262 if ($multi_fetched) {
3263 printdebug "multi clone after fetch merge\n";
3265 clone_finish($dstdir);
3268 printdebug "clone main body\n";
3270 canonicalise_suite();
3271 my $hasgit = check_for_git();
3272 mkdir $dstdir or fail "create \`$dstdir': $!";
3274 runcmd @git, qw(init -q);
3276 my $giturl = access_giturl(1);
3277 if (defined $giturl) {
3278 runcmd @git, qw(remote add), 'origin', $giturl;
3281 progress "fetching existing git history";
3283 runcmd_ordryrun_local @git, qw(fetch origin);
3285 progress "starting new git history";
3287 fetch_from_archive() or no_such_package;
3288 my $vcsgiturl = $dsc->{'Vcs-Git'};
3289 if (length $vcsgiturl) {
3290 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3291 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3294 clone_finish($dstdir);
3298 canonicalise_suite();
3299 if (check_for_git()) {
3302 fetch_from_archive() or no_such_package();
3303 printdone "fetched into ".lrref();
3307 my $multi_fetched = fork_for_multisuite(sub { });
3308 fetch() unless $multi_fetched; # parent
3309 return if $multi_fetched eq '0'; # child
3310 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3312 printdone "fetched to ".lrref()." and merged into HEAD";
3315 sub check_not_dirty () {
3316 foreach my $f (qw(local-options local-patch-header)) {
3317 if (stat_exists "debian/source/$f") {
3318 fail "git tree contains debian/source/$f";
3322 return if $ignoredirty;
3324 my @cmd = (@git, qw(diff --quiet HEAD));
3326 $!=0; $?=-1; system @cmd;
3329 fail "working tree is dirty (does not match HEAD)";
3335 sub commit_admin ($) {
3338 runcmd_ordryrun_local @git, qw(commit -m), $m;
3341 sub commit_quilty_patch () {
3342 my $output = cmdoutput @git, qw(status --porcelain);
3344 foreach my $l (split /\n/, $output) {
3345 next unless $l =~ m/\S/;
3346 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3350 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3352 progress "nothing quilty to commit, ok.";
3355 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3356 runcmd_ordryrun_local @git, qw(add -f), @adds;
3358 Commit Debian 3.0 (quilt) metadata
3360 [dgit ($our_version) quilt-fixup]
3364 sub get_source_format () {
3366 if (open F, "debian/source/options") {
3370 s/\s+$//; # ignore missing final newline
3372 my ($k, $v) = ($`, $'); #');
3373 $v =~ s/^"(.*)"$/$1/;
3379 F->error and die $!;
3382 die $! unless $!==&ENOENT;
3385 if (!open F, "debian/source/format") {
3386 die $! unless $!==&ENOENT;
3390 F->error and die $!;
3392 return ($_, \%options);
3395 sub madformat_wantfixup ($) {
3397 return 0 unless $format eq '3.0 (quilt)';
3398 our $quilt_mode_warned;
3399 if ($quilt_mode eq 'nocheck') {
3400 progress "Not doing any fixup of \`$format' due to".
3401 " ----no-quilt-fixup or --quilt=nocheck"
3402 unless $quilt_mode_warned++;
3405 progress "Format \`$format', need to check/update patch stack"
3406 unless $quilt_mode_warned++;
3410 sub maybe_split_brain_save ($$$) {
3411 my ($headref, $dgitview, $msg) = @_;
3412 # => message fragment "$saved" describing disposition of $dgitview
3413 return "commit id $dgitview" unless defined $split_brain_save;
3414 my @cmd = (shell_cmd "cd ../../../..",
3415 @git, qw(update-ref -m),
3416 "dgit --dgit-view-save $msg HEAD=$headref",
3417 $split_brain_save, $dgitview);
3419 return "and left in $split_brain_save";
3422 # An "infopair" is a tuple [ $thing, $what ]
3423 # (often $thing is a commit hash; $what is a description)
3425 sub infopair_cond_equal ($$) {
3427 $x->[0] eq $y->[0] or fail <<END;
3428 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3432 sub infopair_lrf_tag_lookup ($$) {
3433 my ($tagnames, $what) = @_;
3434 # $tagname may be an array ref
3435 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3436 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3437 foreach my $tagname (@tagnames) {
3438 my $lrefname = lrfetchrefs."/tags/$tagname";
3439 my $tagobj = $lrfetchrefs_f{$lrefname};
3440 next unless defined $tagobj;
3441 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3442 return [ git_rev_parse($tagobj), $what ];
3444 fail @tagnames==1 ? <<END : <<END;
3445 Wanted tag $what (@tagnames) on dgit server, but not found
3447 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3451 sub infopair_cond_ff ($$) {
3452 my ($anc,$desc) = @_;
3453 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3454 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3458 sub pseudomerge_version_check ($$) {
3459 my ($clogp, $archive_hash) = @_;
3461 my $arch_clogp = commit_getclogp $archive_hash;
3462 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3463 'version currently in archive' ];
3464 if (defined $overwrite_version) {
3465 if (length $overwrite_version) {
3466 infopair_cond_equal([ $overwrite_version,
3467 '--overwrite= version' ],
3470 my $v = $i_arch_v->[0];
3471 progress "Checking package changelog for archive version $v ...";
3473 my @xa = ("-f$v", "-t$v");
3474 my $vclogp = parsechangelog @xa;
3475 my $cv = [ (getfield $vclogp, 'Version'),
3476 "Version field from dpkg-parsechangelog @xa" ];
3477 infopair_cond_equal($i_arch_v, $cv);
3480 $@ =~ s/^dgit: //gm;
3482 "Perhaps debian/changelog does not mention $v ?";
3487 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3491 sub pseudomerge_make_commit ($$$$ $$) {
3492 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3493 $msg_cmd, $msg_msg) = @_;
3494 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3496 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3497 my $authline = clogp_authline $clogp;
3501 !defined $overwrite_version ? ""
3502 : !length $overwrite_version ? " --overwrite"
3503 : " --overwrite=".$overwrite_version;
3506 my $pmf = ".git/dgit/pseudomerge";
3507 open MC, ">", $pmf or die "$pmf $!";
3508 print MC <<END or die $!;
3511 parent $archive_hash
3521 return make_commit($pmf);
3524 sub splitbrain_pseudomerge ($$$$) {
3525 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3526 # => $merged_dgitview
3527 printdebug "splitbrain_pseudomerge...\n";
3529 # We: debian/PREVIOUS HEAD($maintview)
3530 # expect: o ----------------- o
3533 # a/d/PREVIOUS $dgitview
3536 # we do: `------------------ o
3540 return $dgitview unless defined $archive_hash;
3542 printdebug "splitbrain_pseudomerge...\n";
3544 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3546 if (!defined $overwrite_version) {
3547 progress "Checking that HEAD inciudes all changes in archive...";
3550 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3552 if (defined $overwrite_version) {
3554 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3555 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3556 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3557 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3558 my $i_archive = [ $archive_hash, "current archive contents" ];
3560 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3562 infopair_cond_equal($i_dgit, $i_archive);
3563 infopair_cond_ff($i_dep14, $i_dgit);
3564 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3568 $us: check failed (maybe --overwrite is needed, consult documentation)
3573 my $r = pseudomerge_make_commit
3574 $clogp, $dgitview, $archive_hash, $i_arch_v,
3575 "dgit --quilt=$quilt_mode",
3576 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3577 Declare fast forward from $i_arch_v->[0]
3579 Make fast forward from $i_arch_v->[0]
3582 maybe_split_brain_save $maintview, $r, "pseudomerge";
3584 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3588 sub plain_overwrite_pseudomerge ($$$) {
3589 my ($clogp, $head, $archive_hash) = @_;
3591 printdebug "plain_overwrite_pseudomerge...";
3593 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3595 return $head if is_fast_fwd $archive_hash, $head;
3597 my $m = "Declare fast forward from $i_arch_v->[0]";
3599 my $r = pseudomerge_make_commit
3600 $clogp, $head, $archive_hash, $i_arch_v,
3603 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3605 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3609 sub push_parse_changelog ($) {
3612 my $clogp = Dpkg::Control::Hash->new();
3613 $clogp->load($clogpfn) or die;
3615 my $clogpackage = getfield $clogp, 'Source';
3616 $package //= $clogpackage;
3617 fail "-p specified $package but changelog specified $clogpackage"
3618 unless $package eq $clogpackage;
3619 my $cversion = getfield $clogp, 'Version';
3620 my $tag = debiantag($cversion, access_nomdistro);
3621 runcmd @git, qw(check-ref-format), $tag;
3623 my $dscfn = dscfn($cversion);
3625 return ($clogp, $cversion, $dscfn);
3628 sub push_parse_dsc ($$$) {
3629 my ($dscfn,$dscfnwhat, $cversion) = @_;
3630 $dsc = parsecontrol($dscfn,$dscfnwhat);
3631 my $dversion = getfield $dsc, 'Version';
3632 my $dscpackage = getfield $dsc, 'Source';
3633 ($dscpackage eq $package && $dversion eq $cversion) or
3634 fail "$dscfn is for $dscpackage $dversion".
3635 " but debian/changelog is for $package $cversion";
3638 sub push_tagwants ($$$$) {
3639 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3642 TagFn => \&debiantag,
3647 if (defined $maintviewhead) {
3649 TagFn => \&debiantag_maintview,
3650 Objid => $maintviewhead,
3651 TfSuffix => '-maintview',
3655 foreach my $tw (@tagwants) {
3656 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3657 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3659 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3663 sub push_mktags ($$ $$ $) {
3665 $changesfile,$changesfilewhat,
3668 die unless $tagwants->[0]{View} eq 'dgit';
3670 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3671 $dsc->save("$dscfn.tmp") or die $!;
3673 my $changes = parsecontrol($changesfile,$changesfilewhat);
3674 foreach my $field (qw(Source Distribution Version)) {
3675 $changes->{$field} eq $clogp->{$field} or
3676 fail "changes field $field \`$changes->{$field}'".
3677 " does not match changelog \`$clogp->{$field}'";
3680 my $cversion = getfield $clogp, 'Version';
3681 my $clogsuite = getfield $clogp, 'Distribution';
3683 # We make the git tag by hand because (a) that makes it easier
3684 # to control the "tagger" (b) we can do remote signing
3685 my $authline = clogp_authline $clogp;
3686 my $delibs = join(" ", "",@deliberatelies);
3687 my $declaredistro = access_nomdistro();
3691 my $tfn = $tw->{Tfn};
3692 my $head = $tw->{Objid};
3693 my $tag = $tw->{Tag};
3695 open TO, '>', $tfn->('.tmp') or die $!;
3696 print TO <<END or die $!;
3703 if ($tw->{View} eq 'dgit') {
3704 print TO <<END or die $!;
3705 $package release $cversion for $clogsuite ($csuite) [dgit]
3706 [dgit distro=$declaredistro$delibs]
3708 foreach my $ref (sort keys %previously) {
3709 print TO <<END or die $!;
3710 [dgit previously:$ref=$previously{$ref}]
3713 } elsif ($tw->{View} eq 'maint') {
3714 print TO <<END or die $!;
3715 $package release $cversion for $clogsuite ($csuite)
3716 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3719 die Dumper($tw)."?";
3724 my $tagobjfn = $tfn->('.tmp');
3726 if (!defined $keyid) {
3727 $keyid = access_cfg('keyid','RETURN-UNDEF');
3729 if (!defined $keyid) {
3730 $keyid = getfield $clogp, 'Maintainer';
3732 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3733 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3734 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3735 push @sign_cmd, $tfn->('.tmp');
3736 runcmd_ordryrun @sign_cmd;
3738 $tagobjfn = $tfn->('.signed.tmp');
3739 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3740 $tfn->('.tmp'), $tfn->('.tmp.asc');
3746 my @r = map { $mktag->($_); } @$tagwants;
3750 sub sign_changes ($) {
3751 my ($changesfile) = @_;
3753 my @debsign_cmd = @debsign;
3754 push @debsign_cmd, "-k$keyid" if defined $keyid;
3755 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3756 push @debsign_cmd, $changesfile;
3757 runcmd_ordryrun @debsign_cmd;
3762 printdebug "actually entering push\n";
3764 supplementary_message(<<'END');
3765 Push failed, while checking state of the archive.
3766 You can retry the push, after fixing the problem, if you like.
3768 if (check_for_git()) {
3771 my $archive_hash = fetch_from_archive();
3772 if (!$archive_hash) {
3774 fail "package appears to be new in this suite;".
3775 " if this is intentional, use --new";
3778 supplementary_message(<<'END');
3779 Push failed, while preparing your push.
3780 You can retry the push, after fixing the problem, if you like.
3783 need_tagformat 'new', "quilt mode $quilt_mode"
3784 if quiltmode_splitbrain;
3788 access_giturl(); # check that success is vaguely likely
3791 my $clogpfn = ".git/dgit/changelog.822.tmp";
3792 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3794 responder_send_file('parsed-changelog', $clogpfn);
3796 my ($clogp, $cversion, $dscfn) =
3797 push_parse_changelog("$clogpfn");
3799 my $dscpath = "$buildproductsdir/$dscfn";
3800 stat_exists $dscpath or
3801 fail "looked for .dsc $dscfn, but $!;".
3802 " maybe you forgot to build";
3804 responder_send_file('dsc', $dscpath);
3806 push_parse_dsc($dscpath, $dscfn, $cversion);
3808 my $format = getfield $dsc, 'Format';
3809 printdebug "format $format\n";
3811 my $actualhead = git_rev_parse('HEAD');
3812 my $dgithead = $actualhead;
3813 my $maintviewhead = undef;
3815 my $upstreamversion = upstreamversion $clogp->{Version};
3817 if (madformat_wantfixup($format)) {
3818 # user might have not used dgit build, so maybe do this now:
3819 if (quiltmode_splitbrain()) {
3821 quilt_make_fake_dsc($upstreamversion);
3823 ($dgithead, $cachekey) =
3824 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3826 "--quilt=$quilt_mode but no cached dgit view:
3827 perhaps tree changed since dgit build[-source] ?";
3829 $dgithead = splitbrain_pseudomerge($clogp,
3830 $actualhead, $dgithead,
3832 $maintviewhead = $actualhead;
3833 changedir '../../../..';
3834 prep_ud(); # so _only_subdir() works, below
3836 commit_quilty_patch();
3840 if (defined $overwrite_version && !defined $maintviewhead) {
3841 $dgithead = plain_overwrite_pseudomerge($clogp,
3849 if ($archive_hash) {
3850 if (is_fast_fwd($archive_hash, $dgithead)) {
3852 } elsif (deliberately_not_fast_forward) {
3855 fail "dgit push: HEAD is not a descendant".
3856 " of the archive's version.\n".
3857 "To overwrite the archive's contents,".
3858 " pass --overwrite[=VERSION].\n".
3859 "To rewind history, if permitted by the archive,".
3860 " use --deliberately-not-fast-forward.";
3865 progress "checking that $dscfn corresponds to HEAD";
3866 runcmd qw(dpkg-source -x --),
3867 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3868 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3869 check_for_vendor_patches() if madformat($dsc->{format});
3870 changedir '../../../..';
3871 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3872 debugcmd "+",@diffcmd;
3874 my $r = system @diffcmd;
3877 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3879 HEAD specifies a different tree to $dscfn:
3881 Perhaps you forgot to build. Or perhaps there is a problem with your
3882 source tree (see dgit(7) for some hints). To see a full diff, run
3889 if (!$changesfile) {
3890 my $pat = changespat $cversion;
3891 my @cs = glob "$buildproductsdir/$pat";
3892 fail "failed to find unique changes file".
3893 " (looked for $pat in $buildproductsdir);".
3894 " perhaps you need to use dgit -C"
3896 ($changesfile) = @cs;
3898 $changesfile = "$buildproductsdir/$changesfile";
3901 # Check that changes and .dsc agree enough
3902 $changesfile =~ m{[^/]*$};
3903 my $changes = parsecontrol($changesfile,$&);
3904 files_compare_inputs($dsc, $changes)
3905 unless forceing [qw(dsc-changes-mismatch)];
3907 # Perhaps adjust .dsc to contain right set of origs
3908 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3910 unless forceing [qw(changes-origs-exactly)];
3912 # Checks complete, we're going to try and go ahead:
3914 responder_send_file('changes',$changesfile);
3915 responder_send_command("param head $dgithead");
3916 responder_send_command("param csuite $csuite");
3917 responder_send_command("param tagformat $tagformat");
3918 if (defined $maintviewhead) {
3919 die unless ($protovsn//4) >= 4;
3920 responder_send_command("param maint-view $maintviewhead");
3923 if (deliberately_not_fast_forward) {
3924 git_for_each_ref(lrfetchrefs, sub {
3925 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3926 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3927 responder_send_command("previously $rrefname=$objid");
3928 $previously{$rrefname} = $objid;
3932 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3936 supplementary_message(<<'END');
3937 Push failed, while signing the tag.
3938 You can retry the push, after fixing the problem, if you like.
3940 # If we manage to sign but fail to record it anywhere, it's fine.
3941 if ($we_are_responder) {
3942 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3943 responder_receive_files('signed-tag', @tagobjfns);
3945 @tagobjfns = push_mktags($clogp,$dscpath,
3946 $changesfile,$changesfile,
3949 supplementary_message(<<'END');
3950 Push failed, *after* signing the tag.
3951 If you want to try again, you should use a new version number.
3954 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3956 foreach my $tw (@tagwants) {
3957 my $tag = $tw->{Tag};
3958 my $tagobjfn = $tw->{TagObjFn};
3960 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3961 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3962 runcmd_ordryrun_local
3963 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3966 supplementary_message(<<'END');
3967 Push failed, while updating the remote git repository - see messages above.
3968 If you want to try again, you should use a new version number.
3970 if (!check_for_git()) {
3971 create_remote_git_repo();
3974 my @pushrefs = $forceflag.$dgithead.":".rrref();
3975 foreach my $tw (@tagwants) {
3976 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3979 runcmd_ordryrun @git,
3980 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3981 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3983 supplementary_message(<<'END');
3984 Push failed, after updating the remote git repository.
3985 If you want to try again, you must use a new version number.
3987 if ($we_are_responder) {
3988 my $dryrunsuffix = act_local() ? "" : ".tmp";
3989 responder_receive_files('signed-dsc-changes',
3990 "$dscpath$dryrunsuffix",
3991 "$changesfile$dryrunsuffix");
3994 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3996 progress "[new .dsc left in $dscpath.tmp]";
3998 sign_changes $changesfile;
4001 supplementary_message(<<END);
4002 Push failed, while uploading package(s) to the archive server.
4003 You can retry the upload of exactly these same files with dput of:
4005 If that .changes file is broken, you will need to use a new version
4006 number for your next attempt at the upload.
4008 my $host = access_cfg('upload-host','RETURN-UNDEF');
4009 my @hostarg = defined($host) ? ($host,) : ();
4010 runcmd_ordryrun @dput, @hostarg, $changesfile;
4011 printdone "pushed and uploaded $cversion";
4013 supplementary_message('');
4014 responder_send_command("complete");
4021 badusage "-p is not allowed with clone; specify as argument instead"
4022 if defined $package;
4025 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4026 ($package,$isuite) = @ARGV;
4027 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4028 ($package,$dstdir) = @ARGV;
4029 } elsif (@ARGV==3) {
4030 ($package,$isuite,$dstdir) = @ARGV;
4032 badusage "incorrect arguments to dgit clone";
4034 $dstdir ||= "$package";
4036 if (stat_exists $dstdir) {
4037 fail "$dstdir already exists";
4041 if ($rmonerror && !$dryrun_level) {
4042 $cwd_remove= getcwd();
4044 return unless defined $cwd_remove;
4045 if (!chdir "$cwd_remove") {
4046 return if $!==&ENOENT;
4047 die "chdir $cwd_remove: $!";
4049 printdebug "clone rmonerror removing $dstdir\n";
4051 rmtree($dstdir) or die "remove $dstdir: $!\n";
4052 } elsif (grep { $! == $_ }
4053 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4055 print STDERR "check whether to remove $dstdir: $!\n";
4061 $cwd_remove = undef;
4064 sub branchsuite () {
4065 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4066 if ($branch =~ m#$lbranch_re#o) {
4073 sub fetchpullargs () {
4075 if (!defined $package) {
4076 my $sourcep = parsecontrol('debian/control','debian/control');
4077 $package = getfield $sourcep, 'Source';
4080 $isuite = branchsuite();
4082 my $clogp = parsechangelog();
4083 $isuite = getfield $clogp, 'Distribution';
4085 } elsif (@ARGV==1) {
4088 badusage "incorrect arguments to dgit fetch or dgit pull";
4095 my $multi_fetched = fork_for_multisuite(sub { });
4096 exit 0 if $multi_fetched;
4103 if (quiltmode_splitbrain()) {
4104 my ($format, $fopts) = get_source_format();
4105 madformat($format) and fail <<END
4106 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4115 badusage "-p is not allowed with dgit push" if defined $package;
4117 my $clogp = parsechangelog();
4118 $package = getfield $clogp, 'Source';
4121 } elsif (@ARGV==1) {
4122 ($specsuite) = (@ARGV);
4124 badusage "incorrect arguments to dgit push";
4126 $isuite = getfield $clogp, 'Distribution';
4128 local ($package) = $existing_package; # this is a hack
4129 canonicalise_suite();
4131 canonicalise_suite();
4133 if (defined $specsuite &&
4134 $specsuite ne $isuite &&
4135 $specsuite ne $csuite) {
4136 fail "dgit push: changelog specifies $isuite ($csuite)".
4137 " but command line specifies $specsuite";
4142 #---------- remote commands' implementation ----------
4144 sub cmd_remote_push_build_host {
4145 my ($nrargs) = shift @ARGV;
4146 my (@rargs) = @ARGV[0..$nrargs-1];
4147 @ARGV = @ARGV[$nrargs..$#ARGV];
4149 my ($dir,$vsnwant) = @rargs;
4150 # vsnwant is a comma-separated list; we report which we have
4151 # chosen in our ready response (so other end can tell if they
4154 $we_are_responder = 1;
4155 $us .= " (build host)";
4159 open PI, "<&STDIN" or die $!;
4160 open STDIN, "/dev/null" or die $!;
4161 open PO, ">&STDOUT" or die $!;
4163 open STDOUT, ">&STDERR" or die $!;
4167 ($protovsn) = grep {
4168 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4169 } @rpushprotovsn_support;
4171 fail "build host has dgit rpush protocol versions ".
4172 (join ",", @rpushprotovsn_support).
4173 " but invocation host has $vsnwant"
4174 unless defined $protovsn;
4176 responder_send_command("dgit-remote-push-ready $protovsn");
4177 rpush_handle_protovsn_bothends();
4182 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4183 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4184 # a good error message)
4186 sub rpush_handle_protovsn_bothends () {
4187 if ($protovsn < 4) {
4188 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4197 my $report = i_child_report();
4198 if (defined $report) {
4199 printdebug "($report)\n";
4200 } elsif ($i_child_pid) {
4201 printdebug "(killing build host child $i_child_pid)\n";
4202 kill 15, $i_child_pid;
4204 if (defined $i_tmp && !defined $initiator_tempdir) {
4206 eval { rmtree $i_tmp; };
4210 END { i_cleanup(); }
4213 my ($base,$selector,@args) = @_;
4214 $selector =~ s/\-/_/g;
4215 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4222 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4230 push @rargs, join ",", @rpushprotovsn_support;
4233 push @rdgit, @ropts;
4234 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4236 my @cmd = (@ssh, $host, shellquote @rdgit);
4239 if (defined $initiator_tempdir) {
4240 rmtree $initiator_tempdir;
4241 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4242 $i_tmp = $initiator_tempdir;
4246 $i_child_pid = open2(\*RO, \*RI, @cmd);
4248 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4249 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4250 $supplementary_message = '' unless $protovsn >= 3;
4252 fail "rpush negotiated protocol version $protovsn".
4253 " which does not support quilt mode $quilt_mode"
4254 if quiltmode_splitbrain;
4256 rpush_handle_protovsn_bothends();
4258 my ($icmd,$iargs) = initiator_expect {
4259 m/^(\S+)(?: (.*))?$/;
4262 i_method "i_resp", $icmd, $iargs;
4266 sub i_resp_progress ($) {
4268 my $msg = protocol_read_bytes \*RO, $rhs;
4272 sub i_resp_supplementary_message ($) {
4274 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4277 sub i_resp_complete {
4278 my $pid = $i_child_pid;
4279 $i_child_pid = undef; # prevents killing some other process with same pid
4280 printdebug "waiting for build host child $pid...\n";
4281 my $got = waitpid $pid, 0;
4282 die $! unless $got == $pid;
4283 die "build host child failed $?" if $?;
4286 printdebug "all done\n";
4290 sub i_resp_file ($) {
4292 my $localname = i_method "i_localname", $keyword;
4293 my $localpath = "$i_tmp/$localname";
4294 stat_exists $localpath and
4295 badproto \*RO, "file $keyword ($localpath) twice";
4296 protocol_receive_file \*RO, $localpath;
4297 i_method "i_file", $keyword;
4302 sub i_resp_param ($) {
4303 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4307 sub i_resp_previously ($) {
4308 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4309 or badproto \*RO, "bad previously spec";
4310 my $r = system qw(git check-ref-format), $1;
4311 die "bad previously ref spec ($r)" if $r;
4312 $previously{$1} = $2;
4317 sub i_resp_want ($) {
4319 die "$keyword ?" if $i_wanted{$keyword}++;
4320 my @localpaths = i_method "i_want", $keyword;
4321 printdebug "[[ $keyword @localpaths\n";
4322 foreach my $localpath (@localpaths) {
4323 protocol_send_file \*RI, $localpath;
4325 print RI "files-end\n" or die $!;
4328 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4330 sub i_localname_parsed_changelog {
4331 return "remote-changelog.822";
4333 sub i_file_parsed_changelog {
4334 ($i_clogp, $i_version, $i_dscfn) =
4335 push_parse_changelog "$i_tmp/remote-changelog.822";
4336 die if $i_dscfn =~ m#/|^\W#;
4339 sub i_localname_dsc {
4340 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4345 sub i_localname_changes {
4346 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4347 $i_changesfn = $i_dscfn;
4348 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4349 return $i_changesfn;
4351 sub i_file_changes { }
4353 sub i_want_signed_tag {
4354 printdebug Dumper(\%i_param, $i_dscfn);
4355 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4356 && defined $i_param{'csuite'}
4357 or badproto \*RO, "premature desire for signed-tag";
4358 my $head = $i_param{'head'};
4359 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4361 my $maintview = $i_param{'maint-view'};
4362 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4365 if ($protovsn >= 4) {
4366 my $p = $i_param{'tagformat'} // '<undef>';
4368 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4371 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4373 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4375 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4378 push_mktags $i_clogp, $i_dscfn,
4379 $i_changesfn, 'remote changes',
4383 sub i_want_signed_dsc_changes {
4384 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4385 sign_changes $i_changesfn;
4386 return ($i_dscfn, $i_changesfn);
4389 #---------- building etc. ----------
4395 #----- `3.0 (quilt)' handling -----
4397 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4399 sub quiltify_dpkg_commit ($$$;$) {
4400 my ($patchname,$author,$msg, $xinfo) = @_;
4404 my $descfn = ".git/dgit/quilt-description.tmp";
4405 open O, '>', $descfn or die "$descfn: $!";
4406 $msg =~ s/\n+/\n\n/;
4407 print O <<END or die $!;
4409 ${xinfo}Subject: $msg
4416 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4417 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4418 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4419 runcmd @dpkgsource, qw(--commit .), $patchname;
4423 sub quiltify_trees_differ ($$;$$$) {
4424 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4425 # returns true iff the two tree objects differ other than in debian/
4426 # with $finegrained,
4427 # returns bitmask 01 - differ in upstream files except .gitignore
4428 # 02 - differ in .gitignore
4429 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4430 # is set for each modified .gitignore filename $fn
4431 # if $unrepres is defined, array ref to which is appeneded
4432 # a list of unrepresentable changes (removals of upstream files
4435 my @cmd = (@git, qw(diff-tree -z));
4436 push @cmd, qw(--name-only) unless $unrepres;
4437 push @cmd, qw(-r) if $finegrained || $unrepres;
4439 my $diffs= cmdoutput @cmd;
4442 foreach my $f (split /\0/, $diffs) {
4443 if ($unrepres && !@lmodes) {
4444 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4447 my ($oldmode,$newmode) = @lmodes;
4450 next if $f =~ m#^debian(?:/.*)?$#s;
4454 die "deleted\n" unless $newmode =~ m/[^0]/;
4455 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4456 if ($oldmode =~ m/[^0]/) {
4457 die "mode changed\n" if $oldmode ne $newmode;
4459 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4463 local $/="\n"; chomp $@;
4464 push @$unrepres, [ $f, $@ ];
4468 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4469 $r |= $isignore ? 02 : 01;
4470 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4472 printdebug "quiltify_trees_differ $x $y => $r\n";
4476 sub quiltify_tree_sentinelfiles ($) {
4477 # lists the `sentinel' files present in the tree
4479 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4480 qw(-- debian/rules debian/control);
4485 sub quiltify_splitbrain_needed () {
4486 if (!$split_brain) {
4487 progress "dgit view: changes are required...";
4488 runcmd @git, qw(checkout -q -b dgit-view);
4493 sub quiltify_splitbrain ($$$$$$) {
4494 my ($clogp, $unapplied, $headref, $diffbits,
4495 $editedignores, $cachekey) = @_;
4496 if ($quilt_mode !~ m/gbp|dpm/) {
4497 # treat .gitignore just like any other upstream file
4498 $diffbits = { %$diffbits };
4499 $_ = !!$_ foreach values %$diffbits;
4501 # We would like any commits we generate to be reproducible
4502 my @authline = clogp_authline($clogp);
4503 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4504 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4505 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4506 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4507 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4508 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4510 if ($quilt_mode =~ m/gbp|unapplied/ &&
4511 ($diffbits->{O2H} & 01)) {
4513 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4514 " but git tree differs from orig in upstream files.";
4515 if (!stat_exists "debian/patches") {
4517 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4521 if ($quilt_mode =~ m/dpm/ &&
4522 ($diffbits->{H2A} & 01)) {
4524 --quilt=$quilt_mode specified, implying patches-applied git tree
4525 but git tree differs from result of applying debian/patches to upstream
4528 if ($quilt_mode =~ m/gbp|unapplied/ &&
4529 ($diffbits->{O2A} & 01)) { # some patches
4530 quiltify_splitbrain_needed();
4531 progress "dgit view: creating patches-applied version using gbp pq";
4532 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4533 # gbp pq import creates a fresh branch; push back to dgit-view
4534 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4535 runcmd @git, qw(checkout -q dgit-view);
4537 if ($quilt_mode =~ m/gbp|dpm/ &&
4538 ($diffbits->{O2A} & 02)) {
4540 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4541 tool which does not create patches for changes to upstream
4542 .gitignores: but, such patches exist in debian/patches.
4545 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4546 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4547 quiltify_splitbrain_needed();
4548 progress "dgit view: creating patch to represent .gitignore changes";
4549 ensuredir "debian/patches";
4550 my $gipatch = "debian/patches/auto-gitignore";
4551 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4552 stat GIPATCH or die "$gipatch: $!";
4553 fail "$gipatch already exists; but want to create it".
4554 " to record .gitignore changes" if (stat _)[7];
4555 print GIPATCH <<END or die "$gipatch: $!";
4556 Subject: Update .gitignore from Debian packaging branch
4558 The Debian packaging git branch contains these updates to the upstream
4559 .gitignore file(s). This patch is autogenerated, to provide these
4560 updates to users of the official Debian archive view of the package.
4562 [dgit ($our_version) update-gitignore]
4565 close GIPATCH or die "$gipatch: $!";
4566 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4567 $unapplied, $headref, "--", sort keys %$editedignores;
4568 open SERIES, "+>>", "debian/patches/series" or die $!;
4569 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4571 defined read SERIES, $newline, 1 or die $!;
4572 print SERIES "\n" or die $! unless $newline eq "\n";
4573 print SERIES "auto-gitignore\n" or die $!;
4574 close SERIES or die $!;
4575 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4577 Commit patch to update .gitignore
4579 [dgit ($our_version) update-gitignore-quilt-fixup]
4583 my $dgitview = git_rev_parse 'HEAD';
4585 changedir '../../../..';
4586 # When we no longer need to support squeeze, use --create-reflog
4588 ensuredir ".git/logs/refs/dgit-intern";
4589 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4592 my $oldcache = git_get_ref "refs/$splitbraincache";
4593 if ($oldcache eq $dgitview) {
4594 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4595 # git update-ref doesn't always update, in this case. *sigh*
4596 my $dummy = make_commit_text <<END;
4599 author Dgit <dgit\@example.com> 1000000000 +0000
4600 committer Dgit <dgit\@example.com> 1000000000 +0000
4602 Dummy commit - do not use
4604 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4605 "refs/$splitbraincache", $dummy;
4607 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4610 changedir '.git/dgit/unpack/work';
4612 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4613 progress "dgit view: created ($saved)";
4616 sub quiltify ($$$$) {
4617 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4619 # Quilt patchification algorithm
4621 # We search backwards through the history of the main tree's HEAD
4622 # (T) looking for a start commit S whose tree object is identical
4623 # to to the patch tip tree (ie the tree corresponding to the
4624 # current dpkg-committed patch series). For these purposes
4625 # `identical' disregards anything in debian/ - this wrinkle is
4626 # necessary because dpkg-source treates debian/ specially.
4628 # We can only traverse edges where at most one of the ancestors'
4629 # trees differs (in changes outside in debian/). And we cannot
4630 # handle edges which change .pc/ or debian/patches. To avoid
4631 # going down a rathole we avoid traversing edges which introduce
4632 # debian/rules or debian/control. And we set a limit on the
4633 # number of edges we are willing to look at.
4635 # If we succeed, we walk forwards again. For each traversed edge
4636 # PC (with P parent, C child) (starting with P=S and ending with
4637 # C=T) to we do this:
4639 # - dpkg-source --commit with a patch name and message derived from C
4640 # After traversing PT, we git commit the changes which
4641 # should be contained within debian/patches.
4643 # The search for the path S..T is breadth-first. We maintain a
4644 # todo list containing search nodes. A search node identifies a
4645 # commit, and looks something like this:
4647 # Commit => $git_commit_id,
4648 # Child => $c, # or undef if P=T
4649 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4650 # Nontrivial => true iff $p..$c has relevant changes
4657 my %considered; # saves being exponential on some weird graphs
4659 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4662 my ($search,$whynot) = @_;
4663 printdebug " search NOT $search->{Commit} $whynot\n";
4664 $search->{Whynot} = $whynot;
4665 push @nots, $search;
4666 no warnings qw(exiting);
4675 my $c = shift @todo;
4676 next if $considered{$c->{Commit}}++;
4678 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4680 printdebug "quiltify investigate $c->{Commit}\n";
4683 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4684 printdebug " search finished hooray!\n";
4689 if ($quilt_mode eq 'nofix') {
4690 fail "quilt fixup required but quilt mode is \`nofix'\n".
4691 "HEAD commit $c->{Commit} differs from tree implied by ".
4692 " debian/patches (tree object $oldtiptree)";
4694 if ($quilt_mode eq 'smash') {
4695 printdebug " search quitting smash\n";
4699 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4700 $not->($c, "has $c_sentinels not $t_sentinels")
4701 if $c_sentinels ne $t_sentinels;
4703 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4704 $commitdata =~ m/\n\n/;
4706 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4707 @parents = map { { Commit => $_, Child => $c } } @parents;
4709 $not->($c, "root commit") if !@parents;
4711 foreach my $p (@parents) {
4712 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4714 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4715 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4717 foreach my $p (@parents) {
4718 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4720 my @cmd= (@git, qw(diff-tree -r --name-only),
4721 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4722 my $patchstackchange = cmdoutput @cmd;
4723 if (length $patchstackchange) {
4724 $patchstackchange =~ s/\n/,/g;
4725 $not->($p, "changed $patchstackchange");
4728 printdebug " search queue P=$p->{Commit} ",
4729 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4735 printdebug "quiltify want to smash\n";
4738 my $x = $_[0]{Commit};
4739 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4742 my $reportnot = sub {
4744 my $s = $abbrev->($notp);
4745 my $c = $notp->{Child};
4746 $s .= "..".$abbrev->($c) if $c;
4747 $s .= ": ".$notp->{Whynot};
4750 if ($quilt_mode eq 'linear') {
4751 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4752 foreach my $notp (@nots) {
4753 print STDERR "$us: ", $reportnot->($notp), "\n";
4755 print STDERR "$us: $_\n" foreach @$failsuggestion;
4756 fail "quilt fixup naive history linearisation failed.\n".
4757 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4758 } elsif ($quilt_mode eq 'smash') {
4759 } elsif ($quilt_mode eq 'auto') {
4760 progress "quilt fixup cannot be linear, smashing...";
4762 die "$quilt_mode ?";
4765 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4766 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4768 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4770 quiltify_dpkg_commit "auto-$version-$target-$time",
4771 (getfield $clogp, 'Maintainer'),
4772 "Automatically generated patch ($clogp->{Version})\n".
4773 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4777 progress "quiltify linearisation planning successful, executing...";
4779 for (my $p = $sref_S;
4780 my $c = $p->{Child};
4782 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4783 next unless $p->{Nontrivial};
4785 my $cc = $c->{Commit};
4787 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4788 $commitdata =~ m/\n\n/ or die "$c ?";
4791 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4794 my $commitdate = cmdoutput
4795 @git, qw(log -n1 --pretty=format:%aD), $cc;
4797 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4799 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4806 my $gbp_check_suitable = sub {
4811 die "contains unexpected slashes\n" if m{//} || m{/$};
4812 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4813 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4814 die "too long" if length > 200;
4816 return $_ unless $@;
4817 print STDERR "quiltifying commit $cc:".
4818 " ignoring/dropping Gbp-Pq $what: $@";
4822 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4824 (\S+) \s* \n //ixm) {
4825 $patchname = $gbp_check_suitable->($1, 'Name');
4827 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4829 (\S+) \s* \n //ixm) {
4830 $patchdir = $gbp_check_suitable->($1, 'Topic');
4835 if (!defined $patchname) {
4836 $patchname = $title;
4837 $patchname =~ s/[.:]$//;
4840 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4841 my $translitname = $converter->convert($patchname);
4842 die unless defined $translitname;
4843 $patchname = $translitname;
4846 "dgit: patch title transliteration error: $@"
4848 $patchname =~ y/ A-Z/-a-z/;
4849 $patchname =~ y/-a-z0-9_.+=~//cd;
4850 $patchname =~ s/^\W/x-$&/;
4851 $patchname = substr($patchname,0,40);
4853 if (!defined $patchdir) {
4856 if (length $patchdir) {
4857 $patchname = "$patchdir/$patchname";
4859 if ($patchname =~ m{^(.*)/}) {
4860 mkpath "debian/patches/$1";
4865 stat "debian/patches/$patchname$index";
4867 $!==ENOENT or die "$patchname$index $!";
4869 runcmd @git, qw(checkout -q), $cc;
4871 # We use the tip's changelog so that dpkg-source doesn't
4872 # produce complaining messages from dpkg-parsechangelog. None
4873 # of the information dpkg-source gets from the changelog is
4874 # actually relevant - it gets put into the original message
4875 # which dpkg-source provides our stunt editor, and then
4877 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4879 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4880 "Date: $commitdate\n".
4881 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4883 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4886 runcmd @git, qw(checkout -q master);
4889 sub build_maybe_quilt_fixup () {
4890 my ($format,$fopts) = get_source_format;
4891 return unless madformat_wantfixup $format;
4894 check_for_vendor_patches();
4896 if (quiltmode_splitbrain) {
4897 foreach my $needtf (qw(new maint)) {
4898 next if grep { $_ eq $needtf } access_cfg_tagformats;
4900 quilt mode $quilt_mode requires split view so server needs to support
4901 both "new" and "maint" tag formats, but config says it doesn't.
4906 my $clogp = parsechangelog();
4907 my $headref = git_rev_parse('HEAD');
4912 my $upstreamversion = upstreamversion $version;
4914 if ($fopts->{'single-debian-patch'}) {
4915 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4917 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4920 die 'bug' if $split_brain && !$need_split_build_invocation;
4922 changedir '../../../..';
4923 runcmd_ordryrun_local
4924 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4927 sub quilt_fixup_mkwork ($) {
4930 mkdir "work" or die $!;
4932 mktree_in_ud_here();
4933 runcmd @git, qw(reset -q --hard), $headref;
4936 sub quilt_fixup_linkorigs ($$) {
4937 my ($upstreamversion, $fn) = @_;
4938 # calls $fn->($leafname);
4940 foreach my $f (<../../../../*>) { #/){
4941 my $b=$f; $b =~ s{.*/}{};
4943 local ($debuglevel) = $debuglevel-1;
4944 printdebug "QF linkorigs $b, $f ?\n";
4946 next unless is_orig_file_of_vsn $b, $upstreamversion;
4947 printdebug "QF linkorigs $b, $f Y\n";
4948 link_ltarget $f, $b or die "$b $!";
4953 sub quilt_fixup_delete_pc () {
4954 runcmd @git, qw(rm -rqf .pc);
4956 Commit removal of .pc (quilt series tracking data)
4958 [dgit ($our_version) upgrade quilt-remove-pc]
4962 sub quilt_fixup_singlepatch ($$$) {
4963 my ($clogp, $headref, $upstreamversion) = @_;
4965 progress "starting quiltify (single-debian-patch)";
4967 # dpkg-source --commit generates new patches even if
4968 # single-debian-patch is in debian/source/options. In order to
4969 # get it to generate debian/patches/debian-changes, it is
4970 # necessary to build the source package.
4972 quilt_fixup_linkorigs($upstreamversion, sub { });
4973 quilt_fixup_mkwork($headref);
4975 rmtree("debian/patches");
4977 runcmd @dpkgsource, qw(-b .);
4979 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4980 rename srcfn("$upstreamversion", "/debian/patches"),
4981 "work/debian/patches";
4984 commit_quilty_patch();
4987 sub quilt_make_fake_dsc ($) {
4988 my ($upstreamversion) = @_;
4990 my $fakeversion="$upstreamversion-~~DGITFAKE";
4992 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4993 print $fakedsc <<END or die $!;
4996 Version: $fakeversion
5000 my $dscaddfile=sub {
5003 my $md = new Digest::MD5;
5005 my $fh = new IO::File $b, '<' or die "$b $!";
5010 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5013 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5015 my @files=qw(debian/source/format debian/rules
5016 debian/control debian/changelog);
5017 foreach my $maybe (qw(debian/patches debian/source/options
5018 debian/tests/control)) {
5019 next unless stat_exists "../../../$maybe";
5020 push @files, $maybe;
5023 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5024 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5026 $dscaddfile->($debtar);
5027 close $fakedsc or die $!;
5030 sub quilt_check_splitbrain_cache ($$) {
5031 my ($headref, $upstreamversion) = @_;
5032 # Called only if we are in (potentially) split brain mode.
5034 # Computes the cache key and looks in the cache.
5035 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5037 my $splitbrain_cachekey;
5040 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5041 # we look in the reflog of dgit-intern/quilt-cache
5042 # we look for an entry whose message is the key for the cache lookup
5043 my @cachekey = (qw(dgit), $our_version);
5044 push @cachekey, $upstreamversion;
5045 push @cachekey, $quilt_mode;
5046 push @cachekey, $headref;
5048 push @cachekey, hashfile('fake.dsc');
5050 my $srcshash = Digest::SHA->new(256);
5051 my %sfs = ( %INC, '$0(dgit)' => $0 );
5052 foreach my $sfk (sort keys %sfs) {
5053 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5054 $srcshash->add($sfk," ");
5055 $srcshash->add(hashfile($sfs{$sfk}));
5056 $srcshash->add("\n");
5058 push @cachekey, $srcshash->hexdigest();
5059 $splitbrain_cachekey = "@cachekey";
5061 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5063 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5064 debugcmd "|(probably)",@cmd;
5065 my $child = open GC, "-|"; defined $child or die $!;
5067 chdir '../../..' or die $!;
5068 if (!stat ".git/logs/refs/$splitbraincache") {
5069 $! == ENOENT or die $!;
5070 printdebug ">(no reflog)\n";
5077 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5078 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5081 quilt_fixup_mkwork($headref);
5082 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5083 if ($cachehit ne $headref) {
5084 progress "dgit view: found cached ($saved)";
5085 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5087 return ($cachehit, $splitbrain_cachekey);
5089 progress "dgit view: found cached, no changes required";
5090 return ($headref, $splitbrain_cachekey);
5092 die $! if GC->error;
5093 failedcmd unless close GC;
5095 printdebug "splitbrain cache miss\n";
5096 return (undef, $splitbrain_cachekey);
5099 sub quilt_fixup_multipatch ($$$) {
5100 my ($clogp, $headref, $upstreamversion) = @_;
5102 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5105 # - honour any existing .pc in case it has any strangeness
5106 # - determine the git commit corresponding to the tip of
5107 # the patch stack (if there is one)
5108 # - if there is such a git commit, convert each subsequent
5109 # git commit into a quilt patch with dpkg-source --commit
5110 # - otherwise convert all the differences in the tree into
5111 # a single git commit
5115 # Our git tree doesn't necessarily contain .pc. (Some versions of
5116 # dgit would include the .pc in the git tree.) If there isn't
5117 # one, we need to generate one by unpacking the patches that we
5120 # We first look for a .pc in the git tree. If there is one, we
5121 # will use it. (This is not the normal case.)
5123 # Otherwise need to regenerate .pc so that dpkg-source --commit
5124 # can work. We do this as follows:
5125 # 1. Collect all relevant .orig from parent directory
5126 # 2. Generate a debian.tar.gz out of
5127 # debian/{patches,rules,source/format,source/options}
5128 # 3. Generate a fake .dsc containing just these fields:
5129 # Format Source Version Files
5130 # 4. Extract the fake .dsc
5131 # Now the fake .dsc has a .pc directory.
5132 # (In fact we do this in every case, because in future we will
5133 # want to search for a good base commit for generating patches.)
5135 # Then we can actually do the dpkg-source --commit
5136 # 1. Make a new working tree with the same object
5137 # store as our main tree and check out the main
5139 # 2. Copy .pc from the fake's extraction, if necessary
5140 # 3. Run dpkg-source --commit
5141 # 4. If the result has changes to debian/, then
5142 # - git add them them
5143 # - git add .pc if we had a .pc in-tree
5145 # 5. If we had a .pc in-tree, delete it, and git commit
5146 # 6. Back in the main tree, fast forward to the new HEAD
5148 # Another situation we may have to cope with is gbp-style
5149 # patches-unapplied trees.
5151 # We would want to detect these, so we know to escape into
5152 # quilt_fixup_gbp. However, this is in general not possible.
5153 # Consider a package with a one patch which the dgit user reverts
5154 # (with git revert or the moral equivalent).
5156 # That is indistinguishable in contents from a patches-unapplied
5157 # tree. And looking at the history to distinguish them is not
5158 # useful because the user might have made a confusing-looking git
5159 # history structure (which ought to produce an error if dgit can't
5160 # cope, not a silent reintroduction of an unwanted patch).
5162 # So gbp users will have to pass an option. But we can usually
5163 # detect their failure to do so: if the tree is not a clean
5164 # patches-applied tree, quilt linearisation fails, but the tree
5165 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5166 # they want --quilt=unapplied.
5168 # To help detect this, when we are extracting the fake dsc, we
5169 # first extract it with --skip-patches, and then apply the patches
5170 # afterwards with dpkg-source --before-build. That lets us save a
5171 # tree object corresponding to .origs.
5173 my $splitbrain_cachekey;
5175 quilt_make_fake_dsc($upstreamversion);
5177 if (quiltmode_splitbrain()) {
5179 ($cachehit, $splitbrain_cachekey) =
5180 quilt_check_splitbrain_cache($headref, $upstreamversion);
5181 return if $cachehit;
5185 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5187 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5188 rename $fakexdir, "fake" or die "$fakexdir $!";
5192 remove_stray_gits();
5193 mktree_in_ud_here();
5197 runcmd @git, qw(add -Af .);
5198 my $unapplied=git_write_tree();
5199 printdebug "fake orig tree object $unapplied\n";
5203 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5205 if (system @bbcmd) {
5206 failedcmd @bbcmd if $? < 0;
5208 failed to apply your git tree's patch stack (from debian/patches/) to
5209 the corresponding upstream tarball(s). Your source tree and .orig
5210 are probably too inconsistent. dgit can only fix up certain kinds of
5211 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5217 quilt_fixup_mkwork($headref);
5220 if (stat_exists ".pc") {
5222 progress "Tree already contains .pc - will use it then delete it.";
5225 rename '../fake/.pc','.pc' or die $!;
5228 changedir '../fake';
5230 runcmd @git, qw(add -Af .);
5231 my $oldtiptree=git_write_tree();
5232 printdebug "fake o+d/p tree object $unapplied\n";
5233 changedir '../work';
5236 # We calculate some guesswork now about what kind of tree this might
5237 # be. This is mostly for error reporting.
5243 # O = orig, without patches applied
5244 # A = "applied", ie orig with H's debian/patches applied
5245 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5246 \%editedignores, \@unrepres),
5247 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5248 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5252 foreach my $b (qw(01 02)) {
5253 foreach my $v (qw(O2H O2A H2A)) {
5254 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5257 printdebug "differences \@dl @dl.\n";
5260 "$us: base trees orig=%.20s o+d/p=%.20s",
5261 $unapplied, $oldtiptree;
5263 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5264 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5265 $dl[0], $dl[1], $dl[3], $dl[4],
5269 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5271 forceable_fail [qw(unrepresentable)], <<END;
5272 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5277 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5278 push @failsuggestion, "This might be a patches-unapplied branch.";
5279 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5280 push @failsuggestion, "This might be a patches-applied branch.";
5282 push @failsuggestion, "Maybe you need to specify one of".
5283 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5285 if (quiltmode_splitbrain()) {
5286 quiltify_splitbrain($clogp, $unapplied, $headref,
5287 $diffbits, \%editedignores,
5288 $splitbrain_cachekey);
5292 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5293 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5295 if (!open P, '>>', ".pc/applied-patches") {
5296 $!==&ENOENT or die $!;
5301 commit_quilty_patch();
5303 if ($mustdeletepc) {
5304 quilt_fixup_delete_pc();
5308 sub quilt_fixup_editor () {
5309 my $descfn = $ENV{$fakeeditorenv};
5310 my $editing = $ARGV[$#ARGV];
5311 open I1, '<', $descfn or die "$descfn: $!";
5312 open I2, '<', $editing or die "$editing: $!";
5313 unlink $editing or die "$editing: $!";
5314 open O, '>', $editing or die "$editing: $!";
5315 while (<I1>) { print O or die $!; } I1->error and die $!;
5318 $copying ||= m/^\-\-\- /;
5319 next unless $copying;
5322 I2->error and die $!;
5327 sub maybe_apply_patches_dirtily () {
5328 return unless $quilt_mode =~ m/gbp|unapplied/;
5329 print STDERR <<END or die $!;
5331 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5332 dgit: Have to apply the patches - making the tree dirty.
5333 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5336 $patches_applied_dirtily = 01;
5337 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5338 runcmd qw(dpkg-source --before-build .);
5341 sub maybe_unapply_patches_again () {
5342 progress "dgit: Unapplying patches again to tidy up the tree."
5343 if $patches_applied_dirtily;
5344 runcmd qw(dpkg-source --after-build .)
5345 if $patches_applied_dirtily & 01;
5347 if $patches_applied_dirtily & 02;
5348 $patches_applied_dirtily = 0;
5351 #----- other building -----
5353 our $clean_using_builder;
5354 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5355 # clean the tree before building (perhaps invoked indirectly by
5356 # whatever we are using to run the build), rather than separately
5357 # and explicitly by us.
5360 return if $clean_using_builder;
5361 if ($cleanmode eq 'dpkg-source') {
5362 maybe_apply_patches_dirtily();
5363 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5364 } elsif ($cleanmode eq 'dpkg-source-d') {
5365 maybe_apply_patches_dirtily();
5366 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5367 } elsif ($cleanmode eq 'git') {
5368 runcmd_ordryrun_local @git, qw(clean -xdf);
5369 } elsif ($cleanmode eq 'git-ff') {
5370 runcmd_ordryrun_local @git, qw(clean -xdff);
5371 } elsif ($cleanmode eq 'check') {
5372 my $leftovers = cmdoutput @git, qw(clean -xdn);
5373 if (length $leftovers) {
5374 print STDERR $leftovers, "\n" or die $!;
5375 fail "tree contains uncommitted files and --clean=check specified";
5377 } elsif ($cleanmode eq 'none') {
5384 badusage "clean takes no additional arguments" if @ARGV;
5387 maybe_unapply_patches_again();
5390 sub build_prep_early () {
5391 our $build_prep_early_done //= 0;
5392 return if $build_prep_early_done++;
5394 badusage "-p is not allowed when building" if defined $package;
5395 my $clogp = parsechangelog();
5396 $isuite = getfield $clogp, 'Distribution';
5397 $package = getfield $clogp, 'Source';
5398 $version = getfield $clogp, 'Version';
5405 build_maybe_quilt_fixup();
5407 my $pat = changespat $version;
5408 foreach my $f (glob "$buildproductsdir/$pat") {
5410 unlink $f or fail "remove old changes file $f: $!";
5412 progress "would remove $f";
5418 sub changesopts_initial () {
5419 my @opts =@changesopts[1..$#changesopts];
5422 sub changesopts_version () {
5423 if (!defined $changes_since_version) {
5424 my @vsns = archive_query('archive_query');
5425 my @quirk = access_quirk();
5426 if ($quirk[0] eq 'backports') {
5427 local $isuite = $quirk[2];
5429 canonicalise_suite();
5430 push @vsns, archive_query('archive_query');
5433 @vsns = map { $_->[0] } @vsns;
5434 @vsns = sort { -version_compare($a, $b) } @vsns;
5435 $changes_since_version = $vsns[0];
5436 progress "changelog will contain changes since $vsns[0]";
5438 $changes_since_version = '_';
5439 progress "package seems new, not specifying -v<version>";
5442 if ($changes_since_version ne '_') {
5443 return ("-v$changes_since_version");
5449 sub changesopts () {
5450 return (changesopts_initial(), changesopts_version());
5453 sub massage_dbp_args ($;$) {
5454 my ($cmd,$xargs) = @_;
5457 # - if we're going to split the source build out so we can
5458 # do strange things to it, massage the arguments to dpkg-buildpackage
5459 # so that the main build doessn't build source (or add an argument
5460 # to stop it building source by default).
5462 # - add -nc to stop dpkg-source cleaning the source tree,
5463 # unless we're not doing a split build and want dpkg-source
5464 # as cleanmode, in which case we can do nothing
5467 # 0 - source will NOT need to be built separately by caller
5468 # +1 - source will need to be built separately by caller
5469 # +2 - source will need to be built separately by caller AND
5470 # dpkg-buildpackage should not in fact be run at all!
5471 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5472 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5473 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5474 $clean_using_builder = 1;
5477 # -nc has the side effect of specifying -b if nothing else specified
5478 # and some combinations of -S, -b, et al, are errors, rather than
5479 # later simply overriding earlie. So we need to:
5480 # - search the command line for these options
5481 # - pick the last one
5482 # - perhaps add our own as a default
5483 # - perhaps adjust it to the corresponding non-source-building version
5485 foreach my $l ($cmd, $xargs) {
5487 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5490 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5492 if ($need_split_build_invocation) {
5493 printdebug "massage split $dmode.\n";
5494 $r = $dmode =~ m/[S]/ ? +2 :
5495 $dmode =~ y/gGF/ABb/ ? +1 :
5496 $dmode =~ m/[ABb]/ ? 0 :
5499 printdebug "massage done $r $dmode.\n";
5501 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5507 my $wasdir = must_getcwd();
5513 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5514 my ($msg_if_onlyone) = @_;
5515 # If there is only one .changes file, fail with $msg_if_onlyone,
5516 # or if that is undef, be a no-op.
5517 # Returns the changes file to report to the user.
5518 my $pat = changespat $version;
5519 my @changesfiles = glob $pat;
5520 @changesfiles = sort {
5521 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5525 if (@changesfiles==1) {
5526 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5527 only one changes file from build (@changesfiles)
5529 $result = $changesfiles[0];
5530 } elsif (@changesfiles==2) {
5531 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5532 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5533 fail "$l found in binaries changes file $binchanges"
5536 runcmd_ordryrun_local @mergechanges, @changesfiles;
5537 my $multichanges = changespat $version,'multi';
5539 stat_exists $multichanges or fail "$multichanges: $!";
5540 foreach my $cf (glob $pat) {
5541 next if $cf eq $multichanges;
5542 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5545 $result = $multichanges;
5547 fail "wrong number of different changes files (@changesfiles)";
5549 printdone "build successful, results in $result\n" or die $!;
5552 sub midbuild_checkchanges () {
5553 my $pat = changespat $version;
5554 return if $rmchanges;
5555 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5556 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5558 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5559 Suggest you delete @unwanted.
5564 sub midbuild_checkchanges_vanilla ($) {
5566 midbuild_checkchanges() if $wantsrc == 1;
5569 sub postbuild_mergechanges_vanilla ($) {
5571 if ($wantsrc == 1) {
5573 postbuild_mergechanges(undef);
5576 printdone "build successful\n";
5581 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5582 my $wantsrc = massage_dbp_args \@dbp;
5585 midbuild_checkchanges_vanilla $wantsrc;
5590 push @dbp, changesopts_version();
5591 maybe_apply_patches_dirtily();
5592 runcmd_ordryrun_local @dbp;
5594 maybe_unapply_patches_again();
5595 postbuild_mergechanges_vanilla $wantsrc;
5599 $quilt_mode //= 'gbp';
5605 # gbp can make .origs out of thin air. In my tests it does this
5606 # even for a 1.0 format package, with no origs present. So I
5607 # guess it keys off just the version number. We don't know
5608 # exactly what .origs ought to exist, but let's assume that we
5609 # should run gbp if: the version has an upstream part and the main
5611 my $upstreamversion = upstreamversion $version;
5612 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5613 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5615 if ($gbp_make_orig) {
5617 $cleanmode = 'none'; # don't do it again
5618 $need_split_build_invocation = 1;
5621 my @dbp = @dpkgbuildpackage;
5623 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5625 if (!length $gbp_build[0]) {
5626 if (length executable_on_path('git-buildpackage')) {
5627 $gbp_build[0] = qw(git-buildpackage);
5629 $gbp_build[0] = 'gbp buildpackage';
5632 my @cmd = opts_opt_multi_cmd @gbp_build;
5634 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5636 if ($gbp_make_orig) {
5637 ensuredir '.git/dgit';
5638 my $ok = '.git/dgit/origs-gen-ok';
5639 unlink $ok or $!==&ENOENT or die $!;
5640 my @origs_cmd = @cmd;
5641 push @origs_cmd, qw(--git-cleaner=true);
5642 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5643 push @origs_cmd, @ARGV;
5645 debugcmd @origs_cmd;
5647 do { local $!; stat_exists $ok; }
5648 or failedcmd @origs_cmd;
5650 dryrun_report @origs_cmd;
5656 midbuild_checkchanges_vanilla $wantsrc;
5658 if (!$clean_using_builder) {
5659 push @cmd, '--git-cleaner=true';
5663 maybe_unapply_patches_again();
5665 push @cmd, changesopts();
5666 runcmd_ordryrun_local @cmd, @ARGV;
5668 postbuild_mergechanges_vanilla $wantsrc;
5670 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5673 my $our_cleanmode = $cleanmode;
5674 if ($need_split_build_invocation) {
5675 # Pretend that clean is being done some other way. This
5676 # forces us not to try to use dpkg-buildpackage to clean and
5677 # build source all in one go; and instead we run dpkg-source
5678 # (and build_prep() will do the clean since $clean_using_builder
5680 $our_cleanmode = 'ELSEWHERE';
5682 if ($our_cleanmode =~ m/^dpkg-source/) {
5683 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5684 $clean_using_builder = 1;
5687 $sourcechanges = changespat $version,'source';
5689 unlink "../$sourcechanges" or $!==ENOENT
5690 or fail "remove $sourcechanges: $!";
5692 $dscfn = dscfn($version);
5693 if ($our_cleanmode eq 'dpkg-source') {
5694 maybe_apply_patches_dirtily();
5695 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5697 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5698 maybe_apply_patches_dirtily();
5699 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5702 my @cmd = (@dpkgsource, qw(-b --));
5705 runcmd_ordryrun_local @cmd, "work";
5706 my @udfiles = <${package}_*>;
5707 changedir "../../..";
5708 foreach my $f (@udfiles) {
5709 printdebug "source copy, found $f\n";
5712 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5713 $f eq srcfn($version, $&));
5714 printdebug "source copy, found $f - renaming\n";
5715 rename "$ud/$f", "../$f" or $!==ENOENT
5716 or fail "put in place new source file ($f): $!";
5719 my $pwd = must_getcwd();
5720 my $leafdir = basename $pwd;
5722 runcmd_ordryrun_local @cmd, $leafdir;
5725 runcmd_ordryrun_local qw(sh -ec),
5726 'exec >$1; shift; exec "$@"','x',
5727 "../$sourcechanges",
5728 @dpkggenchanges, qw(-S), changesopts();
5732 sub cmd_build_source {
5733 badusage "build-source takes no additional arguments" if @ARGV;
5735 maybe_unapply_patches_again();
5736 printdone "source built, results in $dscfn and $sourcechanges";
5741 midbuild_checkchanges();
5744 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5745 stat_exists $sourcechanges
5746 or fail "$sourcechanges (in parent directory): $!";
5748 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5750 maybe_unapply_patches_again();
5752 postbuild_mergechanges(<<END);
5753 perhaps you need to pass -A ? (sbuild's default is to build only
5754 arch-specific binaries; dgit 1.4 used to override that.)
5759 sub cmd_quilt_fixup {
5760 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5761 my $clogp = parsechangelog();
5762 $version = getfield $clogp, 'Version';
5763 $package = getfield $clogp, 'Source';
5766 build_maybe_quilt_fixup();
5769 sub cmd_import_dsc {
5773 last unless $ARGV[0] =~ m/^-/;
5776 if (m/^--require-valid-signature$/) {
5779 badusage "unknown dgit import-dsc sub-option \`$_'";
5783 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5784 my ($dscfn, $dstbranch) = @ARGV;
5786 badusage "dry run makes no sense with import-dsc" unless act_local();
5788 my $force = $dstbranch =~ s/^\+// ? +1 :
5789 $dstbranch =~ s/^\.\.// ? -1 :
5791 my $info = $force ? " $&" : '';
5792 $info = "$dscfn$info";
5794 my $specbranch = $dstbranch;
5795 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5796 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5798 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5799 my $chead = cmdoutput_errok @symcmd;
5800 defined $chead or $?==256 or failedcmd @symcmd;
5802 fail "$dstbranch is checked out - will not update it"
5803 if defined $chead and $chead eq $dstbranch;
5805 my $oldhash = git_get_ref $dstbranch;
5807 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5808 $dscdata = do { local $/ = undef; <D>; };
5809 D->error and fail "read $dscfn: $!";
5812 # we don't normally need this so import it here
5813 use Dpkg::Source::Package;
5814 my $dp = new Dpkg::Source::Package filename => $dscfn,
5815 require_valid_signature => $needsig;
5817 local $SIG{__WARN__} = sub {
5819 return unless $needsig;
5820 fail "import-dsc signature check failed";
5822 if (!$dp->is_signed()) {
5823 warn "$us: warning: importing unsigned .dsc\n";
5825 my $r = $dp->check_signature();
5826 die "->check_signature => $r" if $needsig && $r;
5832 my $dgit_commit = $dsc->{$ourdscfield[0]};
5833 if (defined $dgit_commit &&
5834 !forceing [qw(import-dsc-with-dgit-field)]) {
5835 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5836 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5837 my @cmd = (qw(sh -ec),
5838 "echo $dgit_commit | git cat-file --batch-check");
5839 my $objgot = cmdoutput @cmd;
5840 if ($objgot =~ m#^\w+ missing\b#) {
5842 .dsc contains Dgit field referring to object $dgit_commit
5843 Your git tree does not have that object. Try `git fetch' from a
5844 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5847 if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
5849 progress "Not fast forward, forced update.";
5851 fail "Not fast forward to $dgit_commit";
5854 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5855 $dstbranch, $dgit_commit);
5857 progress "dgit: import-dsc updated git ref $dstbranch";
5862 Branch $dstbranch already exists
5863 Specify ..$specbranch for a pseudo-merge, binding in existing history
5864 Specify +$specbranch to overwrite, discarding existing history
5866 if $oldhash && !$force;
5868 $package = getfield $dsc, 'Source';
5869 my @dfi = dsc_files_info();
5870 foreach my $fi (@dfi) {
5871 my $f = $fi->{Filename};
5873 next if lstat $here;
5874 fail "stat $here: $!" unless $! == ENOENT;
5876 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5878 } elsif ($dscfn =~ m#^/#) {
5881 fail "cannot import $dscfn which seems to be inside working tree!";
5883 $there =~ s#/+[^/]+$## or
5884 fail "cannot import $dscfn which seems to not have a basename";
5886 symlink $there, $here or fail "symlink $there to $here: $!";
5887 progress "made symlink $here -> $there";
5888 print STDERR Dumper($fi);
5890 my @mergeinputs = generate_commits_from_dsc();
5891 die unless @mergeinputs == 1;
5893 my $newhash = $mergeinputs[0]{Commit};
5897 progress "Import, forced update - synthetic orphan git history.";
5898 } elsif ($force < 0) {
5899 progress "Import, merging.";
5900 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5901 my $version = getfield $dsc, 'Version';
5902 $newhash = make_commit_text <<END;
5907 Merge $package ($version) import into $dstbranch
5910 die; # caught earlier
5914 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5915 $dstbranch, $newhash);
5917 progress "dgit: import-dsc results are in in git ref $dstbranch";
5920 sub cmd_archive_api_query {
5921 badusage "need only 1 subpath argument" unless @ARGV==1;
5922 my ($subpath) = @ARGV;
5923 my @cmd = archive_api_query_cmd($subpath);
5926 exec @cmd or fail "exec curl: $!\n";
5929 sub cmd_clone_dgit_repos_server {
5930 badusage "need destination argument" unless @ARGV==1;
5931 my ($destdir) = @ARGV;
5932 $package = '_dgit-repos-server';
5933 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5935 exec @cmd or fail "exec git clone: $!\n";
5938 sub cmd_setup_mergechangelogs {
5939 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5940 setup_mergechangelogs(1);
5943 sub cmd_setup_useremail {
5944 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5948 sub cmd_setup_new_tree {
5949 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5953 #---------- argument parsing and main program ----------
5956 print "dgit version $our_version\n" or die $!;
5960 our (%valopts_long, %valopts_short);
5963 sub defvalopt ($$$$) {
5964 my ($long,$short,$val_re,$how) = @_;
5965 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5966 $valopts_long{$long} = $oi;
5967 $valopts_short{$short} = $oi;
5968 # $how subref should:
5969 # do whatever assignemnt or thing it likes with $_[0]
5970 # if the option should not be passed on to remote, @rvalopts=()
5971 # or $how can be a scalar ref, meaning simply assign the value
5974 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5975 defvalopt '--distro', '-d', '.+', \$idistro;
5976 defvalopt '', '-k', '.+', \$keyid;
5977 defvalopt '--existing-package','', '.*', \$existing_package;
5978 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5979 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5980 defvalopt '--package', '-p', $package_re, \$package;
5981 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5983 defvalopt '', '-C', '.+', sub {
5984 ($changesfile) = (@_);
5985 if ($changesfile =~ s#^(.*)/##) {
5986 $buildproductsdir = $1;
5990 defvalopt '--initiator-tempdir','','.*', sub {
5991 ($initiator_tempdir) = (@_);
5992 $initiator_tempdir =~ m#^/# or
5993 badusage "--initiator-tempdir must be used specify an".
5994 " absolute, not relative, directory."
6000 if (defined $ENV{'DGIT_SSH'}) {
6001 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6002 } elsif (defined $ENV{'GIT_SSH'}) {
6003 @ssh = ($ENV{'GIT_SSH'});
6011 if (!defined $val) {
6012 badusage "$what needs a value" unless @ARGV;
6014 push @rvalopts, $val;
6016 badusage "bad value \`$val' for $what" unless
6017 $val =~ m/^$oi->{Re}$(?!\n)/s;
6018 my $how = $oi->{How};
6019 if (ref($how) eq 'SCALAR') {
6024 push @ropts, @rvalopts;
6028 last unless $ARGV[0] =~ m/^-/;
6032 if (m/^--dry-run$/) {
6035 } elsif (m/^--damp-run$/) {
6038 } elsif (m/^--no-sign$/) {
6041 } elsif (m/^--help$/) {
6043 } elsif (m/^--version$/) {
6045 } elsif (m/^--new$/) {
6048 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6049 ($om = $opts_opt_map{$1}) &&
6053 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6054 !$opts_opt_cmdonly{$1} &&
6055 ($om = $opts_opt_map{$1})) {
6058 } elsif (m/^--(gbp|dpm)$/s) {
6059 push @ropts, "--quilt=$1";
6061 } elsif (m/^--ignore-dirty$/s) {
6064 } elsif (m/^--no-quilt-fixup$/s) {
6066 $quilt_mode = 'nocheck';
6067 } elsif (m/^--no-rm-on-error$/s) {
6070 } elsif (m/^--overwrite$/s) {
6072 $overwrite_version = '';
6073 } elsif (m/^--overwrite=(.+)$/s) {
6075 $overwrite_version = $1;
6076 } elsif (m/^--delayed=(\d+)$/s) {
6079 } elsif (m/^--dgit-view-save=(.+)$/s) {
6081 $split_brain_save = $1;
6082 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6083 } elsif (m/^--(no-)?rm-old-changes$/s) {
6086 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6088 push @deliberatelies, $&;
6089 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6093 } elsif (m/^--force-/) {
6095 "$us: warning: ignoring unknown force option $_\n";
6097 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6098 # undocumented, for testing
6100 $tagformat_want = [ $1, 'command line', 1 ];
6101 # 1 menas overrides distro configuration
6102 } elsif (m/^--always-split-source-build$/s) {
6103 # undocumented, for testing
6105 $need_split_build_invocation = 1;
6106 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6107 $val = $2 ? $' : undef; #';
6108 $valopt->($oi->{Long});
6110 badusage "unknown long option \`$_'";
6117 } elsif (s/^-L/-/) {
6120 } elsif (s/^-h/-/) {
6122 } elsif (s/^-D/-/) {
6126 } elsif (s/^-N/-/) {
6131 push @changesopts, $_;
6133 } elsif (s/^-wn$//s) {
6135 $cleanmode = 'none';
6136 } elsif (s/^-wg$//s) {
6139 } elsif (s/^-wgf$//s) {
6141 $cleanmode = 'git-ff';
6142 } elsif (s/^-wd$//s) {
6144 $cleanmode = 'dpkg-source';
6145 } elsif (s/^-wdd$//s) {
6147 $cleanmode = 'dpkg-source-d';
6148 } elsif (s/^-wc$//s) {
6150 $cleanmode = 'check';
6151 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6152 push @git, '-c', $&;
6153 $gitcfgs{cmdline}{$1} = [ $2 ];
6154 } elsif (s/^-c([^=]+)$//s) {
6155 push @git, '-c', $&;
6156 $gitcfgs{cmdline}{$1} = [ 'true' ];
6157 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6159 $val = undef unless length $val;
6160 $valopt->($oi->{Short});
6163 badusage "unknown short option \`$_'";
6170 sub check_env_sanity () {
6171 my $blocked = new POSIX::SigSet;
6172 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6175 foreach my $name (qw(PIPE CHLD)) {
6176 my $signame = "SIG$name";
6177 my $signum = eval "POSIX::$signame" // die;
6178 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6179 die "$signame is set to something other than SIG_DFL\n";
6180 $blocked->ismember($signum) and
6181 die "$signame is blocked\n";
6187 On entry to dgit, $@
6188 This is a bug produced by something in in your execution environment.
6194 sub finalise_opts_opts () {
6195 foreach my $k (keys %opts_opt_map) {
6196 my $om = $opts_opt_map{$k};
6198 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6200 badcfg "cannot set command for $k"
6201 unless length $om->[0];
6205 foreach my $c (access_cfg_cfgs("opts-$k")) {
6207 map { $_ ? @$_ : () }
6208 map { $gitcfgs{$_}{$c} }
6209 reverse @gitcfgsources;
6210 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6211 "\n" if $debuglevel >= 4;
6213 badcfg "cannot configure options for $k"
6214 if $opts_opt_cmdonly{$k};
6215 my $insertpos = $opts_cfg_insertpos{$k};
6216 @$om = ( @$om[0..$insertpos-1],
6218 @$om[$insertpos..$#$om] );
6223 if ($ENV{$fakeeditorenv}) {
6225 quilt_fixup_editor();
6232 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6233 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6234 if $dryrun_level == 1;
6236 print STDERR $helpmsg or die $!;
6239 my $cmd = shift @ARGV;
6242 my $pre_fn = ${*::}{"pre_$cmd"};
6243 $pre_fn->() if $pre_fn;
6245 if (!defined $rmchanges) {
6246 local $access_forpush;
6247 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6250 if (!defined $quilt_mode) {
6251 local $access_forpush;
6252 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6253 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6255 $quilt_mode =~ m/^($quilt_modes_re)$/
6256 or badcfg "unknown quilt-mode \`$quilt_mode'";
6260 $need_split_build_invocation ||= quiltmode_splitbrain();
6262 if (!defined $cleanmode) {
6263 local $access_forpush;
6264 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6265 $cleanmode //= 'dpkg-source';
6267 badcfg "unknown clean-mode \`$cleanmode'" unless
6268 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6271 my $fn = ${*::}{"cmd_$cmd"};
6272 $fn or badusage "unknown operation $cmd";