3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::Util qw(any);
38 use List::MoreUtils qw(pairwise);
39 use Text::Glob qw(match_glob);
40 use Fcntl qw(:DEFAULT :flock);
45 our $our_version = 'UNRELEASED'; ###substituted###
46 our $absurdity = undef; ###substituted###
48 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
51 our $isuite = 'unstable';
57 our $dryrun_level = 0;
59 our $buildproductsdir = '..';
65 our $existing_package = 'dpkg';
67 our $changes_since_version;
69 our $overwrite_version; # undef: not specified; '': check changelog
71 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
72 our $split_brain_save;
73 our $we_are_responder;
74 our $initiator_tempdir;
75 our $patches_applied_dirtily = 00;
80 our %forceopts = map { $_=>0 }
81 qw(unrepresentable unsupported-source-format
82 dsc-changes-mismatch changes-origs-exactly
83 import-gitapply-absurd
84 import-gitapply-no-absurd
85 import-dsc-with-dgit-field);
87 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
89 our $suite_re = '[-+.0-9a-z]+';
90 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
91 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
92 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
93 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
95 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
96 our $splitbraincache = 'dgit-intern/quilt-cache';
99 our (@dget) = qw(dget);
100 our (@curl) = qw(curl);
101 our (@dput) = qw(dput);
102 our (@debsign) = qw(debsign);
103 our (@gpg) = qw(gpg);
104 our (@sbuild) = qw(sbuild);
106 our (@dgit) = qw(dgit);
107 our (@aptget) = qw(apt-get);
108 our (@aptcache) = qw(apt-cache);
109 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
110 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
111 our (@dpkggenchanges) = qw(dpkg-genchanges);
112 our (@mergechanges) = qw(mergechanges -f);
113 our (@gbp_build) = ('');
114 our (@gbp_pq) = ('gbp pq');
115 our (@changesopts) = ('');
117 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
120 'debsign' => \@debsign,
122 'sbuild' => \@sbuild,
126 'apt-get' => \@aptget,
127 'apt-cache' => \@aptcache,
128 'dpkg-source' => \@dpkgsource,
129 'dpkg-buildpackage' => \@dpkgbuildpackage,
130 'dpkg-genchanges' => \@dpkggenchanges,
131 'gbp-build' => \@gbp_build,
132 'gbp-pq' => \@gbp_pq,
133 'ch' => \@changesopts,
134 'mergechanges' => \@mergechanges);
136 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
137 our %opts_cfg_insertpos = map {
139 scalar @{ $opts_opt_map{$_} }
140 } keys %opts_opt_map;
142 sub finalise_opts_opts();
148 our $supplementary_message = '';
149 our $need_split_build_invocation = 0;
150 our $split_brain = 0;
154 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
157 our $remotename = 'dgit';
158 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
162 if (!defined $absurdity) {
164 $absurdity =~ s{/[^/]+$}{/absurd} or die;
168 my ($v,$distro) = @_;
169 return $tagformatfn->($v, $distro);
172 sub debiantag_maintview ($$) {
173 my ($v,$distro) = @_;
178 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
180 sub lbranch () { return "$branchprefix/$csuite"; }
181 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
182 sub lref () { return "refs/heads/".lbranch(); }
183 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
184 sub rrref () { return server_ref($csuite); }
186 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
187 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
189 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
190 # locally fetched refs because they have unhelpful names and clutter
191 # up gitk etc. So we track whether we have "used up" head ref (ie,
192 # whether we have made another local ref which refers to this object).
194 # (If we deleted them unconditionally, then we might end up
195 # re-fetching the same git objects each time dgit fetch was run.)
197 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
198 # in git_fetch_us to fetch the refs in question, and possibly a call
199 # to lrfetchref_used.
201 our (%lrfetchrefs_f, %lrfetchrefs_d);
202 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
204 sub lrfetchref_used ($) {
205 my ($fullrefname) = @_;
206 my $objid = $lrfetchrefs_f{$fullrefname};
207 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
218 return "${package}_".(stripepoch $vsn).$sfx
223 return srcfn($vsn,".dsc");
226 sub changespat ($;$) {
227 my ($vsn, $arch) = @_;
228 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
231 sub upstreamversion ($) {
243 foreach my $f (@end) {
245 print STDERR "$us: cleanup: $@" if length $@;
249 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
251 sub forceable_fail ($$) {
252 my ($forceoptsl, $msg) = @_;
253 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
254 print STDERR "warning: overriding problem due to --force:\n". $msg;
258 my ($forceoptsl) = @_;
259 my @got = grep { $forceopts{$_} } @$forceoptsl;
260 return 0 unless @got;
262 "warning: skipping checks or functionality due to --force-$got[0]\n";
265 sub no_such_package () {
266 print STDERR "$us: package $package does not exist in suite $isuite\n";
272 printdebug "CD $newdir\n";
273 chdir $newdir or confess "chdir: $newdir: $!";
276 sub deliberately ($) {
278 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
281 sub deliberately_not_fast_forward () {
282 foreach (qw(not-fast-forward fresh-repo)) {
283 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
287 sub quiltmode_splitbrain () {
288 $quilt_mode =~ m/gbp|dpm|unapplied/;
291 sub opts_opt_multi_cmd {
293 push @cmd, split /\s+/, shift @_;
299 return opts_opt_multi_cmd @gbp_pq;
302 #---------- remote protocol support, common ----------
304 # remote push initiator/responder protocol:
305 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
306 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
307 # < dgit-remote-push-ready <actual-proto-vsn>
314 # > supplementary-message NBYTES # $protovsn >= 3
319 # > file parsed-changelog
320 # [indicates that output of dpkg-parsechangelog follows]
321 # > data-block NBYTES
322 # > [NBYTES bytes of data (no newline)]
323 # [maybe some more blocks]
332 # > param head DGIT-VIEW-HEAD
333 # > param csuite SUITE
334 # > param tagformat old|new
335 # > param maint-view MAINT-VIEW-HEAD
337 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
338 # # goes into tag, for replay prevention
341 # [indicates that signed tag is wanted]
342 # < data-block NBYTES
343 # < [NBYTES bytes of data (no newline)]
344 # [maybe some more blocks]
348 # > want signed-dsc-changes
349 # < data-block NBYTES [transfer of signed dsc]
351 # < data-block NBYTES [transfer of signed changes]
359 sub i_child_report () {
360 # Sees if our child has died, and reap it if so. Returns a string
361 # describing how it died if it failed, or undef otherwise.
362 return undef unless $i_child_pid;
363 my $got = waitpid $i_child_pid, WNOHANG;
364 return undef if $got <= 0;
365 die unless $got == $i_child_pid;
366 $i_child_pid = undef;
367 return undef unless $?;
368 return "build host child ".waitstatusmsg();
373 fail "connection lost: $!" if $fh->error;
374 fail "protocol violation; $m not expected";
377 sub badproto_badread ($$) {
379 fail "connection lost: $!" if $!;
380 my $report = i_child_report();
381 fail $report if defined $report;
382 badproto $fh, "eof (reading $wh)";
385 sub protocol_expect (&$) {
386 my ($match, $fh) = @_;
389 defined && chomp or badproto_badread $fh, "protocol message";
397 badproto $fh, "\`$_'";
400 sub protocol_send_file ($$) {
401 my ($fh, $ourfn) = @_;
402 open PF, "<", $ourfn or die "$ourfn: $!";
405 my $got = read PF, $d, 65536;
406 die "$ourfn: $!" unless defined $got;
408 print $fh "data-block ".length($d)."\n" or die $!;
409 print $fh $d or die $!;
411 PF->error and die "$ourfn $!";
412 print $fh "data-end\n" or die $!;
416 sub protocol_read_bytes ($$) {
417 my ($fh, $nbytes) = @_;
418 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
420 my $got = read $fh, $d, $nbytes;
421 $got==$nbytes or badproto_badread $fh, "data block";
425 sub protocol_receive_file ($$) {
426 my ($fh, $ourfn) = @_;
427 printdebug "() $ourfn\n";
428 open PF, ">", $ourfn or die "$ourfn: $!";
430 my ($y,$l) = protocol_expect {
431 m/^data-block (.*)$/ ? (1,$1) :
432 m/^data-end$/ ? (0,) :
436 my $d = protocol_read_bytes $fh, $l;
437 print PF $d or die $!;
442 #---------- remote protocol support, responder ----------
444 sub responder_send_command ($) {
446 return unless $we_are_responder;
447 # called even without $we_are_responder
448 printdebug ">> $command\n";
449 print PO $command, "\n" or die $!;
452 sub responder_send_file ($$) {
453 my ($keyword, $ourfn) = @_;
454 return unless $we_are_responder;
455 printdebug "]] $keyword $ourfn\n";
456 responder_send_command "file $keyword";
457 protocol_send_file \*PO, $ourfn;
460 sub responder_receive_files ($@) {
461 my ($keyword, @ourfns) = @_;
462 die unless $we_are_responder;
463 printdebug "[[ $keyword @ourfns\n";
464 responder_send_command "want $keyword";
465 foreach my $fn (@ourfns) {
466 protocol_receive_file \*PI, $fn;
469 protocol_expect { m/^files-end$/ } \*PI;
472 #---------- remote protocol support, initiator ----------
474 sub initiator_expect (&) {
476 protocol_expect { &$match } \*RO;
479 #---------- end remote code ----------
482 if ($we_are_responder) {
484 responder_send_command "progress ".length($m) or die $!;
485 print PO $m or die $!;
495 $ua = LWP::UserAgent->new();
499 progress "downloading $what...";
500 my $r = $ua->get(@_) or die $!;
501 return undef if $r->code == 404;
502 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
503 return $r->decoded_content(charset => 'none');
506 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
511 failedcmd @_ if system @_;
514 sub act_local () { return $dryrun_level <= 1; }
515 sub act_scary () { return !$dryrun_level; }
518 if (!$dryrun_level) {
519 progress "$us ok: @_";
521 progress "would be ok: @_ (but dry run only)";
526 printcmd(\*STDERR,$debugprefix."#",@_);
529 sub runcmd_ordryrun {
537 sub runcmd_ordryrun_local {
546 my ($first_shell, @cmd) = @_;
547 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
550 our $helpmsg = <<END;
552 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
553 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
554 dgit [dgit-opts] build [dpkg-buildpackage-opts]
555 dgit [dgit-opts] sbuild [sbuild-opts]
556 dgit [dgit-opts] push [dgit-opts] [suite]
557 dgit [dgit-opts] rpush build-host:build-dir ...
558 important dgit options:
559 -k<keyid> sign tag and package with <keyid> instead of default
560 --dry-run -n do not change anything, but go through the motions
561 --damp-run -L like --dry-run but make local changes, without signing
562 --new -N allow introducing a new package
563 --debug -D increase debug level
564 -c<name>=<value> set git config option (used directly by dgit too)
567 our $later_warning_msg = <<END;
568 Perhaps the upload is stuck in incoming. Using the version from git.
572 print STDERR "$us: @_\n", $helpmsg or die $!;
577 @ARGV or badusage "too few arguments";
578 return scalar shift @ARGV;
582 print $helpmsg or die $!;
586 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
588 our %defcfg = ('dgit.default.distro' => 'debian',
589 'dgit-suite.*-security.distro' => 'debian-security',
590 'dgit.default.username' => '',
591 'dgit.default.archive-query-default-component' => 'main',
592 'dgit.default.ssh' => 'ssh',
593 'dgit.default.archive-query' => 'madison:',
594 'dgit.default.sshpsql-dbname' => 'service=projectb',
595 'dgit.default.aptget-components' => 'main',
596 'dgit.default.dgit-tag-format' => 'new,old,maint',
597 # old means "repo server accepts pushes with old dgit tags"
598 # new means "repo server accepts pushes with new dgit tags"
599 # maint means "repo server accepts split brain pushes"
600 # hist means "repo server may have old pushes without new tag"
601 # ("hist" is implied by "old")
602 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
603 'dgit-distro.debian.git-check' => 'url',
604 'dgit-distro.debian.git-check-suffix' => '/info/refs',
605 'dgit-distro.debian.new-private-pushers' => 't',
606 'dgit-distro.debian/push.git-url' => '',
607 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
608 'dgit-distro.debian/push.git-user-force' => 'dgit',
609 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
610 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
611 'dgit-distro.debian/push.git-create' => 'true',
612 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
613 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
614 # 'dgit-distro.debian.archive-query-tls-key',
615 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
616 # ^ this does not work because curl is broken nowadays
617 # Fixing #790093 properly will involve providing providing the key
618 # in some pacagke and maybe updating these paths.
620 # 'dgit-distro.debian.archive-query-tls-curl-args',
621 # '--ca-path=/etc/ssl/ca-debian',
622 # ^ this is a workaround but works (only) on DSA-administered machines
623 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
624 'dgit-distro.debian.git-url-suffix' => '',
625 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
626 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
627 'dgit-distro.debian-security.archive-query' => 'aptget:',
628 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
629 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
630 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
631 'dgit-distro.debian-security.nominal-distro' => 'debian',
632 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
633 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
634 'dgit-distro.ubuntu.git-check' => 'false',
635 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
636 'dgit-distro.test-dummy.ssh' => "$td/ssh",
637 'dgit-distro.test-dummy.username' => "alice",
638 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
639 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
640 'dgit-distro.test-dummy.git-url' => "$td/git",
641 'dgit-distro.test-dummy.git-host' => "git",
642 'dgit-distro.test-dummy.git-path' => "$td/git",
643 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
644 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
645 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
646 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
650 our @gitcfgsources = qw(cmdline local global system);
652 sub git_slurp_config () {
653 local ($debuglevel) = $debuglevel-2;
656 # This algoritm is a bit subtle, but this is needed so that for
657 # options which we want to be single-valued, we allow the
658 # different config sources to override properly. See #835858.
659 foreach my $src (@gitcfgsources) {
660 next if $src eq 'cmdline';
661 # we do this ourselves since git doesn't handle it
663 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
666 open GITS, "-|", @cmd or die $!;
669 printdebug "=> ", (messagequote $_), "\n";
671 push @{ $gitcfgs{$src}{$`} }, $'; #';
675 or ($!==0 && $?==256)
680 sub git_get_config ($) {
682 foreach my $src (@gitcfgsources) {
683 my $l = $gitcfgs{$src}{$c};
684 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
687 @$l==1 or badcfg "multiple values for $c".
688 " (in $src git config)" if @$l > 1;
696 return undef if $c =~ /RETURN-UNDEF/;
697 my $v = git_get_config($c);
698 return $v if defined $v;
699 my $dv = $defcfg{$c};
700 return $dv if defined $dv;
702 badcfg "need value for one of: @_\n".
703 "$us: distro or suite appears not to be (properly) supported";
706 sub access_basedistro () {
707 if (defined $idistro) {
710 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
711 return $def if defined $def;
712 foreach my $src (@gitcfgsources, 'internal') {
713 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
715 foreach my $k (keys %$kl) {
716 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
718 next unless match_glob $dpat, $isuite;
722 return cfg("dgit.default.distro");
726 sub access_nomdistro () {
727 my $base = access_basedistro();
728 return cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
731 sub access_quirk () {
732 # returns (quirk name, distro to use instead or undef, quirk-specific info)
733 my $basedistro = access_basedistro();
734 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
736 if (defined $backports_quirk) {
737 my $re = $backports_quirk;
738 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
740 $re =~ s/\%/([-0-9a-z_]+)/
741 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
742 if ($isuite =~ m/^$re$/) {
743 return ('backports',"$basedistro-backports",$1);
746 return ('none',undef);
751 sub parse_cfg_bool ($$$) {
752 my ($what,$def,$v) = @_;
755 $v =~ m/^[ty1]/ ? 1 :
756 $v =~ m/^[fn0]/ ? 0 :
757 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
760 sub access_forpush_config () {
761 my $d = access_basedistro();
765 parse_cfg_bool('new-private-pushers', 0,
766 cfg("dgit-distro.$d.new-private-pushers",
769 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
772 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
773 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
774 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
775 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
778 sub access_forpush () {
779 $access_forpush //= access_forpush_config();
780 return $access_forpush;
784 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
785 badcfg "pushing but distro is configured readonly"
786 if access_forpush_config() eq '0';
788 $supplementary_message = <<'END' unless $we_are_responder;
789 Push failed, before we got started.
790 You can retry the push, after fixing the problem, if you like.
792 finalise_opts_opts();
796 finalise_opts_opts();
799 sub supplementary_message ($) {
801 if (!$we_are_responder) {
802 $supplementary_message = $msg;
804 } elsif ($protovsn >= 3) {
805 responder_send_command "supplementary-message ".length($msg)
807 print PO $msg or die $!;
811 sub access_distros () {
812 # Returns list of distros to try, in order
815 # 0. `instead of' distro name(s) we have been pointed to
816 # 1. the access_quirk distro, if any
817 # 2a. the user's specified distro, or failing that } basedistro
818 # 2b. the distro calculated from the suite }
819 my @l = access_basedistro();
821 my (undef,$quirkdistro) = access_quirk();
822 unshift @l, $quirkdistro;
823 unshift @l, $instead_distro;
824 @l = grep { defined } @l;
826 push @l, access_nomdistro();
828 if (access_forpush()) {
829 @l = map { ("$_/push", $_) } @l;
834 sub access_cfg_cfgs (@) {
837 # The nesting of these loops determines the search order. We put
838 # the key loop on the outside so that we search all the distros
839 # for each key, before going on to the next key. That means that
840 # if access_cfg is called with a more specific, and then a less
841 # specific, key, an earlier distro can override the less specific
842 # without necessarily overriding any more specific keys. (If the
843 # distro wants to override the more specific keys it can simply do
844 # so; whereas if we did the loop the other way around, it would be
845 # impossible to for an earlier distro to override a less specific
846 # key but not the more specific ones without restating the unknown
847 # values of the more specific keys.
850 # We have to deal with RETURN-UNDEF specially, so that we don't
851 # terminate the search prematurely.
853 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
856 foreach my $d (access_distros()) {
857 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
859 push @cfgs, map { "dgit.default.$_" } @realkeys;
866 my (@cfgs) = access_cfg_cfgs(@keys);
867 my $value = cfg(@cfgs);
871 sub access_cfg_bool ($$) {
872 my ($def, @keys) = @_;
873 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
876 sub string_to_ssh ($) {
878 if ($spec =~ m/\s/) {
879 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
885 sub access_cfg_ssh () {
886 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
887 if (!defined $gitssh) {
890 return string_to_ssh $gitssh;
894 sub access_runeinfo ($) {
896 return ": dgit ".access_basedistro()." $info ;";
899 sub access_someuserhost ($) {
901 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
902 defined($user) && length($user) or
903 $user = access_cfg("$some-user",'username');
904 my $host = access_cfg("$some-host");
905 return length($user) ? "$user\@$host" : $host;
908 sub access_gituserhost () {
909 return access_someuserhost('git');
912 sub access_giturl (;$) {
914 my $url = access_cfg('git-url','RETURN-UNDEF');
917 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
918 return undef unless defined $proto;
921 access_gituserhost().
922 access_cfg('git-path');
924 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
927 return "$url/$package$suffix";
930 sub parsecontrolfh ($$;$) {
931 my ($fh, $desc, $allowsigned) = @_;
932 our $dpkgcontrolhash_noissigned;
935 my %opts = ('name' => $desc);
936 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
937 $c = Dpkg::Control::Hash->new(%opts);
938 $c->parse($fh,$desc) or die "parsing of $desc failed";
939 last if $allowsigned;
940 last if $dpkgcontrolhash_noissigned;
941 my $issigned= $c->get_option('is_pgp_signed');
942 if (!defined $issigned) {
943 $dpkgcontrolhash_noissigned= 1;
944 seek $fh, 0,0 or die "seek $desc: $!";
945 } elsif ($issigned) {
946 fail "control file $desc is (already) PGP-signed. ".
947 " Note that dgit push needs to modify the .dsc and then".
948 " do the signature itself";
957 my ($file, $desc, $allowsigned) = @_;
958 my $fh = new IO::Handle;
959 open $fh, '<', $file or die "$file: $!";
960 my $c = parsecontrolfh($fh,$desc,$allowsigned);
961 $fh->error and die $!;
967 my ($dctrl,$field) = @_;
968 my $v = $dctrl->{$field};
969 return $v if defined $v;
970 fail "missing field $field in ".$dctrl->get_option('name');
974 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
975 my $p = new IO::Handle;
976 my @cmd = (qw(dpkg-parsechangelog), @_);
977 open $p, '-|', @cmd or die $!;
979 $?=0; $!=0; close $p or failedcmd @cmd;
983 sub commit_getclogp ($) {
984 # Returns the parsed changelog hashref for a particular commit
986 our %commit_getclogp_memo;
987 my $memo = $commit_getclogp_memo{$objid};
988 return $memo if $memo;
990 my $mclog = ".git/dgit/clog-$objid";
991 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
992 "$objid:debian/changelog";
993 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
998 defined $d or fail "getcwd failed: $!";
1002 sub parse_dscdata () {
1003 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1004 printdebug Dumper($dscdata) if $debuglevel>1;
1005 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1006 printdebug Dumper($dsc) if $debuglevel>1;
1011 sub archive_query ($;@) {
1012 my ($method) = shift @_;
1013 fail "this operation does not support multiple comma-separated suites"
1015 my $query = access_cfg('archive-query','RETURN-UNDEF');
1016 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1019 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1022 sub archive_query_prepend_mirror {
1023 my $m = access_cfg('mirror');
1024 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1027 sub pool_dsc_subpath ($$) {
1028 my ($vsn,$component) = @_; # $package is implict arg
1029 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1030 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1033 sub cfg_apply_map ($$$) {
1034 my ($varref, $what, $mapspec) = @_;
1035 return unless $mapspec;
1037 printdebug "config $what EVAL{ $mapspec; }\n";
1039 eval "package Dgit::Config; $mapspec;";
1044 #---------- `ftpmasterapi' archive query method (nascent) ----------
1046 sub archive_api_query_cmd ($) {
1048 my @cmd = (@curl, qw(-sS));
1049 my $url = access_cfg('archive-query-url');
1050 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1052 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1053 foreach my $key (split /\:/, $keys) {
1054 $key =~ s/\%HOST\%/$host/g;
1056 fail "for $url: stat $key: $!" unless $!==ENOENT;
1059 fail "config requested specific TLS key but do not know".
1060 " how to get curl to use exactly that EE key ($key)";
1061 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1062 # # Sadly the above line does not work because of changes
1063 # # to gnutls. The real fix for #790093 may involve
1064 # # new curl options.
1067 # Fixing #790093 properly will involve providing a value
1068 # for this on clients.
1069 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1070 push @cmd, split / /, $kargs if defined $kargs;
1072 push @cmd, $url.$subpath;
1076 sub api_query ($$;$) {
1078 my ($data, $subpath, $ok404) = @_;
1079 badcfg "ftpmasterapi archive query method takes no data part"
1081 my @cmd = archive_api_query_cmd($subpath);
1082 my $url = $cmd[$#cmd];
1083 push @cmd, qw(-w %{http_code});
1084 my $json = cmdoutput @cmd;
1085 unless ($json =~ s/\d+\d+\d$//) {
1086 failedcmd_report_cmd undef, @cmd;
1087 fail "curl failed to print 3-digit HTTP code";
1090 return undef if $code eq '404' && $ok404;
1091 fail "fetch of $url gave HTTP code $code"
1092 unless $url =~ m#^file://# or $code =~ m/^2/;
1093 return decode_json($json);
1096 sub canonicalise_suite_ftpmasterapi {
1097 my ($proto,$data) = @_;
1098 my $suites = api_query($data, 'suites');
1100 foreach my $entry (@$suites) {
1102 my $v = $entry->{$_};
1103 defined $v && $v eq $isuite;
1104 } qw(codename name);
1105 push @matched, $entry;
1107 fail "unknown suite $isuite" unless @matched;
1110 @matched==1 or die "multiple matches for suite $isuite\n";
1111 $cn = "$matched[0]{codename}";
1112 defined $cn or die "suite $isuite info has no codename\n";
1113 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1115 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1120 sub archive_query_ftpmasterapi {
1121 my ($proto,$data) = @_;
1122 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1124 my $digester = Digest::SHA->new(256);
1125 foreach my $entry (@$info) {
1127 my $vsn = "$entry->{version}";
1128 my ($ok,$msg) = version_check $vsn;
1129 die "bad version: $msg\n" unless $ok;
1130 my $component = "$entry->{component}";
1131 $component =~ m/^$component_re$/ or die "bad component";
1132 my $filename = "$entry->{filename}";
1133 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1134 or die "bad filename";
1135 my $sha256sum = "$entry->{sha256sum}";
1136 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1137 push @rows, [ $vsn, "/pool/$component/$filename",
1138 $digester, $sha256sum ];
1140 die "bad ftpmaster api response: $@\n".Dumper($entry)
1143 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1144 return archive_query_prepend_mirror @rows;
1147 sub file_in_archive_ftpmasterapi {
1148 my ($proto,$data,$filename) = @_;
1149 my $pat = $filename;
1152 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1153 my $info = api_query($data, "file_in_archive/$pat", 1);
1156 #---------- `aptget' archive query method ----------
1159 our $aptget_releasefile;
1160 our $aptget_configpath;
1162 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1163 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1165 sub aptget_cache_clean {
1166 runcmd_ordryrun_local qw(sh -ec),
1167 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1171 sub aptget_lock_acquire () {
1172 my $lockfile = "$aptget_base/lock";
1173 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1174 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1177 sub aptget_prep ($) {
1179 return if defined $aptget_base;
1181 badcfg "aptget archive query method takes no data part"
1184 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1187 ensuredir "$cache/dgit";
1189 access_cfg('aptget-cachekey','RETURN-UNDEF')
1190 // access_nomdistro();
1192 $aptget_base = "$cache/dgit/aptget";
1193 ensuredir $aptget_base;
1195 my $quoted_base = $aptget_base;
1196 die "$quoted_base contains bad chars, cannot continue"
1197 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1199 ensuredir $aptget_base;
1201 aptget_lock_acquire();
1203 aptget_cache_clean();
1205 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1206 my $sourceslist = "source.list#$cachekey";
1208 my $aptsuites = $isuite;
1209 cfg_apply_map(\$aptsuites, 'suite map',
1210 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1212 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1213 printf SRCS "deb-src %s %s %s\n",
1214 access_cfg('mirror'),
1216 access_cfg('aptget-components')
1219 ensuredir "$aptget_base/cache";
1220 ensuredir "$aptget_base/lists";
1222 open CONF, ">", $aptget_configpath or die $!;
1224 Debug::NoLocking "true";
1225 APT::Get::List-Cleanup "false";
1226 #clear APT::Update::Post-Invoke-Success;
1227 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1228 Dir::State::Lists "$quoted_base/lists";
1229 Dir::Etc::preferences "$quoted_base/preferences";
1230 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1231 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1234 foreach my $key (qw(
1237 Dir::Cache::Archives
1238 Dir::Etc::SourceParts
1239 Dir::Etc::preferencesparts
1241 ensuredir "$aptget_base/$key";
1242 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1245 my $oldatime = (time // die $!) - 1;
1246 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1247 next unless stat_exists $oldlist;
1248 my ($mtime) = (stat _)[9];
1249 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1252 runcmd_ordryrun_local aptget_aptget(), qw(update);
1255 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1256 next unless stat_exists $oldlist;
1257 my ($atime) = (stat _)[8];
1258 next if $atime == $oldatime;
1259 push @releasefiles, $oldlist;
1261 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1262 @releasefiles = @inreleasefiles if @inreleasefiles;
1263 die "apt updated wrong number of Release files (@releasefiles), erk"
1264 unless @releasefiles == 1;
1266 ($aptget_releasefile) = @releasefiles;
1269 sub canonicalise_suite_aptget {
1270 my ($proto,$data) = @_;
1273 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1275 foreach my $name (qw(Codename Suite)) {
1276 my $val = $release->{$name};
1278 printdebug "release file $name: $val\n";
1279 $val =~ m/^$suite_re$/o or fail
1280 "Release file ($aptget_releasefile) specifies intolerable $name";
1281 cfg_apply_map(\$val, 'suite rmap',
1282 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1289 sub archive_query_aptget {
1290 my ($proto,$data) = @_;
1293 ensuredir "$aptget_base/source";
1294 foreach my $old (<$aptget_base/source/*.dsc>) {
1295 unlink $old or die "$old: $!";
1298 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1299 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1300 # avoids apt-get source failing with ambiguous error code
1302 runcmd_ordryrun_local
1303 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1304 aptget_aptget(), qw(--download-only --only-source source), $package;
1306 my @dscs = <$aptget_base/source/*.dsc>;
1307 fail "apt-get source did not produce a .dsc" unless @dscs;
1308 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1310 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1313 my $uri = "file://". uri_escape $dscs[0];
1314 $uri =~ s{\%2f}{/}gi;
1315 return [ (getfield $pre_dsc, 'Version'), $uri ];
1318 #---------- `dummyapicat' archive query method ----------
1320 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1321 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1323 sub file_in_archive_dummycatapi ($$$) {
1324 my ($proto,$data,$filename) = @_;
1325 my $mirror = access_cfg('mirror');
1326 $mirror =~ s#^file://#/# or die "$mirror ?";
1328 my @cmd = (qw(sh -ec), '
1330 find -name "$2" -print0 |
1332 ', qw(x), $mirror, $filename);
1333 debugcmd "-|", @cmd;
1334 open FIA, "-|", @cmd or die $!;
1337 printdebug "| $_\n";
1338 m/^(\w+) (\S+)$/ or die "$_ ?";
1339 push @out, { sha256sum => $1, filename => $2 };
1341 close FIA or die failedcmd @cmd;
1345 #---------- `madison' archive query method ----------
1347 sub archive_query_madison {
1348 return archive_query_prepend_mirror
1349 map { [ @$_[0..1] ] } madison_get_parse(@_);
1352 sub madison_get_parse {
1353 my ($proto,$data) = @_;
1354 die unless $proto eq 'madison';
1355 if (!length $data) {
1356 $data= access_cfg('madison-distro','RETURN-UNDEF');
1357 $data //= access_basedistro();
1359 $rmad{$proto,$data,$package} ||= cmdoutput
1360 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1361 my $rmad = $rmad{$proto,$data,$package};
1364 foreach my $l (split /\n/, $rmad) {
1365 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1366 \s*( [^ \t|]+ )\s* \|
1367 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1368 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1369 $1 eq $package or die "$rmad $package ?";
1376 $component = access_cfg('archive-query-default-component');
1378 $5 eq 'source' or die "$rmad ?";
1379 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1381 return sort { -version_compare($a->[0],$b->[0]); } @out;
1384 sub canonicalise_suite_madison {
1385 # madison canonicalises for us
1386 my @r = madison_get_parse(@_);
1388 "unable to canonicalise suite using package $package".
1389 " which does not appear to exist in suite $isuite;".
1390 " --existing-package may help";
1394 sub file_in_archive_madison { return undef; }
1396 #---------- `sshpsql' archive query method ----------
1399 my ($data,$runeinfo,$sql) = @_;
1400 if (!length $data) {
1401 $data= access_someuserhost('sshpsql').':'.
1402 access_cfg('sshpsql-dbname');
1404 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1405 my ($userhost,$dbname) = ($`,$'); #';
1407 my @cmd = (access_cfg_ssh, $userhost,
1408 access_runeinfo("ssh-psql $runeinfo").
1409 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1410 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1412 open P, "-|", @cmd or die $!;
1415 printdebug(">|$_|\n");
1418 $!=0; $?=0; close P or failedcmd @cmd;
1420 my $nrows = pop @rows;
1421 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1422 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1423 @rows = map { [ split /\|/, $_ ] } @rows;
1424 my $ncols = scalar @{ shift @rows };
1425 die if grep { scalar @$_ != $ncols } @rows;
1429 sub sql_injection_check {
1430 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1433 sub archive_query_sshpsql ($$) {
1434 my ($proto,$data) = @_;
1435 sql_injection_check $isuite, $package;
1436 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1437 SELECT source.version, component.name, files.filename, files.sha256sum
1439 JOIN src_associations ON source.id = src_associations.source
1440 JOIN suite ON suite.id = src_associations.suite
1441 JOIN dsc_files ON dsc_files.source = source.id
1442 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1443 JOIN component ON component.id = files_archive_map.component_id
1444 JOIN files ON files.id = dsc_files.file
1445 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1446 AND source.source='$package'
1447 AND files.filename LIKE '%.dsc';
1449 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1450 my $digester = Digest::SHA->new(256);
1452 my ($vsn,$component,$filename,$sha256sum) = @$_;
1453 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1455 return archive_query_prepend_mirror @rows;
1458 sub canonicalise_suite_sshpsql ($$) {
1459 my ($proto,$data) = @_;
1460 sql_injection_check $isuite;
1461 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1462 SELECT suite.codename
1463 FROM suite where suite_name='$isuite' or codename='$isuite';
1465 @rows = map { $_->[0] } @rows;
1466 fail "unknown suite $isuite" unless @rows;
1467 die "ambiguous $isuite: @rows ?" if @rows>1;
1471 sub file_in_archive_sshpsql ($$$) { return undef; }
1473 #---------- `dummycat' archive query method ----------
1475 sub canonicalise_suite_dummycat ($$) {
1476 my ($proto,$data) = @_;
1477 my $dpath = "$data/suite.$isuite";
1478 if (!open C, "<", $dpath) {
1479 $!==ENOENT or die "$dpath: $!";
1480 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1484 chomp or die "$dpath: $!";
1486 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1490 sub archive_query_dummycat ($$) {
1491 my ($proto,$data) = @_;
1492 canonicalise_suite();
1493 my $dpath = "$data/package.$csuite.$package";
1494 if (!open C, "<", $dpath) {
1495 $!==ENOENT or die "$dpath: $!";
1496 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1504 printdebug "dummycat query $csuite $package $dpath | $_\n";
1505 my @row = split /\s+/, $_;
1506 @row==2 or die "$dpath: $_ ?";
1509 C->error and die "$dpath: $!";
1511 return archive_query_prepend_mirror
1512 sort { -version_compare($a->[0],$b->[0]); } @rows;
1515 sub file_in_archive_dummycat () { return undef; }
1517 #---------- tag format handling ----------
1519 sub access_cfg_tagformats () {
1520 split /\,/, access_cfg('dgit-tag-format');
1523 sub need_tagformat ($$) {
1524 my ($fmt, $why) = @_;
1525 fail "need to use tag format $fmt ($why) but also need".
1526 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1527 " - no way to proceed"
1528 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1529 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1532 sub select_tagformat () {
1534 return if $tagformatfn && !$tagformat_want;
1535 die 'bug' if $tagformatfn && $tagformat_want;
1536 # ... $tagformat_want assigned after previous select_tagformat
1538 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1539 printdebug "select_tagformat supported @supported\n";
1541 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1542 printdebug "select_tagformat specified @$tagformat_want\n";
1544 my ($fmt,$why,$override) = @$tagformat_want;
1546 fail "target distro supports tag formats @supported".
1547 " but have to use $fmt ($why)"
1549 or grep { $_ eq $fmt } @supported;
1551 $tagformat_want = undef;
1553 $tagformatfn = ${*::}{"debiantag_$fmt"};
1555 fail "trying to use unknown tag format \`$fmt' ($why) !"
1556 unless $tagformatfn;
1559 #---------- archive query entrypoints and rest of program ----------
1561 sub canonicalise_suite () {
1562 return if defined $csuite;
1563 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1564 $csuite = archive_query('canonicalise_suite');
1565 if ($isuite ne $csuite) {
1566 progress "canonical suite name for $isuite is $csuite";
1568 progress "canonical suite name is $csuite";
1572 sub get_archive_dsc () {
1573 canonicalise_suite();
1574 my @vsns = archive_query('archive_query');
1575 foreach my $vinfo (@vsns) {
1576 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1577 $dscurl = $vsn_dscurl;
1578 $dscdata = url_get($dscurl);
1580 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1585 $digester->add($dscdata);
1586 my $got = $digester->hexdigest();
1588 fail "$dscurl has hash $got but".
1589 " archive told us to expect $digest";
1592 my $fmt = getfield $dsc, 'Format';
1593 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1594 "unsupported source format $fmt, sorry";
1596 $dsc_checked = !!$digester;
1597 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1601 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1604 sub check_for_git ();
1605 sub check_for_git () {
1607 my $how = access_cfg('git-check');
1608 if ($how eq 'ssh-cmd') {
1610 (access_cfg_ssh, access_gituserhost(),
1611 access_runeinfo("git-check $package").
1612 " set -e; cd ".access_cfg('git-path').";".
1613 " if test -d $package.git; then echo 1; else echo 0; fi");
1614 my $r= cmdoutput @cmd;
1615 if (defined $r and $r =~ m/^divert (\w+)$/) {
1617 my ($usedistro,) = access_distros();
1618 # NB that if we are pushing, $usedistro will be $distro/push
1619 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1620 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1621 progress "diverting to $divert (using config for $instead_distro)";
1622 return check_for_git();
1624 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1626 } elsif ($how eq 'url') {
1627 my $prefix = access_cfg('git-check-url','git-url');
1628 my $suffix = access_cfg('git-check-suffix','git-suffix',
1629 'RETURN-UNDEF') // '.git';
1630 my $url = "$prefix/$package$suffix";
1631 my @cmd = (@curl, qw(-sS -I), $url);
1632 my $result = cmdoutput @cmd;
1633 $result =~ s/^\S+ 200 .*\n\r?\n//;
1634 # curl -sS -I with https_proxy prints
1635 # HTTP/1.0 200 Connection established
1636 $result =~ m/^\S+ (404|200) /s or
1637 fail "unexpected results from git check query - ".
1638 Dumper($prefix, $result);
1640 if ($code eq '404') {
1642 } elsif ($code eq '200') {
1647 } elsif ($how eq 'true') {
1649 } elsif ($how eq 'false') {
1652 badcfg "unknown git-check \`$how'";
1656 sub create_remote_git_repo () {
1657 my $how = access_cfg('git-create');
1658 if ($how eq 'ssh-cmd') {
1660 (access_cfg_ssh, access_gituserhost(),
1661 access_runeinfo("git-create $package").
1662 "set -e; cd ".access_cfg('git-path').";".
1663 " cp -a _template $package.git");
1664 } elsif ($how eq 'true') {
1667 badcfg "unknown git-create \`$how'";
1671 our ($dsc_hash,$lastpush_mergeinput);
1673 our $ud = '.git/dgit/unpack';
1683 sub mktree_in_ud_here () {
1684 runcmd qw(git init -q);
1685 runcmd qw(git config gc.auto 0);
1686 rmtree('.git/objects');
1687 symlink '../../../../objects','.git/objects' or die $!;
1690 sub git_write_tree () {
1691 my $tree = cmdoutput @git, qw(write-tree);
1692 $tree =~ m/^\w+$/ or die "$tree ?";
1696 sub remove_stray_gits () {
1697 my @gitscmd = qw(find -name .git -prune -print0);
1698 debugcmd "|",@gitscmd;
1699 open GITS, "-|", @gitscmd or die $!;
1704 print STDERR "$us: warning: removing from source package: ",
1705 (messagequote $_), "\n";
1709 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1712 sub mktree_in_ud_from_only_subdir (;$) {
1715 # changes into the subdir
1717 die "expected one subdir but found @dirs ?" unless @dirs==1;
1718 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1722 remove_stray_gits();
1723 mktree_in_ud_here();
1725 my ($format, $fopts) = get_source_format();
1726 if (madformat($format)) {
1731 runcmd @git, qw(add -Af);
1732 my $tree=git_write_tree();
1733 return ($tree,$dir);
1736 our @files_csum_info_fields =
1737 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1738 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1739 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1741 sub dsc_files_info () {
1742 foreach my $csumi (@files_csum_info_fields) {
1743 my ($fname, $module, $method) = @$csumi;
1744 my $field = $dsc->{$fname};
1745 next unless defined $field;
1746 eval "use $module; 1;" or die $@;
1748 foreach (split /\n/, $field) {
1750 m/^(\w+) (\d+) (\S+)$/ or
1751 fail "could not parse .dsc $fname line \`$_'";
1752 my $digester = eval "$module"."->$method;" or die $@;
1757 Digester => $digester,
1762 fail "missing any supported Checksums-* or Files field in ".
1763 $dsc->get_option('name');
1767 map { $_->{Filename} } dsc_files_info();
1770 sub files_compare_inputs (@) {
1775 my $showinputs = sub {
1776 return join "; ", map { $_->get_option('name') } @$inputs;
1779 foreach my $in (@$inputs) {
1781 my $in_name = $in->get_option('name');
1783 printdebug "files_compare_inputs $in_name\n";
1785 foreach my $csumi (@files_csum_info_fields) {
1786 my ($fname) = @$csumi;
1787 printdebug "files_compare_inputs $in_name $fname\n";
1789 my $field = $in->{$fname};
1790 next unless defined $field;
1793 foreach (split /\n/, $field) {
1796 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1797 fail "could not parse $in_name $fname line \`$_'";
1799 printdebug "files_compare_inputs $in_name $fname $f\n";
1803 my $re = \ $record{$f}{$fname};
1805 $fchecked{$f}{$in_name} = 1;
1807 fail "hash or size of $f varies in $fname fields".
1808 " (between: ".$showinputs->().")";
1813 @files = sort @files;
1814 $expected_files //= \@files;
1815 "@$expected_files" eq "@files" or
1816 fail "file list in $in_name varies between hash fields!";
1819 fail "$in_name has no files list field(s)";
1821 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1824 grep { keys %$_ == @$inputs-1 } values %fchecked
1825 or fail "no file appears in all file lists".
1826 " (looked in: ".$showinputs->().")";
1829 sub is_orig_file_in_dsc ($$) {
1830 my ($f, $dsc_files_info) = @_;
1831 return 0 if @$dsc_files_info <= 1;
1832 # One file means no origs, and the filename doesn't have a "what
1833 # part of dsc" component. (Consider versions ending `.orig'.)
1834 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1838 sub is_orig_file_of_vsn ($$) {
1839 my ($f, $upstreamvsn) = @_;
1840 my $base = srcfn $upstreamvsn, '';
1841 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1845 sub changes_update_origs_from_dsc ($$$$) {
1846 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1848 printdebug "checking origs needed ($upstreamvsn)...\n";
1849 $_ = getfield $changes, 'Files';
1850 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1851 fail "cannot find section/priority from .changes Files field";
1852 my $placementinfo = $1;
1854 printdebug "checking origs needed placement '$placementinfo'...\n";
1855 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1856 $l =~ m/\S+$/ or next;
1858 printdebug "origs $file | $l\n";
1859 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1860 printdebug "origs $file is_orig\n";
1861 my $have = archive_query('file_in_archive', $file);
1862 if (!defined $have) {
1864 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1870 printdebug "origs $file \$#\$have=$#$have\n";
1871 foreach my $h (@$have) {
1874 foreach my $csumi (@files_csum_info_fields) {
1875 my ($fname, $module, $method, $archivefield) = @$csumi;
1876 next unless defined $h->{$archivefield};
1877 $_ = $dsc->{$fname};
1878 next unless defined;
1879 m/^(\w+) .* \Q$file\E$/m or
1880 fail ".dsc $fname missing entry for $file";
1881 if ($h->{$archivefield} eq $1) {
1885 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1888 die "$file ".Dumper($h)." ?!" if $same && @differ;
1891 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1894 printdebug "origs $file f.same=$found_same".
1895 " #f._differ=$#found_differ\n";
1896 if (@found_differ && !$found_same) {
1898 "archive contains $file with different checksum",
1901 # Now we edit the changes file to add or remove it
1902 foreach my $csumi (@files_csum_info_fields) {
1903 my ($fname, $module, $method, $archivefield) = @$csumi;
1904 next unless defined $changes->{$fname};
1906 # in archive, delete from .changes if it's there
1907 $changed{$file} = "removed" if
1908 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1909 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1910 # not in archive, but it's here in the .changes
1912 my $dsc_data = getfield $dsc, $fname;
1913 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1915 $extra =~ s/ \d+ /$&$placementinfo /
1916 or die "$fname $extra >$dsc_data< ?"
1917 if $fname eq 'Files';
1918 $changes->{$fname} .= "\n". $extra;
1919 $changed{$file} = "added";
1924 foreach my $file (keys %changed) {
1926 "edited .changes for archive .orig contents: %s %s",
1927 $changed{$file}, $file;
1929 my $chtmp = "$changesfile.tmp";
1930 $changes->save($chtmp);
1932 rename $chtmp,$changesfile or die "$changesfile $!";
1934 progress "[new .changes left in $changesfile]";
1937 progress "$changesfile already has appropriate .orig(s) (if any)";
1941 sub make_commit ($) {
1943 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1946 sub make_commit_text ($) {
1949 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1951 print Dumper($text) if $debuglevel > 1;
1952 my $child = open2($out, $in, @cmd) or die $!;
1955 print $in $text or die $!;
1956 close $in or die $!;
1958 $h =~ m/^\w+$/ or die;
1960 printdebug "=> $h\n";
1963 waitpid $child, 0 == $child or die "$child $!";
1964 $? and failedcmd @cmd;
1968 sub clogp_authline ($) {
1970 my $author = getfield $clogp, 'Maintainer';
1971 $author =~ s#,.*##ms;
1972 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1973 my $authline = "$author $date";
1974 $authline =~ m/$git_authline_re/o or
1975 fail "unexpected commit author line format \`$authline'".
1976 " (was generated from changelog Maintainer field)";
1977 return ($1,$2,$3) if wantarray;
1981 sub vendor_patches_distro ($$) {
1982 my ($checkdistro, $what) = @_;
1983 return unless defined $checkdistro;
1985 my $series = "debian/patches/\L$checkdistro\E.series";
1986 printdebug "checking for vendor-specific $series ($what)\n";
1988 if (!open SERIES, "<", $series) {
1989 die "$series $!" unless $!==ENOENT;
1998 Unfortunately, this source package uses a feature of dpkg-source where
1999 the same source package unpacks to different source code on different
2000 distros. dgit cannot safely operate on such packages on affected
2001 distros, because the meaning of source packages is not stable.
2003 Please ask the distro/maintainer to remove the distro-specific series
2004 files and use a different technique (if necessary, uploading actually
2005 different packages, if different distros are supposed to have
2009 fail "Found active distro-specific series file for".
2010 " $checkdistro ($what): $series, cannot continue";
2012 die "$series $!" if SERIES->error;
2016 sub check_for_vendor_patches () {
2017 # This dpkg-source feature doesn't seem to be documented anywhere!
2018 # But it can be found in the changelog (reformatted):
2020 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2021 # Author: Raphael Hertzog <hertzog@debian.org>
2022 # Date: Sun Oct 3 09:36:48 2010 +0200
2024 # dpkg-source: correctly create .pc/.quilt_series with alternate
2027 # If you have debian/patches/ubuntu.series and you were
2028 # unpacking the source package on ubuntu, quilt was still
2029 # directed to debian/patches/series instead of
2030 # debian/patches/ubuntu.series.
2032 # debian/changelog | 3 +++
2033 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2034 # 2 files changed, 6 insertions(+), 1 deletion(-)
2037 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2038 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2039 "Dpkg::Vendor \`current vendor'");
2040 vendor_patches_distro(access_basedistro(),
2041 "(base) distro being accessed");
2042 vendor_patches_distro(access_nomdistro(),
2043 "(nominal) distro being accessed");
2046 sub generate_commits_from_dsc () {
2047 # See big comment in fetch_from_archive, below.
2048 # See also README.dsc-import.
2052 my @dfi = dsc_files_info();
2053 foreach my $fi (@dfi) {
2054 my $f = $fi->{Filename};
2055 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2057 printdebug "considering linking $f: ";
2059 link_ltarget "../../../../$f", $f
2060 or ((printdebug "($!) "), 0)
2064 printdebug "linked.\n";
2066 complete_file_from_dsc('.', $fi)
2069 if (is_orig_file_in_dsc($f, \@dfi)) {
2070 link $f, "../../../../$f"
2076 # We unpack and record the orig tarballs first, so that we only
2077 # need disk space for one private copy of the unpacked source.
2078 # But we can't make them into commits until we have the metadata
2079 # from the debian/changelog, so we record the tree objects now and
2080 # make them into commits later.
2082 my $upstreamv = upstreamversion $dsc->{version};
2083 my $orig_f_base = srcfn $upstreamv, '';
2085 foreach my $fi (@dfi) {
2086 # We actually import, and record as a commit, every tarball
2087 # (unless there is only one file, in which case there seems
2090 my $f = $fi->{Filename};
2091 printdebug "import considering $f ";
2092 (printdebug "only one dfi\n"), next if @dfi == 1;
2093 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2094 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2098 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2100 printdebug "Y ", (join ' ', map { $_//"(none)" }
2101 $compr_ext, $orig_f_part
2104 my $input = new IO::File $f, '<' or die "$f $!";
2108 if (defined $compr_ext) {
2110 Dpkg::Compression::compression_guess_from_filename $f;
2111 fail "Dpkg::Compression cannot handle file $f in source package"
2112 if defined $compr_ext && !defined $cname;
2114 new Dpkg::Compression::Process compression => $cname;
2115 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2116 my $compr_fh = new IO::Handle;
2117 my $compr_pid = open $compr_fh, "-|" // die $!;
2119 open STDIN, "<&", $input or die $!;
2121 die "dgit (child): exec $compr_cmd[0]: $!\n";
2126 rmtree "../unpack-tar";
2127 mkdir "../unpack-tar" or die $!;
2128 my @tarcmd = qw(tar -x -f -
2129 --no-same-owner --no-same-permissions
2130 --no-acls --no-xattrs --no-selinux);
2131 my $tar_pid = fork // die $!;
2133 chdir "../unpack-tar" or die $!;
2134 open STDIN, "<&", $input or die $!;
2136 die "dgit (child): exec $tarcmd[0]: $!";
2138 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2139 !$? or failedcmd @tarcmd;
2142 (@compr_cmd ? failedcmd @compr_cmd
2144 # finally, we have the results in "tarball", but maybe
2145 # with the wrong permissions
2147 runcmd qw(chmod -R +rwX ../unpack-tar);
2148 changedir "../unpack-tar";
2149 my ($tree) = mktree_in_ud_from_only_subdir(1);
2150 changedir "../../unpack";
2151 rmtree "../unpack-tar";
2153 my $ent = [ $f, $tree ];
2155 Orig => !!$orig_f_part,
2156 Sort => (!$orig_f_part ? 2 :
2157 $orig_f_part =~ m/-/g ? 1 :
2165 # put any without "_" first (spec is not clear whether files
2166 # are always in the usual order). Tarballs without "_" are
2167 # the main orig or the debian tarball.
2168 $a->{Sort} <=> $b->{Sort} or
2172 my $any_orig = grep { $_->{Orig} } @tartrees;
2174 my $dscfn = "$package.dsc";
2176 my $treeimporthow = 'package';
2178 open D, ">", $dscfn or die "$dscfn: $!";
2179 print D $dscdata or die "$dscfn: $!";
2180 close D or die "$dscfn: $!";
2181 my @cmd = qw(dpkg-source);
2182 push @cmd, '--no-check' if $dsc_checked;
2183 if (madformat $dsc->{format}) {
2184 push @cmd, '--skip-patches';
2185 $treeimporthow = 'unpatched';
2187 push @cmd, qw(-x --), $dscfn;
2190 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
2191 if (madformat $dsc->{format}) {
2192 check_for_vendor_patches();
2196 if (madformat $dsc->{format}) {
2197 my @pcmd = qw(dpkg-source --before-build .);
2198 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2200 runcmd @git, qw(add -Af);
2201 $dappliedtree = git_write_tree();
2204 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2205 debugcmd "|",@clogcmd;
2206 open CLOGS, "-|", @clogcmd or die $!;
2211 printdebug "import clog search...\n";
2214 my $stanzatext = do { local $/=""; <CLOGS>; };
2215 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2216 last if !defined $stanzatext;
2218 my $desc = "package changelog, entry no.$.";
2219 open my $stanzafh, "<", \$stanzatext or die;
2220 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2221 $clogp //= $thisstanza;
2223 printdebug "import clog $thisstanza->{version} $desc...\n";
2225 last if !$any_orig; # we don't need $r1clogp
2227 # We look for the first (most recent) changelog entry whose
2228 # version number is lower than the upstream version of this
2229 # package. Then the last (least recent) previous changelog
2230 # entry is treated as the one which introduced this upstream
2231 # version and used for the synthetic commits for the upstream
2234 # One might think that a more sophisticated algorithm would be
2235 # necessary. But: we do not want to scan the whole changelog
2236 # file. Stopping when we see an earlier version, which
2237 # necessarily then is an earlier upstream version, is the only
2238 # realistic way to do that. Then, either the earliest
2239 # changelog entry we have seen so far is indeed the earliest
2240 # upload of this upstream version; or there are only changelog
2241 # entries relating to later upstream versions (which is not
2242 # possible unless the changelog and .dsc disagree about the
2243 # version). Then it remains to choose between the physically
2244 # last entry in the file, and the one with the lowest version
2245 # number. If these are not the same, we guess that the
2246 # versions were created in a non-monotic order rather than
2247 # that the changelog entries have been misordered.
2249 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2251 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2252 $r1clogp = $thisstanza;
2254 printdebug "import clog $r1clogp->{version} becomes r1\n";
2256 die $! if CLOGS->error;
2257 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2259 $clogp or fail "package changelog has no entries!";
2261 my $authline = clogp_authline $clogp;
2262 my $changes = getfield $clogp, 'Changes';
2263 my $cversion = getfield $clogp, 'Version';
2266 $r1clogp //= $clogp; # maybe there's only one entry;
2267 my $r1authline = clogp_authline $r1clogp;
2268 # Strictly, r1authline might now be wrong if it's going to be
2269 # unused because !$any_orig. Whatever.
2271 printdebug "import tartrees authline $authline\n";
2272 printdebug "import tartrees r1authline $r1authline\n";
2274 foreach my $tt (@tartrees) {
2275 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2277 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2280 committer $r1authline
2284 [dgit import orig $tt->{F}]
2292 [dgit import tarball $package $cversion $tt->{F}]
2297 printdebug "import main commit\n";
2299 open C, ">../commit.tmp" or die $!;
2300 print C <<END or die $!;
2303 print C <<END or die $! foreach @tartrees;
2306 print C <<END or die $!;
2312 [dgit import $treeimporthow $package $cversion]
2316 my $rawimport_hash = make_commit qw(../commit.tmp);
2318 if (madformat $dsc->{format}) {
2319 printdebug "import apply patches...\n";
2321 # regularise the state of the working tree so that
2322 # the checkout of $rawimport_hash works nicely.
2323 my $dappliedcommit = make_commit_text(<<END);
2330 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2332 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2334 # We need the answers to be reproducible
2335 my @authline = clogp_authline($clogp);
2336 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2337 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2338 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2339 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2340 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2341 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2343 my $path = $ENV{PATH} or die;
2345 foreach my $use_absurd (qw(0 1)) {
2346 local $ENV{PATH} = $path;
2349 progress "warning: $@";
2350 $path = "$absurdity:$path";
2351 progress "$us: trying slow absurd-git-apply...";
2352 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2357 die "forbid absurd git-apply\n" if $use_absurd
2358 && forceing [qw(import-gitapply-no-absurd)];
2359 die "only absurd git-apply!\n" if !$use_absurd
2360 && forceing [qw(import-gitapply-absurd)];
2362 local $ENV{PATH} = $path if $use_absurd;
2364 my @showcmd = (gbp_pq, qw(import));
2365 my @realcmd = shell_cmd
2366 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2367 debugcmd "+",@realcmd;
2368 if (system @realcmd) {
2369 die +(shellquote @showcmd).
2371 failedcmd_waitstatus()."\n";
2374 my $gapplied = git_rev_parse('HEAD');
2375 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2376 $gappliedtree eq $dappliedtree or
2378 gbp-pq import and dpkg-source disagree!
2379 gbp-pq import gave commit $gapplied
2380 gbp-pq import gave tree $gappliedtree
2381 dpkg-source --before-build gave tree $dappliedtree
2383 $rawimport_hash = $gapplied;
2388 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2393 progress "synthesised git commit from .dsc $cversion";
2395 my $rawimport_mergeinput = {
2396 Commit => $rawimport_hash,
2397 Info => "Import of source package",
2399 my @output = ($rawimport_mergeinput);
2401 if ($lastpush_mergeinput) {
2402 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2403 my $oversion = getfield $oldclogp, 'Version';
2405 version_compare($oversion, $cversion);
2407 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2408 { Message => <<END, ReverseParents => 1 });
2409 Record $package ($cversion) in archive suite $csuite
2411 } elsif ($vcmp > 0) {
2412 print STDERR <<END or die $!;
2414 Version actually in archive: $cversion (older)
2415 Last version pushed with dgit: $oversion (newer or same)
2418 @output = $lastpush_mergeinput;
2420 # Same version. Use what's in the server git branch,
2421 # discarding our own import. (This could happen if the
2422 # server automatically imports all packages into git.)
2423 @output = $lastpush_mergeinput;
2426 changedir '../../../..';
2431 sub complete_file_from_dsc ($$) {
2432 our ($dstdir, $fi) = @_;
2433 # Ensures that we have, in $dir, the file $fi, with the correct
2434 # contents. (Downloading it from alongside $dscurl if necessary.)
2436 my $f = $fi->{Filename};
2437 my $tf = "$dstdir/$f";
2440 if (stat_exists $tf) {
2441 progress "using existing $f";
2443 printdebug "$tf does not exist, need to fetch\n";
2445 $furl =~ s{/[^/]+$}{};
2447 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2448 die "$f ?" if $f =~ m#/#;
2449 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2450 return 0 if !act_local();
2454 open F, "<", "$tf" or die "$tf: $!";
2455 $fi->{Digester}->reset();
2456 $fi->{Digester}->addfile(*F);
2457 F->error and die $!;
2458 my $got = $fi->{Digester}->hexdigest();
2459 $got eq $fi->{Hash} or
2460 fail "file $f has hash $got but .dsc".
2461 " demands hash $fi->{Hash} ".
2462 ($downloaded ? "(got wrong file from archive!)"
2463 : "(perhaps you should delete this file?)");
2468 sub ensure_we_have_orig () {
2469 my @dfi = dsc_files_info();
2470 foreach my $fi (@dfi) {
2471 my $f = $fi->{Filename};
2472 next unless is_orig_file_in_dsc($f, \@dfi);
2473 complete_file_from_dsc('..', $fi)
2478 sub git_fetch_us () {
2479 # Want to fetch only what we are going to use, unless
2480 # deliberately-not-ff, in which case we must fetch everything.
2482 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2484 (quiltmode_splitbrain
2485 ? (map { $_->('*',access_nomdistro) }
2486 \&debiantag_new, \&debiantag_maintview)
2487 : debiantags('*',access_nomdistro));
2488 push @specs, server_branch($csuite);
2489 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2491 # This is rather miserable:
2492 # When git fetch --prune is passed a fetchspec ending with a *,
2493 # it does a plausible thing. If there is no * then:
2494 # - it matches subpaths too, even if the supplied refspec
2495 # starts refs, and behaves completely madly if the source
2496 # has refs/refs/something. (See, for example, Debian #NNNN.)
2497 # - if there is no matching remote ref, it bombs out the whole
2499 # We want to fetch a fixed ref, and we don't know in advance
2500 # if it exists, so this is not suitable.
2502 # Our workaround is to use git ls-remote. git ls-remote has its
2503 # own qairks. Notably, it has the absurd multi-tail-matching
2504 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2505 # refs/refs/foo etc.
2507 # Also, we want an idempotent snapshot, but we have to make two
2508 # calls to the remote: one to git ls-remote and to git fetch. The
2509 # solution is use git ls-remote to obtain a target state, and
2510 # git fetch to try to generate it. If we don't manage to generate
2511 # the target state, we try again.
2513 printdebug "git_fetch_us specs @specs\n";
2515 my $specre = join '|', map {
2521 printdebug "git_fetch_us specre=$specre\n";
2522 my $wanted_rref = sub {
2524 return m/^(?:$specre)$/o;
2527 my $fetch_iteration = 0;
2530 printdebug "git_fetch_us iteration $fetch_iteration\n";
2531 if (++$fetch_iteration > 10) {
2532 fail "too many iterations trying to get sane fetch!";
2535 my @look = map { "refs/$_" } @specs;
2536 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2540 open GITLS, "-|", @lcmd or die $!;
2542 printdebug "=> ", $_;
2543 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2544 my ($objid,$rrefname) = ($1,$2);
2545 if (!$wanted_rref->($rrefname)) {
2547 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2551 $wantr{$rrefname} = $objid;
2554 close GITLS or failedcmd @lcmd;
2556 # OK, now %want is exactly what we want for refs in @specs
2558 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2559 "+refs/$_:".lrfetchrefs."/$_";
2562 printdebug "git_fetch_us fspecs @fspecs\n";
2564 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2565 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2568 %lrfetchrefs_f = ();
2571 git_for_each_ref(lrfetchrefs, sub {
2572 my ($objid,$objtype,$lrefname,$reftail) = @_;
2573 $lrfetchrefs_f{$lrefname} = $objid;
2574 $objgot{$objid} = 1;
2577 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2578 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2579 if (!exists $wantr{$rrefname}) {
2580 if ($wanted_rref->($rrefname)) {
2582 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2586 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2589 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2590 delete $lrfetchrefs_f{$lrefname};
2594 foreach my $rrefname (sort keys %wantr) {
2595 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2596 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2597 my $want = $wantr{$rrefname};
2598 next if $got eq $want;
2599 if (!defined $objgot{$want}) {
2601 warning: git ls-remote suggests we want $lrefname
2602 warning: and it should refer to $want
2603 warning: but git fetch didn't fetch that object to any relevant ref.
2604 warning: This may be due to a race with someone updating the server.
2605 warning: Will try again...
2607 next FETCH_ITERATION;
2610 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2612 runcmd_ordryrun_local @git, qw(update-ref -m),
2613 "dgit fetch git fetch fixup", $lrefname, $want;
2614 $lrfetchrefs_f{$lrefname} = $want;
2618 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2619 Dumper(\%lrfetchrefs_f);
2622 my @tagpats = debiantags('*',access_nomdistro);
2624 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2625 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2626 printdebug "currently $fullrefname=$objid\n";
2627 $here{$fullrefname} = $objid;
2629 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2630 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2631 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2632 printdebug "offered $lref=$objid\n";
2633 if (!defined $here{$lref}) {
2634 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2635 runcmd_ordryrun_local @upd;
2636 lrfetchref_used $fullrefname;
2637 } elsif ($here{$lref} eq $objid) {
2638 lrfetchref_used $fullrefname;
2641 "Not updateting $lref from $here{$lref} to $objid.\n";
2646 sub mergeinfo_getclogp ($) {
2647 # Ensures thit $mi->{Clogp} exists and returns it
2649 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2652 sub mergeinfo_version ($) {
2653 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2656 sub fetch_from_archive_record_1 ($) {
2658 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2659 'DGIT_ARCHIVE', $hash;
2660 cmdoutput @git, qw(log -n2), $hash;
2661 # ... gives git a chance to complain if our commit is malformed
2664 sub fetch_from_archive_record_2 ($) {
2666 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2670 dryrun_report @upd_cmd;
2674 sub fetch_from_archive () {
2675 ensure_setup_existing_tree();
2677 # Ensures that lrref() is what is actually in the archive, one way
2678 # or another, according to us - ie this client's
2679 # appropritaely-updated archive view. Also returns the commit id.
2680 # If there is nothing in the archive, leaves lrref alone and
2681 # returns undef. git_fetch_us must have already been called.
2685 foreach my $field (@ourdscfield) {
2686 $dsc_hash = $dsc->{$field};
2687 last if defined $dsc_hash;
2689 if (defined $dsc_hash) {
2690 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2692 progress "last upload to archive specified git hash";
2694 progress "last upload to archive has NO git hash";
2697 progress "no version available from the archive";
2700 # If the archive's .dsc has a Dgit field, there are three
2701 # relevant git commitids we need to choose between and/or merge
2703 # 1. $dsc_hash: the Dgit field from the archive
2704 # 2. $lastpush_hash: the suite branch on the dgit git server
2705 # 3. $lastfetch_hash: our local tracking brach for the suite
2707 # These may all be distinct and need not be in any fast forward
2710 # If the dsc was pushed to this suite, then the server suite
2711 # branch will have been updated; but it might have been pushed to
2712 # a different suite and copied by the archive. Conversely a more
2713 # recent version may have been pushed with dgit but not appeared
2714 # in the archive (yet).
2716 # $lastfetch_hash may be awkward because archive imports
2717 # (particularly, imports of Dgit-less .dscs) are performed only as
2718 # needed on individual clients, so different clients may perform a
2719 # different subset of them - and these imports are only made
2720 # public during push. So $lastfetch_hash may represent a set of
2721 # imports different to a subsequent upload by a different dgit
2724 # Our approach is as follows:
2726 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2727 # descendant of $dsc_hash, then it was pushed by a dgit user who
2728 # had based their work on $dsc_hash, so we should prefer it.
2729 # Otherwise, $dsc_hash was installed into this suite in the
2730 # archive other than by a dgit push, and (necessarily) after the
2731 # last dgit push into that suite (since a dgit push would have
2732 # been descended from the dgit server git branch); thus, in that
2733 # case, we prefer the archive's version (and produce a
2734 # pseudo-merge to overwrite the dgit server git branch).
2736 # (If there is no Dgit field in the archive's .dsc then
2737 # generate_commit_from_dsc uses the version numbers to decide
2738 # whether the suite branch or the archive is newer. If the suite
2739 # branch is newer it ignores the archive's .dsc; otherwise it
2740 # generates an import of the .dsc, and produces a pseudo-merge to
2741 # overwrite the suite branch with the archive contents.)
2743 # The outcome of that part of the algorithm is the `public view',
2744 # and is same for all dgit clients: it does not depend on any
2745 # unpublished history in the local tracking branch.
2747 # As between the public view and the local tracking branch: The
2748 # local tracking branch is only updated by dgit fetch, and
2749 # whenever dgit fetch runs it includes the public view in the
2750 # local tracking branch. Therefore if the public view is not
2751 # descended from the local tracking branch, the local tracking
2752 # branch must contain history which was imported from the archive
2753 # but never pushed; and, its tip is now out of date. So, we make
2754 # a pseudo-merge to overwrite the old imports and stitch the old
2757 # Finally: we do not necessarily reify the public view (as
2758 # described above). This is so that we do not end up stacking two
2759 # pseudo-merges. So what we actually do is figure out the inputs
2760 # to any public view pseudo-merge and put them in @mergeinputs.
2763 # $mergeinputs[]{Commit}
2764 # $mergeinputs[]{Info}
2765 # $mergeinputs[0] is the one whose tree we use
2766 # @mergeinputs is in the order we use in the actual commit)
2769 # $mergeinputs[]{Message} is a commit message to use
2770 # $mergeinputs[]{ReverseParents} if def specifies that parent
2771 # list should be in opposite order
2772 # Such an entry has no Commit or Info. It applies only when found
2773 # in the last entry. (This ugliness is to support making
2774 # identical imports to previous dgit versions.)
2776 my $lastpush_hash = git_get_ref(lrfetchref());
2777 printdebug "previous reference hash=$lastpush_hash\n";
2778 $lastpush_mergeinput = $lastpush_hash && {
2779 Commit => $lastpush_hash,
2780 Info => "dgit suite branch on dgit git server",
2783 my $lastfetch_hash = git_get_ref(lrref());
2784 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2785 my $lastfetch_mergeinput = $lastfetch_hash && {
2786 Commit => $lastfetch_hash,
2787 Info => "dgit client's archive history view",
2790 my $dsc_mergeinput = $dsc_hash && {
2791 Commit => $dsc_hash,
2792 Info => "Dgit field in .dsc from archive",
2796 my $del_lrfetchrefs = sub {
2799 printdebug "del_lrfetchrefs...\n";
2800 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2801 my $objid = $lrfetchrefs_d{$fullrefname};
2802 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2804 $gur ||= new IO::Handle;
2805 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2807 printf $gur "delete %s %s\n", $fullrefname, $objid;
2810 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2814 if (defined $dsc_hash) {
2815 ensure_we_have_orig();
2816 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2817 @mergeinputs = $dsc_mergeinput
2818 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2819 print STDERR <<END or die $!;
2821 Git commit in archive is behind the last version allegedly pushed/uploaded.
2822 Commit referred to by archive: $dsc_hash
2823 Last version pushed with dgit: $lastpush_hash
2826 @mergeinputs = ($lastpush_mergeinput);
2828 # Archive has .dsc which is not a descendant of the last dgit
2829 # push. This can happen if the archive moves .dscs about.
2830 # Just follow its lead.
2831 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2832 progress "archive .dsc names newer git commit";
2833 @mergeinputs = ($dsc_mergeinput);
2835 progress "archive .dsc names other git commit, fixing up";
2836 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2840 @mergeinputs = generate_commits_from_dsc();
2841 # We have just done an import. Now, our import algorithm might
2842 # have been improved. But even so we do not want to generate
2843 # a new different import of the same package. So if the
2844 # version numbers are the same, just use our existing version.
2845 # If the version numbers are different, the archive has changed
2846 # (perhaps, rewound).
2847 if ($lastfetch_mergeinput &&
2848 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2849 (mergeinfo_version $mergeinputs[0]) )) {
2850 @mergeinputs = ($lastfetch_mergeinput);
2852 } elsif ($lastpush_hash) {
2853 # only in git, not in the archive yet
2854 @mergeinputs = ($lastpush_mergeinput);
2855 print STDERR <<END or die $!;
2857 Package not found in the archive, but has allegedly been pushed using dgit.
2861 printdebug "nothing found!\n";
2862 if (defined $skew_warning_vsn) {
2863 print STDERR <<END or die $!;
2865 Warning: relevant archive skew detected.
2866 Archive allegedly contains $skew_warning_vsn
2867 But we were not able to obtain any version from the archive or git.
2871 unshift @end, $del_lrfetchrefs;
2875 if ($lastfetch_hash &&
2877 my $h = $_->{Commit};
2878 $h and is_fast_fwd($lastfetch_hash, $h);
2879 # If true, one of the existing parents of this commit
2880 # is a descendant of the $lastfetch_hash, so we'll
2881 # be ff from that automatically.
2885 push @mergeinputs, $lastfetch_mergeinput;
2888 printdebug "fetch mergeinfos:\n";
2889 foreach my $mi (@mergeinputs) {
2891 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2893 printdebug sprintf " ReverseParents=%d Message=%s",
2894 $mi->{ReverseParents}, $mi->{Message};
2898 my $compat_info= pop @mergeinputs
2899 if $mergeinputs[$#mergeinputs]{Message};
2901 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2904 if (@mergeinputs > 1) {
2906 my $tree_commit = $mergeinputs[0]{Commit};
2908 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2909 $tree =~ m/\n\n/; $tree = $`;
2910 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2913 # We use the changelog author of the package in question the
2914 # author of this pseudo-merge. This is (roughly) correct if
2915 # this commit is simply representing aa non-dgit upload.
2916 # (Roughly because it does not record sponsorship - but we
2917 # don't have sponsorship info because that's in the .changes,
2918 # which isn't in the archivw.)
2920 # But, it might be that we are representing archive history
2921 # updates (including in-archive copies). These are not really
2922 # the responsibility of the person who created the .dsc, but
2923 # there is no-one whose name we should better use. (The
2924 # author of the .dsc-named commit is clearly worse.)
2926 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2927 my $author = clogp_authline $useclogp;
2928 my $cversion = getfield $useclogp, 'Version';
2930 my $mcf = ".git/dgit/mergecommit";
2931 open MC, ">", $mcf or die "$mcf $!";
2932 print MC <<END or die $!;
2936 my @parents = grep { $_->{Commit} } @mergeinputs;
2937 @parents = reverse @parents if $compat_info->{ReverseParents};
2938 print MC <<END or die $! foreach @parents;
2942 print MC <<END or die $!;
2948 if (defined $compat_info->{Message}) {
2949 print MC $compat_info->{Message} or die $!;
2951 print MC <<END or die $!;
2952 Record $package ($cversion) in archive suite $csuite
2956 my $message_add_info = sub {
2958 my $mversion = mergeinfo_version $mi;
2959 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2963 $message_add_info->($mergeinputs[0]);
2964 print MC <<END or die $!;
2965 should be treated as descended from
2967 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2971 $hash = make_commit $mcf;
2973 $hash = $mergeinputs[0]{Commit};
2975 printdebug "fetch hash=$hash\n";
2978 my ($lasth, $what) = @_;
2979 return unless $lasth;
2980 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2983 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
2985 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2987 fetch_from_archive_record_1($hash);
2989 if (defined $skew_warning_vsn) {
2991 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2992 my $gotclogp = commit_getclogp($hash);
2993 my $got_vsn = getfield $gotclogp, 'Version';
2994 printdebug "SKEW CHECK GOT $got_vsn\n";
2995 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2996 print STDERR <<END or die $!;
2998 Warning: archive skew detected. Using the available version:
2999 Archive allegedly contains $skew_warning_vsn
3000 We were able to obtain only $got_vsn
3006 if ($lastfetch_hash ne $hash) {
3007 fetch_from_archive_record_2($hash);
3010 lrfetchref_used lrfetchref();
3012 unshift @end, $del_lrfetchrefs;
3016 sub set_local_git_config ($$) {
3018 runcmd @git, qw(config), $k, $v;
3021 sub setup_mergechangelogs (;$) {
3023 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3025 my $driver = 'dpkg-mergechangelogs';
3026 my $cb = "merge.$driver";
3027 my $attrs = '.git/info/attributes';
3028 ensuredir '.git/info';
3030 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3031 if (!open ATTRS, "<", $attrs) {
3032 $!==ENOENT or die "$attrs: $!";
3036 next if m{^debian/changelog\s};
3037 print NATTRS $_, "\n" or die $!;
3039 ATTRS->error and die $!;
3042 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3045 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3046 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3048 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3051 sub setup_useremail (;$) {
3053 return unless $always || access_cfg_bool(1, 'setup-useremail');
3056 my ($k, $envvar) = @_;
3057 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3058 return unless defined $v;
3059 set_local_git_config "user.$k", $v;
3062 $setup->('email', 'DEBEMAIL');
3063 $setup->('name', 'DEBFULLNAME');
3066 sub ensure_setup_existing_tree () {
3067 my $k = "remote.$remotename.skipdefaultupdate";
3068 my $c = git_get_config $k;
3069 return if defined $c;
3070 set_local_git_config $k, 'true';
3073 sub setup_new_tree () {
3074 setup_mergechangelogs();
3078 sub multisuite_suite_child ($$$) {
3079 my ($tsuite, $merginputs, $fn) = @_;
3080 # in child, sets things up, calls $fn->(), and returns undef
3081 # in parent, returns canonical suite name for $tsuite
3082 my $canonsuitefh = IO::File::new_tmpfile;
3083 my $pid = fork // die $!;
3086 $us .= " [$isuite]";
3087 $debugprefix .= " ";
3088 progress "fetching $tsuite...";
3089 canonicalise_suite();
3090 print $canonsuitefh $csuite, "\n" or die $!;
3091 close $canonsuitefh or die $!;
3095 waitpid $pid,0 == $pid or die $!;
3096 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3097 seek $canonsuitefh,0,0 or die $!;
3098 local $csuite = <$canonsuitefh>;
3099 die $! unless defined $csuite && chomp $csuite;
3101 printdebug "multisuite $tsuite missing\n";
3104 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3105 push @$merginputs, {
3112 sub fork_for_multisuite ($) {
3113 my ($before_fetch_merge) = @_;
3114 # if nothing unusual, just returns ''
3117 # returns 0 to caller in child, to do first of the specified suites
3118 # in child, $csuite is not yet set
3120 # returns 1 to caller in parent, to finish up anything needed after
3121 # in parent, $csuite is set to canonicalised portmanteau
3123 my $org_isuite = $isuite;
3124 my @suites = split /\,/, $isuite;
3125 return '' unless @suites > 1;
3126 printdebug "fork_for_multisuite: @suites\n";
3130 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3132 return 0 unless defined $cbasesuite;
3134 fail "package $package missing in (base suite) $cbasesuite"
3135 unless @mergeinputs;
3137 my @csuites = ($cbasesuite);
3139 $before_fetch_merge->();
3141 foreach my $tsuite (@suites[1..$#suites]) {
3142 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3148 # xxx collecte the ref here
3150 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3151 push @csuites, $csubsuite;
3154 foreach my $mi (@mergeinputs) {
3155 my $ref = git_get_ref $mi->{Ref};
3156 die "$mi->{Ref} ?" unless length $ref;
3157 $mi->{Commit} = $ref;
3160 $csuite = join ",", @csuites;
3162 my $previous = git_get_ref lrref;
3164 unshift @mergeinputs, {
3165 Commit => $previous,
3166 Info => "local combined tracking branch",
3168 "archive seems to have rewound: local tracking branch is ahead!",
3172 foreach my $ix (0..$#mergeinputs) {
3173 $mergeinputs[$ix]{Index} = $ix;
3176 @mergeinputs = sort {
3177 -version_compare(mergeinfo_version $a,
3178 mergeinfo_version $b) # highest version first
3180 $a->{Index} <=> $b->{Index}; # earliest in spec first
3186 foreach my $mi (@mergeinputs) {
3187 printdebug "multisuite merge check $mi->{Info}\n";
3188 foreach my $previous (@needed) {
3189 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3190 printdebug "multisuite merge un-needed $previous->{Info}\n";
3194 printdebug "multisuite merge this-needed\n";
3195 $mi->{Character} = '+';
3198 $needed[0]{Character} = '*';
3200 my $output = $needed[0]{Commit};
3203 printdebug "multisuite merge nontrivial\n";
3204 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3206 my $commit = "tree $tree\n";
3207 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3208 "Input branches:\n";
3210 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3211 printdebug "multisuite merge include $mi->{Info}\n";
3212 $mi->{Character} //= ' ';
3213 $commit .= "parent $mi->{Commit}\n";
3214 $msg .= sprintf " %s %-25s %s\n",
3216 (mergeinfo_version $mi),
3219 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3221 " * marks the highest version branch, which choose to use\n".
3222 " + marks each branch which was not already an ancestor\n\n".
3223 "[dgit multi-suite $csuite]\n";
3225 "author $authline\n".
3226 "committer $authline\n\n";
3227 $output = make_commit_text $commit.$msg;
3228 printdebug "multisuite merge generated $output\n";
3231 fetch_from_archive_record_1($output);
3232 fetch_from_archive_record_2($output);
3234 progress "calculated combined tracking suite $csuite";
3239 sub clone_set_head () {
3240 open H, "> .git/HEAD" or die $!;
3241 print H "ref: ".lref()."\n" or die $!;
3244 sub clone_finish ($) {
3246 runcmd @git, qw(reset --hard), lrref();
3247 runcmd qw(bash -ec), <<'END';
3249 git ls-tree -r --name-only -z HEAD | \
3250 xargs -0r touch -r . --
3252 printdone "ready for work in $dstdir";
3257 badusage "dry run makes no sense with clone" unless act_local();
3259 my $multi_fetched = fork_for_multisuite(sub {
3260 printdebug "multi clone before fetch merge\n";
3263 if ($multi_fetched) {
3264 printdebug "multi clone after fetch merge\n";
3266 clone_finish($dstdir);
3269 printdebug "clone main body\n";
3271 canonicalise_suite();
3272 my $hasgit = check_for_git();
3273 mkdir $dstdir or fail "create \`$dstdir': $!";
3275 runcmd @git, qw(init -q);
3277 my $giturl = access_giturl(1);
3278 if (defined $giturl) {
3279 runcmd @git, qw(remote add), 'origin', $giturl;
3282 progress "fetching existing git history";
3284 runcmd_ordryrun_local @git, qw(fetch origin);
3286 progress "starting new git history";
3288 fetch_from_archive() or no_such_package;
3289 my $vcsgiturl = $dsc->{'Vcs-Git'};
3290 if (length $vcsgiturl) {
3291 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3292 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3295 clone_finish($dstdir);
3299 canonicalise_suite();
3300 if (check_for_git()) {
3303 fetch_from_archive() or no_such_package();
3304 printdone "fetched into ".lrref();
3308 my $multi_fetched = fork_for_multisuite(sub { });
3309 fetch() unless $multi_fetched; # parent
3310 return if $multi_fetched eq '0'; # child
3311 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3313 printdone "fetched to ".lrref()." and merged into HEAD";
3316 sub check_not_dirty () {
3317 foreach my $f (qw(local-options local-patch-header)) {
3318 if (stat_exists "debian/source/$f") {
3319 fail "git tree contains debian/source/$f";
3323 return if $ignoredirty;
3325 my @cmd = (@git, qw(diff --quiet HEAD));
3327 $!=0; $?=-1; system @cmd;
3330 fail "working tree is dirty (does not match HEAD)";
3336 sub commit_admin ($) {
3339 runcmd_ordryrun_local @git, qw(commit -m), $m;
3342 sub commit_quilty_patch () {
3343 my $output = cmdoutput @git, qw(status --porcelain);
3345 foreach my $l (split /\n/, $output) {
3346 next unless $l =~ m/\S/;
3347 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3351 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3353 progress "nothing quilty to commit, ok.";
3356 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3357 runcmd_ordryrun_local @git, qw(add -f), @adds;
3359 Commit Debian 3.0 (quilt) metadata
3361 [dgit ($our_version) quilt-fixup]
3365 sub get_source_format () {
3367 if (open F, "debian/source/options") {
3371 s/\s+$//; # ignore missing final newline
3373 my ($k, $v) = ($`, $'); #');
3374 $v =~ s/^"(.*)"$/$1/;
3380 F->error and die $!;
3383 die $! unless $!==&ENOENT;
3386 if (!open F, "debian/source/format") {
3387 die $! unless $!==&ENOENT;
3391 F->error and die $!;
3393 return ($_, \%options);
3396 sub madformat_wantfixup ($) {
3398 return 0 unless $format eq '3.0 (quilt)';
3399 our $quilt_mode_warned;
3400 if ($quilt_mode eq 'nocheck') {
3401 progress "Not doing any fixup of \`$format' due to".
3402 " ----no-quilt-fixup or --quilt=nocheck"
3403 unless $quilt_mode_warned++;
3406 progress "Format \`$format', need to check/update patch stack"
3407 unless $quilt_mode_warned++;
3411 sub maybe_split_brain_save ($$$) {
3412 my ($headref, $dgitview, $msg) = @_;
3413 # => message fragment "$saved" describing disposition of $dgitview
3414 return "commit id $dgitview" unless defined $split_brain_save;
3415 my @cmd = (shell_cmd "cd ../../../..",
3416 @git, qw(update-ref -m),
3417 "dgit --dgit-view-save $msg HEAD=$headref",
3418 $split_brain_save, $dgitview);
3420 return "and left in $split_brain_save";
3423 # An "infopair" is a tuple [ $thing, $what ]
3424 # (often $thing is a commit hash; $what is a description)
3426 sub infopair_cond_equal ($$) {
3428 $x->[0] eq $y->[0] or fail <<END;
3429 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3433 sub infopair_lrf_tag_lookup ($$) {
3434 my ($tagnames, $what) = @_;
3435 # $tagname may be an array ref
3436 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3437 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3438 foreach my $tagname (@tagnames) {
3439 my $lrefname = lrfetchrefs."/tags/$tagname";
3440 my $tagobj = $lrfetchrefs_f{$lrefname};
3441 next unless defined $tagobj;
3442 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3443 return [ git_rev_parse($tagobj), $what ];
3445 fail @tagnames==1 ? <<END : <<END;
3446 Wanted tag $what (@tagnames) on dgit server, but not found
3448 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3452 sub infopair_cond_ff ($$) {
3453 my ($anc,$desc) = @_;
3454 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3455 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3459 sub pseudomerge_version_check ($$) {
3460 my ($clogp, $archive_hash) = @_;
3462 my $arch_clogp = commit_getclogp $archive_hash;
3463 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3464 'version currently in archive' ];
3465 if (defined $overwrite_version) {
3466 if (length $overwrite_version) {
3467 infopair_cond_equal([ $overwrite_version,
3468 '--overwrite= version' ],
3471 my $v = $i_arch_v->[0];
3472 progress "Checking package changelog for archive version $v ...";
3474 my @xa = ("-f$v", "-t$v");
3475 my $vclogp = parsechangelog @xa;
3476 my $cv = [ (getfield $vclogp, 'Version'),
3477 "Version field from dpkg-parsechangelog @xa" ];
3478 infopair_cond_equal($i_arch_v, $cv);
3481 $@ =~ s/^dgit: //gm;
3483 "Perhaps debian/changelog does not mention $v ?";
3488 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3492 sub pseudomerge_make_commit ($$$$ $$) {
3493 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3494 $msg_cmd, $msg_msg) = @_;
3495 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3497 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3498 my $authline = clogp_authline $clogp;
3502 !defined $overwrite_version ? ""
3503 : !length $overwrite_version ? " --overwrite"
3504 : " --overwrite=".$overwrite_version;
3507 my $pmf = ".git/dgit/pseudomerge";
3508 open MC, ">", $pmf or die "$pmf $!";
3509 print MC <<END or die $!;
3512 parent $archive_hash
3522 return make_commit($pmf);
3525 sub splitbrain_pseudomerge ($$$$) {
3526 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3527 # => $merged_dgitview
3528 printdebug "splitbrain_pseudomerge...\n";
3530 # We: debian/PREVIOUS HEAD($maintview)
3531 # expect: o ----------------- o
3534 # a/d/PREVIOUS $dgitview
3537 # we do: `------------------ o
3541 return $dgitview unless defined $archive_hash;
3543 printdebug "splitbrain_pseudomerge...\n";
3545 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3547 if (!defined $overwrite_version) {
3548 progress "Checking that HEAD inciudes all changes in archive...";
3551 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3553 if (defined $overwrite_version) {
3555 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3556 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3557 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3558 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3559 my $i_archive = [ $archive_hash, "current archive contents" ];
3561 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3563 infopair_cond_equal($i_dgit, $i_archive);
3564 infopair_cond_ff($i_dep14, $i_dgit);
3565 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3569 $us: check failed (maybe --overwrite is needed, consult documentation)
3574 my $r = pseudomerge_make_commit
3575 $clogp, $dgitview, $archive_hash, $i_arch_v,
3576 "dgit --quilt=$quilt_mode",
3577 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3578 Declare fast forward from $i_arch_v->[0]
3580 Make fast forward from $i_arch_v->[0]
3583 maybe_split_brain_save $maintview, $r, "pseudomerge";
3585 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3589 sub plain_overwrite_pseudomerge ($$$) {
3590 my ($clogp, $head, $archive_hash) = @_;
3592 printdebug "plain_overwrite_pseudomerge...";
3594 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3596 return $head if is_fast_fwd $archive_hash, $head;
3598 my $m = "Declare fast forward from $i_arch_v->[0]";
3600 my $r = pseudomerge_make_commit
3601 $clogp, $head, $archive_hash, $i_arch_v,
3604 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3606 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3610 sub push_parse_changelog ($) {
3613 my $clogp = Dpkg::Control::Hash->new();
3614 $clogp->load($clogpfn) or die;
3616 my $clogpackage = getfield $clogp, 'Source';
3617 $package //= $clogpackage;
3618 fail "-p specified $package but changelog specified $clogpackage"
3619 unless $package eq $clogpackage;
3620 my $cversion = getfield $clogp, 'Version';
3621 my $tag = debiantag($cversion, access_nomdistro);
3622 runcmd @git, qw(check-ref-format), $tag;
3624 my $dscfn = dscfn($cversion);
3626 return ($clogp, $cversion, $dscfn);
3629 sub push_parse_dsc ($$$) {
3630 my ($dscfn,$dscfnwhat, $cversion) = @_;
3631 $dsc = parsecontrol($dscfn,$dscfnwhat);
3632 my $dversion = getfield $dsc, 'Version';
3633 my $dscpackage = getfield $dsc, 'Source';
3634 ($dscpackage eq $package && $dversion eq $cversion) or
3635 fail "$dscfn is for $dscpackage $dversion".
3636 " but debian/changelog is for $package $cversion";
3639 sub push_tagwants ($$$$) {
3640 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3643 TagFn => \&debiantag,
3648 if (defined $maintviewhead) {
3650 TagFn => \&debiantag_maintview,
3651 Objid => $maintviewhead,
3652 TfSuffix => '-maintview',
3656 foreach my $tw (@tagwants) {
3657 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3658 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3660 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3664 sub push_mktags ($$ $$ $) {
3666 $changesfile,$changesfilewhat,
3669 die unless $tagwants->[0]{View} eq 'dgit';
3671 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3672 $dsc->save("$dscfn.tmp") or die $!;
3674 my $changes = parsecontrol($changesfile,$changesfilewhat);
3675 foreach my $field (qw(Source Distribution Version)) {
3676 $changes->{$field} eq $clogp->{$field} or
3677 fail "changes field $field \`$changes->{$field}'".
3678 " does not match changelog \`$clogp->{$field}'";
3681 my $cversion = getfield $clogp, 'Version';
3682 my $clogsuite = getfield $clogp, 'Distribution';
3684 # We make the git tag by hand because (a) that makes it easier
3685 # to control the "tagger" (b) we can do remote signing
3686 my $authline = clogp_authline $clogp;
3687 my $delibs = join(" ", "",@deliberatelies);
3688 my $declaredistro = access_nomdistro();
3692 my $tfn = $tw->{Tfn};
3693 my $head = $tw->{Objid};
3694 my $tag = $tw->{Tag};
3696 open TO, '>', $tfn->('.tmp') or die $!;
3697 print TO <<END or die $!;
3704 if ($tw->{View} eq 'dgit') {
3705 print TO <<END or die $!;
3706 $package release $cversion for $clogsuite ($csuite) [dgit]
3707 [dgit distro=$declaredistro$delibs]
3709 foreach my $ref (sort keys %previously) {
3710 print TO <<END or die $!;
3711 [dgit previously:$ref=$previously{$ref}]
3714 } elsif ($tw->{View} eq 'maint') {
3715 print TO <<END or die $!;
3716 $package release $cversion for $clogsuite ($csuite)
3717 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3720 die Dumper($tw)."?";
3725 my $tagobjfn = $tfn->('.tmp');
3727 if (!defined $keyid) {
3728 $keyid = access_cfg('keyid','RETURN-UNDEF');
3730 if (!defined $keyid) {
3731 $keyid = getfield $clogp, 'Maintainer';
3733 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3734 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3735 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3736 push @sign_cmd, $tfn->('.tmp');
3737 runcmd_ordryrun @sign_cmd;
3739 $tagobjfn = $tfn->('.signed.tmp');
3740 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3741 $tfn->('.tmp'), $tfn->('.tmp.asc');
3747 my @r = map { $mktag->($_); } @$tagwants;
3751 sub sign_changes ($) {
3752 my ($changesfile) = @_;
3754 my @debsign_cmd = @debsign;
3755 push @debsign_cmd, "-k$keyid" if defined $keyid;
3756 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3757 push @debsign_cmd, $changesfile;
3758 runcmd_ordryrun @debsign_cmd;
3763 printdebug "actually entering push\n";
3765 supplementary_message(<<'END');
3766 Push failed, while checking state of the archive.
3767 You can retry the push, after fixing the problem, if you like.
3769 if (check_for_git()) {
3772 my $archive_hash = fetch_from_archive();
3773 if (!$archive_hash) {
3775 fail "package appears to be new in this suite;".
3776 " if this is intentional, use --new";
3779 supplementary_message(<<'END');
3780 Push failed, while preparing your push.
3781 You can retry the push, after fixing the problem, if you like.
3784 need_tagformat 'new', "quilt mode $quilt_mode"
3785 if quiltmode_splitbrain;
3789 access_giturl(); # check that success is vaguely likely
3792 my $clogpfn = ".git/dgit/changelog.822.tmp";
3793 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3795 responder_send_file('parsed-changelog', $clogpfn);
3797 my ($clogp, $cversion, $dscfn) =
3798 push_parse_changelog("$clogpfn");
3800 my $dscpath = "$buildproductsdir/$dscfn";
3801 stat_exists $dscpath or
3802 fail "looked for .dsc $dscfn, but $!;".
3803 " maybe you forgot to build";
3805 responder_send_file('dsc', $dscpath);
3807 push_parse_dsc($dscpath, $dscfn, $cversion);
3809 my $format = getfield $dsc, 'Format';
3810 printdebug "format $format\n";
3812 my $actualhead = git_rev_parse('HEAD');
3813 my $dgithead = $actualhead;
3814 my $maintviewhead = undef;
3816 my $upstreamversion = upstreamversion $clogp->{Version};
3818 if (madformat_wantfixup($format)) {
3819 # user might have not used dgit build, so maybe do this now:
3820 if (quiltmode_splitbrain()) {
3822 quilt_make_fake_dsc($upstreamversion);
3824 ($dgithead, $cachekey) =
3825 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3827 "--quilt=$quilt_mode but no cached dgit view:
3828 perhaps tree changed since dgit build[-source] ?";
3830 $dgithead = splitbrain_pseudomerge($clogp,
3831 $actualhead, $dgithead,
3833 $maintviewhead = $actualhead;
3834 changedir '../../../..';
3835 prep_ud(); # so _only_subdir() works, below
3837 commit_quilty_patch();
3841 if (defined $overwrite_version && !defined $maintviewhead) {
3842 $dgithead = plain_overwrite_pseudomerge($clogp,
3850 if ($archive_hash) {
3851 if (is_fast_fwd($archive_hash, $dgithead)) {
3853 } elsif (deliberately_not_fast_forward) {
3856 fail "dgit push: HEAD is not a descendant".
3857 " of the archive's version.\n".
3858 "To overwrite the archive's contents,".
3859 " pass --overwrite[=VERSION].\n".
3860 "To rewind history, if permitted by the archive,".
3861 " use --deliberately-not-fast-forward.";
3866 progress "checking that $dscfn corresponds to HEAD";
3867 runcmd qw(dpkg-source -x --),
3868 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3869 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3870 check_for_vendor_patches() if madformat($dsc->{format});
3871 changedir '../../../..';
3872 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3873 debugcmd "+",@diffcmd;
3875 my $r = system @diffcmd;
3878 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3880 HEAD specifies a different tree to $dscfn:
3882 Perhaps you forgot to build. Or perhaps there is a problem with your
3883 source tree (see dgit(7) for some hints). To see a full diff, run
3890 if (!$changesfile) {
3891 my $pat = changespat $cversion;
3892 my @cs = glob "$buildproductsdir/$pat";
3893 fail "failed to find unique changes file".
3894 " (looked for $pat in $buildproductsdir);".
3895 " perhaps you need to use dgit -C"
3897 ($changesfile) = @cs;
3899 $changesfile = "$buildproductsdir/$changesfile";
3902 # Check that changes and .dsc agree enough
3903 $changesfile =~ m{[^/]*$};
3904 my $changes = parsecontrol($changesfile,$&);
3905 files_compare_inputs($dsc, $changes)
3906 unless forceing [qw(dsc-changes-mismatch)];
3908 # Perhaps adjust .dsc to contain right set of origs
3909 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3911 unless forceing [qw(changes-origs-exactly)];
3913 # Checks complete, we're going to try and go ahead:
3915 responder_send_file('changes',$changesfile);
3916 responder_send_command("param head $dgithead");
3917 responder_send_command("param csuite $csuite");
3918 responder_send_command("param tagformat $tagformat");
3919 if (defined $maintviewhead) {
3920 die unless ($protovsn//4) >= 4;
3921 responder_send_command("param maint-view $maintviewhead");
3924 if (deliberately_not_fast_forward) {
3925 git_for_each_ref(lrfetchrefs, sub {
3926 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3927 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3928 responder_send_command("previously $rrefname=$objid");
3929 $previously{$rrefname} = $objid;
3933 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3937 supplementary_message(<<'END');
3938 Push failed, while signing the tag.
3939 You can retry the push, after fixing the problem, if you like.
3941 # If we manage to sign but fail to record it anywhere, it's fine.
3942 if ($we_are_responder) {
3943 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3944 responder_receive_files('signed-tag', @tagobjfns);
3946 @tagobjfns = push_mktags($clogp,$dscpath,
3947 $changesfile,$changesfile,
3950 supplementary_message(<<'END');
3951 Push failed, *after* signing the tag.
3952 If you want to try again, you should use a new version number.
3955 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3957 foreach my $tw (@tagwants) {
3958 my $tag = $tw->{Tag};
3959 my $tagobjfn = $tw->{TagObjFn};
3961 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3962 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3963 runcmd_ordryrun_local
3964 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3967 supplementary_message(<<'END');
3968 Push failed, while updating the remote git repository - see messages above.
3969 If you want to try again, you should use a new version number.
3971 if (!check_for_git()) {
3972 create_remote_git_repo();
3975 my @pushrefs = $forceflag.$dgithead.":".rrref();
3976 foreach my $tw (@tagwants) {
3977 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3980 runcmd_ordryrun @git,
3981 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3982 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3984 supplementary_message(<<'END');
3985 Push failed, after updating the remote git repository.
3986 If you want to try again, you must use a new version number.
3988 if ($we_are_responder) {
3989 my $dryrunsuffix = act_local() ? "" : ".tmp";
3990 responder_receive_files('signed-dsc-changes',
3991 "$dscpath$dryrunsuffix",
3992 "$changesfile$dryrunsuffix");
3995 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3997 progress "[new .dsc left in $dscpath.tmp]";
3999 sign_changes $changesfile;
4002 supplementary_message(<<END);
4003 Push failed, while uploading package(s) to the archive server.
4004 You can retry the upload of exactly these same files with dput of:
4006 If that .changes file is broken, you will need to use a new version
4007 number for your next attempt at the upload.
4009 my $host = access_cfg('upload-host','RETURN-UNDEF');
4010 my @hostarg = defined($host) ? ($host,) : ();
4011 runcmd_ordryrun @dput, @hostarg, $changesfile;
4012 printdone "pushed and uploaded $cversion";
4014 supplementary_message('');
4015 responder_send_command("complete");
4022 badusage "-p is not allowed with clone; specify as argument instead"
4023 if defined $package;
4026 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4027 ($package,$isuite) = @ARGV;
4028 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4029 ($package,$dstdir) = @ARGV;
4030 } elsif (@ARGV==3) {
4031 ($package,$isuite,$dstdir) = @ARGV;
4033 badusage "incorrect arguments to dgit clone";
4035 $dstdir ||= "$package";
4037 if (stat_exists $dstdir) {
4038 fail "$dstdir already exists";
4042 if ($rmonerror && !$dryrun_level) {
4043 $cwd_remove= getcwd();
4045 return unless defined $cwd_remove;
4046 if (!chdir "$cwd_remove") {
4047 return if $!==&ENOENT;
4048 die "chdir $cwd_remove: $!";
4050 printdebug "clone rmonerror removing $dstdir\n";
4052 rmtree($dstdir) or die "remove $dstdir: $!\n";
4053 } elsif (grep { $! == $_ }
4054 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4056 print STDERR "check whether to remove $dstdir: $!\n";
4062 $cwd_remove = undef;
4065 sub branchsuite () {
4066 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4067 if ($branch =~ m#$lbranch_re#o) {
4074 sub fetchpullargs () {
4076 if (!defined $package) {
4077 my $sourcep = parsecontrol('debian/control','debian/control');
4078 $package = getfield $sourcep, 'Source';
4081 $isuite = branchsuite();
4083 my $clogp = parsechangelog();
4084 $isuite = getfield $clogp, 'Distribution';
4086 } elsif (@ARGV==1) {
4089 badusage "incorrect arguments to dgit fetch or dgit pull";
4096 my $multi_fetched = fork_for_multisuite(sub { });
4097 exit 0 if $multi_fetched;
4104 if (quiltmode_splitbrain()) {
4105 my ($format, $fopts) = get_source_format();
4106 madformat($format) and fail <<END
4107 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4116 badusage "-p is not allowed with dgit push" if defined $package;
4118 my $clogp = parsechangelog();
4119 $package = getfield $clogp, 'Source';
4122 } elsif (@ARGV==1) {
4123 ($specsuite) = (@ARGV);
4125 badusage "incorrect arguments to dgit push";
4127 $isuite = getfield $clogp, 'Distribution';
4129 local ($package) = $existing_package; # this is a hack
4130 canonicalise_suite();
4132 canonicalise_suite();
4134 if (defined $specsuite &&
4135 $specsuite ne $isuite &&
4136 $specsuite ne $csuite) {
4137 fail "dgit push: changelog specifies $isuite ($csuite)".
4138 " but command line specifies $specsuite";
4143 #---------- remote commands' implementation ----------
4145 sub cmd_remote_push_build_host {
4146 my ($nrargs) = shift @ARGV;
4147 my (@rargs) = @ARGV[0..$nrargs-1];
4148 @ARGV = @ARGV[$nrargs..$#ARGV];
4150 my ($dir,$vsnwant) = @rargs;
4151 # vsnwant is a comma-separated list; we report which we have
4152 # chosen in our ready response (so other end can tell if they
4155 $we_are_responder = 1;
4156 $us .= " (build host)";
4160 open PI, "<&STDIN" or die $!;
4161 open STDIN, "/dev/null" or die $!;
4162 open PO, ">&STDOUT" or die $!;
4164 open STDOUT, ">&STDERR" or die $!;
4168 ($protovsn) = grep {
4169 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4170 } @rpushprotovsn_support;
4172 fail "build host has dgit rpush protocol versions ".
4173 (join ",", @rpushprotovsn_support).
4174 " but invocation host has $vsnwant"
4175 unless defined $protovsn;
4177 responder_send_command("dgit-remote-push-ready $protovsn");
4178 rpush_handle_protovsn_bothends();
4183 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4184 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4185 # a good error message)
4187 sub rpush_handle_protovsn_bothends () {
4188 if ($protovsn < 4) {
4189 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4198 my $report = i_child_report();
4199 if (defined $report) {
4200 printdebug "($report)\n";
4201 } elsif ($i_child_pid) {
4202 printdebug "(killing build host child $i_child_pid)\n";
4203 kill 15, $i_child_pid;
4205 if (defined $i_tmp && !defined $initiator_tempdir) {
4207 eval { rmtree $i_tmp; };
4211 END { i_cleanup(); }
4214 my ($base,$selector,@args) = @_;
4215 $selector =~ s/\-/_/g;
4216 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4223 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4231 push @rargs, join ",", @rpushprotovsn_support;
4234 push @rdgit, @ropts;
4235 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4237 my @cmd = (@ssh, $host, shellquote @rdgit);
4240 if (defined $initiator_tempdir) {
4241 rmtree $initiator_tempdir;
4242 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4243 $i_tmp = $initiator_tempdir;
4247 $i_child_pid = open2(\*RO, \*RI, @cmd);
4249 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4250 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4251 $supplementary_message = '' unless $protovsn >= 3;
4253 fail "rpush negotiated protocol version $protovsn".
4254 " which does not support quilt mode $quilt_mode"
4255 if quiltmode_splitbrain;
4257 rpush_handle_protovsn_bothends();
4259 my ($icmd,$iargs) = initiator_expect {
4260 m/^(\S+)(?: (.*))?$/;
4263 i_method "i_resp", $icmd, $iargs;
4267 sub i_resp_progress ($) {
4269 my $msg = protocol_read_bytes \*RO, $rhs;
4273 sub i_resp_supplementary_message ($) {
4275 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4278 sub i_resp_complete {
4279 my $pid = $i_child_pid;
4280 $i_child_pid = undef; # prevents killing some other process with same pid
4281 printdebug "waiting for build host child $pid...\n";
4282 my $got = waitpid $pid, 0;
4283 die $! unless $got == $pid;
4284 die "build host child failed $?" if $?;
4287 printdebug "all done\n";
4291 sub i_resp_file ($) {
4293 my $localname = i_method "i_localname", $keyword;
4294 my $localpath = "$i_tmp/$localname";
4295 stat_exists $localpath and
4296 badproto \*RO, "file $keyword ($localpath) twice";
4297 protocol_receive_file \*RO, $localpath;
4298 i_method "i_file", $keyword;
4303 sub i_resp_param ($) {
4304 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4308 sub i_resp_previously ($) {
4309 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4310 or badproto \*RO, "bad previously spec";
4311 my $r = system qw(git check-ref-format), $1;
4312 die "bad previously ref spec ($r)" if $r;
4313 $previously{$1} = $2;
4318 sub i_resp_want ($) {
4320 die "$keyword ?" if $i_wanted{$keyword}++;
4321 my @localpaths = i_method "i_want", $keyword;
4322 printdebug "[[ $keyword @localpaths\n";
4323 foreach my $localpath (@localpaths) {
4324 protocol_send_file \*RI, $localpath;
4326 print RI "files-end\n" or die $!;
4329 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4331 sub i_localname_parsed_changelog {
4332 return "remote-changelog.822";
4334 sub i_file_parsed_changelog {
4335 ($i_clogp, $i_version, $i_dscfn) =
4336 push_parse_changelog "$i_tmp/remote-changelog.822";
4337 die if $i_dscfn =~ m#/|^\W#;
4340 sub i_localname_dsc {
4341 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4346 sub i_localname_changes {
4347 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4348 $i_changesfn = $i_dscfn;
4349 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4350 return $i_changesfn;
4352 sub i_file_changes { }
4354 sub i_want_signed_tag {
4355 printdebug Dumper(\%i_param, $i_dscfn);
4356 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4357 && defined $i_param{'csuite'}
4358 or badproto \*RO, "premature desire for signed-tag";
4359 my $head = $i_param{'head'};
4360 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4362 my $maintview = $i_param{'maint-view'};
4363 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4366 if ($protovsn >= 4) {
4367 my $p = $i_param{'tagformat'} // '<undef>';
4369 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4372 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4374 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4376 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4379 push_mktags $i_clogp, $i_dscfn,
4380 $i_changesfn, 'remote changes',
4384 sub i_want_signed_dsc_changes {
4385 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4386 sign_changes $i_changesfn;
4387 return ($i_dscfn, $i_changesfn);
4390 #---------- building etc. ----------
4396 #----- `3.0 (quilt)' handling -----
4398 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4400 sub quiltify_dpkg_commit ($$$;$) {
4401 my ($patchname,$author,$msg, $xinfo) = @_;
4405 my $descfn = ".git/dgit/quilt-description.tmp";
4406 open O, '>', $descfn or die "$descfn: $!";
4407 $msg =~ s/\n+/\n\n/;
4408 print O <<END or die $!;
4410 ${xinfo}Subject: $msg
4417 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4418 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4419 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4420 runcmd @dpkgsource, qw(--commit .), $patchname;
4424 sub quiltify_trees_differ ($$;$$$) {
4425 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4426 # returns true iff the two tree objects differ other than in debian/
4427 # with $finegrained,
4428 # returns bitmask 01 - differ in upstream files except .gitignore
4429 # 02 - differ in .gitignore
4430 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4431 # is set for each modified .gitignore filename $fn
4432 # if $unrepres is defined, array ref to which is appeneded
4433 # a list of unrepresentable changes (removals of upstream files
4436 my @cmd = (@git, qw(diff-tree -z));
4437 push @cmd, qw(--name-only) unless $unrepres;
4438 push @cmd, qw(-r) if $finegrained || $unrepres;
4440 my $diffs= cmdoutput @cmd;
4443 foreach my $f (split /\0/, $diffs) {
4444 if ($unrepres && !@lmodes) {
4445 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4448 my ($oldmode,$newmode) = @lmodes;
4451 next if $f =~ m#^debian(?:/.*)?$#s;
4455 die "deleted\n" unless $newmode =~ m/[^0]/;
4456 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4457 if ($oldmode =~ m/[^0]/) {
4458 die "mode changed\n" if $oldmode ne $newmode;
4460 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4464 local $/="\n"; chomp $@;
4465 push @$unrepres, [ $f, $@ ];
4469 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4470 $r |= $isignore ? 02 : 01;
4471 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4473 printdebug "quiltify_trees_differ $x $y => $r\n";
4477 sub quiltify_tree_sentinelfiles ($) {
4478 # lists the `sentinel' files present in the tree
4480 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4481 qw(-- debian/rules debian/control);
4486 sub quiltify_splitbrain_needed () {
4487 if (!$split_brain) {
4488 progress "dgit view: changes are required...";
4489 runcmd @git, qw(checkout -q -b dgit-view);
4494 sub quiltify_splitbrain ($$$$$$) {
4495 my ($clogp, $unapplied, $headref, $diffbits,
4496 $editedignores, $cachekey) = @_;
4497 if ($quilt_mode !~ m/gbp|dpm/) {
4498 # treat .gitignore just like any other upstream file
4499 $diffbits = { %$diffbits };
4500 $_ = !!$_ foreach values %$diffbits;
4502 # We would like any commits we generate to be reproducible
4503 my @authline = clogp_authline($clogp);
4504 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4505 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4506 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4507 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4508 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4509 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4511 if ($quilt_mode =~ m/gbp|unapplied/ &&
4512 ($diffbits->{O2H} & 01)) {
4514 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4515 " but git tree differs from orig in upstream files.";
4516 if (!stat_exists "debian/patches") {
4518 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4522 if ($quilt_mode =~ m/dpm/ &&
4523 ($diffbits->{H2A} & 01)) {
4525 --quilt=$quilt_mode specified, implying patches-applied git tree
4526 but git tree differs from result of applying debian/patches to upstream
4529 if ($quilt_mode =~ m/gbp|unapplied/ &&
4530 ($diffbits->{O2A} & 01)) { # some patches
4531 quiltify_splitbrain_needed();
4532 progress "dgit view: creating patches-applied version using gbp pq";
4533 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4534 # gbp pq import creates a fresh branch; push back to dgit-view
4535 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4536 runcmd @git, qw(checkout -q dgit-view);
4538 if ($quilt_mode =~ m/gbp|dpm/ &&
4539 ($diffbits->{O2A} & 02)) {
4541 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4542 tool which does not create patches for changes to upstream
4543 .gitignores: but, such patches exist in debian/patches.
4546 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4547 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4548 quiltify_splitbrain_needed();
4549 progress "dgit view: creating patch to represent .gitignore changes";
4550 ensuredir "debian/patches";
4551 my $gipatch = "debian/patches/auto-gitignore";
4552 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4553 stat GIPATCH or die "$gipatch: $!";
4554 fail "$gipatch already exists; but want to create it".
4555 " to record .gitignore changes" if (stat _)[7];
4556 print GIPATCH <<END or die "$gipatch: $!";
4557 Subject: Update .gitignore from Debian packaging branch
4559 The Debian packaging git branch contains these updates to the upstream
4560 .gitignore file(s). This patch is autogenerated, to provide these
4561 updates to users of the official Debian archive view of the package.
4563 [dgit ($our_version) update-gitignore]
4566 close GIPATCH or die "$gipatch: $!";
4567 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4568 $unapplied, $headref, "--", sort keys %$editedignores;
4569 open SERIES, "+>>", "debian/patches/series" or die $!;
4570 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4572 defined read SERIES, $newline, 1 or die $!;
4573 print SERIES "\n" or die $! unless $newline eq "\n";
4574 print SERIES "auto-gitignore\n" or die $!;
4575 close SERIES or die $!;
4576 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4578 Commit patch to update .gitignore
4580 [dgit ($our_version) update-gitignore-quilt-fixup]
4584 my $dgitview = git_rev_parse 'HEAD';
4586 changedir '../../../..';
4587 # When we no longer need to support squeeze, use --create-reflog
4589 ensuredir ".git/logs/refs/dgit-intern";
4590 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4593 my $oldcache = git_get_ref "refs/$splitbraincache";
4594 if ($oldcache eq $dgitview) {
4595 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4596 # git update-ref doesn't always update, in this case. *sigh*
4597 my $dummy = make_commit_text <<END;
4600 author Dgit <dgit\@example.com> 1000000000 +0000
4601 committer Dgit <dgit\@example.com> 1000000000 +0000
4603 Dummy commit - do not use
4605 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4606 "refs/$splitbraincache", $dummy;
4608 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4611 changedir '.git/dgit/unpack/work';
4613 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4614 progress "dgit view: created ($saved)";
4617 sub quiltify ($$$$) {
4618 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4620 # Quilt patchification algorithm
4622 # We search backwards through the history of the main tree's HEAD
4623 # (T) looking for a start commit S whose tree object is identical
4624 # to to the patch tip tree (ie the tree corresponding to the
4625 # current dpkg-committed patch series). For these purposes
4626 # `identical' disregards anything in debian/ - this wrinkle is
4627 # necessary because dpkg-source treates debian/ specially.
4629 # We can only traverse edges where at most one of the ancestors'
4630 # trees differs (in changes outside in debian/). And we cannot
4631 # handle edges which change .pc/ or debian/patches. To avoid
4632 # going down a rathole we avoid traversing edges which introduce
4633 # debian/rules or debian/control. And we set a limit on the
4634 # number of edges we are willing to look at.
4636 # If we succeed, we walk forwards again. For each traversed edge
4637 # PC (with P parent, C child) (starting with P=S and ending with
4638 # C=T) to we do this:
4640 # - dpkg-source --commit with a patch name and message derived from C
4641 # After traversing PT, we git commit the changes which
4642 # should be contained within debian/patches.
4644 # The search for the path S..T is breadth-first. We maintain a
4645 # todo list containing search nodes. A search node identifies a
4646 # commit, and looks something like this:
4648 # Commit => $git_commit_id,
4649 # Child => $c, # or undef if P=T
4650 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4651 # Nontrivial => true iff $p..$c has relevant changes
4658 my %considered; # saves being exponential on some weird graphs
4660 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4663 my ($search,$whynot) = @_;
4664 printdebug " search NOT $search->{Commit} $whynot\n";
4665 $search->{Whynot} = $whynot;
4666 push @nots, $search;
4667 no warnings qw(exiting);
4676 my $c = shift @todo;
4677 next if $considered{$c->{Commit}}++;
4679 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4681 printdebug "quiltify investigate $c->{Commit}\n";
4684 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4685 printdebug " search finished hooray!\n";
4690 if ($quilt_mode eq 'nofix') {
4691 fail "quilt fixup required but quilt mode is \`nofix'\n".
4692 "HEAD commit $c->{Commit} differs from tree implied by ".
4693 " debian/patches (tree object $oldtiptree)";
4695 if ($quilt_mode eq 'smash') {
4696 printdebug " search quitting smash\n";
4700 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4701 $not->($c, "has $c_sentinels not $t_sentinels")
4702 if $c_sentinels ne $t_sentinels;
4704 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4705 $commitdata =~ m/\n\n/;
4707 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4708 @parents = map { { Commit => $_, Child => $c } } @parents;
4710 $not->($c, "root commit") if !@parents;
4712 foreach my $p (@parents) {
4713 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4715 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4716 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4718 foreach my $p (@parents) {
4719 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4721 my @cmd= (@git, qw(diff-tree -r --name-only),
4722 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4723 my $patchstackchange = cmdoutput @cmd;
4724 if (length $patchstackchange) {
4725 $patchstackchange =~ s/\n/,/g;
4726 $not->($p, "changed $patchstackchange");
4729 printdebug " search queue P=$p->{Commit} ",
4730 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4736 printdebug "quiltify want to smash\n";
4739 my $x = $_[0]{Commit};
4740 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4743 my $reportnot = sub {
4745 my $s = $abbrev->($notp);
4746 my $c = $notp->{Child};
4747 $s .= "..".$abbrev->($c) if $c;
4748 $s .= ": ".$notp->{Whynot};
4751 if ($quilt_mode eq 'linear') {
4752 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4753 foreach my $notp (@nots) {
4754 print STDERR "$us: ", $reportnot->($notp), "\n";
4756 print STDERR "$us: $_\n" foreach @$failsuggestion;
4757 fail "quilt fixup naive history linearisation failed.\n".
4758 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4759 } elsif ($quilt_mode eq 'smash') {
4760 } elsif ($quilt_mode eq 'auto') {
4761 progress "quilt fixup cannot be linear, smashing...";
4763 die "$quilt_mode ?";
4766 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4767 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4769 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4771 quiltify_dpkg_commit "auto-$version-$target-$time",
4772 (getfield $clogp, 'Maintainer'),
4773 "Automatically generated patch ($clogp->{Version})\n".
4774 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4778 progress "quiltify linearisation planning successful, executing...";
4780 for (my $p = $sref_S;
4781 my $c = $p->{Child};
4783 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4784 next unless $p->{Nontrivial};
4786 my $cc = $c->{Commit};
4788 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4789 $commitdata =~ m/\n\n/ or die "$c ?";
4792 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4795 my $commitdate = cmdoutput
4796 @git, qw(log -n1 --pretty=format:%aD), $cc;
4798 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4800 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4807 my $gbp_check_suitable = sub {
4812 die "contains unexpected slashes\n" if m{//} || m{/$};
4813 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4814 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4815 die "too long" if length > 200;
4817 return $_ unless $@;
4818 print STDERR "quiltifying commit $cc:".
4819 " ignoring/dropping Gbp-Pq $what: $@";
4823 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4825 (\S+) \s* \n //ixm) {
4826 $patchname = $gbp_check_suitable->($1, 'Name');
4828 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4830 (\S+) \s* \n //ixm) {
4831 $patchdir = $gbp_check_suitable->($1, 'Topic');
4836 if (!defined $patchname) {
4837 $patchname = $title;
4838 $patchname =~ s/[.:]$//;
4841 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4842 my $translitname = $converter->convert($patchname);
4843 die unless defined $translitname;
4844 $patchname = $translitname;
4847 "dgit: patch title transliteration error: $@"
4849 $patchname =~ y/ A-Z/-a-z/;
4850 $patchname =~ y/-a-z0-9_.+=~//cd;
4851 $patchname =~ s/^\W/x-$&/;
4852 $patchname = substr($patchname,0,40);
4854 if (!defined $patchdir) {
4857 if (length $patchdir) {
4858 $patchname = "$patchdir/$patchname";
4860 if ($patchname =~ m{^(.*)/}) {
4861 mkpath "debian/patches/$1";
4866 stat "debian/patches/$patchname$index";
4868 $!==ENOENT or die "$patchname$index $!";
4870 runcmd @git, qw(checkout -q), $cc;
4872 # We use the tip's changelog so that dpkg-source doesn't
4873 # produce complaining messages from dpkg-parsechangelog. None
4874 # of the information dpkg-source gets from the changelog is
4875 # actually relevant - it gets put into the original message
4876 # which dpkg-source provides our stunt editor, and then
4878 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4880 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4881 "Date: $commitdate\n".
4882 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4884 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4887 runcmd @git, qw(checkout -q master);
4890 sub build_maybe_quilt_fixup () {
4891 my ($format,$fopts) = get_source_format;
4892 return unless madformat_wantfixup $format;
4895 check_for_vendor_patches();
4897 if (quiltmode_splitbrain) {
4898 foreach my $needtf (qw(new maint)) {
4899 next if grep { $_ eq $needtf } access_cfg_tagformats;
4901 quilt mode $quilt_mode requires split view so server needs to support
4902 both "new" and "maint" tag formats, but config says it doesn't.
4907 my $clogp = parsechangelog();
4908 my $headref = git_rev_parse('HEAD');
4913 my $upstreamversion = upstreamversion $version;
4915 if ($fopts->{'single-debian-patch'}) {
4916 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4918 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4921 die 'bug' if $split_brain && !$need_split_build_invocation;
4923 changedir '../../../..';
4924 runcmd_ordryrun_local
4925 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4928 sub quilt_fixup_mkwork ($) {
4931 mkdir "work" or die $!;
4933 mktree_in_ud_here();
4934 runcmd @git, qw(reset -q --hard), $headref;
4937 sub quilt_fixup_linkorigs ($$) {
4938 my ($upstreamversion, $fn) = @_;
4939 # calls $fn->($leafname);
4941 foreach my $f (<../../../../*>) { #/){
4942 my $b=$f; $b =~ s{.*/}{};
4944 local ($debuglevel) = $debuglevel-1;
4945 printdebug "QF linkorigs $b, $f ?\n";
4947 next unless is_orig_file_of_vsn $b, $upstreamversion;
4948 printdebug "QF linkorigs $b, $f Y\n";
4949 link_ltarget $f, $b or die "$b $!";
4954 sub quilt_fixup_delete_pc () {
4955 runcmd @git, qw(rm -rqf .pc);
4957 Commit removal of .pc (quilt series tracking data)
4959 [dgit ($our_version) upgrade quilt-remove-pc]
4963 sub quilt_fixup_singlepatch ($$$) {
4964 my ($clogp, $headref, $upstreamversion) = @_;
4966 progress "starting quiltify (single-debian-patch)";
4968 # dpkg-source --commit generates new patches even if
4969 # single-debian-patch is in debian/source/options. In order to
4970 # get it to generate debian/patches/debian-changes, it is
4971 # necessary to build the source package.
4973 quilt_fixup_linkorigs($upstreamversion, sub { });
4974 quilt_fixup_mkwork($headref);
4976 rmtree("debian/patches");
4978 runcmd @dpkgsource, qw(-b .);
4980 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4981 rename srcfn("$upstreamversion", "/debian/patches"),
4982 "work/debian/patches";
4985 commit_quilty_patch();
4988 sub quilt_make_fake_dsc ($) {
4989 my ($upstreamversion) = @_;
4991 my $fakeversion="$upstreamversion-~~DGITFAKE";
4993 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4994 print $fakedsc <<END or die $!;
4997 Version: $fakeversion
5001 my $dscaddfile=sub {
5004 my $md = new Digest::MD5;
5006 my $fh = new IO::File $b, '<' or die "$b $!";
5011 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5014 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5016 my @files=qw(debian/source/format debian/rules
5017 debian/control debian/changelog);
5018 foreach my $maybe (qw(debian/patches debian/source/options
5019 debian/tests/control)) {
5020 next unless stat_exists "../../../$maybe";
5021 push @files, $maybe;
5024 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5025 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5027 $dscaddfile->($debtar);
5028 close $fakedsc or die $!;
5031 sub quilt_check_splitbrain_cache ($$) {
5032 my ($headref, $upstreamversion) = @_;
5033 # Called only if we are in (potentially) split brain mode.
5035 # Computes the cache key and looks in the cache.
5036 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5038 my $splitbrain_cachekey;
5041 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5042 # we look in the reflog of dgit-intern/quilt-cache
5043 # we look for an entry whose message is the key for the cache lookup
5044 my @cachekey = (qw(dgit), $our_version);
5045 push @cachekey, $upstreamversion;
5046 push @cachekey, $quilt_mode;
5047 push @cachekey, $headref;
5049 push @cachekey, hashfile('fake.dsc');
5051 my $srcshash = Digest::SHA->new(256);
5052 my %sfs = ( %INC, '$0(dgit)' => $0 );
5053 foreach my $sfk (sort keys %sfs) {
5054 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5055 $srcshash->add($sfk," ");
5056 $srcshash->add(hashfile($sfs{$sfk}));
5057 $srcshash->add("\n");
5059 push @cachekey, $srcshash->hexdigest();
5060 $splitbrain_cachekey = "@cachekey";
5062 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5064 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5065 debugcmd "|(probably)",@cmd;
5066 my $child = open GC, "-|"; defined $child or die $!;
5068 chdir '../../..' or die $!;
5069 if (!stat ".git/logs/refs/$splitbraincache") {
5070 $! == ENOENT or die $!;
5071 printdebug ">(no reflog)\n";
5078 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5079 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5082 quilt_fixup_mkwork($headref);
5083 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5084 if ($cachehit ne $headref) {
5085 progress "dgit view: found cached ($saved)";
5086 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5088 return ($cachehit, $splitbrain_cachekey);
5090 progress "dgit view: found cached, no changes required";
5091 return ($headref, $splitbrain_cachekey);
5093 die $! if GC->error;
5094 failedcmd unless close GC;
5096 printdebug "splitbrain cache miss\n";
5097 return (undef, $splitbrain_cachekey);
5100 sub quilt_fixup_multipatch ($$$) {
5101 my ($clogp, $headref, $upstreamversion) = @_;
5103 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5106 # - honour any existing .pc in case it has any strangeness
5107 # - determine the git commit corresponding to the tip of
5108 # the patch stack (if there is one)
5109 # - if there is such a git commit, convert each subsequent
5110 # git commit into a quilt patch with dpkg-source --commit
5111 # - otherwise convert all the differences in the tree into
5112 # a single git commit
5116 # Our git tree doesn't necessarily contain .pc. (Some versions of
5117 # dgit would include the .pc in the git tree.) If there isn't
5118 # one, we need to generate one by unpacking the patches that we
5121 # We first look for a .pc in the git tree. If there is one, we
5122 # will use it. (This is not the normal case.)
5124 # Otherwise need to regenerate .pc so that dpkg-source --commit
5125 # can work. We do this as follows:
5126 # 1. Collect all relevant .orig from parent directory
5127 # 2. Generate a debian.tar.gz out of
5128 # debian/{patches,rules,source/format,source/options}
5129 # 3. Generate a fake .dsc containing just these fields:
5130 # Format Source Version Files
5131 # 4. Extract the fake .dsc
5132 # Now the fake .dsc has a .pc directory.
5133 # (In fact we do this in every case, because in future we will
5134 # want to search for a good base commit for generating patches.)
5136 # Then we can actually do the dpkg-source --commit
5137 # 1. Make a new working tree with the same object
5138 # store as our main tree and check out the main
5140 # 2. Copy .pc from the fake's extraction, if necessary
5141 # 3. Run dpkg-source --commit
5142 # 4. If the result has changes to debian/, then
5143 # - git add them them
5144 # - git add .pc if we had a .pc in-tree
5146 # 5. If we had a .pc in-tree, delete it, and git commit
5147 # 6. Back in the main tree, fast forward to the new HEAD
5149 # Another situation we may have to cope with is gbp-style
5150 # patches-unapplied trees.
5152 # We would want to detect these, so we know to escape into
5153 # quilt_fixup_gbp. However, this is in general not possible.
5154 # Consider a package with a one patch which the dgit user reverts
5155 # (with git revert or the moral equivalent).
5157 # That is indistinguishable in contents from a patches-unapplied
5158 # tree. And looking at the history to distinguish them is not
5159 # useful because the user might have made a confusing-looking git
5160 # history structure (which ought to produce an error if dgit can't
5161 # cope, not a silent reintroduction of an unwanted patch).
5163 # So gbp users will have to pass an option. But we can usually
5164 # detect their failure to do so: if the tree is not a clean
5165 # patches-applied tree, quilt linearisation fails, but the tree
5166 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5167 # they want --quilt=unapplied.
5169 # To help detect this, when we are extracting the fake dsc, we
5170 # first extract it with --skip-patches, and then apply the patches
5171 # afterwards with dpkg-source --before-build. That lets us save a
5172 # tree object corresponding to .origs.
5174 my $splitbrain_cachekey;
5176 quilt_make_fake_dsc($upstreamversion);
5178 if (quiltmode_splitbrain()) {
5180 ($cachehit, $splitbrain_cachekey) =
5181 quilt_check_splitbrain_cache($headref, $upstreamversion);
5182 return if $cachehit;
5186 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5188 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5189 rename $fakexdir, "fake" or die "$fakexdir $!";
5193 remove_stray_gits();
5194 mktree_in_ud_here();
5198 runcmd @git, qw(add -Af .);
5199 my $unapplied=git_write_tree();
5200 printdebug "fake orig tree object $unapplied\n";
5204 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5206 if (system @bbcmd) {
5207 failedcmd @bbcmd if $? < 0;
5209 failed to apply your git tree's patch stack (from debian/patches/) to
5210 the corresponding upstream tarball(s). Your source tree and .orig
5211 are probably too inconsistent. dgit can only fix up certain kinds of
5212 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5218 quilt_fixup_mkwork($headref);
5221 if (stat_exists ".pc") {
5223 progress "Tree already contains .pc - will use it then delete it.";
5226 rename '../fake/.pc','.pc' or die $!;
5229 changedir '../fake';
5231 runcmd @git, qw(add -Af .);
5232 my $oldtiptree=git_write_tree();
5233 printdebug "fake o+d/p tree object $unapplied\n";
5234 changedir '../work';
5237 # We calculate some guesswork now about what kind of tree this might
5238 # be. This is mostly for error reporting.
5244 # O = orig, without patches applied
5245 # A = "applied", ie orig with H's debian/patches applied
5246 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5247 \%editedignores, \@unrepres),
5248 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5249 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5253 foreach my $b (qw(01 02)) {
5254 foreach my $v (qw(O2H O2A H2A)) {
5255 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5258 printdebug "differences \@dl @dl.\n";
5261 "$us: base trees orig=%.20s o+d/p=%.20s",
5262 $unapplied, $oldtiptree;
5264 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5265 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5266 $dl[0], $dl[1], $dl[3], $dl[4],
5270 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5272 forceable_fail [qw(unrepresentable)], <<END;
5273 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5278 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5279 push @failsuggestion, "This might be a patches-unapplied branch.";
5280 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5281 push @failsuggestion, "This might be a patches-applied branch.";
5283 push @failsuggestion, "Maybe you need to specify one of".
5284 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5286 if (quiltmode_splitbrain()) {
5287 quiltify_splitbrain($clogp, $unapplied, $headref,
5288 $diffbits, \%editedignores,
5289 $splitbrain_cachekey);
5293 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5294 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5296 if (!open P, '>>', ".pc/applied-patches") {
5297 $!==&ENOENT or die $!;
5302 commit_quilty_patch();
5304 if ($mustdeletepc) {
5305 quilt_fixup_delete_pc();
5309 sub quilt_fixup_editor () {
5310 my $descfn = $ENV{$fakeeditorenv};
5311 my $editing = $ARGV[$#ARGV];
5312 open I1, '<', $descfn or die "$descfn: $!";
5313 open I2, '<', $editing or die "$editing: $!";
5314 unlink $editing or die "$editing: $!";
5315 open O, '>', $editing or die "$editing: $!";
5316 while (<I1>) { print O or die $!; } I1->error and die $!;
5319 $copying ||= m/^\-\-\- /;
5320 next unless $copying;
5323 I2->error and die $!;
5328 sub maybe_apply_patches_dirtily () {
5329 return unless $quilt_mode =~ m/gbp|unapplied/;
5330 print STDERR <<END or die $!;
5332 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5333 dgit: Have to apply the patches - making the tree dirty.
5334 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5337 $patches_applied_dirtily = 01;
5338 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5339 runcmd qw(dpkg-source --before-build .);
5342 sub maybe_unapply_patches_again () {
5343 progress "dgit: Unapplying patches again to tidy up the tree."
5344 if $patches_applied_dirtily;
5345 runcmd qw(dpkg-source --after-build .)
5346 if $patches_applied_dirtily & 01;
5348 if $patches_applied_dirtily & 02;
5349 $patches_applied_dirtily = 0;
5352 #----- other building -----
5354 our $clean_using_builder;
5355 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5356 # clean the tree before building (perhaps invoked indirectly by
5357 # whatever we are using to run the build), rather than separately
5358 # and explicitly by us.
5361 return if $clean_using_builder;
5362 if ($cleanmode eq 'dpkg-source') {
5363 maybe_apply_patches_dirtily();
5364 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5365 } elsif ($cleanmode eq 'dpkg-source-d') {
5366 maybe_apply_patches_dirtily();
5367 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5368 } elsif ($cleanmode eq 'git') {
5369 runcmd_ordryrun_local @git, qw(clean -xdf);
5370 } elsif ($cleanmode eq 'git-ff') {
5371 runcmd_ordryrun_local @git, qw(clean -xdff);
5372 } elsif ($cleanmode eq 'check') {
5373 my $leftovers = cmdoutput @git, qw(clean -xdn);
5374 if (length $leftovers) {
5375 print STDERR $leftovers, "\n" or die $!;
5376 fail "tree contains uncommitted files and --clean=check specified";
5378 } elsif ($cleanmode eq 'none') {
5385 badusage "clean takes no additional arguments" if @ARGV;
5388 maybe_unapply_patches_again();
5391 sub build_prep_early () {
5392 our $build_prep_early_done //= 0;
5393 return if $build_prep_early_done++;
5395 badusage "-p is not allowed when building" if defined $package;
5396 my $clogp = parsechangelog();
5397 $isuite = getfield $clogp, 'Distribution';
5398 $package = getfield $clogp, 'Source';
5399 $version = getfield $clogp, 'Version';
5406 build_maybe_quilt_fixup();
5408 my $pat = changespat $version;
5409 foreach my $f (glob "$buildproductsdir/$pat") {
5411 unlink $f or fail "remove old changes file $f: $!";
5413 progress "would remove $f";
5419 sub changesopts_initial () {
5420 my @opts =@changesopts[1..$#changesopts];
5423 sub changesopts_version () {
5424 if (!defined $changes_since_version) {
5425 my @vsns = archive_query('archive_query');
5426 my @quirk = access_quirk();
5427 if ($quirk[0] eq 'backports') {
5428 local $isuite = $quirk[2];
5430 canonicalise_suite();
5431 push @vsns, archive_query('archive_query');
5434 @vsns = map { $_->[0] } @vsns;
5435 @vsns = sort { -version_compare($a, $b) } @vsns;
5436 $changes_since_version = $vsns[0];
5437 progress "changelog will contain changes since $vsns[0]";
5439 $changes_since_version = '_';
5440 progress "package seems new, not specifying -v<version>";
5443 if ($changes_since_version ne '_') {
5444 return ("-v$changes_since_version");
5450 sub changesopts () {
5451 return (changesopts_initial(), changesopts_version());
5454 sub massage_dbp_args ($;$) {
5455 my ($cmd,$xargs) = @_;
5458 # - if we're going to split the source build out so we can
5459 # do strange things to it, massage the arguments to dpkg-buildpackage
5460 # so that the main build doessn't build source (or add an argument
5461 # to stop it building source by default).
5463 # - add -nc to stop dpkg-source cleaning the source tree,
5464 # unless we're not doing a split build and want dpkg-source
5465 # as cleanmode, in which case we can do nothing
5468 # 0 - source will NOT need to be built separately by caller
5469 # +1 - source will need to be built separately by caller
5470 # +2 - source will need to be built separately by caller AND
5471 # dpkg-buildpackage should not in fact be run at all!
5472 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5473 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5474 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5475 $clean_using_builder = 1;
5478 # -nc has the side effect of specifying -b if nothing else specified
5479 # and some combinations of -S, -b, et al, are errors, rather than
5480 # later simply overriding earlie. So we need to:
5481 # - search the command line for these options
5482 # - pick the last one
5483 # - perhaps add our own as a default
5484 # - perhaps adjust it to the corresponding non-source-building version
5486 foreach my $l ($cmd, $xargs) {
5488 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5491 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5493 if ($need_split_build_invocation) {
5494 printdebug "massage split $dmode.\n";
5495 $r = $dmode =~ m/[S]/ ? +2 :
5496 $dmode =~ y/gGF/ABb/ ? +1 :
5497 $dmode =~ m/[ABb]/ ? 0 :
5500 printdebug "massage done $r $dmode.\n";
5502 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5508 my $wasdir = must_getcwd();
5514 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5515 my ($msg_if_onlyone) = @_;
5516 # If there is only one .changes file, fail with $msg_if_onlyone,
5517 # or if that is undef, be a no-op.
5518 # Returns the changes file to report to the user.
5519 my $pat = changespat $version;
5520 my @changesfiles = glob $pat;
5521 @changesfiles = sort {
5522 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5526 if (@changesfiles==1) {
5527 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5528 only one changes file from build (@changesfiles)
5530 $result = $changesfiles[0];
5531 } elsif (@changesfiles==2) {
5532 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5533 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5534 fail "$l found in binaries changes file $binchanges"
5537 runcmd_ordryrun_local @mergechanges, @changesfiles;
5538 my $multichanges = changespat $version,'multi';
5540 stat_exists $multichanges or fail "$multichanges: $!";
5541 foreach my $cf (glob $pat) {
5542 next if $cf eq $multichanges;
5543 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5546 $result = $multichanges;
5548 fail "wrong number of different changes files (@changesfiles)";
5550 printdone "build successful, results in $result\n" or die $!;
5553 sub midbuild_checkchanges () {
5554 my $pat = changespat $version;
5555 return if $rmchanges;
5556 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5557 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5559 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5560 Suggest you delete @unwanted.
5565 sub midbuild_checkchanges_vanilla ($) {
5567 midbuild_checkchanges() if $wantsrc == 1;
5570 sub postbuild_mergechanges_vanilla ($) {
5572 if ($wantsrc == 1) {
5574 postbuild_mergechanges(undef);
5577 printdone "build successful\n";
5582 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5583 my $wantsrc = massage_dbp_args \@dbp;
5586 midbuild_checkchanges_vanilla $wantsrc;
5591 push @dbp, changesopts_version();
5592 maybe_apply_patches_dirtily();
5593 runcmd_ordryrun_local @dbp;
5595 maybe_unapply_patches_again();
5596 postbuild_mergechanges_vanilla $wantsrc;
5600 $quilt_mode //= 'gbp';
5606 # gbp can make .origs out of thin air. In my tests it does this
5607 # even for a 1.0 format package, with no origs present. So I
5608 # guess it keys off just the version number. We don't know
5609 # exactly what .origs ought to exist, but let's assume that we
5610 # should run gbp if: the version has an upstream part and the main
5612 my $upstreamversion = upstreamversion $version;
5613 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5614 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5616 if ($gbp_make_orig) {
5618 $cleanmode = 'none'; # don't do it again
5619 $need_split_build_invocation = 1;
5622 my @dbp = @dpkgbuildpackage;
5624 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5626 if (!length $gbp_build[0]) {
5627 if (length executable_on_path('git-buildpackage')) {
5628 $gbp_build[0] = qw(git-buildpackage);
5630 $gbp_build[0] = 'gbp buildpackage';
5633 my @cmd = opts_opt_multi_cmd @gbp_build;
5635 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5637 if ($gbp_make_orig) {
5638 ensuredir '.git/dgit';
5639 my $ok = '.git/dgit/origs-gen-ok';
5640 unlink $ok or $!==&ENOENT or die $!;
5641 my @origs_cmd = @cmd;
5642 push @origs_cmd, qw(--git-cleaner=true);
5643 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5644 push @origs_cmd, @ARGV;
5646 debugcmd @origs_cmd;
5648 do { local $!; stat_exists $ok; }
5649 or failedcmd @origs_cmd;
5651 dryrun_report @origs_cmd;
5657 midbuild_checkchanges_vanilla $wantsrc;
5659 if (!$clean_using_builder) {
5660 push @cmd, '--git-cleaner=true';
5664 maybe_unapply_patches_again();
5666 push @cmd, changesopts();
5667 runcmd_ordryrun_local @cmd, @ARGV;
5669 postbuild_mergechanges_vanilla $wantsrc;
5671 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5674 my $our_cleanmode = $cleanmode;
5675 if ($need_split_build_invocation) {
5676 # Pretend that clean is being done some other way. This
5677 # forces us not to try to use dpkg-buildpackage to clean and
5678 # build source all in one go; and instead we run dpkg-source
5679 # (and build_prep() will do the clean since $clean_using_builder
5681 $our_cleanmode = 'ELSEWHERE';
5683 if ($our_cleanmode =~ m/^dpkg-source/) {
5684 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5685 $clean_using_builder = 1;
5688 $sourcechanges = changespat $version,'source';
5690 unlink "../$sourcechanges" or $!==ENOENT
5691 or fail "remove $sourcechanges: $!";
5693 $dscfn = dscfn($version);
5694 if ($our_cleanmode eq 'dpkg-source') {
5695 maybe_apply_patches_dirtily();
5696 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5698 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5699 maybe_apply_patches_dirtily();
5700 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5703 my @cmd = (@dpkgsource, qw(-b --));
5706 runcmd_ordryrun_local @cmd, "work";
5707 my @udfiles = <${package}_*>;
5708 changedir "../../..";
5709 foreach my $f (@udfiles) {
5710 printdebug "source copy, found $f\n";
5713 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5714 $f eq srcfn($version, $&));
5715 printdebug "source copy, found $f - renaming\n";
5716 rename "$ud/$f", "../$f" or $!==ENOENT
5717 or fail "put in place new source file ($f): $!";
5720 my $pwd = must_getcwd();
5721 my $leafdir = basename $pwd;
5723 runcmd_ordryrun_local @cmd, $leafdir;
5726 runcmd_ordryrun_local qw(sh -ec),
5727 'exec >$1; shift; exec "$@"','x',
5728 "../$sourcechanges",
5729 @dpkggenchanges, qw(-S), changesopts();
5733 sub cmd_build_source {
5734 badusage "build-source takes no additional arguments" if @ARGV;
5736 maybe_unapply_patches_again();
5737 printdone "source built, results in $dscfn and $sourcechanges";
5742 midbuild_checkchanges();
5745 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5746 stat_exists $sourcechanges
5747 or fail "$sourcechanges (in parent directory): $!";
5749 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5751 maybe_unapply_patches_again();
5753 postbuild_mergechanges(<<END);
5754 perhaps you need to pass -A ? (sbuild's default is to build only
5755 arch-specific binaries; dgit 1.4 used to override that.)
5760 sub cmd_quilt_fixup {
5761 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5762 my $clogp = parsechangelog();
5763 $version = getfield $clogp, 'Version';
5764 $package = getfield $clogp, 'Source';
5767 build_maybe_quilt_fixup();
5770 sub cmd_import_dsc {
5774 last unless $ARGV[0] =~ m/^-/;
5777 if (m/^--require-valid-signature$/) {
5780 badusage "unknown dgit import-dsc sub-option \`$_'";
5784 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5785 my ($dscfn, $dstbranch) = @ARGV;
5787 badusage "dry run makes no sense with import-dsc" unless act_local();
5789 my $force = $dstbranch =~ s/^\+// ? +1 :
5790 $dstbranch =~ s/^\.\.// ? -1 :
5792 my $info = $force ? " $&" : '';
5793 $info = "$dscfn$info";
5795 my $specbranch = $dstbranch;
5796 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5797 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5799 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5800 my $chead = cmdoutput_errok @symcmd;
5801 defined $chead or $?==256 or failedcmd @symcmd;
5803 fail "$dstbranch is checked out - will not update it"
5804 if defined $chead and $chead eq $dstbranch;
5806 my $oldhash = git_get_ref $dstbranch;
5808 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5809 $dscdata = do { local $/ = undef; <D>; };
5810 D->error and fail "read $dscfn: $!";
5813 # we don't normally need this so import it here
5814 use Dpkg::Source::Package;
5815 my $dp = new Dpkg::Source::Package filename => $dscfn,
5816 require_valid_signature => $needsig;
5818 local $SIG{__WARN__} = sub {
5820 return unless $needsig;
5821 fail "import-dsc signature check failed";
5823 if (!$dp->is_signed()) {
5824 warn "$us: warning: importing unsigned .dsc\n";
5826 my $r = $dp->check_signature();
5827 die "->check_signature => $r" if $needsig && $r;
5833 my $dgit_commit = $dsc->{$ourdscfield[0]};
5834 if (defined $dgit_commit &&
5835 !forceing [qw(import-dsc-with-dgit-field)]) {
5836 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5837 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5838 my @cmd = (qw(sh -ec),
5839 "echo $dgit_commit | git cat-file --batch-check");
5840 my $objgot = cmdoutput @cmd;
5841 if ($objgot =~ m#^\w+ missing\b#) {
5843 .dsc contains Dgit field referring to object $dgit_commit
5844 Your git tree does not have that object. Try `git fetch' from a
5845 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5848 if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
5850 progress "Not fast forward, forced update.";
5852 fail "Not fast forward to $dgit_commit";
5855 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5856 $dstbranch, $dgit_commit);
5858 progress "dgit: import-dsc updated git ref $dstbranch";
5863 Branch $dstbranch already exists
5864 Specify ..$specbranch for a pseudo-merge, binding in existing history
5865 Specify +$specbranch to overwrite, discarding existing history
5867 if $oldhash && !$force;
5869 $package = getfield $dsc, 'Source';
5870 my @dfi = dsc_files_info();
5871 foreach my $fi (@dfi) {
5872 my $f = $fi->{Filename};
5874 next if lstat $here;
5875 fail "stat $here: $!" unless $! == ENOENT;
5877 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5879 } elsif ($dscfn =~ m#^/#) {
5882 fail "cannot import $dscfn which seems to be inside working tree!";
5884 $there =~ s#/+[^/]+$## or
5885 fail "cannot import $dscfn which seems to not have a basename";
5887 symlink $there, $here or fail "symlink $there to $here: $!";
5888 progress "made symlink $here -> $there";
5889 print STDERR Dumper($fi);
5891 my @mergeinputs = generate_commits_from_dsc();
5892 die unless @mergeinputs == 1;
5894 my $newhash = $mergeinputs[0]{Commit};
5898 progress "Import, forced update - synthetic orphan git history.";
5899 } elsif ($force < 0) {
5900 progress "Import, merging.";
5901 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5902 my $version = getfield $dsc, 'Version';
5903 $newhash = make_commit_text <<END;
5908 Merge $package ($version) import into $dstbranch
5911 die; # caught earlier
5915 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5916 $dstbranch, $newhash);
5918 progress "dgit: import-dsc results are in in git ref $dstbranch";
5921 sub cmd_archive_api_query {
5922 badusage "need only 1 subpath argument" unless @ARGV==1;
5923 my ($subpath) = @ARGV;
5924 my @cmd = archive_api_query_cmd($subpath);
5927 exec @cmd or fail "exec curl: $!\n";
5930 sub cmd_clone_dgit_repos_server {
5931 badusage "need destination argument" unless @ARGV==1;
5932 my ($destdir) = @ARGV;
5933 $package = '_dgit-repos-server';
5934 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5936 exec @cmd or fail "exec git clone: $!\n";
5939 sub cmd_setup_mergechangelogs {
5940 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5941 setup_mergechangelogs(1);
5944 sub cmd_setup_useremail {
5945 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5949 sub cmd_setup_new_tree {
5950 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5954 #---------- argument parsing and main program ----------
5957 print "dgit version $our_version\n" or die $!;
5961 our (%valopts_long, %valopts_short);
5964 sub defvalopt ($$$$) {
5965 my ($long,$short,$val_re,$how) = @_;
5966 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5967 $valopts_long{$long} = $oi;
5968 $valopts_short{$short} = $oi;
5969 # $how subref should:
5970 # do whatever assignemnt or thing it likes with $_[0]
5971 # if the option should not be passed on to remote, @rvalopts=()
5972 # or $how can be a scalar ref, meaning simply assign the value
5975 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5976 defvalopt '--distro', '-d', '.+', \$idistro;
5977 defvalopt '', '-k', '.+', \$keyid;
5978 defvalopt '--existing-package','', '.*', \$existing_package;
5979 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5980 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5981 defvalopt '--package', '-p', $package_re, \$package;
5982 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5984 defvalopt '', '-C', '.+', sub {
5985 ($changesfile) = (@_);
5986 if ($changesfile =~ s#^(.*)/##) {
5987 $buildproductsdir = $1;
5991 defvalopt '--initiator-tempdir','','.*', sub {
5992 ($initiator_tempdir) = (@_);
5993 $initiator_tempdir =~ m#^/# or
5994 badusage "--initiator-tempdir must be used specify an".
5995 " absolute, not relative, directory."
6001 if (defined $ENV{'DGIT_SSH'}) {
6002 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6003 } elsif (defined $ENV{'GIT_SSH'}) {
6004 @ssh = ($ENV{'GIT_SSH'});
6012 if (!defined $val) {
6013 badusage "$what needs a value" unless @ARGV;
6015 push @rvalopts, $val;
6017 badusage "bad value \`$val' for $what" unless
6018 $val =~ m/^$oi->{Re}$(?!\n)/s;
6019 my $how = $oi->{How};
6020 if (ref($how) eq 'SCALAR') {
6025 push @ropts, @rvalopts;
6029 last unless $ARGV[0] =~ m/^-/;
6033 if (m/^--dry-run$/) {
6036 } elsif (m/^--damp-run$/) {
6039 } elsif (m/^--no-sign$/) {
6042 } elsif (m/^--help$/) {
6044 } elsif (m/^--version$/) {
6046 } elsif (m/^--new$/) {
6049 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6050 ($om = $opts_opt_map{$1}) &&
6054 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6055 !$opts_opt_cmdonly{$1} &&
6056 ($om = $opts_opt_map{$1})) {
6059 } elsif (m/^--(gbp|dpm)$/s) {
6060 push @ropts, "--quilt=$1";
6062 } elsif (m/^--ignore-dirty$/s) {
6065 } elsif (m/^--no-quilt-fixup$/s) {
6067 $quilt_mode = 'nocheck';
6068 } elsif (m/^--no-rm-on-error$/s) {
6071 } elsif (m/^--overwrite$/s) {
6073 $overwrite_version = '';
6074 } elsif (m/^--overwrite=(.+)$/s) {
6076 $overwrite_version = $1;
6077 } elsif (m/^--delayed=(\d+)$/s) {
6080 } elsif (m/^--dgit-view-save=(.+)$/s) {
6082 $split_brain_save = $1;
6083 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6084 } elsif (m/^--(no-)?rm-old-changes$/s) {
6087 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6089 push @deliberatelies, $&;
6090 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6094 } elsif (m/^--force-/) {
6096 "$us: warning: ignoring unknown force option $_\n";
6098 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6099 # undocumented, for testing
6101 $tagformat_want = [ $1, 'command line', 1 ];
6102 # 1 menas overrides distro configuration
6103 } elsif (m/^--always-split-source-build$/s) {
6104 # undocumented, for testing
6106 $need_split_build_invocation = 1;
6107 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6108 $val = $2 ? $' : undef; #';
6109 $valopt->($oi->{Long});
6111 badusage "unknown long option \`$_'";
6118 } elsif (s/^-L/-/) {
6121 } elsif (s/^-h/-/) {
6123 } elsif (s/^-D/-/) {
6127 } elsif (s/^-N/-/) {
6132 push @changesopts, $_;
6134 } elsif (s/^-wn$//s) {
6136 $cleanmode = 'none';
6137 } elsif (s/^-wg$//s) {
6140 } elsif (s/^-wgf$//s) {
6142 $cleanmode = 'git-ff';
6143 } elsif (s/^-wd$//s) {
6145 $cleanmode = 'dpkg-source';
6146 } elsif (s/^-wdd$//s) {
6148 $cleanmode = 'dpkg-source-d';
6149 } elsif (s/^-wc$//s) {
6151 $cleanmode = 'check';
6152 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6153 push @git, '-c', $&;
6154 $gitcfgs{cmdline}{$1} = [ $2 ];
6155 } elsif (s/^-c([^=]+)$//s) {
6156 push @git, '-c', $&;
6157 $gitcfgs{cmdline}{$1} = [ 'true' ];
6158 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6160 $val = undef unless length $val;
6161 $valopt->($oi->{Short});
6164 badusage "unknown short option \`$_'";
6171 sub check_env_sanity () {
6172 my $blocked = new POSIX::SigSet;
6173 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6176 foreach my $name (qw(PIPE CHLD)) {
6177 my $signame = "SIG$name";
6178 my $signum = eval "POSIX::$signame" // die;
6179 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6180 die "$signame is set to something other than SIG_DFL\n";
6181 $blocked->ismember($signum) and
6182 die "$signame is blocked\n";
6188 On entry to dgit, $@
6189 This is a bug produced by something in in your execution environment.
6195 sub finalise_opts_opts () {
6196 foreach my $k (keys %opts_opt_map) {
6197 my $om = $opts_opt_map{$k};
6199 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6201 badcfg "cannot set command for $k"
6202 unless length $om->[0];
6206 foreach my $c (access_cfg_cfgs("opts-$k")) {
6208 map { $_ ? @$_ : () }
6209 map { $gitcfgs{$_}{$c} }
6210 reverse @gitcfgsources;
6211 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6212 "\n" if $debuglevel >= 4;
6214 badcfg "cannot configure options for $k"
6215 if $opts_opt_cmdonly{$k};
6216 my $insertpos = $opts_cfg_insertpos{$k};
6217 @$om = ( @$om[0..$insertpos-1],
6219 @$om[$insertpos..$#$om] );
6224 if ($ENV{$fakeeditorenv}) {
6226 quilt_fixup_editor();
6233 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6234 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6235 if $dryrun_level == 1;
6237 print STDERR $helpmsg or die $!;
6240 my $cmd = shift @ARGV;
6243 my $pre_fn = ${*::}{"pre_$cmd"};
6244 $pre_fn->() if $pre_fn;
6246 if (!defined $rmchanges) {
6247 local $access_forpush;
6248 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6251 if (!defined $quilt_mode) {
6252 local $access_forpush;
6253 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6254 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6256 $quilt_mode =~ m/^($quilt_modes_re)$/
6257 or badcfg "unknown quilt-mode \`$quilt_mode'";
6261 $need_split_build_invocation ||= quiltmode_splitbrain();
6263 if (!defined $cleanmode) {
6264 local $access_forpush;
6265 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6266 $cleanmode //= 'dpkg-source';
6268 badcfg "unknown clean-mode \`$cleanmode'" unless
6269 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6272 my $fn = ${*::}{"cmd_$cmd"};
6273 $fn or badusage "unknown operation $cmd";