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 git_add_write_tree () {
1697 runcmd @git, qw(add -Af .);
1698 return git_write_tree();
1701 sub remove_stray_gits () {
1702 my @gitscmd = qw(find -name .git -prune -print0);
1703 debugcmd "|",@gitscmd;
1704 open GITS, "-|", @gitscmd or die $!;
1709 print STDERR "$us: warning: removing from source package: ",
1710 (messagequote $_), "\n";
1714 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1717 sub mktree_in_ud_from_only_subdir (;$) {
1720 # changes into the subdir
1722 die "expected one subdir but found @dirs ?" unless @dirs==1;
1723 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1727 remove_stray_gits();
1728 mktree_in_ud_here();
1730 my ($format, $fopts) = get_source_format();
1731 if (madformat($format)) {
1736 runcmd @git, qw(add -Af);
1737 my $tree=git_write_tree();
1738 return ($tree,$dir);
1741 our @files_csum_info_fields =
1742 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1743 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1744 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1746 sub dsc_files_info () {
1747 foreach my $csumi (@files_csum_info_fields) {
1748 my ($fname, $module, $method) = @$csumi;
1749 my $field = $dsc->{$fname};
1750 next unless defined $field;
1751 eval "use $module; 1;" or die $@;
1753 foreach (split /\n/, $field) {
1755 m/^(\w+) (\d+) (\S+)$/ or
1756 fail "could not parse .dsc $fname line \`$_'";
1757 my $digester = eval "$module"."->$method;" or die $@;
1762 Digester => $digester,
1767 fail "missing any supported Checksums-* or Files field in ".
1768 $dsc->get_option('name');
1772 map { $_->{Filename} } dsc_files_info();
1775 sub files_compare_inputs (@) {
1780 my $showinputs = sub {
1781 return join "; ", map { $_->get_option('name') } @$inputs;
1784 foreach my $in (@$inputs) {
1786 my $in_name = $in->get_option('name');
1788 printdebug "files_compare_inputs $in_name\n";
1790 foreach my $csumi (@files_csum_info_fields) {
1791 my ($fname) = @$csumi;
1792 printdebug "files_compare_inputs $in_name $fname\n";
1794 my $field = $in->{$fname};
1795 next unless defined $field;
1798 foreach (split /\n/, $field) {
1801 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1802 fail "could not parse $in_name $fname line \`$_'";
1804 printdebug "files_compare_inputs $in_name $fname $f\n";
1808 my $re = \ $record{$f}{$fname};
1810 $fchecked{$f}{$in_name} = 1;
1812 fail "hash or size of $f varies in $fname fields".
1813 " (between: ".$showinputs->().")";
1818 @files = sort @files;
1819 $expected_files //= \@files;
1820 "@$expected_files" eq "@files" or
1821 fail "file list in $in_name varies between hash fields!";
1824 fail "$in_name has no files list field(s)";
1826 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1829 grep { keys %$_ == @$inputs-1 } values %fchecked
1830 or fail "no file appears in all file lists".
1831 " (looked in: ".$showinputs->().")";
1834 sub is_orig_file_in_dsc ($$) {
1835 my ($f, $dsc_files_info) = @_;
1836 return 0 if @$dsc_files_info <= 1;
1837 # One file means no origs, and the filename doesn't have a "what
1838 # part of dsc" component. (Consider versions ending `.orig'.)
1839 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1843 sub is_orig_file_of_vsn ($$) {
1844 my ($f, $upstreamvsn) = @_;
1845 my $base = srcfn $upstreamvsn, '';
1846 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1850 sub changes_update_origs_from_dsc ($$$$) {
1851 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1853 printdebug "checking origs needed ($upstreamvsn)...\n";
1854 $_ = getfield $changes, 'Files';
1855 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1856 fail "cannot find section/priority from .changes Files field";
1857 my $placementinfo = $1;
1859 printdebug "checking origs needed placement '$placementinfo'...\n";
1860 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1861 $l =~ m/\S+$/ or next;
1863 printdebug "origs $file | $l\n";
1864 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1865 printdebug "origs $file is_orig\n";
1866 my $have = archive_query('file_in_archive', $file);
1867 if (!defined $have) {
1869 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1875 printdebug "origs $file \$#\$have=$#$have\n";
1876 foreach my $h (@$have) {
1879 foreach my $csumi (@files_csum_info_fields) {
1880 my ($fname, $module, $method, $archivefield) = @$csumi;
1881 next unless defined $h->{$archivefield};
1882 $_ = $dsc->{$fname};
1883 next unless defined;
1884 m/^(\w+) .* \Q$file\E$/m or
1885 fail ".dsc $fname missing entry for $file";
1886 if ($h->{$archivefield} eq $1) {
1890 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1893 die "$file ".Dumper($h)." ?!" if $same && @differ;
1896 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1899 printdebug "origs $file f.same=$found_same".
1900 " #f._differ=$#found_differ\n";
1901 if (@found_differ && !$found_same) {
1903 "archive contains $file with different checksum",
1906 # Now we edit the changes file to add or remove it
1907 foreach my $csumi (@files_csum_info_fields) {
1908 my ($fname, $module, $method, $archivefield) = @$csumi;
1909 next unless defined $changes->{$fname};
1911 # in archive, delete from .changes if it's there
1912 $changed{$file} = "removed" if
1913 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1914 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1915 # not in archive, but it's here in the .changes
1917 my $dsc_data = getfield $dsc, $fname;
1918 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1920 $extra =~ s/ \d+ /$&$placementinfo /
1921 or die "$fname $extra >$dsc_data< ?"
1922 if $fname eq 'Files';
1923 $changes->{$fname} .= "\n". $extra;
1924 $changed{$file} = "added";
1929 foreach my $file (keys %changed) {
1931 "edited .changes for archive .orig contents: %s %s",
1932 $changed{$file}, $file;
1934 my $chtmp = "$changesfile.tmp";
1935 $changes->save($chtmp);
1937 rename $chtmp,$changesfile or die "$changesfile $!";
1939 progress "[new .changes left in $changesfile]";
1942 progress "$changesfile already has appropriate .orig(s) (if any)";
1946 sub make_commit ($) {
1948 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1951 sub make_commit_text ($) {
1954 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1956 print Dumper($text) if $debuglevel > 1;
1957 my $child = open2($out, $in, @cmd) or die $!;
1960 print $in $text or die $!;
1961 close $in or die $!;
1963 $h =~ m/^\w+$/ or die;
1965 printdebug "=> $h\n";
1968 waitpid $child, 0 == $child or die "$child $!";
1969 $? and failedcmd @cmd;
1973 sub clogp_authline ($) {
1975 my $author = getfield $clogp, 'Maintainer';
1976 $author =~ s#,.*##ms;
1977 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1978 my $authline = "$author $date";
1979 $authline =~ m/$git_authline_re/o or
1980 fail "unexpected commit author line format \`$authline'".
1981 " (was generated from changelog Maintainer field)";
1982 return ($1,$2,$3) if wantarray;
1986 sub vendor_patches_distro ($$) {
1987 my ($checkdistro, $what) = @_;
1988 return unless defined $checkdistro;
1990 my $series = "debian/patches/\L$checkdistro\E.series";
1991 printdebug "checking for vendor-specific $series ($what)\n";
1993 if (!open SERIES, "<", $series) {
1994 die "$series $!" unless $!==ENOENT;
2003 Unfortunately, this source package uses a feature of dpkg-source where
2004 the same source package unpacks to different source code on different
2005 distros. dgit cannot safely operate on such packages on affected
2006 distros, because the meaning of source packages is not stable.
2008 Please ask the distro/maintainer to remove the distro-specific series
2009 files and use a different technique (if necessary, uploading actually
2010 different packages, if different distros are supposed to have
2014 fail "Found active distro-specific series file for".
2015 " $checkdistro ($what): $series, cannot continue";
2017 die "$series $!" if SERIES->error;
2021 sub check_for_vendor_patches () {
2022 # This dpkg-source feature doesn't seem to be documented anywhere!
2023 # But it can be found in the changelog (reformatted):
2025 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2026 # Author: Raphael Hertzog <hertzog@debian.org>
2027 # Date: Sun Oct 3 09:36:48 2010 +0200
2029 # dpkg-source: correctly create .pc/.quilt_series with alternate
2032 # If you have debian/patches/ubuntu.series and you were
2033 # unpacking the source package on ubuntu, quilt was still
2034 # directed to debian/patches/series instead of
2035 # debian/patches/ubuntu.series.
2037 # debian/changelog | 3 +++
2038 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2039 # 2 files changed, 6 insertions(+), 1 deletion(-)
2042 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2043 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2044 "Dpkg::Vendor \`current vendor'");
2045 vendor_patches_distro(access_basedistro(),
2046 "(base) distro being accessed");
2047 vendor_patches_distro(access_nomdistro(),
2048 "(nominal) distro being accessed");
2051 sub generate_commits_from_dsc () {
2052 # See big comment in fetch_from_archive, below.
2053 # See also README.dsc-import.
2057 my @dfi = dsc_files_info();
2058 foreach my $fi (@dfi) {
2059 my $f = $fi->{Filename};
2060 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2062 printdebug "considering linking $f: ";
2064 link_ltarget "../../../../$f", $f
2065 or ((printdebug "($!) "), 0)
2069 printdebug "linked.\n";
2071 complete_file_from_dsc('.', $fi)
2074 if (is_orig_file_in_dsc($f, \@dfi)) {
2075 link $f, "../../../../$f"
2081 # We unpack and record the orig tarballs first, so that we only
2082 # need disk space for one private copy of the unpacked source.
2083 # But we can't make them into commits until we have the metadata
2084 # from the debian/changelog, so we record the tree objects now and
2085 # make them into commits later.
2087 my $upstreamv = upstreamversion $dsc->{version};
2088 my $orig_f_base = srcfn $upstreamv, '';
2090 foreach my $fi (@dfi) {
2091 # We actually import, and record as a commit, every tarball
2092 # (unless there is only one file, in which case there seems
2095 my $f = $fi->{Filename};
2096 printdebug "import considering $f ";
2097 (printdebug "only one dfi\n"), next if @dfi == 1;
2098 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2099 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2103 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2105 printdebug "Y ", (join ' ', map { $_//"(none)" }
2106 $compr_ext, $orig_f_part
2109 my $input = new IO::File $f, '<' or die "$f $!";
2113 if (defined $compr_ext) {
2115 Dpkg::Compression::compression_guess_from_filename $f;
2116 fail "Dpkg::Compression cannot handle file $f in source package"
2117 if defined $compr_ext && !defined $cname;
2119 new Dpkg::Compression::Process compression => $cname;
2120 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2121 my $compr_fh = new IO::Handle;
2122 my $compr_pid = open $compr_fh, "-|" // die $!;
2124 open STDIN, "<&", $input or die $!;
2126 die "dgit (child): exec $compr_cmd[0]: $!\n";
2131 rmtree "../unpack-tar";
2132 mkdir "../unpack-tar" or die $!;
2133 my @tarcmd = qw(tar -x -f -
2134 --no-same-owner --no-same-permissions
2135 --no-acls --no-xattrs --no-selinux);
2136 my $tar_pid = fork // die $!;
2138 chdir "../unpack-tar" or die $!;
2139 open STDIN, "<&", $input or die $!;
2141 die "dgit (child): exec $tarcmd[0]: $!";
2143 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2144 !$? or failedcmd @tarcmd;
2147 (@compr_cmd ? failedcmd @compr_cmd
2149 # finally, we have the results in "tarball", but maybe
2150 # with the wrong permissions
2152 runcmd qw(chmod -R +rwX ../unpack-tar);
2153 changedir "../unpack-tar";
2154 my ($tree) = mktree_in_ud_from_only_subdir(1);
2155 changedir "../../unpack";
2156 rmtree "../unpack-tar";
2158 my $ent = [ $f, $tree ];
2160 Orig => !!$orig_f_part,
2161 Sort => (!$orig_f_part ? 2 :
2162 $orig_f_part =~ m/-/g ? 1 :
2170 # put any without "_" first (spec is not clear whether files
2171 # are always in the usual order). Tarballs without "_" are
2172 # the main orig or the debian tarball.
2173 $a->{Sort} <=> $b->{Sort} or
2177 my $any_orig = grep { $_->{Orig} } @tartrees;
2179 my $dscfn = "$package.dsc";
2181 my $treeimporthow = 'package';
2183 open D, ">", $dscfn or die "$dscfn: $!";
2184 print D $dscdata or die "$dscfn: $!";
2185 close D or die "$dscfn: $!";
2186 my @cmd = qw(dpkg-source);
2187 push @cmd, '--no-check' if $dsc_checked;
2188 if (madformat $dsc->{format}) {
2189 push @cmd, '--skip-patches';
2190 $treeimporthow = 'unpatched';
2192 push @cmd, qw(-x --), $dscfn;
2195 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
2196 if (madformat $dsc->{format}) {
2197 check_for_vendor_patches();
2201 if (madformat $dsc->{format}) {
2202 my @pcmd = qw(dpkg-source --before-build .);
2203 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2205 runcmd @git, qw(add -Af);
2206 $dappliedtree = git_write_tree();
2209 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2210 debugcmd "|",@clogcmd;
2211 open CLOGS, "-|", @clogcmd or die $!;
2216 printdebug "import clog search...\n";
2219 my $stanzatext = do { local $/=""; <CLOGS>; };
2220 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2221 last if !defined $stanzatext;
2223 my $desc = "package changelog, entry no.$.";
2224 open my $stanzafh, "<", \$stanzatext or die;
2225 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2226 $clogp //= $thisstanza;
2228 printdebug "import clog $thisstanza->{version} $desc...\n";
2230 last if !$any_orig; # we don't need $r1clogp
2232 # We look for the first (most recent) changelog entry whose
2233 # version number is lower than the upstream version of this
2234 # package. Then the last (least recent) previous changelog
2235 # entry is treated as the one which introduced this upstream
2236 # version and used for the synthetic commits for the upstream
2239 # One might think that a more sophisticated algorithm would be
2240 # necessary. But: we do not want to scan the whole changelog
2241 # file. Stopping when we see an earlier version, which
2242 # necessarily then is an earlier upstream version, is the only
2243 # realistic way to do that. Then, either the earliest
2244 # changelog entry we have seen so far is indeed the earliest
2245 # upload of this upstream version; or there are only changelog
2246 # entries relating to later upstream versions (which is not
2247 # possible unless the changelog and .dsc disagree about the
2248 # version). Then it remains to choose between the physically
2249 # last entry in the file, and the one with the lowest version
2250 # number. If these are not the same, we guess that the
2251 # versions were created in a non-monotic order rather than
2252 # that the changelog entries have been misordered.
2254 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2256 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2257 $r1clogp = $thisstanza;
2259 printdebug "import clog $r1clogp->{version} becomes r1\n";
2261 die $! if CLOGS->error;
2262 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2264 $clogp or fail "package changelog has no entries!";
2266 my $authline = clogp_authline $clogp;
2267 my $changes = getfield $clogp, 'Changes';
2268 my $cversion = getfield $clogp, 'Version';
2271 $r1clogp //= $clogp; # maybe there's only one entry;
2272 my $r1authline = clogp_authline $r1clogp;
2273 # Strictly, r1authline might now be wrong if it's going to be
2274 # unused because !$any_orig. Whatever.
2276 printdebug "import tartrees authline $authline\n";
2277 printdebug "import tartrees r1authline $r1authline\n";
2279 foreach my $tt (@tartrees) {
2280 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2282 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2285 committer $r1authline
2289 [dgit import orig $tt->{F}]
2297 [dgit import tarball $package $cversion $tt->{F}]
2302 printdebug "import main commit\n";
2304 open C, ">../commit.tmp" or die $!;
2305 print C <<END or die $!;
2308 print C <<END or die $! foreach @tartrees;
2311 print C <<END or die $!;
2317 [dgit import $treeimporthow $package $cversion]
2321 my $rawimport_hash = make_commit qw(../commit.tmp);
2323 if (madformat $dsc->{format}) {
2324 printdebug "import apply patches...\n";
2326 # regularise the state of the working tree so that
2327 # the checkout of $rawimport_hash works nicely.
2328 my $dappliedcommit = make_commit_text(<<END);
2335 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2337 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2339 # We need the answers to be reproducible
2340 my @authline = clogp_authline($clogp);
2341 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2342 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2343 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2344 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2345 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2346 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2348 my $path = $ENV{PATH} or die;
2350 foreach my $use_absurd (qw(0 1)) {
2351 local $ENV{PATH} = $path;
2354 progress "warning: $@";
2355 $path = "$absurdity:$path";
2356 progress "$us: trying slow absurd-git-apply...";
2357 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2362 die "forbid absurd git-apply\n" if $use_absurd
2363 && forceing [qw(import-gitapply-no-absurd)];
2364 die "only absurd git-apply!\n" if !$use_absurd
2365 && forceing [qw(import-gitapply-absurd)];
2367 local $ENV{PATH} = $path if $use_absurd;
2369 my @showcmd = (gbp_pq, qw(import));
2370 my @realcmd = shell_cmd
2371 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2372 debugcmd "+",@realcmd;
2373 if (system @realcmd) {
2374 die +(shellquote @showcmd).
2376 failedcmd_waitstatus()."\n";
2379 my $gapplied = git_rev_parse('HEAD');
2380 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2381 $gappliedtree eq $dappliedtree or
2383 gbp-pq import and dpkg-source disagree!
2384 gbp-pq import gave commit $gapplied
2385 gbp-pq import gave tree $gappliedtree
2386 dpkg-source --before-build gave tree $dappliedtree
2388 $rawimport_hash = $gapplied;
2393 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2398 progress "synthesised git commit from .dsc $cversion";
2400 my $rawimport_mergeinput = {
2401 Commit => $rawimport_hash,
2402 Info => "Import of source package",
2404 my @output = ($rawimport_mergeinput);
2406 if ($lastpush_mergeinput) {
2407 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2408 my $oversion = getfield $oldclogp, 'Version';
2410 version_compare($oversion, $cversion);
2412 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2413 { Message => <<END, ReverseParents => 1 });
2414 Record $package ($cversion) in archive suite $csuite
2416 } elsif ($vcmp > 0) {
2417 print STDERR <<END or die $!;
2419 Version actually in archive: $cversion (older)
2420 Last version pushed with dgit: $oversion (newer or same)
2423 @output = $lastpush_mergeinput;
2425 # Same version. Use what's in the server git branch,
2426 # discarding our own import. (This could happen if the
2427 # server automatically imports all packages into git.)
2428 @output = $lastpush_mergeinput;
2431 changedir '../../../..';
2436 sub complete_file_from_dsc ($$) {
2437 our ($dstdir, $fi) = @_;
2438 # Ensures that we have, in $dir, the file $fi, with the correct
2439 # contents. (Downloading it from alongside $dscurl if necessary.)
2441 my $f = $fi->{Filename};
2442 my $tf = "$dstdir/$f";
2445 if (stat_exists $tf) {
2446 progress "using existing $f";
2448 printdebug "$tf does not exist, need to fetch\n";
2450 $furl =~ s{/[^/]+$}{};
2452 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2453 die "$f ?" if $f =~ m#/#;
2454 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2455 return 0 if !act_local();
2459 open F, "<", "$tf" or die "$tf: $!";
2460 $fi->{Digester}->reset();
2461 $fi->{Digester}->addfile(*F);
2462 F->error and die $!;
2463 my $got = $fi->{Digester}->hexdigest();
2464 $got eq $fi->{Hash} or
2465 fail "file $f has hash $got but .dsc".
2466 " demands hash $fi->{Hash} ".
2467 ($downloaded ? "(got wrong file from archive!)"
2468 : "(perhaps you should delete this file?)");
2473 sub ensure_we_have_orig () {
2474 my @dfi = dsc_files_info();
2475 foreach my $fi (@dfi) {
2476 my $f = $fi->{Filename};
2477 next unless is_orig_file_in_dsc($f, \@dfi);
2478 complete_file_from_dsc('..', $fi)
2483 sub git_fetch_us () {
2484 # Want to fetch only what we are going to use, unless
2485 # deliberately-not-ff, in which case we must fetch everything.
2487 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2489 (quiltmode_splitbrain
2490 ? (map { $_->('*',access_nomdistro) }
2491 \&debiantag_new, \&debiantag_maintview)
2492 : debiantags('*',access_nomdistro));
2493 push @specs, server_branch($csuite);
2494 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2496 # This is rather miserable:
2497 # When git fetch --prune is passed a fetchspec ending with a *,
2498 # it does a plausible thing. If there is no * then:
2499 # - it matches subpaths too, even if the supplied refspec
2500 # starts refs, and behaves completely madly if the source
2501 # has refs/refs/something. (See, for example, Debian #NNNN.)
2502 # - if there is no matching remote ref, it bombs out the whole
2504 # We want to fetch a fixed ref, and we don't know in advance
2505 # if it exists, so this is not suitable.
2507 # Our workaround is to use git ls-remote. git ls-remote has its
2508 # own qairks. Notably, it has the absurd multi-tail-matching
2509 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2510 # refs/refs/foo etc.
2512 # Also, we want an idempotent snapshot, but we have to make two
2513 # calls to the remote: one to git ls-remote and to git fetch. The
2514 # solution is use git ls-remote to obtain a target state, and
2515 # git fetch to try to generate it. If we don't manage to generate
2516 # the target state, we try again.
2518 printdebug "git_fetch_us specs @specs\n";
2520 my $specre = join '|', map {
2526 printdebug "git_fetch_us specre=$specre\n";
2527 my $wanted_rref = sub {
2529 return m/^(?:$specre)$/o;
2532 my $fetch_iteration = 0;
2535 printdebug "git_fetch_us iteration $fetch_iteration\n";
2536 if (++$fetch_iteration > 10) {
2537 fail "too many iterations trying to get sane fetch!";
2540 my @look = map { "refs/$_" } @specs;
2541 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2545 open GITLS, "-|", @lcmd or die $!;
2547 printdebug "=> ", $_;
2548 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2549 my ($objid,$rrefname) = ($1,$2);
2550 if (!$wanted_rref->($rrefname)) {
2552 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2556 $wantr{$rrefname} = $objid;
2559 close GITLS or failedcmd @lcmd;
2561 # OK, now %want is exactly what we want for refs in @specs
2563 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2564 "+refs/$_:".lrfetchrefs."/$_";
2567 printdebug "git_fetch_us fspecs @fspecs\n";
2569 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2570 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2573 %lrfetchrefs_f = ();
2576 git_for_each_ref(lrfetchrefs, sub {
2577 my ($objid,$objtype,$lrefname,$reftail) = @_;
2578 $lrfetchrefs_f{$lrefname} = $objid;
2579 $objgot{$objid} = 1;
2582 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2583 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2584 if (!exists $wantr{$rrefname}) {
2585 if ($wanted_rref->($rrefname)) {
2587 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2591 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2594 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2595 delete $lrfetchrefs_f{$lrefname};
2599 foreach my $rrefname (sort keys %wantr) {
2600 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2601 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2602 my $want = $wantr{$rrefname};
2603 next if $got eq $want;
2604 if (!defined $objgot{$want}) {
2606 warning: git ls-remote suggests we want $lrefname
2607 warning: and it should refer to $want
2608 warning: but git fetch didn't fetch that object to any relevant ref.
2609 warning: This may be due to a race with someone updating the server.
2610 warning: Will try again...
2612 next FETCH_ITERATION;
2615 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2617 runcmd_ordryrun_local @git, qw(update-ref -m),
2618 "dgit fetch git fetch fixup", $lrefname, $want;
2619 $lrfetchrefs_f{$lrefname} = $want;
2623 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2624 Dumper(\%lrfetchrefs_f);
2627 my @tagpats = debiantags('*',access_nomdistro);
2629 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2630 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2631 printdebug "currently $fullrefname=$objid\n";
2632 $here{$fullrefname} = $objid;
2634 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2635 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2636 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2637 printdebug "offered $lref=$objid\n";
2638 if (!defined $here{$lref}) {
2639 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2640 runcmd_ordryrun_local @upd;
2641 lrfetchref_used $fullrefname;
2642 } elsif ($here{$lref} eq $objid) {
2643 lrfetchref_used $fullrefname;
2646 "Not updateting $lref from $here{$lref} to $objid.\n";
2651 sub mergeinfo_getclogp ($) {
2652 # Ensures thit $mi->{Clogp} exists and returns it
2654 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2657 sub mergeinfo_version ($) {
2658 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2661 sub fetch_from_archive_record_1 ($) {
2663 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2664 'DGIT_ARCHIVE', $hash;
2665 cmdoutput @git, qw(log -n2), $hash;
2666 # ... gives git a chance to complain if our commit is malformed
2669 sub fetch_from_archive_record_2 ($) {
2671 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2675 dryrun_report @upd_cmd;
2679 sub fetch_from_archive () {
2680 ensure_setup_existing_tree();
2682 # Ensures that lrref() is what is actually in the archive, one way
2683 # or another, according to us - ie this client's
2684 # appropritaely-updated archive view. Also returns the commit id.
2685 # If there is nothing in the archive, leaves lrref alone and
2686 # returns undef. git_fetch_us must have already been called.
2690 foreach my $field (@ourdscfield) {
2691 $dsc_hash = $dsc->{$field};
2692 last if defined $dsc_hash;
2694 if (defined $dsc_hash) {
2695 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2697 progress "last upload to archive specified git hash";
2699 progress "last upload to archive has NO git hash";
2702 progress "no version available from the archive";
2705 # If the archive's .dsc has a Dgit field, there are three
2706 # relevant git commitids we need to choose between and/or merge
2708 # 1. $dsc_hash: the Dgit field from the archive
2709 # 2. $lastpush_hash: the suite branch on the dgit git server
2710 # 3. $lastfetch_hash: our local tracking brach for the suite
2712 # These may all be distinct and need not be in any fast forward
2715 # If the dsc was pushed to this suite, then the server suite
2716 # branch will have been updated; but it might have been pushed to
2717 # a different suite and copied by the archive. Conversely a more
2718 # recent version may have been pushed with dgit but not appeared
2719 # in the archive (yet).
2721 # $lastfetch_hash may be awkward because archive imports
2722 # (particularly, imports of Dgit-less .dscs) are performed only as
2723 # needed on individual clients, so different clients may perform a
2724 # different subset of them - and these imports are only made
2725 # public during push. So $lastfetch_hash may represent a set of
2726 # imports different to a subsequent upload by a different dgit
2729 # Our approach is as follows:
2731 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2732 # descendant of $dsc_hash, then it was pushed by a dgit user who
2733 # had based their work on $dsc_hash, so we should prefer it.
2734 # Otherwise, $dsc_hash was installed into this suite in the
2735 # archive other than by a dgit push, and (necessarily) after the
2736 # last dgit push into that suite (since a dgit push would have
2737 # been descended from the dgit server git branch); thus, in that
2738 # case, we prefer the archive's version (and produce a
2739 # pseudo-merge to overwrite the dgit server git branch).
2741 # (If there is no Dgit field in the archive's .dsc then
2742 # generate_commit_from_dsc uses the version numbers to decide
2743 # whether the suite branch or the archive is newer. If the suite
2744 # branch is newer it ignores the archive's .dsc; otherwise it
2745 # generates an import of the .dsc, and produces a pseudo-merge to
2746 # overwrite the suite branch with the archive contents.)
2748 # The outcome of that part of the algorithm is the `public view',
2749 # and is same for all dgit clients: it does not depend on any
2750 # unpublished history in the local tracking branch.
2752 # As between the public view and the local tracking branch: The
2753 # local tracking branch is only updated by dgit fetch, and
2754 # whenever dgit fetch runs it includes the public view in the
2755 # local tracking branch. Therefore if the public view is not
2756 # descended from the local tracking branch, the local tracking
2757 # branch must contain history which was imported from the archive
2758 # but never pushed; and, its tip is now out of date. So, we make
2759 # a pseudo-merge to overwrite the old imports and stitch the old
2762 # Finally: we do not necessarily reify the public view (as
2763 # described above). This is so that we do not end up stacking two
2764 # pseudo-merges. So what we actually do is figure out the inputs
2765 # to any public view pseudo-merge and put them in @mergeinputs.
2768 # $mergeinputs[]{Commit}
2769 # $mergeinputs[]{Info}
2770 # $mergeinputs[0] is the one whose tree we use
2771 # @mergeinputs is in the order we use in the actual commit)
2774 # $mergeinputs[]{Message} is a commit message to use
2775 # $mergeinputs[]{ReverseParents} if def specifies that parent
2776 # list should be in opposite order
2777 # Such an entry has no Commit or Info. It applies only when found
2778 # in the last entry. (This ugliness is to support making
2779 # identical imports to previous dgit versions.)
2781 my $lastpush_hash = git_get_ref(lrfetchref());
2782 printdebug "previous reference hash=$lastpush_hash\n";
2783 $lastpush_mergeinput = $lastpush_hash && {
2784 Commit => $lastpush_hash,
2785 Info => "dgit suite branch on dgit git server",
2788 my $lastfetch_hash = git_get_ref(lrref());
2789 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2790 my $lastfetch_mergeinput = $lastfetch_hash && {
2791 Commit => $lastfetch_hash,
2792 Info => "dgit client's archive history view",
2795 my $dsc_mergeinput = $dsc_hash && {
2796 Commit => $dsc_hash,
2797 Info => "Dgit field in .dsc from archive",
2801 my $del_lrfetchrefs = sub {
2804 printdebug "del_lrfetchrefs...\n";
2805 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2806 my $objid = $lrfetchrefs_d{$fullrefname};
2807 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2809 $gur ||= new IO::Handle;
2810 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2812 printf $gur "delete %s %s\n", $fullrefname, $objid;
2815 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2819 if (defined $dsc_hash) {
2820 ensure_we_have_orig();
2821 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2822 @mergeinputs = $dsc_mergeinput
2823 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2824 print STDERR <<END or die $!;
2826 Git commit in archive is behind the last version allegedly pushed/uploaded.
2827 Commit referred to by archive: $dsc_hash
2828 Last version pushed with dgit: $lastpush_hash
2831 @mergeinputs = ($lastpush_mergeinput);
2833 # Archive has .dsc which is not a descendant of the last dgit
2834 # push. This can happen if the archive moves .dscs about.
2835 # Just follow its lead.
2836 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2837 progress "archive .dsc names newer git commit";
2838 @mergeinputs = ($dsc_mergeinput);
2840 progress "archive .dsc names other git commit, fixing up";
2841 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2845 @mergeinputs = generate_commits_from_dsc();
2846 # We have just done an import. Now, our import algorithm might
2847 # have been improved. But even so we do not want to generate
2848 # a new different import of the same package. So if the
2849 # version numbers are the same, just use our existing version.
2850 # If the version numbers are different, the archive has changed
2851 # (perhaps, rewound).
2852 if ($lastfetch_mergeinput &&
2853 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2854 (mergeinfo_version $mergeinputs[0]) )) {
2855 @mergeinputs = ($lastfetch_mergeinput);
2857 } elsif ($lastpush_hash) {
2858 # only in git, not in the archive yet
2859 @mergeinputs = ($lastpush_mergeinput);
2860 print STDERR <<END or die $!;
2862 Package not found in the archive, but has allegedly been pushed using dgit.
2866 printdebug "nothing found!\n";
2867 if (defined $skew_warning_vsn) {
2868 print STDERR <<END or die $!;
2870 Warning: relevant archive skew detected.
2871 Archive allegedly contains $skew_warning_vsn
2872 But we were not able to obtain any version from the archive or git.
2876 unshift @end, $del_lrfetchrefs;
2880 if ($lastfetch_hash &&
2882 my $h = $_->{Commit};
2883 $h and is_fast_fwd($lastfetch_hash, $h);
2884 # If true, one of the existing parents of this commit
2885 # is a descendant of the $lastfetch_hash, so we'll
2886 # be ff from that automatically.
2890 push @mergeinputs, $lastfetch_mergeinput;
2893 printdebug "fetch mergeinfos:\n";
2894 foreach my $mi (@mergeinputs) {
2896 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2898 printdebug sprintf " ReverseParents=%d Message=%s",
2899 $mi->{ReverseParents}, $mi->{Message};
2903 my $compat_info= pop @mergeinputs
2904 if $mergeinputs[$#mergeinputs]{Message};
2906 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2909 if (@mergeinputs > 1) {
2911 my $tree_commit = $mergeinputs[0]{Commit};
2913 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2914 $tree =~ m/\n\n/; $tree = $`;
2915 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2918 # We use the changelog author of the package in question the
2919 # author of this pseudo-merge. This is (roughly) correct if
2920 # this commit is simply representing aa non-dgit upload.
2921 # (Roughly because it does not record sponsorship - but we
2922 # don't have sponsorship info because that's in the .changes,
2923 # which isn't in the archivw.)
2925 # But, it might be that we are representing archive history
2926 # updates (including in-archive copies). These are not really
2927 # the responsibility of the person who created the .dsc, but
2928 # there is no-one whose name we should better use. (The
2929 # author of the .dsc-named commit is clearly worse.)
2931 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2932 my $author = clogp_authline $useclogp;
2933 my $cversion = getfield $useclogp, 'Version';
2935 my $mcf = ".git/dgit/mergecommit";
2936 open MC, ">", $mcf or die "$mcf $!";
2937 print MC <<END or die $!;
2941 my @parents = grep { $_->{Commit} } @mergeinputs;
2942 @parents = reverse @parents if $compat_info->{ReverseParents};
2943 print MC <<END or die $! foreach @parents;
2947 print MC <<END or die $!;
2953 if (defined $compat_info->{Message}) {
2954 print MC $compat_info->{Message} or die $!;
2956 print MC <<END or die $!;
2957 Record $package ($cversion) in archive suite $csuite
2961 my $message_add_info = sub {
2963 my $mversion = mergeinfo_version $mi;
2964 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2968 $message_add_info->($mergeinputs[0]);
2969 print MC <<END or die $!;
2970 should be treated as descended from
2972 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2976 $hash = make_commit $mcf;
2978 $hash = $mergeinputs[0]{Commit};
2980 printdebug "fetch hash=$hash\n";
2983 my ($lasth, $what) = @_;
2984 return unless $lasth;
2985 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2988 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
2990 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2992 fetch_from_archive_record_1($hash);
2994 if (defined $skew_warning_vsn) {
2996 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2997 my $gotclogp = commit_getclogp($hash);
2998 my $got_vsn = getfield $gotclogp, 'Version';
2999 printdebug "SKEW CHECK GOT $got_vsn\n";
3000 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3001 print STDERR <<END or die $!;
3003 Warning: archive skew detected. Using the available version:
3004 Archive allegedly contains $skew_warning_vsn
3005 We were able to obtain only $got_vsn
3011 if ($lastfetch_hash ne $hash) {
3012 fetch_from_archive_record_2($hash);
3015 lrfetchref_used lrfetchref();
3017 unshift @end, $del_lrfetchrefs;
3021 sub set_local_git_config ($$) {
3023 runcmd @git, qw(config), $k, $v;
3026 sub setup_mergechangelogs (;$) {
3028 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3030 my $driver = 'dpkg-mergechangelogs';
3031 my $cb = "merge.$driver";
3032 my $attrs = '.git/info/attributes';
3033 ensuredir '.git/info';
3035 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3036 if (!open ATTRS, "<", $attrs) {
3037 $!==ENOENT or die "$attrs: $!";
3041 next if m{^debian/changelog\s};
3042 print NATTRS $_, "\n" or die $!;
3044 ATTRS->error and die $!;
3047 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3050 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3051 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3053 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3056 sub setup_useremail (;$) {
3058 return unless $always || access_cfg_bool(1, 'setup-useremail');
3061 my ($k, $envvar) = @_;
3062 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3063 return unless defined $v;
3064 set_local_git_config "user.$k", $v;
3067 $setup->('email', 'DEBEMAIL');
3068 $setup->('name', 'DEBFULLNAME');
3071 sub ensure_setup_existing_tree () {
3072 my $k = "remote.$remotename.skipdefaultupdate";
3073 my $c = git_get_config $k;
3074 return if defined $c;
3075 set_local_git_config $k, 'true';
3078 sub setup_new_tree () {
3079 setup_mergechangelogs();
3083 sub multisuite_suite_child ($$$) {
3084 my ($tsuite, $merginputs, $fn) = @_;
3085 # in child, sets things up, calls $fn->(), and returns undef
3086 # in parent, returns canonical suite name for $tsuite
3087 my $canonsuitefh = IO::File::new_tmpfile;
3088 my $pid = fork // die $!;
3091 $us .= " [$isuite]";
3092 $debugprefix .= " ";
3093 progress "fetching $tsuite...";
3094 canonicalise_suite();
3095 print $canonsuitefh $csuite, "\n" or die $!;
3096 close $canonsuitefh or die $!;
3100 waitpid $pid,0 == $pid or die $!;
3101 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3102 seek $canonsuitefh,0,0 or die $!;
3103 local $csuite = <$canonsuitefh>;
3104 die $! unless defined $csuite && chomp $csuite;
3106 printdebug "multisuite $tsuite missing\n";
3109 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3110 push @$merginputs, {
3117 sub fork_for_multisuite ($) {
3118 my ($before_fetch_merge) = @_;
3119 # if nothing unusual, just returns ''
3122 # returns 0 to caller in child, to do first of the specified suites
3123 # in child, $csuite is not yet set
3125 # returns 1 to caller in parent, to finish up anything needed after
3126 # in parent, $csuite is set to canonicalised portmanteau
3128 my $org_isuite = $isuite;
3129 my @suites = split /\,/, $isuite;
3130 return '' unless @suites > 1;
3131 printdebug "fork_for_multisuite: @suites\n";
3135 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3137 return 0 unless defined $cbasesuite;
3139 fail "package $package missing in (base suite) $cbasesuite"
3140 unless @mergeinputs;
3142 my @csuites = ($cbasesuite);
3144 $before_fetch_merge->();
3146 foreach my $tsuite (@suites[1..$#suites]) {
3147 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3153 # xxx collecte the ref here
3155 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3156 push @csuites, $csubsuite;
3159 foreach my $mi (@mergeinputs) {
3160 my $ref = git_get_ref $mi->{Ref};
3161 die "$mi->{Ref} ?" unless length $ref;
3162 $mi->{Commit} = $ref;
3165 $csuite = join ",", @csuites;
3167 my $previous = git_get_ref lrref;
3169 unshift @mergeinputs, {
3170 Commit => $previous,
3171 Info => "local combined tracking branch",
3173 "archive seems to have rewound: local tracking branch is ahead!",
3177 foreach my $ix (0..$#mergeinputs) {
3178 $mergeinputs[$ix]{Index} = $ix;
3181 @mergeinputs = sort {
3182 -version_compare(mergeinfo_version $a,
3183 mergeinfo_version $b) # highest version first
3185 $a->{Index} <=> $b->{Index}; # earliest in spec first
3191 foreach my $mi (@mergeinputs) {
3192 printdebug "multisuite merge check $mi->{Info}\n";
3193 foreach my $previous (@needed) {
3194 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3195 printdebug "multisuite merge un-needed $previous->{Info}\n";
3199 printdebug "multisuite merge this-needed\n";
3200 $mi->{Character} = '+';
3203 $needed[0]{Character} = '*';
3205 my $output = $needed[0]{Commit};
3208 printdebug "multisuite merge nontrivial\n";
3209 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3211 my $commit = "tree $tree\n";
3212 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3213 "Input branches:\n";
3215 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3216 printdebug "multisuite merge include $mi->{Info}\n";
3217 $mi->{Character} //= ' ';
3218 $commit .= "parent $mi->{Commit}\n";
3219 $msg .= sprintf " %s %-25s %s\n",
3221 (mergeinfo_version $mi),
3224 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3226 " * marks the highest version branch, which choose to use\n".
3227 " + marks each branch which was not already an ancestor\n\n".
3228 "[dgit multi-suite $csuite]\n";
3230 "author $authline\n".
3231 "committer $authline\n\n";
3232 $output = make_commit_text $commit.$msg;
3233 printdebug "multisuite merge generated $output\n";
3236 fetch_from_archive_record_1($output);
3237 fetch_from_archive_record_2($output);
3239 progress "calculated combined tracking suite $csuite";
3244 sub clone_set_head () {
3245 open H, "> .git/HEAD" or die $!;
3246 print H "ref: ".lref()."\n" or die $!;
3249 sub clone_finish ($) {
3251 runcmd @git, qw(reset --hard), lrref();
3252 runcmd qw(bash -ec), <<'END';
3254 git ls-tree -r --name-only -z HEAD | \
3255 xargs -0r touch -r . --
3257 printdone "ready for work in $dstdir";
3262 badusage "dry run makes no sense with clone" unless act_local();
3264 my $multi_fetched = fork_for_multisuite(sub {
3265 printdebug "multi clone before fetch merge\n";
3268 if ($multi_fetched) {
3269 printdebug "multi clone after fetch merge\n";
3271 clone_finish($dstdir);
3274 printdebug "clone main body\n";
3276 canonicalise_suite();
3277 my $hasgit = check_for_git();
3278 mkdir $dstdir or fail "create \`$dstdir': $!";
3280 runcmd @git, qw(init -q);
3282 my $giturl = access_giturl(1);
3283 if (defined $giturl) {
3284 runcmd @git, qw(remote add), 'origin', $giturl;
3287 progress "fetching existing git history";
3289 runcmd_ordryrun_local @git, qw(fetch origin);
3291 progress "starting new git history";
3293 fetch_from_archive() or no_such_package;
3294 my $vcsgiturl = $dsc->{'Vcs-Git'};
3295 if (length $vcsgiturl) {
3296 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3297 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3300 clone_finish($dstdir);
3304 canonicalise_suite();
3305 if (check_for_git()) {
3308 fetch_from_archive() or no_such_package();
3309 printdone "fetched into ".lrref();
3313 my $multi_fetched = fork_for_multisuite(sub { });
3314 fetch() unless $multi_fetched; # parent
3315 return if $multi_fetched eq '0'; # child
3316 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3318 printdone "fetched to ".lrref()." and merged into HEAD";
3321 sub check_not_dirty () {
3322 foreach my $f (qw(local-options local-patch-header)) {
3323 if (stat_exists "debian/source/$f") {
3324 fail "git tree contains debian/source/$f";
3328 return if $ignoredirty;
3330 my @cmd = (@git, qw(diff --quiet HEAD));
3332 $!=0; $?=-1; system @cmd;
3335 fail "working tree is dirty (does not match HEAD)";
3341 sub commit_admin ($) {
3344 runcmd_ordryrun_local @git, qw(commit -m), $m;
3347 sub commit_quilty_patch () {
3348 my $output = cmdoutput @git, qw(status --porcelain);
3350 foreach my $l (split /\n/, $output) {
3351 next unless $l =~ m/\S/;
3352 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3356 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3358 progress "nothing quilty to commit, ok.";
3361 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3362 runcmd_ordryrun_local @git, qw(add -f), @adds;
3364 Commit Debian 3.0 (quilt) metadata
3366 [dgit ($our_version) quilt-fixup]
3370 sub get_source_format () {
3372 if (open F, "debian/source/options") {
3376 s/\s+$//; # ignore missing final newline
3378 my ($k, $v) = ($`, $'); #');
3379 $v =~ s/^"(.*)"$/$1/;
3385 F->error and die $!;
3388 die $! unless $!==&ENOENT;
3391 if (!open F, "debian/source/format") {
3392 die $! unless $!==&ENOENT;
3396 F->error and die $!;
3398 return ($_, \%options);
3401 sub madformat_wantfixup ($) {
3403 return 0 unless $format eq '3.0 (quilt)';
3404 our $quilt_mode_warned;
3405 if ($quilt_mode eq 'nocheck') {
3406 progress "Not doing any fixup of \`$format' due to".
3407 " ----no-quilt-fixup or --quilt=nocheck"
3408 unless $quilt_mode_warned++;
3411 progress "Format \`$format', need to check/update patch stack"
3412 unless $quilt_mode_warned++;
3416 sub maybe_split_brain_save ($$$) {
3417 my ($headref, $dgitview, $msg) = @_;
3418 # => message fragment "$saved" describing disposition of $dgitview
3419 return "commit id $dgitview" unless defined $split_brain_save;
3420 my @cmd = (shell_cmd "cd ../../../..",
3421 @git, qw(update-ref -m),
3422 "dgit --dgit-view-save $msg HEAD=$headref",
3423 $split_brain_save, $dgitview);
3425 return "and left in $split_brain_save";
3428 # An "infopair" is a tuple [ $thing, $what ]
3429 # (often $thing is a commit hash; $what is a description)
3431 sub infopair_cond_equal ($$) {
3433 $x->[0] eq $y->[0] or fail <<END;
3434 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3438 sub infopair_lrf_tag_lookup ($$) {
3439 my ($tagnames, $what) = @_;
3440 # $tagname may be an array ref
3441 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3442 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3443 foreach my $tagname (@tagnames) {
3444 my $lrefname = lrfetchrefs."/tags/$tagname";
3445 my $tagobj = $lrfetchrefs_f{$lrefname};
3446 next unless defined $tagobj;
3447 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3448 return [ git_rev_parse($tagobj), $what ];
3450 fail @tagnames==1 ? <<END : <<END;
3451 Wanted tag $what (@tagnames) on dgit server, but not found
3453 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3457 sub infopair_cond_ff ($$) {
3458 my ($anc,$desc) = @_;
3459 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3460 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3464 sub pseudomerge_version_check ($$) {
3465 my ($clogp, $archive_hash) = @_;
3467 my $arch_clogp = commit_getclogp $archive_hash;
3468 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3469 'version currently in archive' ];
3470 if (defined $overwrite_version) {
3471 if (length $overwrite_version) {
3472 infopair_cond_equal([ $overwrite_version,
3473 '--overwrite= version' ],
3476 my $v = $i_arch_v->[0];
3477 progress "Checking package changelog for archive version $v ...";
3479 my @xa = ("-f$v", "-t$v");
3480 my $vclogp = parsechangelog @xa;
3481 my $cv = [ (getfield $vclogp, 'Version'),
3482 "Version field from dpkg-parsechangelog @xa" ];
3483 infopair_cond_equal($i_arch_v, $cv);
3486 $@ =~ s/^dgit: //gm;
3488 "Perhaps debian/changelog does not mention $v ?";
3493 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3497 sub pseudomerge_make_commit ($$$$ $$) {
3498 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3499 $msg_cmd, $msg_msg) = @_;
3500 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3502 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3503 my $authline = clogp_authline $clogp;
3507 !defined $overwrite_version ? ""
3508 : !length $overwrite_version ? " --overwrite"
3509 : " --overwrite=".$overwrite_version;
3512 my $pmf = ".git/dgit/pseudomerge";
3513 open MC, ">", $pmf or die "$pmf $!";
3514 print MC <<END or die $!;
3517 parent $archive_hash
3527 return make_commit($pmf);
3530 sub splitbrain_pseudomerge ($$$$) {
3531 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3532 # => $merged_dgitview
3533 printdebug "splitbrain_pseudomerge...\n";
3535 # We: debian/PREVIOUS HEAD($maintview)
3536 # expect: o ----------------- o
3539 # a/d/PREVIOUS $dgitview
3542 # we do: `------------------ o
3546 return $dgitview unless defined $archive_hash;
3548 printdebug "splitbrain_pseudomerge...\n";
3550 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3552 if (!defined $overwrite_version) {
3553 progress "Checking that HEAD inciudes all changes in archive...";
3556 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3558 if (defined $overwrite_version) {
3560 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3561 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3562 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3563 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3564 my $i_archive = [ $archive_hash, "current archive contents" ];
3566 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3568 infopair_cond_equal($i_dgit, $i_archive);
3569 infopair_cond_ff($i_dep14, $i_dgit);
3570 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3574 $us: check failed (maybe --overwrite is needed, consult documentation)
3579 my $r = pseudomerge_make_commit
3580 $clogp, $dgitview, $archive_hash, $i_arch_v,
3581 "dgit --quilt=$quilt_mode",
3582 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3583 Declare fast forward from $i_arch_v->[0]
3585 Make fast forward from $i_arch_v->[0]
3588 maybe_split_brain_save $maintview, $r, "pseudomerge";
3590 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3594 sub plain_overwrite_pseudomerge ($$$) {
3595 my ($clogp, $head, $archive_hash) = @_;
3597 printdebug "plain_overwrite_pseudomerge...";
3599 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3601 return $head if is_fast_fwd $archive_hash, $head;
3603 my $m = "Declare fast forward from $i_arch_v->[0]";
3605 my $r = pseudomerge_make_commit
3606 $clogp, $head, $archive_hash, $i_arch_v,
3609 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3611 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3615 sub push_parse_changelog ($) {
3618 my $clogp = Dpkg::Control::Hash->new();
3619 $clogp->load($clogpfn) or die;
3621 my $clogpackage = getfield $clogp, 'Source';
3622 $package //= $clogpackage;
3623 fail "-p specified $package but changelog specified $clogpackage"
3624 unless $package eq $clogpackage;
3625 my $cversion = getfield $clogp, 'Version';
3626 my $tag = debiantag($cversion, access_nomdistro);
3627 runcmd @git, qw(check-ref-format), $tag;
3629 my $dscfn = dscfn($cversion);
3631 return ($clogp, $cversion, $dscfn);
3634 sub push_parse_dsc ($$$) {
3635 my ($dscfn,$dscfnwhat, $cversion) = @_;
3636 $dsc = parsecontrol($dscfn,$dscfnwhat);
3637 my $dversion = getfield $dsc, 'Version';
3638 my $dscpackage = getfield $dsc, 'Source';
3639 ($dscpackage eq $package && $dversion eq $cversion) or
3640 fail "$dscfn is for $dscpackage $dversion".
3641 " but debian/changelog is for $package $cversion";
3644 sub push_tagwants ($$$$) {
3645 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3648 TagFn => \&debiantag,
3653 if (defined $maintviewhead) {
3655 TagFn => \&debiantag_maintview,
3656 Objid => $maintviewhead,
3657 TfSuffix => '-maintview',
3661 foreach my $tw (@tagwants) {
3662 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3663 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3665 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3669 sub push_mktags ($$ $$ $) {
3671 $changesfile,$changesfilewhat,
3674 die unless $tagwants->[0]{View} eq 'dgit';
3676 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3677 $dsc->save("$dscfn.tmp") or die $!;
3679 my $changes = parsecontrol($changesfile,$changesfilewhat);
3680 foreach my $field (qw(Source Distribution Version)) {
3681 $changes->{$field} eq $clogp->{$field} or
3682 fail "changes field $field \`$changes->{$field}'".
3683 " does not match changelog \`$clogp->{$field}'";
3686 my $cversion = getfield $clogp, 'Version';
3687 my $clogsuite = getfield $clogp, 'Distribution';
3689 # We make the git tag by hand because (a) that makes it easier
3690 # to control the "tagger" (b) we can do remote signing
3691 my $authline = clogp_authline $clogp;
3692 my $delibs = join(" ", "",@deliberatelies);
3693 my $declaredistro = access_nomdistro();
3697 my $tfn = $tw->{Tfn};
3698 my $head = $tw->{Objid};
3699 my $tag = $tw->{Tag};
3701 open TO, '>', $tfn->('.tmp') or die $!;
3702 print TO <<END or die $!;
3709 if ($tw->{View} eq 'dgit') {
3710 print TO <<END or die $!;
3711 $package release $cversion for $clogsuite ($csuite) [dgit]
3712 [dgit distro=$declaredistro$delibs]
3714 foreach my $ref (sort keys %previously) {
3715 print TO <<END or die $!;
3716 [dgit previously:$ref=$previously{$ref}]
3719 } elsif ($tw->{View} eq 'maint') {
3720 print TO <<END or die $!;
3721 $package release $cversion for $clogsuite ($csuite)
3722 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3725 die Dumper($tw)."?";
3730 my $tagobjfn = $tfn->('.tmp');
3732 if (!defined $keyid) {
3733 $keyid = access_cfg('keyid','RETURN-UNDEF');
3735 if (!defined $keyid) {
3736 $keyid = getfield $clogp, 'Maintainer';
3738 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3739 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3740 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3741 push @sign_cmd, $tfn->('.tmp');
3742 runcmd_ordryrun @sign_cmd;
3744 $tagobjfn = $tfn->('.signed.tmp');
3745 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3746 $tfn->('.tmp'), $tfn->('.tmp.asc');
3752 my @r = map { $mktag->($_); } @$tagwants;
3756 sub sign_changes ($) {
3757 my ($changesfile) = @_;
3759 my @debsign_cmd = @debsign;
3760 push @debsign_cmd, "-k$keyid" if defined $keyid;
3761 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3762 push @debsign_cmd, $changesfile;
3763 runcmd_ordryrun @debsign_cmd;
3768 printdebug "actually entering push\n";
3770 supplementary_message(<<'END');
3771 Push failed, while checking state of the archive.
3772 You can retry the push, after fixing the problem, if you like.
3774 if (check_for_git()) {
3777 my $archive_hash = fetch_from_archive();
3778 if (!$archive_hash) {
3780 fail "package appears to be new in this suite;".
3781 " if this is intentional, use --new";
3784 supplementary_message(<<'END');
3785 Push failed, while preparing your push.
3786 You can retry the push, after fixing the problem, if you like.
3789 need_tagformat 'new', "quilt mode $quilt_mode"
3790 if quiltmode_splitbrain;
3794 access_giturl(); # check that success is vaguely likely
3797 my $clogpfn = ".git/dgit/changelog.822.tmp";
3798 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3800 responder_send_file('parsed-changelog', $clogpfn);
3802 my ($clogp, $cversion, $dscfn) =
3803 push_parse_changelog("$clogpfn");
3805 my $dscpath = "$buildproductsdir/$dscfn";
3806 stat_exists $dscpath or
3807 fail "looked for .dsc $dscfn, but $!;".
3808 " maybe you forgot to build";
3810 responder_send_file('dsc', $dscpath);
3812 push_parse_dsc($dscpath, $dscfn, $cversion);
3814 my $format = getfield $dsc, 'Format';
3815 printdebug "format $format\n";
3817 my $actualhead = git_rev_parse('HEAD');
3818 my $dgithead = $actualhead;
3819 my $maintviewhead = undef;
3821 my $upstreamversion = upstreamversion $clogp->{Version};
3823 if (madformat_wantfixup($format)) {
3824 # user might have not used dgit build, so maybe do this now:
3825 if (quiltmode_splitbrain()) {
3827 quilt_make_fake_dsc($upstreamversion);
3829 ($dgithead, $cachekey) =
3830 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3832 "--quilt=$quilt_mode but no cached dgit view:
3833 perhaps tree changed since dgit build[-source] ?";
3835 $dgithead = splitbrain_pseudomerge($clogp,
3836 $actualhead, $dgithead,
3838 $maintviewhead = $actualhead;
3839 changedir '../../../..';
3840 prep_ud(); # so _only_subdir() works, below
3842 commit_quilty_patch();
3846 if (defined $overwrite_version && !defined $maintviewhead) {
3847 $dgithead = plain_overwrite_pseudomerge($clogp,
3855 if ($archive_hash) {
3856 if (is_fast_fwd($archive_hash, $dgithead)) {
3858 } elsif (deliberately_not_fast_forward) {
3861 fail "dgit push: HEAD is not a descendant".
3862 " of the archive's version.\n".
3863 "To overwrite the archive's contents,".
3864 " pass --overwrite[=VERSION].\n".
3865 "To rewind history, if permitted by the archive,".
3866 " use --deliberately-not-fast-forward.";
3871 progress "checking that $dscfn corresponds to HEAD";
3872 runcmd qw(dpkg-source -x --),
3873 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3874 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3875 check_for_vendor_patches() if madformat($dsc->{format});
3876 changedir '../../../..';
3877 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3878 debugcmd "+",@diffcmd;
3880 my $r = system @diffcmd;
3883 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3885 HEAD specifies a different tree to $dscfn:
3887 Perhaps you forgot to build. Or perhaps there is a problem with your
3888 source tree (see dgit(7) for some hints). To see a full diff, run
3895 if (!$changesfile) {
3896 my $pat = changespat $cversion;
3897 my @cs = glob "$buildproductsdir/$pat";
3898 fail "failed to find unique changes file".
3899 " (looked for $pat in $buildproductsdir);".
3900 " perhaps you need to use dgit -C"
3902 ($changesfile) = @cs;
3904 $changesfile = "$buildproductsdir/$changesfile";
3907 # Check that changes and .dsc agree enough
3908 $changesfile =~ m{[^/]*$};
3909 my $changes = parsecontrol($changesfile,$&);
3910 files_compare_inputs($dsc, $changes)
3911 unless forceing [qw(dsc-changes-mismatch)];
3913 # Perhaps adjust .dsc to contain right set of origs
3914 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3916 unless forceing [qw(changes-origs-exactly)];
3918 # Checks complete, we're going to try and go ahead:
3920 responder_send_file('changes',$changesfile);
3921 responder_send_command("param head $dgithead");
3922 responder_send_command("param csuite $csuite");
3923 responder_send_command("param tagformat $tagformat");
3924 if (defined $maintviewhead) {
3925 die unless ($protovsn//4) >= 4;
3926 responder_send_command("param maint-view $maintviewhead");
3929 if (deliberately_not_fast_forward) {
3930 git_for_each_ref(lrfetchrefs, sub {
3931 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3932 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3933 responder_send_command("previously $rrefname=$objid");
3934 $previously{$rrefname} = $objid;
3938 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3942 supplementary_message(<<'END');
3943 Push failed, while signing the tag.
3944 You can retry the push, after fixing the problem, if you like.
3946 # If we manage to sign but fail to record it anywhere, it's fine.
3947 if ($we_are_responder) {
3948 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3949 responder_receive_files('signed-tag', @tagobjfns);
3951 @tagobjfns = push_mktags($clogp,$dscpath,
3952 $changesfile,$changesfile,
3955 supplementary_message(<<'END');
3956 Push failed, *after* signing the tag.
3957 If you want to try again, you should use a new version number.
3960 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3962 foreach my $tw (@tagwants) {
3963 my $tag = $tw->{Tag};
3964 my $tagobjfn = $tw->{TagObjFn};
3966 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3967 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3968 runcmd_ordryrun_local
3969 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3972 supplementary_message(<<'END');
3973 Push failed, while updating the remote git repository - see messages above.
3974 If you want to try again, you should use a new version number.
3976 if (!check_for_git()) {
3977 create_remote_git_repo();
3980 my @pushrefs = $forceflag.$dgithead.":".rrref();
3981 foreach my $tw (@tagwants) {
3982 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3985 runcmd_ordryrun @git,
3986 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3987 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3989 supplementary_message(<<'END');
3990 Push failed, after updating the remote git repository.
3991 If you want to try again, you must use a new version number.
3993 if ($we_are_responder) {
3994 my $dryrunsuffix = act_local() ? "" : ".tmp";
3995 responder_receive_files('signed-dsc-changes',
3996 "$dscpath$dryrunsuffix",
3997 "$changesfile$dryrunsuffix");
4000 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4002 progress "[new .dsc left in $dscpath.tmp]";
4004 sign_changes $changesfile;
4007 supplementary_message(<<END);
4008 Push failed, while uploading package(s) to the archive server.
4009 You can retry the upload of exactly these same files with dput of:
4011 If that .changes file is broken, you will need to use a new version
4012 number for your next attempt at the upload.
4014 my $host = access_cfg('upload-host','RETURN-UNDEF');
4015 my @hostarg = defined($host) ? ($host,) : ();
4016 runcmd_ordryrun @dput, @hostarg, $changesfile;
4017 printdone "pushed and uploaded $cversion";
4019 supplementary_message('');
4020 responder_send_command("complete");
4027 badusage "-p is not allowed with clone; specify as argument instead"
4028 if defined $package;
4031 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4032 ($package,$isuite) = @ARGV;
4033 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4034 ($package,$dstdir) = @ARGV;
4035 } elsif (@ARGV==3) {
4036 ($package,$isuite,$dstdir) = @ARGV;
4038 badusage "incorrect arguments to dgit clone";
4040 $dstdir ||= "$package";
4042 if (stat_exists $dstdir) {
4043 fail "$dstdir already exists";
4047 if ($rmonerror && !$dryrun_level) {
4048 $cwd_remove= getcwd();
4050 return unless defined $cwd_remove;
4051 if (!chdir "$cwd_remove") {
4052 return if $!==&ENOENT;
4053 die "chdir $cwd_remove: $!";
4055 printdebug "clone rmonerror removing $dstdir\n";
4057 rmtree($dstdir) or die "remove $dstdir: $!\n";
4058 } elsif (grep { $! == $_ }
4059 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4061 print STDERR "check whether to remove $dstdir: $!\n";
4067 $cwd_remove = undef;
4070 sub branchsuite () {
4071 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4072 if ($branch =~ m#$lbranch_re#o) {
4079 sub fetchpullargs () {
4081 if (!defined $package) {
4082 my $sourcep = parsecontrol('debian/control','debian/control');
4083 $package = getfield $sourcep, 'Source';
4086 $isuite = branchsuite();
4088 my $clogp = parsechangelog();
4089 $isuite = getfield $clogp, 'Distribution';
4091 } elsif (@ARGV==1) {
4094 badusage "incorrect arguments to dgit fetch or dgit pull";
4101 my $multi_fetched = fork_for_multisuite(sub { });
4102 exit 0 if $multi_fetched;
4109 if (quiltmode_splitbrain()) {
4110 my ($format, $fopts) = get_source_format();
4111 madformat($format) and fail <<END
4112 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4121 badusage "-p is not allowed with dgit push" if defined $package;
4123 my $clogp = parsechangelog();
4124 $package = getfield $clogp, 'Source';
4127 } elsif (@ARGV==1) {
4128 ($specsuite) = (@ARGV);
4130 badusage "incorrect arguments to dgit push";
4132 $isuite = getfield $clogp, 'Distribution';
4134 local ($package) = $existing_package; # this is a hack
4135 canonicalise_suite();
4137 canonicalise_suite();
4139 if (defined $specsuite &&
4140 $specsuite ne $isuite &&
4141 $specsuite ne $csuite) {
4142 fail "dgit push: changelog specifies $isuite ($csuite)".
4143 " but command line specifies $specsuite";
4148 #---------- remote commands' implementation ----------
4150 sub cmd_remote_push_build_host {
4151 my ($nrargs) = shift @ARGV;
4152 my (@rargs) = @ARGV[0..$nrargs-1];
4153 @ARGV = @ARGV[$nrargs..$#ARGV];
4155 my ($dir,$vsnwant) = @rargs;
4156 # vsnwant is a comma-separated list; we report which we have
4157 # chosen in our ready response (so other end can tell if they
4160 $we_are_responder = 1;
4161 $us .= " (build host)";
4165 open PI, "<&STDIN" or die $!;
4166 open STDIN, "/dev/null" or die $!;
4167 open PO, ">&STDOUT" or die $!;
4169 open STDOUT, ">&STDERR" or die $!;
4173 ($protovsn) = grep {
4174 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4175 } @rpushprotovsn_support;
4177 fail "build host has dgit rpush protocol versions ".
4178 (join ",", @rpushprotovsn_support).
4179 " but invocation host has $vsnwant"
4180 unless defined $protovsn;
4182 responder_send_command("dgit-remote-push-ready $protovsn");
4183 rpush_handle_protovsn_bothends();
4188 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4189 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4190 # a good error message)
4192 sub rpush_handle_protovsn_bothends () {
4193 if ($protovsn < 4) {
4194 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4203 my $report = i_child_report();
4204 if (defined $report) {
4205 printdebug "($report)\n";
4206 } elsif ($i_child_pid) {
4207 printdebug "(killing build host child $i_child_pid)\n";
4208 kill 15, $i_child_pid;
4210 if (defined $i_tmp && !defined $initiator_tempdir) {
4212 eval { rmtree $i_tmp; };
4216 END { i_cleanup(); }
4219 my ($base,$selector,@args) = @_;
4220 $selector =~ s/\-/_/g;
4221 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4228 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4236 push @rargs, join ",", @rpushprotovsn_support;
4239 push @rdgit, @ropts;
4240 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4242 my @cmd = (@ssh, $host, shellquote @rdgit);
4245 if (defined $initiator_tempdir) {
4246 rmtree $initiator_tempdir;
4247 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4248 $i_tmp = $initiator_tempdir;
4252 $i_child_pid = open2(\*RO, \*RI, @cmd);
4254 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4255 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4256 $supplementary_message = '' unless $protovsn >= 3;
4258 fail "rpush negotiated protocol version $protovsn".
4259 " which does not support quilt mode $quilt_mode"
4260 if quiltmode_splitbrain;
4262 rpush_handle_protovsn_bothends();
4264 my ($icmd,$iargs) = initiator_expect {
4265 m/^(\S+)(?: (.*))?$/;
4268 i_method "i_resp", $icmd, $iargs;
4272 sub i_resp_progress ($) {
4274 my $msg = protocol_read_bytes \*RO, $rhs;
4278 sub i_resp_supplementary_message ($) {
4280 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4283 sub i_resp_complete {
4284 my $pid = $i_child_pid;
4285 $i_child_pid = undef; # prevents killing some other process with same pid
4286 printdebug "waiting for build host child $pid...\n";
4287 my $got = waitpid $pid, 0;
4288 die $! unless $got == $pid;
4289 die "build host child failed $?" if $?;
4292 printdebug "all done\n";
4296 sub i_resp_file ($) {
4298 my $localname = i_method "i_localname", $keyword;
4299 my $localpath = "$i_tmp/$localname";
4300 stat_exists $localpath and
4301 badproto \*RO, "file $keyword ($localpath) twice";
4302 protocol_receive_file \*RO, $localpath;
4303 i_method "i_file", $keyword;
4308 sub i_resp_param ($) {
4309 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4313 sub i_resp_previously ($) {
4314 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4315 or badproto \*RO, "bad previously spec";
4316 my $r = system qw(git check-ref-format), $1;
4317 die "bad previously ref spec ($r)" if $r;
4318 $previously{$1} = $2;
4323 sub i_resp_want ($) {
4325 die "$keyword ?" if $i_wanted{$keyword}++;
4326 my @localpaths = i_method "i_want", $keyword;
4327 printdebug "[[ $keyword @localpaths\n";
4328 foreach my $localpath (@localpaths) {
4329 protocol_send_file \*RI, $localpath;
4331 print RI "files-end\n" or die $!;
4334 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4336 sub i_localname_parsed_changelog {
4337 return "remote-changelog.822";
4339 sub i_file_parsed_changelog {
4340 ($i_clogp, $i_version, $i_dscfn) =
4341 push_parse_changelog "$i_tmp/remote-changelog.822";
4342 die if $i_dscfn =~ m#/|^\W#;
4345 sub i_localname_dsc {
4346 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4351 sub i_localname_changes {
4352 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4353 $i_changesfn = $i_dscfn;
4354 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4355 return $i_changesfn;
4357 sub i_file_changes { }
4359 sub i_want_signed_tag {
4360 printdebug Dumper(\%i_param, $i_dscfn);
4361 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4362 && defined $i_param{'csuite'}
4363 or badproto \*RO, "premature desire for signed-tag";
4364 my $head = $i_param{'head'};
4365 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4367 my $maintview = $i_param{'maint-view'};
4368 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4371 if ($protovsn >= 4) {
4372 my $p = $i_param{'tagformat'} // '<undef>';
4374 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4377 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4379 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4381 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4384 push_mktags $i_clogp, $i_dscfn,
4385 $i_changesfn, 'remote changes',
4389 sub i_want_signed_dsc_changes {
4390 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4391 sign_changes $i_changesfn;
4392 return ($i_dscfn, $i_changesfn);
4395 #---------- building etc. ----------
4401 #----- `3.0 (quilt)' handling -----
4403 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4405 sub quiltify_dpkg_commit ($$$;$) {
4406 my ($patchname,$author,$msg, $xinfo) = @_;
4410 my $descfn = ".git/dgit/quilt-description.tmp";
4411 open O, '>', $descfn or die "$descfn: $!";
4412 $msg =~ s/\n+/\n\n/;
4413 print O <<END or die $!;
4415 ${xinfo}Subject: $msg
4422 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4423 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4424 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4425 runcmd @dpkgsource, qw(--commit .), $patchname;
4429 sub quiltify_trees_differ ($$;$$$) {
4430 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4431 # returns true iff the two tree objects differ other than in debian/
4432 # with $finegrained,
4433 # returns bitmask 01 - differ in upstream files except .gitignore
4434 # 02 - differ in .gitignore
4435 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4436 # is set for each modified .gitignore filename $fn
4437 # if $unrepres is defined, array ref to which is appeneded
4438 # a list of unrepresentable changes (removals of upstream files
4441 my @cmd = (@git, qw(diff-tree -z));
4442 push @cmd, qw(--name-only) unless $unrepres;
4443 push @cmd, qw(-r) if $finegrained || $unrepres;
4445 my $diffs= cmdoutput @cmd;
4448 foreach my $f (split /\0/, $diffs) {
4449 if ($unrepres && !@lmodes) {
4450 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4453 my ($oldmode,$newmode) = @lmodes;
4456 next if $f =~ m#^debian(?:/.*)?$#s;
4460 die "deleted\n" unless $newmode =~ m/[^0]/;
4461 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4462 if ($oldmode =~ m/[^0]/) {
4463 die "mode changed\n" if $oldmode ne $newmode;
4465 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4469 local $/="\n"; chomp $@;
4470 push @$unrepres, [ $f, $@ ];
4474 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4475 $r |= $isignore ? 02 : 01;
4476 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4478 printdebug "quiltify_trees_differ $x $y => $r\n";
4482 sub quiltify_tree_sentinelfiles ($) {
4483 # lists the `sentinel' files present in the tree
4485 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4486 qw(-- debian/rules debian/control);
4491 sub quiltify_splitbrain_needed () {
4492 if (!$split_brain) {
4493 progress "dgit view: changes are required...";
4494 runcmd @git, qw(checkout -q -b dgit-view);
4499 sub quiltify_splitbrain ($$$$$$) {
4500 my ($clogp, $unapplied, $headref, $diffbits,
4501 $editedignores, $cachekey) = @_;
4502 if ($quilt_mode !~ m/gbp|dpm/) {
4503 # treat .gitignore just like any other upstream file
4504 $diffbits = { %$diffbits };
4505 $_ = !!$_ foreach values %$diffbits;
4507 # We would like any commits we generate to be reproducible
4508 my @authline = clogp_authline($clogp);
4509 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4510 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4511 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4512 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4513 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4514 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4516 if ($quilt_mode =~ m/gbp|unapplied/ &&
4517 ($diffbits->{O2H} & 01)) {
4519 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4520 " but git tree differs from orig in upstream files.";
4521 if (!stat_exists "debian/patches") {
4523 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4527 if ($quilt_mode =~ m/dpm/ &&
4528 ($diffbits->{H2A} & 01)) {
4530 --quilt=$quilt_mode specified, implying patches-applied git tree
4531 but git tree differs from result of applying debian/patches to upstream
4534 if ($quilt_mode =~ m/gbp|unapplied/ &&
4535 ($diffbits->{O2A} & 01)) { # some patches
4536 quiltify_splitbrain_needed();
4537 progress "dgit view: creating patches-applied version using gbp pq";
4538 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4539 # gbp pq import creates a fresh branch; push back to dgit-view
4540 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4541 runcmd @git, qw(checkout -q dgit-view);
4543 if ($quilt_mode =~ m/gbp|dpm/ &&
4544 ($diffbits->{O2A} & 02)) {
4546 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4547 tool which does not create patches for changes to upstream
4548 .gitignores: but, such patches exist in debian/patches.
4551 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4552 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4553 quiltify_splitbrain_needed();
4554 progress "dgit view: creating patch to represent .gitignore changes";
4555 ensuredir "debian/patches";
4556 my $gipatch = "debian/patches/auto-gitignore";
4557 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4558 stat GIPATCH or die "$gipatch: $!";
4559 fail "$gipatch already exists; but want to create it".
4560 " to record .gitignore changes" if (stat _)[7];
4561 print GIPATCH <<END or die "$gipatch: $!";
4562 Subject: Update .gitignore from Debian packaging branch
4564 The Debian packaging git branch contains these updates to the upstream
4565 .gitignore file(s). This patch is autogenerated, to provide these
4566 updates to users of the official Debian archive view of the package.
4568 [dgit ($our_version) update-gitignore]
4571 close GIPATCH or die "$gipatch: $!";
4572 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4573 $unapplied, $headref, "--", sort keys %$editedignores;
4574 open SERIES, "+>>", "debian/patches/series" or die $!;
4575 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4577 defined read SERIES, $newline, 1 or die $!;
4578 print SERIES "\n" or die $! unless $newline eq "\n";
4579 print SERIES "auto-gitignore\n" or die $!;
4580 close SERIES or die $!;
4581 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4583 Commit patch to update .gitignore
4585 [dgit ($our_version) update-gitignore-quilt-fixup]
4589 my $dgitview = git_rev_parse 'HEAD';
4591 changedir '../../../..';
4592 # When we no longer need to support squeeze, use --create-reflog
4594 ensuredir ".git/logs/refs/dgit-intern";
4595 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4598 my $oldcache = git_get_ref "refs/$splitbraincache";
4599 if ($oldcache eq $dgitview) {
4600 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4601 # git update-ref doesn't always update, in this case. *sigh*
4602 my $dummy = make_commit_text <<END;
4605 author Dgit <dgit\@example.com> 1000000000 +0000
4606 committer Dgit <dgit\@example.com> 1000000000 +0000
4608 Dummy commit - do not use
4610 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4611 "refs/$splitbraincache", $dummy;
4613 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4616 changedir '.git/dgit/unpack/work';
4618 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4619 progress "dgit view: created ($saved)";
4622 sub quiltify ($$$$) {
4623 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4625 # Quilt patchification algorithm
4627 # We search backwards through the history of the main tree's HEAD
4628 # (T) looking for a start commit S whose tree object is identical
4629 # to to the patch tip tree (ie the tree corresponding to the
4630 # current dpkg-committed patch series). For these purposes
4631 # `identical' disregards anything in debian/ - this wrinkle is
4632 # necessary because dpkg-source treates debian/ specially.
4634 # We can only traverse edges where at most one of the ancestors'
4635 # trees differs (in changes outside in debian/). And we cannot
4636 # handle edges which change .pc/ or debian/patches. To avoid
4637 # going down a rathole we avoid traversing edges which introduce
4638 # debian/rules or debian/control. And we set a limit on the
4639 # number of edges we are willing to look at.
4641 # If we succeed, we walk forwards again. For each traversed edge
4642 # PC (with P parent, C child) (starting with P=S and ending with
4643 # C=T) to we do this:
4645 # - dpkg-source --commit with a patch name and message derived from C
4646 # After traversing PT, we git commit the changes which
4647 # should be contained within debian/patches.
4649 # The search for the path S..T is breadth-first. We maintain a
4650 # todo list containing search nodes. A search node identifies a
4651 # commit, and looks something like this:
4653 # Commit => $git_commit_id,
4654 # Child => $c, # or undef if P=T
4655 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4656 # Nontrivial => true iff $p..$c has relevant changes
4663 my %considered; # saves being exponential on some weird graphs
4665 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4668 my ($search,$whynot) = @_;
4669 printdebug " search NOT $search->{Commit} $whynot\n";
4670 $search->{Whynot} = $whynot;
4671 push @nots, $search;
4672 no warnings qw(exiting);
4681 my $c = shift @todo;
4682 next if $considered{$c->{Commit}}++;
4684 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4686 printdebug "quiltify investigate $c->{Commit}\n";
4689 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4690 printdebug " search finished hooray!\n";
4695 if ($quilt_mode eq 'nofix') {
4696 fail "quilt fixup required but quilt mode is \`nofix'\n".
4697 "HEAD commit $c->{Commit} differs from tree implied by ".
4698 " debian/patches (tree object $oldtiptree)";
4700 if ($quilt_mode eq 'smash') {
4701 printdebug " search quitting smash\n";
4705 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4706 $not->($c, "has $c_sentinels not $t_sentinels")
4707 if $c_sentinels ne $t_sentinels;
4709 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4710 $commitdata =~ m/\n\n/;
4712 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4713 @parents = map { { Commit => $_, Child => $c } } @parents;
4715 $not->($c, "root commit") if !@parents;
4717 foreach my $p (@parents) {
4718 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4720 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4721 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4723 foreach my $p (@parents) {
4724 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4726 my @cmd= (@git, qw(diff-tree -r --name-only),
4727 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4728 my $patchstackchange = cmdoutput @cmd;
4729 if (length $patchstackchange) {
4730 $patchstackchange =~ s/\n/,/g;
4731 $not->($p, "changed $patchstackchange");
4734 printdebug " search queue P=$p->{Commit} ",
4735 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4741 printdebug "quiltify want to smash\n";
4744 my $x = $_[0]{Commit};
4745 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4748 my $reportnot = sub {
4750 my $s = $abbrev->($notp);
4751 my $c = $notp->{Child};
4752 $s .= "..".$abbrev->($c) if $c;
4753 $s .= ": ".$notp->{Whynot};
4756 if ($quilt_mode eq 'linear') {
4757 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4758 foreach my $notp (@nots) {
4759 print STDERR "$us: ", $reportnot->($notp), "\n";
4761 print STDERR "$us: $_\n" foreach @$failsuggestion;
4762 fail "quilt fixup naive history linearisation failed.\n".
4763 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4764 } elsif ($quilt_mode eq 'smash') {
4765 } elsif ($quilt_mode eq 'auto') {
4766 progress "quilt fixup cannot be linear, smashing...";
4768 die "$quilt_mode ?";
4771 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4772 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4774 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4776 quiltify_dpkg_commit "auto-$version-$target-$time",
4777 (getfield $clogp, 'Maintainer'),
4778 "Automatically generated patch ($clogp->{Version})\n".
4779 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4783 progress "quiltify linearisation planning successful, executing...";
4785 for (my $p = $sref_S;
4786 my $c = $p->{Child};
4788 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4789 next unless $p->{Nontrivial};
4791 my $cc = $c->{Commit};
4793 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4794 $commitdata =~ m/\n\n/ or die "$c ?";
4797 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4800 my $commitdate = cmdoutput
4801 @git, qw(log -n1 --pretty=format:%aD), $cc;
4803 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4805 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4812 my $gbp_check_suitable = sub {
4817 die "contains unexpected slashes\n" if m{//} || m{/$};
4818 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4819 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4820 die "too long" if length > 200;
4822 return $_ unless $@;
4823 print STDERR "quiltifying commit $cc:".
4824 " ignoring/dropping Gbp-Pq $what: $@";
4828 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4830 (\S+) \s* \n //ixm) {
4831 $patchname = $gbp_check_suitable->($1, 'Name');
4833 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4835 (\S+) \s* \n //ixm) {
4836 $patchdir = $gbp_check_suitable->($1, 'Topic');
4841 if (!defined $patchname) {
4842 $patchname = $title;
4843 $patchname =~ s/[.:]$//;
4846 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4847 my $translitname = $converter->convert($patchname);
4848 die unless defined $translitname;
4849 $patchname = $translitname;
4852 "dgit: patch title transliteration error: $@"
4854 $patchname =~ y/ A-Z/-a-z/;
4855 $patchname =~ y/-a-z0-9_.+=~//cd;
4856 $patchname =~ s/^\W/x-$&/;
4857 $patchname = substr($patchname,0,40);
4859 if (!defined $patchdir) {
4862 if (length $patchdir) {
4863 $patchname = "$patchdir/$patchname";
4865 if ($patchname =~ m{^(.*)/}) {
4866 mkpath "debian/patches/$1";
4871 stat "debian/patches/$patchname$index";
4873 $!==ENOENT or die "$patchname$index $!";
4875 runcmd @git, qw(checkout -q), $cc;
4877 # We use the tip's changelog so that dpkg-source doesn't
4878 # produce complaining messages from dpkg-parsechangelog. None
4879 # of the information dpkg-source gets from the changelog is
4880 # actually relevant - it gets put into the original message
4881 # which dpkg-source provides our stunt editor, and then
4883 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4885 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4886 "Date: $commitdate\n".
4887 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4889 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4892 runcmd @git, qw(checkout -q master);
4895 sub build_maybe_quilt_fixup () {
4896 my ($format,$fopts) = get_source_format;
4897 return unless madformat_wantfixup $format;
4900 check_for_vendor_patches();
4902 if (quiltmode_splitbrain) {
4903 foreach my $needtf (qw(new maint)) {
4904 next if grep { $_ eq $needtf } access_cfg_tagformats;
4906 quilt mode $quilt_mode requires split view so server needs to support
4907 both "new" and "maint" tag formats, but config says it doesn't.
4912 my $clogp = parsechangelog();
4913 my $headref = git_rev_parse('HEAD');
4918 my $upstreamversion = upstreamversion $version;
4920 if ($fopts->{'single-debian-patch'}) {
4921 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4923 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4926 die 'bug' if $split_brain && !$need_split_build_invocation;
4928 changedir '../../../..';
4929 runcmd_ordryrun_local
4930 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4933 sub quilt_fixup_mkwork ($) {
4936 mkdir "work" or die $!;
4938 mktree_in_ud_here();
4939 runcmd @git, qw(reset -q --hard), $headref;
4942 sub quilt_fixup_linkorigs ($$) {
4943 my ($upstreamversion, $fn) = @_;
4944 # calls $fn->($leafname);
4946 foreach my $f (<../../../../*>) { #/){
4947 my $b=$f; $b =~ s{.*/}{};
4949 local ($debuglevel) = $debuglevel-1;
4950 printdebug "QF linkorigs $b, $f ?\n";
4952 next unless is_orig_file_of_vsn $b, $upstreamversion;
4953 printdebug "QF linkorigs $b, $f Y\n";
4954 link_ltarget $f, $b or die "$b $!";
4959 sub quilt_fixup_delete_pc () {
4960 runcmd @git, qw(rm -rqf .pc);
4962 Commit removal of .pc (quilt series tracking data)
4964 [dgit ($our_version) upgrade quilt-remove-pc]
4968 sub quilt_fixup_singlepatch ($$$) {
4969 my ($clogp, $headref, $upstreamversion) = @_;
4971 progress "starting quiltify (single-debian-patch)";
4973 # dpkg-source --commit generates new patches even if
4974 # single-debian-patch is in debian/source/options. In order to
4975 # get it to generate debian/patches/debian-changes, it is
4976 # necessary to build the source package.
4978 quilt_fixup_linkorigs($upstreamversion, sub { });
4979 quilt_fixup_mkwork($headref);
4981 rmtree("debian/patches");
4983 runcmd @dpkgsource, qw(-b .);
4985 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4986 rename srcfn("$upstreamversion", "/debian/patches"),
4987 "work/debian/patches";
4990 commit_quilty_patch();
4993 sub quilt_make_fake_dsc ($) {
4994 my ($upstreamversion) = @_;
4996 my $fakeversion="$upstreamversion-~~DGITFAKE";
4998 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4999 print $fakedsc <<END or die $!;
5002 Version: $fakeversion
5006 my $dscaddfile=sub {
5009 my $md = new Digest::MD5;
5011 my $fh = new IO::File $b, '<' or die "$b $!";
5016 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5019 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5021 my @files=qw(debian/source/format debian/rules
5022 debian/control debian/changelog);
5023 foreach my $maybe (qw(debian/patches debian/source/options
5024 debian/tests/control)) {
5025 next unless stat_exists "../../../$maybe";
5026 push @files, $maybe;
5029 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5030 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5032 $dscaddfile->($debtar);
5033 close $fakedsc or die $!;
5036 sub quilt_check_splitbrain_cache ($$) {
5037 my ($headref, $upstreamversion) = @_;
5038 # Called only if we are in (potentially) split brain mode.
5040 # Computes the cache key and looks in the cache.
5041 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5043 my $splitbrain_cachekey;
5046 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5047 # we look in the reflog of dgit-intern/quilt-cache
5048 # we look for an entry whose message is the key for the cache lookup
5049 my @cachekey = (qw(dgit), $our_version);
5050 push @cachekey, $upstreamversion;
5051 push @cachekey, $quilt_mode;
5052 push @cachekey, $headref;
5054 push @cachekey, hashfile('fake.dsc');
5056 my $srcshash = Digest::SHA->new(256);
5057 my %sfs = ( %INC, '$0(dgit)' => $0 );
5058 foreach my $sfk (sort keys %sfs) {
5059 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5060 $srcshash->add($sfk," ");
5061 $srcshash->add(hashfile($sfs{$sfk}));
5062 $srcshash->add("\n");
5064 push @cachekey, $srcshash->hexdigest();
5065 $splitbrain_cachekey = "@cachekey";
5067 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5069 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5070 debugcmd "|(probably)",@cmd;
5071 my $child = open GC, "-|"; defined $child or die $!;
5073 chdir '../../..' or die $!;
5074 if (!stat ".git/logs/refs/$splitbraincache") {
5075 $! == ENOENT or die $!;
5076 printdebug ">(no reflog)\n";
5083 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5084 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5087 quilt_fixup_mkwork($headref);
5088 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5089 if ($cachehit ne $headref) {
5090 progress "dgit view: found cached ($saved)";
5091 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5093 return ($cachehit, $splitbrain_cachekey);
5095 progress "dgit view: found cached, no changes required";
5096 return ($headref, $splitbrain_cachekey);
5098 die $! if GC->error;
5099 failedcmd unless close GC;
5101 printdebug "splitbrain cache miss\n";
5102 return (undef, $splitbrain_cachekey);
5105 sub quilt_fixup_multipatch ($$$) {
5106 my ($clogp, $headref, $upstreamversion) = @_;
5108 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5111 # - honour any existing .pc in case it has any strangeness
5112 # - determine the git commit corresponding to the tip of
5113 # the patch stack (if there is one)
5114 # - if there is such a git commit, convert each subsequent
5115 # git commit into a quilt patch with dpkg-source --commit
5116 # - otherwise convert all the differences in the tree into
5117 # a single git commit
5121 # Our git tree doesn't necessarily contain .pc. (Some versions of
5122 # dgit would include the .pc in the git tree.) If there isn't
5123 # one, we need to generate one by unpacking the patches that we
5126 # We first look for a .pc in the git tree. If there is one, we
5127 # will use it. (This is not the normal case.)
5129 # Otherwise need to regenerate .pc so that dpkg-source --commit
5130 # can work. We do this as follows:
5131 # 1. Collect all relevant .orig from parent directory
5132 # 2. Generate a debian.tar.gz out of
5133 # debian/{patches,rules,source/format,source/options}
5134 # 3. Generate a fake .dsc containing just these fields:
5135 # Format Source Version Files
5136 # 4. Extract the fake .dsc
5137 # Now the fake .dsc has a .pc directory.
5138 # (In fact we do this in every case, because in future we will
5139 # want to search for a good base commit for generating patches.)
5141 # Then we can actually do the dpkg-source --commit
5142 # 1. Make a new working tree with the same object
5143 # store as our main tree and check out the main
5145 # 2. Copy .pc from the fake's extraction, if necessary
5146 # 3. Run dpkg-source --commit
5147 # 4. If the result has changes to debian/, then
5148 # - git add them them
5149 # - git add .pc if we had a .pc in-tree
5151 # 5. If we had a .pc in-tree, delete it, and git commit
5152 # 6. Back in the main tree, fast forward to the new HEAD
5154 # Another situation we may have to cope with is gbp-style
5155 # patches-unapplied trees.
5157 # We would want to detect these, so we know to escape into
5158 # quilt_fixup_gbp. However, this is in general not possible.
5159 # Consider a package with a one patch which the dgit user reverts
5160 # (with git revert or the moral equivalent).
5162 # That is indistinguishable in contents from a patches-unapplied
5163 # tree. And looking at the history to distinguish them is not
5164 # useful because the user might have made a confusing-looking git
5165 # history structure (which ought to produce an error if dgit can't
5166 # cope, not a silent reintroduction of an unwanted patch).
5168 # So gbp users will have to pass an option. But we can usually
5169 # detect their failure to do so: if the tree is not a clean
5170 # patches-applied tree, quilt linearisation fails, but the tree
5171 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5172 # they want --quilt=unapplied.
5174 # To help detect this, when we are extracting the fake dsc, we
5175 # first extract it with --skip-patches, and then apply the patches
5176 # afterwards with dpkg-source --before-build. That lets us save a
5177 # tree object corresponding to .origs.
5179 my $splitbrain_cachekey;
5181 quilt_make_fake_dsc($upstreamversion);
5183 if (quiltmode_splitbrain()) {
5185 ($cachehit, $splitbrain_cachekey) =
5186 quilt_check_splitbrain_cache($headref, $upstreamversion);
5187 return if $cachehit;
5191 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5193 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5194 rename $fakexdir, "fake" or die "$fakexdir $!";
5198 remove_stray_gits();
5199 mktree_in_ud_here();
5203 my $unapplied=git_add_write_tree();
5204 printdebug "fake orig tree object $unapplied\n";
5208 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5210 if (system @bbcmd) {
5211 failedcmd @bbcmd if $? < 0;
5213 failed to apply your git tree's patch stack (from debian/patches/) to
5214 the corresponding upstream tarball(s). Your source tree and .orig
5215 are probably too inconsistent. dgit can only fix up certain kinds of
5216 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5222 quilt_fixup_mkwork($headref);
5225 if (stat_exists ".pc") {
5227 progress "Tree already contains .pc - will use it then delete it.";
5230 rename '../fake/.pc','.pc' or die $!;
5233 changedir '../fake';
5235 my $oldtiptree=git_add_write_tree();
5236 printdebug "fake o+d/p tree object $unapplied\n";
5237 changedir '../work';
5240 # We calculate some guesswork now about what kind of tree this might
5241 # be. This is mostly for error reporting.
5247 # O = orig, without patches applied
5248 # A = "applied", ie orig with H's debian/patches applied
5249 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5250 \%editedignores, \@unrepres),
5251 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5252 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5256 foreach my $b (qw(01 02)) {
5257 foreach my $v (qw(O2H O2A H2A)) {
5258 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5261 printdebug "differences \@dl @dl.\n";
5264 "$us: base trees orig=%.20s o+d/p=%.20s",
5265 $unapplied, $oldtiptree;
5267 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5268 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5269 $dl[0], $dl[1], $dl[3], $dl[4],
5273 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5275 forceable_fail [qw(unrepresentable)], <<END;
5276 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5281 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5282 push @failsuggestion, "This might be a patches-unapplied branch.";
5283 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5284 push @failsuggestion, "This might be a patches-applied branch.";
5286 push @failsuggestion, "Maybe you need to specify one of".
5287 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5289 if (quiltmode_splitbrain()) {
5290 quiltify_splitbrain($clogp, $unapplied, $headref,
5291 $diffbits, \%editedignores,
5292 $splitbrain_cachekey);
5296 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5297 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5299 if (!open P, '>>', ".pc/applied-patches") {
5300 $!==&ENOENT or die $!;
5305 commit_quilty_patch();
5307 if ($mustdeletepc) {
5308 quilt_fixup_delete_pc();
5312 sub quilt_fixup_editor () {
5313 my $descfn = $ENV{$fakeeditorenv};
5314 my $editing = $ARGV[$#ARGV];
5315 open I1, '<', $descfn or die "$descfn: $!";
5316 open I2, '<', $editing or die "$editing: $!";
5317 unlink $editing or die "$editing: $!";
5318 open O, '>', $editing or die "$editing: $!";
5319 while (<I1>) { print O or die $!; } I1->error and die $!;
5322 $copying ||= m/^\-\-\- /;
5323 next unless $copying;
5326 I2->error and die $!;
5331 sub maybe_apply_patches_dirtily () {
5332 return unless $quilt_mode =~ m/gbp|unapplied/;
5333 print STDERR <<END or die $!;
5335 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5336 dgit: Have to apply the patches - making the tree dirty.
5337 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5340 $patches_applied_dirtily = 01;
5341 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5342 runcmd qw(dpkg-source --before-build .);
5345 sub maybe_unapply_patches_again () {
5346 progress "dgit: Unapplying patches again to tidy up the tree."
5347 if $patches_applied_dirtily;
5348 runcmd qw(dpkg-source --after-build .)
5349 if $patches_applied_dirtily & 01;
5351 if $patches_applied_dirtily & 02;
5352 $patches_applied_dirtily = 0;
5355 #----- other building -----
5357 our $clean_using_builder;
5358 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5359 # clean the tree before building (perhaps invoked indirectly by
5360 # whatever we are using to run the build), rather than separately
5361 # and explicitly by us.
5364 return if $clean_using_builder;
5365 if ($cleanmode eq 'dpkg-source') {
5366 maybe_apply_patches_dirtily();
5367 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5368 } elsif ($cleanmode eq 'dpkg-source-d') {
5369 maybe_apply_patches_dirtily();
5370 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5371 } elsif ($cleanmode eq 'git') {
5372 runcmd_ordryrun_local @git, qw(clean -xdf);
5373 } elsif ($cleanmode eq 'git-ff') {
5374 runcmd_ordryrun_local @git, qw(clean -xdff);
5375 } elsif ($cleanmode eq 'check') {
5376 my $leftovers = cmdoutput @git, qw(clean -xdn);
5377 if (length $leftovers) {
5378 print STDERR $leftovers, "\n" or die $!;
5379 fail "tree contains uncommitted files and --clean=check specified";
5381 } elsif ($cleanmode eq 'none') {
5388 badusage "clean takes no additional arguments" if @ARGV;
5391 maybe_unapply_patches_again();
5394 sub build_prep_early () {
5395 our $build_prep_early_done //= 0;
5396 return if $build_prep_early_done++;
5398 badusage "-p is not allowed when building" if defined $package;
5399 my $clogp = parsechangelog();
5400 $isuite = getfield $clogp, 'Distribution';
5401 $package = getfield $clogp, 'Source';
5402 $version = getfield $clogp, 'Version';
5409 build_maybe_quilt_fixup();
5411 my $pat = changespat $version;
5412 foreach my $f (glob "$buildproductsdir/$pat") {
5414 unlink $f or fail "remove old changes file $f: $!";
5416 progress "would remove $f";
5422 sub changesopts_initial () {
5423 my @opts =@changesopts[1..$#changesopts];
5426 sub changesopts_version () {
5427 if (!defined $changes_since_version) {
5428 my @vsns = archive_query('archive_query');
5429 my @quirk = access_quirk();
5430 if ($quirk[0] eq 'backports') {
5431 local $isuite = $quirk[2];
5433 canonicalise_suite();
5434 push @vsns, archive_query('archive_query');
5437 @vsns = map { $_->[0] } @vsns;
5438 @vsns = sort { -version_compare($a, $b) } @vsns;
5439 $changes_since_version = $vsns[0];
5440 progress "changelog will contain changes since $vsns[0]";
5442 $changes_since_version = '_';
5443 progress "package seems new, not specifying -v<version>";
5446 if ($changes_since_version ne '_') {
5447 return ("-v$changes_since_version");
5453 sub changesopts () {
5454 return (changesopts_initial(), changesopts_version());
5457 sub massage_dbp_args ($;$) {
5458 my ($cmd,$xargs) = @_;
5461 # - if we're going to split the source build out so we can
5462 # do strange things to it, massage the arguments to dpkg-buildpackage
5463 # so that the main build doessn't build source (or add an argument
5464 # to stop it building source by default).
5466 # - add -nc to stop dpkg-source cleaning the source tree,
5467 # unless we're not doing a split build and want dpkg-source
5468 # as cleanmode, in which case we can do nothing
5471 # 0 - source will NOT need to be built separately by caller
5472 # +1 - source will need to be built separately by caller
5473 # +2 - source will need to be built separately by caller AND
5474 # dpkg-buildpackage should not in fact be run at all!
5475 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5476 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5477 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5478 $clean_using_builder = 1;
5481 # -nc has the side effect of specifying -b if nothing else specified
5482 # and some combinations of -S, -b, et al, are errors, rather than
5483 # later simply overriding earlie. So we need to:
5484 # - search the command line for these options
5485 # - pick the last one
5486 # - perhaps add our own as a default
5487 # - perhaps adjust it to the corresponding non-source-building version
5489 foreach my $l ($cmd, $xargs) {
5491 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5494 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5496 if ($need_split_build_invocation) {
5497 printdebug "massage split $dmode.\n";
5498 $r = $dmode =~ m/[S]/ ? +2 :
5499 $dmode =~ y/gGF/ABb/ ? +1 :
5500 $dmode =~ m/[ABb]/ ? 0 :
5503 printdebug "massage done $r $dmode.\n";
5505 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5511 my $wasdir = must_getcwd();
5517 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5518 my ($msg_if_onlyone) = @_;
5519 # If there is only one .changes file, fail with $msg_if_onlyone,
5520 # or if that is undef, be a no-op.
5521 # Returns the changes file to report to the user.
5522 my $pat = changespat $version;
5523 my @changesfiles = glob $pat;
5524 @changesfiles = sort {
5525 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5529 if (@changesfiles==1) {
5530 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5531 only one changes file from build (@changesfiles)
5533 $result = $changesfiles[0];
5534 } elsif (@changesfiles==2) {
5535 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5536 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5537 fail "$l found in binaries changes file $binchanges"
5540 runcmd_ordryrun_local @mergechanges, @changesfiles;
5541 my $multichanges = changespat $version,'multi';
5543 stat_exists $multichanges or fail "$multichanges: $!";
5544 foreach my $cf (glob $pat) {
5545 next if $cf eq $multichanges;
5546 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5549 $result = $multichanges;
5551 fail "wrong number of different changes files (@changesfiles)";
5553 printdone "build successful, results in $result\n" or die $!;
5556 sub midbuild_checkchanges () {
5557 my $pat = changespat $version;
5558 return if $rmchanges;
5559 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5560 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5562 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5563 Suggest you delete @unwanted.
5568 sub midbuild_checkchanges_vanilla ($) {
5570 midbuild_checkchanges() if $wantsrc == 1;
5573 sub postbuild_mergechanges_vanilla ($) {
5575 if ($wantsrc == 1) {
5577 postbuild_mergechanges(undef);
5580 printdone "build successful\n";
5585 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5586 my $wantsrc = massage_dbp_args \@dbp;
5589 midbuild_checkchanges_vanilla $wantsrc;
5594 push @dbp, changesopts_version();
5595 maybe_apply_patches_dirtily();
5596 runcmd_ordryrun_local @dbp;
5598 maybe_unapply_patches_again();
5599 postbuild_mergechanges_vanilla $wantsrc;
5603 $quilt_mode //= 'gbp';
5609 # gbp can make .origs out of thin air. In my tests it does this
5610 # even for a 1.0 format package, with no origs present. So I
5611 # guess it keys off just the version number. We don't know
5612 # exactly what .origs ought to exist, but let's assume that we
5613 # should run gbp if: the version has an upstream part and the main
5615 my $upstreamversion = upstreamversion $version;
5616 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5617 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5619 if ($gbp_make_orig) {
5621 $cleanmode = 'none'; # don't do it again
5622 $need_split_build_invocation = 1;
5625 my @dbp = @dpkgbuildpackage;
5627 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5629 if (!length $gbp_build[0]) {
5630 if (length executable_on_path('git-buildpackage')) {
5631 $gbp_build[0] = qw(git-buildpackage);
5633 $gbp_build[0] = 'gbp buildpackage';
5636 my @cmd = opts_opt_multi_cmd @gbp_build;
5638 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5640 if ($gbp_make_orig) {
5641 ensuredir '.git/dgit';
5642 my $ok = '.git/dgit/origs-gen-ok';
5643 unlink $ok or $!==&ENOENT or die $!;
5644 my @origs_cmd = @cmd;
5645 push @origs_cmd, qw(--git-cleaner=true);
5646 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5647 push @origs_cmd, @ARGV;
5649 debugcmd @origs_cmd;
5651 do { local $!; stat_exists $ok; }
5652 or failedcmd @origs_cmd;
5654 dryrun_report @origs_cmd;
5660 midbuild_checkchanges_vanilla $wantsrc;
5662 if (!$clean_using_builder) {
5663 push @cmd, '--git-cleaner=true';
5667 maybe_unapply_patches_again();
5669 push @cmd, changesopts();
5670 runcmd_ordryrun_local @cmd, @ARGV;
5672 postbuild_mergechanges_vanilla $wantsrc;
5674 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5677 my $our_cleanmode = $cleanmode;
5678 if ($need_split_build_invocation) {
5679 # Pretend that clean is being done some other way. This
5680 # forces us not to try to use dpkg-buildpackage to clean and
5681 # build source all in one go; and instead we run dpkg-source
5682 # (and build_prep() will do the clean since $clean_using_builder
5684 $our_cleanmode = 'ELSEWHERE';
5686 if ($our_cleanmode =~ m/^dpkg-source/) {
5687 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5688 $clean_using_builder = 1;
5691 $sourcechanges = changespat $version,'source';
5693 unlink "../$sourcechanges" or $!==ENOENT
5694 or fail "remove $sourcechanges: $!";
5696 $dscfn = dscfn($version);
5697 if ($our_cleanmode eq 'dpkg-source') {
5698 maybe_apply_patches_dirtily();
5699 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5701 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5702 maybe_apply_patches_dirtily();
5703 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5706 my @cmd = (@dpkgsource, qw(-b --));
5709 runcmd_ordryrun_local @cmd, "work";
5710 my @udfiles = <${package}_*>;
5711 changedir "../../..";
5712 foreach my $f (@udfiles) {
5713 printdebug "source copy, found $f\n";
5716 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5717 $f eq srcfn($version, $&));
5718 printdebug "source copy, found $f - renaming\n";
5719 rename "$ud/$f", "../$f" or $!==ENOENT
5720 or fail "put in place new source file ($f): $!";
5723 my $pwd = must_getcwd();
5724 my $leafdir = basename $pwd;
5726 runcmd_ordryrun_local @cmd, $leafdir;
5729 runcmd_ordryrun_local qw(sh -ec),
5730 'exec >$1; shift; exec "$@"','x',
5731 "../$sourcechanges",
5732 @dpkggenchanges, qw(-S), changesopts();
5736 sub cmd_build_source {
5737 badusage "build-source takes no additional arguments" if @ARGV;
5739 maybe_unapply_patches_again();
5740 printdone "source built, results in $dscfn and $sourcechanges";
5745 midbuild_checkchanges();
5748 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5749 stat_exists $sourcechanges
5750 or fail "$sourcechanges (in parent directory): $!";
5752 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5754 maybe_unapply_patches_again();
5756 postbuild_mergechanges(<<END);
5757 perhaps you need to pass -A ? (sbuild's default is to build only
5758 arch-specific binaries; dgit 1.4 used to override that.)
5763 sub cmd_quilt_fixup {
5764 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5765 my $clogp = parsechangelog();
5766 $version = getfield $clogp, 'Version';
5767 $package = getfield $clogp, 'Source';
5770 build_maybe_quilt_fixup();
5773 sub cmd_import_dsc {
5777 last unless $ARGV[0] =~ m/^-/;
5780 if (m/^--require-valid-signature$/) {
5783 badusage "unknown dgit import-dsc sub-option \`$_'";
5787 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5788 my ($dscfn, $dstbranch) = @ARGV;
5790 badusage "dry run makes no sense with import-dsc" unless act_local();
5792 my $force = $dstbranch =~ s/^\+// ? +1 :
5793 $dstbranch =~ s/^\.\.// ? -1 :
5795 my $info = $force ? " $&" : '';
5796 $info = "$dscfn$info";
5798 my $specbranch = $dstbranch;
5799 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5800 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5802 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5803 my $chead = cmdoutput_errok @symcmd;
5804 defined $chead or $?==256 or failedcmd @symcmd;
5806 fail "$dstbranch is checked out - will not update it"
5807 if defined $chead and $chead eq $dstbranch;
5809 my $oldhash = git_get_ref $dstbranch;
5811 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5812 $dscdata = do { local $/ = undef; <D>; };
5813 D->error and fail "read $dscfn: $!";
5816 # we don't normally need this so import it here
5817 use Dpkg::Source::Package;
5818 my $dp = new Dpkg::Source::Package filename => $dscfn,
5819 require_valid_signature => $needsig;
5821 local $SIG{__WARN__} = sub {
5823 return unless $needsig;
5824 fail "import-dsc signature check failed";
5826 if (!$dp->is_signed()) {
5827 warn "$us: warning: importing unsigned .dsc\n";
5829 my $r = $dp->check_signature();
5830 die "->check_signature => $r" if $needsig && $r;
5836 my $dgit_commit = $dsc->{$ourdscfield[0]};
5837 if (defined $dgit_commit &&
5838 !forceing [qw(import-dsc-with-dgit-field)]) {
5839 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5840 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5841 my @cmd = (qw(sh -ec),
5842 "echo $dgit_commit | git cat-file --batch-check");
5843 my $objgot = cmdoutput @cmd;
5844 if ($objgot =~ m#^\w+ missing\b#) {
5846 .dsc contains Dgit field referring to object $dgit_commit
5847 Your git tree does not have that object. Try `git fetch' from a
5848 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5851 if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
5853 progress "Not fast forward, forced update.";
5855 fail "Not fast forward to $dgit_commit";
5858 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5859 $dstbranch, $dgit_commit);
5861 progress "dgit: import-dsc updated git ref $dstbranch";
5866 Branch $dstbranch already exists
5867 Specify ..$specbranch for a pseudo-merge, binding in existing history
5868 Specify +$specbranch to overwrite, discarding existing history
5870 if $oldhash && !$force;
5872 $package = getfield $dsc, 'Source';
5873 my @dfi = dsc_files_info();
5874 foreach my $fi (@dfi) {
5875 my $f = $fi->{Filename};
5877 next if lstat $here;
5878 fail "stat $here: $!" unless $! == ENOENT;
5880 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5882 } elsif ($dscfn =~ m#^/#) {
5885 fail "cannot import $dscfn which seems to be inside working tree!";
5887 $there =~ s#/+[^/]+$## or
5888 fail "cannot import $dscfn which seems to not have a basename";
5890 symlink $there, $here or fail "symlink $there to $here: $!";
5891 progress "made symlink $here -> $there";
5892 print STDERR Dumper($fi);
5894 my @mergeinputs = generate_commits_from_dsc();
5895 die unless @mergeinputs == 1;
5897 my $newhash = $mergeinputs[0]{Commit};
5901 progress "Import, forced update - synthetic orphan git history.";
5902 } elsif ($force < 0) {
5903 progress "Import, merging.";
5904 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5905 my $version = getfield $dsc, 'Version';
5906 $newhash = make_commit_text <<END;
5911 Merge $package ($version) import into $dstbranch
5914 die; # caught earlier
5918 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5919 $dstbranch, $newhash);
5921 progress "dgit: import-dsc results are in in git ref $dstbranch";
5924 sub cmd_archive_api_query {
5925 badusage "need only 1 subpath argument" unless @ARGV==1;
5926 my ($subpath) = @ARGV;
5927 my @cmd = archive_api_query_cmd($subpath);
5930 exec @cmd or fail "exec curl: $!\n";
5933 sub cmd_clone_dgit_repos_server {
5934 badusage "need destination argument" unless @ARGV==1;
5935 my ($destdir) = @ARGV;
5936 $package = '_dgit-repos-server';
5937 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5939 exec @cmd or fail "exec git clone: $!\n";
5942 sub cmd_setup_mergechangelogs {
5943 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5944 setup_mergechangelogs(1);
5947 sub cmd_setup_useremail {
5948 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5952 sub cmd_setup_new_tree {
5953 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5957 #---------- argument parsing and main program ----------
5960 print "dgit version $our_version\n" or die $!;
5964 our (%valopts_long, %valopts_short);
5967 sub defvalopt ($$$$) {
5968 my ($long,$short,$val_re,$how) = @_;
5969 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5970 $valopts_long{$long} = $oi;
5971 $valopts_short{$short} = $oi;
5972 # $how subref should:
5973 # do whatever assignemnt or thing it likes with $_[0]
5974 # if the option should not be passed on to remote, @rvalopts=()
5975 # or $how can be a scalar ref, meaning simply assign the value
5978 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5979 defvalopt '--distro', '-d', '.+', \$idistro;
5980 defvalopt '', '-k', '.+', \$keyid;
5981 defvalopt '--existing-package','', '.*', \$existing_package;
5982 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5983 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5984 defvalopt '--package', '-p', $package_re, \$package;
5985 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5987 defvalopt '', '-C', '.+', sub {
5988 ($changesfile) = (@_);
5989 if ($changesfile =~ s#^(.*)/##) {
5990 $buildproductsdir = $1;
5994 defvalopt '--initiator-tempdir','','.*', sub {
5995 ($initiator_tempdir) = (@_);
5996 $initiator_tempdir =~ m#^/# or
5997 badusage "--initiator-tempdir must be used specify an".
5998 " absolute, not relative, directory."
6004 if (defined $ENV{'DGIT_SSH'}) {
6005 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6006 } elsif (defined $ENV{'GIT_SSH'}) {
6007 @ssh = ($ENV{'GIT_SSH'});
6015 if (!defined $val) {
6016 badusage "$what needs a value" unless @ARGV;
6018 push @rvalopts, $val;
6020 badusage "bad value \`$val' for $what" unless
6021 $val =~ m/^$oi->{Re}$(?!\n)/s;
6022 my $how = $oi->{How};
6023 if (ref($how) eq 'SCALAR') {
6028 push @ropts, @rvalopts;
6032 last unless $ARGV[0] =~ m/^-/;
6036 if (m/^--dry-run$/) {
6039 } elsif (m/^--damp-run$/) {
6042 } elsif (m/^--no-sign$/) {
6045 } elsif (m/^--help$/) {
6047 } elsif (m/^--version$/) {
6049 } elsif (m/^--new$/) {
6052 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6053 ($om = $opts_opt_map{$1}) &&
6057 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6058 !$opts_opt_cmdonly{$1} &&
6059 ($om = $opts_opt_map{$1})) {
6062 } elsif (m/^--(gbp|dpm)$/s) {
6063 push @ropts, "--quilt=$1";
6065 } elsif (m/^--ignore-dirty$/s) {
6068 } elsif (m/^--no-quilt-fixup$/s) {
6070 $quilt_mode = 'nocheck';
6071 } elsif (m/^--no-rm-on-error$/s) {
6074 } elsif (m/^--overwrite$/s) {
6076 $overwrite_version = '';
6077 } elsif (m/^--overwrite=(.+)$/s) {
6079 $overwrite_version = $1;
6080 } elsif (m/^--delayed=(\d+)$/s) {
6083 } elsif (m/^--dgit-view-save=(.+)$/s) {
6085 $split_brain_save = $1;
6086 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6087 } elsif (m/^--(no-)?rm-old-changes$/s) {
6090 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6092 push @deliberatelies, $&;
6093 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6097 } elsif (m/^--force-/) {
6099 "$us: warning: ignoring unknown force option $_\n";
6101 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6102 # undocumented, for testing
6104 $tagformat_want = [ $1, 'command line', 1 ];
6105 # 1 menas overrides distro configuration
6106 } elsif (m/^--always-split-source-build$/s) {
6107 # undocumented, for testing
6109 $need_split_build_invocation = 1;
6110 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6111 $val = $2 ? $' : undef; #';
6112 $valopt->($oi->{Long});
6114 badusage "unknown long option \`$_'";
6121 } elsif (s/^-L/-/) {
6124 } elsif (s/^-h/-/) {
6126 } elsif (s/^-D/-/) {
6130 } elsif (s/^-N/-/) {
6135 push @changesopts, $_;
6137 } elsif (s/^-wn$//s) {
6139 $cleanmode = 'none';
6140 } elsif (s/^-wg$//s) {
6143 } elsif (s/^-wgf$//s) {
6145 $cleanmode = 'git-ff';
6146 } elsif (s/^-wd$//s) {
6148 $cleanmode = 'dpkg-source';
6149 } elsif (s/^-wdd$//s) {
6151 $cleanmode = 'dpkg-source-d';
6152 } elsif (s/^-wc$//s) {
6154 $cleanmode = 'check';
6155 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6156 push @git, '-c', $&;
6157 $gitcfgs{cmdline}{$1} = [ $2 ];
6158 } elsif (s/^-c([^=]+)$//s) {
6159 push @git, '-c', $&;
6160 $gitcfgs{cmdline}{$1} = [ 'true' ];
6161 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6163 $val = undef unless length $val;
6164 $valopt->($oi->{Short});
6167 badusage "unknown short option \`$_'";
6174 sub check_env_sanity () {
6175 my $blocked = new POSIX::SigSet;
6176 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6179 foreach my $name (qw(PIPE CHLD)) {
6180 my $signame = "SIG$name";
6181 my $signum = eval "POSIX::$signame" // die;
6182 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6183 die "$signame is set to something other than SIG_DFL\n";
6184 $blocked->ismember($signum) and
6185 die "$signame is blocked\n";
6191 On entry to dgit, $@
6192 This is a bug produced by something in in your execution environment.
6198 sub finalise_opts_opts () {
6199 foreach my $k (keys %opts_opt_map) {
6200 my $om = $opts_opt_map{$k};
6202 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6204 badcfg "cannot set command for $k"
6205 unless length $om->[0];
6209 foreach my $c (access_cfg_cfgs("opts-$k")) {
6211 map { $_ ? @$_ : () }
6212 map { $gitcfgs{$_}{$c} }
6213 reverse @gitcfgsources;
6214 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6215 "\n" if $debuglevel >= 4;
6217 badcfg "cannot configure options for $k"
6218 if $opts_opt_cmdonly{$k};
6219 my $insertpos = $opts_cfg_insertpos{$k};
6220 @$om = ( @$om[0..$insertpos-1],
6222 @$om[$insertpos..$#$om] );
6227 if ($ENV{$fakeeditorenv}) {
6229 quilt_fixup_editor();
6236 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6237 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6238 if $dryrun_level == 1;
6240 print STDERR $helpmsg or die $!;
6243 my $cmd = shift @ARGV;
6246 my $pre_fn = ${*::}{"pre_$cmd"};
6247 $pre_fn->() if $pre_fn;
6249 if (!defined $rmchanges) {
6250 local $access_forpush;
6251 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6254 if (!defined $quilt_mode) {
6255 local $access_forpush;
6256 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6257 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6259 $quilt_mode =~ m/^($quilt_modes_re)$/
6260 or badcfg "unknown quilt-mode \`$quilt_mode'";
6264 $need_split_build_invocation ||= quiltmode_splitbrain();
6266 if (!defined $cleanmode) {
6267 local $access_forpush;
6268 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6269 $cleanmode //= 'dpkg-source';
6271 badcfg "unknown clean-mode \`$cleanmode'" unless
6272 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6275 my $fn = ${*::}{"cmd_$cmd"};
6276 $fn or badusage "unknown operation $cmd";