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 my $query = access_cfg('archive-query','RETURN-UNDEF');
1014 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1017 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1020 sub archive_query_prepend_mirror {
1021 my $m = access_cfg('mirror');
1022 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1025 sub pool_dsc_subpath ($$) {
1026 my ($vsn,$component) = @_; # $package is implict arg
1027 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1028 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1031 sub cfg_apply_map ($$$) {
1032 my ($varref, $what, $mapspec) = @_;
1033 return unless $mapspec;
1035 printdebug "config $what EVAL{ $mapspec; }\n";
1037 eval "package Dgit::Config; $mapspec;";
1042 #---------- `ftpmasterapi' archive query method (nascent) ----------
1044 sub archive_api_query_cmd ($) {
1046 my @cmd = (@curl, qw(-sS));
1047 my $url = access_cfg('archive-query-url');
1048 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1050 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1051 foreach my $key (split /\:/, $keys) {
1052 $key =~ s/\%HOST\%/$host/g;
1054 fail "for $url: stat $key: $!" unless $!==ENOENT;
1057 fail "config requested specific TLS key but do not know".
1058 " how to get curl to use exactly that EE key ($key)";
1059 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1060 # # Sadly the above line does not work because of changes
1061 # # to gnutls. The real fix for #790093 may involve
1062 # # new curl options.
1065 # Fixing #790093 properly will involve providing a value
1066 # for this on clients.
1067 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1068 push @cmd, split / /, $kargs if defined $kargs;
1070 push @cmd, $url.$subpath;
1074 sub api_query ($$;$) {
1076 my ($data, $subpath, $ok404) = @_;
1077 badcfg "ftpmasterapi archive query method takes no data part"
1079 my @cmd = archive_api_query_cmd($subpath);
1080 my $url = $cmd[$#cmd];
1081 push @cmd, qw(-w %{http_code});
1082 my $json = cmdoutput @cmd;
1083 unless ($json =~ s/\d+\d+\d$//) {
1084 failedcmd_report_cmd undef, @cmd;
1085 fail "curl failed to print 3-digit HTTP code";
1088 return undef if $code eq '404' && $ok404;
1089 fail "fetch of $url gave HTTP code $code"
1090 unless $url =~ m#^file://# or $code =~ m/^2/;
1091 return decode_json($json);
1094 sub canonicalise_suite_ftpmasterapi {
1095 my ($proto,$data) = @_;
1096 my $suites = api_query($data, 'suites');
1098 foreach my $entry (@$suites) {
1100 my $v = $entry->{$_};
1101 defined $v && $v eq $isuite;
1102 } qw(codename name);
1103 push @matched, $entry;
1105 fail "unknown suite $isuite" unless @matched;
1108 @matched==1 or die "multiple matches for suite $isuite\n";
1109 $cn = "$matched[0]{codename}";
1110 defined $cn or die "suite $isuite info has no codename\n";
1111 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1113 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1118 sub archive_query_ftpmasterapi {
1119 my ($proto,$data) = @_;
1120 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1122 my $digester = Digest::SHA->new(256);
1123 foreach my $entry (@$info) {
1125 my $vsn = "$entry->{version}";
1126 my ($ok,$msg) = version_check $vsn;
1127 die "bad version: $msg\n" unless $ok;
1128 my $component = "$entry->{component}";
1129 $component =~ m/^$component_re$/ or die "bad component";
1130 my $filename = "$entry->{filename}";
1131 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1132 or die "bad filename";
1133 my $sha256sum = "$entry->{sha256sum}";
1134 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1135 push @rows, [ $vsn, "/pool/$component/$filename",
1136 $digester, $sha256sum ];
1138 die "bad ftpmaster api response: $@\n".Dumper($entry)
1141 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1142 return archive_query_prepend_mirror @rows;
1145 sub file_in_archive_ftpmasterapi {
1146 my ($proto,$data,$filename) = @_;
1147 my $pat = $filename;
1150 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1151 my $info = api_query($data, "file_in_archive/$pat", 1);
1154 #---------- `aptget' archive query method ----------
1157 our $aptget_releasefile;
1158 our $aptget_configpath;
1160 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1161 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1163 sub aptget_cache_clean {
1164 runcmd_ordryrun_local qw(sh -ec),
1165 'cd "$1"; pwd; find -atime +30 -type f -print0 | xargs -0r echo rm --',
1169 sub aptget_lock_acquire () {
1170 my $lockfile = "$aptget_base/lock";
1171 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1172 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1175 sub aptget_prep ($) {
1177 return if defined $aptget_base;
1179 badcfg "aptget archive query method takes no data part"
1182 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1185 ensuredir "$cache/dgit";
1187 access_cfg('aptget-cachekey','RETURN-UNDEF')
1188 // access_nomdistro();
1190 $aptget_base = "$cache/dgit/aptget";
1191 ensuredir $aptget_base;
1193 my $quoted_base = $aptget_base;
1194 die "$quoted_base contains bad chars, cannot continue"
1195 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1197 ensuredir $aptget_base;
1199 aptget_lock_acquire();
1201 aptget_cache_clean();
1203 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1204 my $sourceslist = "source.list#$cachekey";
1206 my $aptsuites = $isuite;
1207 cfg_apply_map(\$aptsuites, 'suite map',
1208 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1210 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1211 printf SRCS "deb-src %s %s %s\n",
1212 access_cfg('mirror'),
1214 access_cfg('aptget-components')
1217 ensuredir "$aptget_base/cache";
1218 ensuredir "$aptget_base/lists";
1220 open CONF, ">", $aptget_configpath or die $!;
1222 Debug::NoLocking "true";
1223 APT::Get::List-Cleanup "false";
1224 #clear APT::Update::Post-Invoke-Success;
1225 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1226 Dir::State::Lists "$quoted_base/lists";
1227 Dir::Etc::preferences "$quoted_base/preferences";
1228 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1229 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1232 foreach my $key (qw(
1235 Dir::Cache::Archives
1236 Dir::Etc::SourceParts
1237 Dir::Etc::preferencesparts
1239 ensuredir "$aptget_base/$key";
1240 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1243 my $oldatime = (time // die $!) - 1;
1244 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1245 next unless stat_exists $oldlist;
1246 my ($mtime) = (stat _)[9];
1247 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1250 runcmd_ordryrun_local aptget_aptget(), qw(update);
1253 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1254 next unless stat_exists $oldlist;
1255 my ($atime) = (stat _)[8];
1256 next if $atime == $oldatime;
1257 push @releasefiles, $oldlist;
1259 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1260 @releasefiles = @inreleasefiles if @inreleasefiles;
1261 die "apt updated wrong number of Release files (@releasefiles), erk"
1262 unless @releasefiles == 1;
1264 ($aptget_releasefile) = @releasefiles;
1267 sub canonicalise_suite_aptget {
1268 my ($proto,$data) = @_;
1271 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1273 foreach my $name (qw(Codename Suite)) {
1274 my $val = $release->{$name};
1276 printdebug "release file $name: $val\n";
1277 $val =~ m/^$suite_re$/o or fail
1278 "Release file ($aptget_releasefile) specifies intolerable $name";
1279 cfg_apply_map(\$val, 'suite rmap',
1280 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1287 sub archive_query_aptget {
1288 my ($proto,$data) = @_;
1291 ensuredir "$aptget_base/source";
1292 foreach my $old (<$aptget_base/source/*.dsc>) {
1293 unlink $old or die "$old: $!";
1296 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1297 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1298 # avoids apt-get source failing with ambiguous error code
1300 runcmd_ordryrun_local
1301 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1302 aptget_aptget(), qw(--download-only --only-source source), $package;
1304 my @dscs = <$aptget_base/source/*.dsc>;
1305 fail "apt-get source did not produce a .dsc" unless @dscs;
1306 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1308 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1311 my $uri = "file://". uri_escape $dscs[0];
1312 $uri =~ s{\%2f}{/}gi;
1313 return [ (getfield $pre_dsc, 'Version'), $uri ];
1316 #---------- `dummyapicat' archive query method ----------
1318 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1319 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1321 sub file_in_archive_dummycatapi ($$$) {
1322 my ($proto,$data,$filename) = @_;
1323 my $mirror = access_cfg('mirror');
1324 $mirror =~ s#^file://#/# or die "$mirror ?";
1326 my @cmd = (qw(sh -ec), '
1328 find -name "$2" -print0 |
1330 ', qw(x), $mirror, $filename);
1331 debugcmd "-|", @cmd;
1332 open FIA, "-|", @cmd or die $!;
1335 printdebug "| $_\n";
1336 m/^(\w+) (\S+)$/ or die "$_ ?";
1337 push @out, { sha256sum => $1, filename => $2 };
1339 close FIA or die failedcmd @cmd;
1343 #---------- `madison' archive query method ----------
1345 sub archive_query_madison {
1346 return archive_query_prepend_mirror
1347 map { [ @$_[0..1] ] } madison_get_parse(@_);
1350 sub madison_get_parse {
1351 my ($proto,$data) = @_;
1352 die unless $proto eq 'madison';
1353 if (!length $data) {
1354 $data= access_cfg('madison-distro','RETURN-UNDEF');
1355 $data //= access_basedistro();
1357 $rmad{$proto,$data,$package} ||= cmdoutput
1358 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1359 my $rmad = $rmad{$proto,$data,$package};
1362 foreach my $l (split /\n/, $rmad) {
1363 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1364 \s*( [^ \t|]+ )\s* \|
1365 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1366 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1367 $1 eq $package or die "$rmad $package ?";
1374 $component = access_cfg('archive-query-default-component');
1376 $5 eq 'source' or die "$rmad ?";
1377 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1379 return sort { -version_compare($a->[0],$b->[0]); } @out;
1382 sub canonicalise_suite_madison {
1383 # madison canonicalises for us
1384 my @r = madison_get_parse(@_);
1386 "unable to canonicalise suite using package $package".
1387 " which does not appear to exist in suite $isuite;".
1388 " --existing-package may help";
1392 sub file_in_archive_madison { return undef; }
1394 #---------- `sshpsql' archive query method ----------
1397 my ($data,$runeinfo,$sql) = @_;
1398 if (!length $data) {
1399 $data= access_someuserhost('sshpsql').':'.
1400 access_cfg('sshpsql-dbname');
1402 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1403 my ($userhost,$dbname) = ($`,$'); #';
1405 my @cmd = (access_cfg_ssh, $userhost,
1406 access_runeinfo("ssh-psql $runeinfo").
1407 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1408 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1410 open P, "-|", @cmd or die $!;
1413 printdebug(">|$_|\n");
1416 $!=0; $?=0; close P or failedcmd @cmd;
1418 my $nrows = pop @rows;
1419 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1420 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1421 @rows = map { [ split /\|/, $_ ] } @rows;
1422 my $ncols = scalar @{ shift @rows };
1423 die if grep { scalar @$_ != $ncols } @rows;
1427 sub sql_injection_check {
1428 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1431 sub archive_query_sshpsql ($$) {
1432 my ($proto,$data) = @_;
1433 sql_injection_check $isuite, $package;
1434 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1435 SELECT source.version, component.name, files.filename, files.sha256sum
1437 JOIN src_associations ON source.id = src_associations.source
1438 JOIN suite ON suite.id = src_associations.suite
1439 JOIN dsc_files ON dsc_files.source = source.id
1440 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1441 JOIN component ON component.id = files_archive_map.component_id
1442 JOIN files ON files.id = dsc_files.file
1443 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1444 AND source.source='$package'
1445 AND files.filename LIKE '%.dsc';
1447 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1448 my $digester = Digest::SHA->new(256);
1450 my ($vsn,$component,$filename,$sha256sum) = @$_;
1451 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1453 return archive_query_prepend_mirror @rows;
1456 sub canonicalise_suite_sshpsql ($$) {
1457 my ($proto,$data) = @_;
1458 sql_injection_check $isuite;
1459 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1460 SELECT suite.codename
1461 FROM suite where suite_name='$isuite' or codename='$isuite';
1463 @rows = map { $_->[0] } @rows;
1464 fail "unknown suite $isuite" unless @rows;
1465 die "ambiguous $isuite: @rows ?" if @rows>1;
1469 sub file_in_archive_sshpsql ($$$) { return undef; }
1471 #---------- `dummycat' archive query method ----------
1473 sub canonicalise_suite_dummycat ($$) {
1474 my ($proto,$data) = @_;
1475 my $dpath = "$data/suite.$isuite";
1476 if (!open C, "<", $dpath) {
1477 $!==ENOENT or die "$dpath: $!";
1478 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1482 chomp or die "$dpath: $!";
1484 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1488 sub archive_query_dummycat ($$) {
1489 my ($proto,$data) = @_;
1490 canonicalise_suite();
1491 my $dpath = "$data/package.$csuite.$package";
1492 if (!open C, "<", $dpath) {
1493 $!==ENOENT or die "$dpath: $!";
1494 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1502 printdebug "dummycat query $csuite $package $dpath | $_\n";
1503 my @row = split /\s+/, $_;
1504 @row==2 or die "$dpath: $_ ?";
1507 C->error and die "$dpath: $!";
1509 return archive_query_prepend_mirror
1510 sort { -version_compare($a->[0],$b->[0]); } @rows;
1513 sub file_in_archive_dummycat () { return undef; }
1515 #---------- tag format handling ----------
1517 sub access_cfg_tagformats () {
1518 split /\,/, access_cfg('dgit-tag-format');
1521 sub need_tagformat ($$) {
1522 my ($fmt, $why) = @_;
1523 fail "need to use tag format $fmt ($why) but also need".
1524 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1525 " - no way to proceed"
1526 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1527 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1530 sub select_tagformat () {
1532 return if $tagformatfn && !$tagformat_want;
1533 die 'bug' if $tagformatfn && $tagformat_want;
1534 # ... $tagformat_want assigned after previous select_tagformat
1536 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1537 printdebug "select_tagformat supported @supported\n";
1539 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1540 printdebug "select_tagformat specified @$tagformat_want\n";
1542 my ($fmt,$why,$override) = @$tagformat_want;
1544 fail "target distro supports tag formats @supported".
1545 " but have to use $fmt ($why)"
1547 or grep { $_ eq $fmt } @supported;
1549 $tagformat_want = undef;
1551 $tagformatfn = ${*::}{"debiantag_$fmt"};
1553 fail "trying to use unknown tag format \`$fmt' ($why) !"
1554 unless $tagformatfn;
1557 #---------- archive query entrypoints and rest of program ----------
1559 sub canonicalise_suite () {
1560 return if defined $csuite;
1561 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1562 $csuite = archive_query('canonicalise_suite');
1563 if ($isuite ne $csuite) {
1564 progress "canonical suite name for $isuite is $csuite";
1566 progress "canonical suite name is $csuite";
1570 sub get_archive_dsc () {
1571 canonicalise_suite();
1572 my @vsns = archive_query('archive_query');
1573 foreach my $vinfo (@vsns) {
1574 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1575 $dscurl = $vsn_dscurl;
1576 $dscdata = url_get($dscurl);
1578 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1583 $digester->add($dscdata);
1584 my $got = $digester->hexdigest();
1586 fail "$dscurl has hash $got but".
1587 " archive told us to expect $digest";
1590 my $fmt = getfield $dsc, 'Format';
1591 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1592 "unsupported source format $fmt, sorry";
1594 $dsc_checked = !!$digester;
1595 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1599 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1602 sub check_for_git ();
1603 sub check_for_git () {
1605 my $how = access_cfg('git-check');
1606 if ($how eq 'ssh-cmd') {
1608 (access_cfg_ssh, access_gituserhost(),
1609 access_runeinfo("git-check $package").
1610 " set -e; cd ".access_cfg('git-path').";".
1611 " if test -d $package.git; then echo 1; else echo 0; fi");
1612 my $r= cmdoutput @cmd;
1613 if (defined $r and $r =~ m/^divert (\w+)$/) {
1615 my ($usedistro,) = access_distros();
1616 # NB that if we are pushing, $usedistro will be $distro/push
1617 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1618 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1619 progress "diverting to $divert (using config for $instead_distro)";
1620 return check_for_git();
1622 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1624 } elsif ($how eq 'url') {
1625 my $prefix = access_cfg('git-check-url','git-url');
1626 my $suffix = access_cfg('git-check-suffix','git-suffix',
1627 'RETURN-UNDEF') // '.git';
1628 my $url = "$prefix/$package$suffix";
1629 my @cmd = (@curl, qw(-sS -I), $url);
1630 my $result = cmdoutput @cmd;
1631 $result =~ s/^\S+ 200 .*\n\r?\n//;
1632 # curl -sS -I with https_proxy prints
1633 # HTTP/1.0 200 Connection established
1634 $result =~ m/^\S+ (404|200) /s or
1635 fail "unexpected results from git check query - ".
1636 Dumper($prefix, $result);
1638 if ($code eq '404') {
1640 } elsif ($code eq '200') {
1645 } elsif ($how eq 'true') {
1647 } elsif ($how eq 'false') {
1650 badcfg "unknown git-check \`$how'";
1654 sub create_remote_git_repo () {
1655 my $how = access_cfg('git-create');
1656 if ($how eq 'ssh-cmd') {
1658 (access_cfg_ssh, access_gituserhost(),
1659 access_runeinfo("git-create $package").
1660 "set -e; cd ".access_cfg('git-path').";".
1661 " cp -a _template $package.git");
1662 } elsif ($how eq 'true') {
1665 badcfg "unknown git-create \`$how'";
1669 our ($dsc_hash,$lastpush_mergeinput);
1671 our $ud = '.git/dgit/unpack';
1681 sub mktree_in_ud_here () {
1682 runcmd qw(git init -q);
1683 runcmd qw(git config gc.auto 0);
1684 rmtree('.git/objects');
1685 symlink '../../../../objects','.git/objects' or die $!;
1688 sub git_write_tree () {
1689 my $tree = cmdoutput @git, qw(write-tree);
1690 $tree =~ m/^\w+$/ or die "$tree ?";
1694 sub remove_stray_gits () {
1695 my @gitscmd = qw(find -name .git -prune -print0);
1696 debugcmd "|",@gitscmd;
1697 open GITS, "-|", @gitscmd or die $!;
1702 print STDERR "$us: warning: removing from source package: ",
1703 (messagequote $_), "\n";
1707 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1710 sub mktree_in_ud_from_only_subdir (;$) {
1713 # changes into the subdir
1715 die "expected one subdir but found @dirs ?" unless @dirs==1;
1716 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1720 remove_stray_gits();
1721 mktree_in_ud_here();
1723 my ($format, $fopts) = get_source_format();
1724 if (madformat($format)) {
1729 runcmd @git, qw(add -Af);
1730 my $tree=git_write_tree();
1731 return ($tree,$dir);
1734 our @files_csum_info_fields =
1735 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1736 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1737 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1739 sub dsc_files_info () {
1740 foreach my $csumi (@files_csum_info_fields) {
1741 my ($fname, $module, $method) = @$csumi;
1742 my $field = $dsc->{$fname};
1743 next unless defined $field;
1744 eval "use $module; 1;" or die $@;
1746 foreach (split /\n/, $field) {
1748 m/^(\w+) (\d+) (\S+)$/ or
1749 fail "could not parse .dsc $fname line \`$_'";
1750 my $digester = eval "$module"."->$method;" or die $@;
1755 Digester => $digester,
1760 fail "missing any supported Checksums-* or Files field in ".
1761 $dsc->get_option('name');
1765 map { $_->{Filename} } dsc_files_info();
1768 sub files_compare_inputs (@) {
1773 my $showinputs = sub {
1774 return join "; ", map { $_->get_option('name') } @$inputs;
1777 foreach my $in (@$inputs) {
1779 my $in_name = $in->get_option('name');
1781 printdebug "files_compare_inputs $in_name\n";
1783 foreach my $csumi (@files_csum_info_fields) {
1784 my ($fname) = @$csumi;
1785 printdebug "files_compare_inputs $in_name $fname\n";
1787 my $field = $in->{$fname};
1788 next unless defined $field;
1791 foreach (split /\n/, $field) {
1794 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1795 fail "could not parse $in_name $fname line \`$_'";
1797 printdebug "files_compare_inputs $in_name $fname $f\n";
1801 my $re = \ $record{$f}{$fname};
1803 $fchecked{$f}{$in_name} = 1;
1805 fail "hash or size of $f varies in $fname fields".
1806 " (between: ".$showinputs->().")";
1811 @files = sort @files;
1812 $expected_files //= \@files;
1813 "@$expected_files" eq "@files" or
1814 fail "file list in $in_name varies between hash fields!";
1817 fail "$in_name has no files list field(s)";
1819 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1822 grep { keys %$_ == @$inputs-1 } values %fchecked
1823 or fail "no file appears in all file lists".
1824 " (looked in: ".$showinputs->().")";
1827 sub is_orig_file_in_dsc ($$) {
1828 my ($f, $dsc_files_info) = @_;
1829 return 0 if @$dsc_files_info <= 1;
1830 # One file means no origs, and the filename doesn't have a "what
1831 # part of dsc" component. (Consider versions ending `.orig'.)
1832 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1836 sub is_orig_file_of_vsn ($$) {
1837 my ($f, $upstreamvsn) = @_;
1838 my $base = srcfn $upstreamvsn, '';
1839 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1843 sub changes_update_origs_from_dsc ($$$$) {
1844 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1846 printdebug "checking origs needed ($upstreamvsn)...\n";
1847 $_ = getfield $changes, 'Files';
1848 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1849 fail "cannot find section/priority from .changes Files field";
1850 my $placementinfo = $1;
1852 printdebug "checking origs needed placement '$placementinfo'...\n";
1853 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1854 $l =~ m/\S+$/ or next;
1856 printdebug "origs $file | $l\n";
1857 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1858 printdebug "origs $file is_orig\n";
1859 my $have = archive_query('file_in_archive', $file);
1860 if (!defined $have) {
1862 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1868 printdebug "origs $file \$#\$have=$#$have\n";
1869 foreach my $h (@$have) {
1872 foreach my $csumi (@files_csum_info_fields) {
1873 my ($fname, $module, $method, $archivefield) = @$csumi;
1874 next unless defined $h->{$archivefield};
1875 $_ = $dsc->{$fname};
1876 next unless defined;
1877 m/^(\w+) .* \Q$file\E$/m or
1878 fail ".dsc $fname missing entry for $file";
1879 if ($h->{$archivefield} eq $1) {
1883 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1886 die "$file ".Dumper($h)." ?!" if $same && @differ;
1889 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1892 print "origs $file f.same=$found_same #f._differ=$#found_differ\n";
1893 if (@found_differ && !$found_same) {
1895 "archive contains $file with different checksum",
1898 # Now we edit the changes file to add or remove it
1899 foreach my $csumi (@files_csum_info_fields) {
1900 my ($fname, $module, $method, $archivefield) = @$csumi;
1901 next unless defined $changes->{$fname};
1903 # in archive, delete from .changes if it's there
1904 $changed{$file} = "removed" if
1905 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1906 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1907 # not in archive, but it's here in the .changes
1909 my $dsc_data = getfield $dsc, $fname;
1910 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1912 $extra =~ s/ \d+ /$&$placementinfo /
1913 or die "$fname $extra >$dsc_data< ?"
1914 if $fname eq 'Files';
1915 $changes->{$fname} .= "\n". $extra;
1916 $changed{$file} = "added";
1921 foreach my $file (keys %changed) {
1923 "edited .changes for archive .orig contents: %s %s",
1924 $changed{$file}, $file;
1926 my $chtmp = "$changesfile.tmp";
1927 $changes->save($chtmp);
1929 rename $chtmp,$changesfile or die "$changesfile $!";
1931 progress "[new .changes left in $changesfile]";
1934 progress "$changesfile already has appropriate .orig(s) (if any)";
1938 sub make_commit ($) {
1940 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1943 sub make_commit_text ($) {
1946 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1948 print Dumper($text) if $debuglevel > 1;
1949 my $child = open2($out, $in, @cmd) or die $!;
1952 print $in $text or die $!;
1953 close $in or die $!;
1955 $h =~ m/^\w+$/ or die;
1957 printdebug "=> $h\n";
1960 waitpid $child, 0 == $child or die "$child $!";
1961 $? and failedcmd @cmd;
1965 sub clogp_authline ($) {
1967 my $author = getfield $clogp, 'Maintainer';
1968 $author =~ s#,.*##ms;
1969 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1970 my $authline = "$author $date";
1971 $authline =~ m/$git_authline_re/o or
1972 fail "unexpected commit author line format \`$authline'".
1973 " (was generated from changelog Maintainer field)";
1974 return ($1,$2,$3) if wantarray;
1978 sub vendor_patches_distro ($$) {
1979 my ($checkdistro, $what) = @_;
1980 return unless defined $checkdistro;
1982 my $series = "debian/patches/\L$checkdistro\E.series";
1983 printdebug "checking for vendor-specific $series ($what)\n";
1985 if (!open SERIES, "<", $series) {
1986 die "$series $!" unless $!==ENOENT;
1995 Unfortunately, this source package uses a feature of dpkg-source where
1996 the same source package unpacks to different source code on different
1997 distros. dgit cannot safely operate on such packages on affected
1998 distros, because the meaning of source packages is not stable.
2000 Please ask the distro/maintainer to remove the distro-specific series
2001 files and use a different technique (if necessary, uploading actually
2002 different packages, if different distros are supposed to have
2006 fail "Found active distro-specific series file for".
2007 " $checkdistro ($what): $series, cannot continue";
2009 die "$series $!" if SERIES->error;
2013 sub check_for_vendor_patches () {
2014 # This dpkg-source feature doesn't seem to be documented anywhere!
2015 # But it can be found in the changelog (reformatted):
2017 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2018 # Author: Raphael Hertzog <hertzog@debian.org>
2019 # Date: Sun Oct 3 09:36:48 2010 +0200
2021 # dpkg-source: correctly create .pc/.quilt_series with alternate
2024 # If you have debian/patches/ubuntu.series and you were
2025 # unpacking the source package on ubuntu, quilt was still
2026 # directed to debian/patches/series instead of
2027 # debian/patches/ubuntu.series.
2029 # debian/changelog | 3 +++
2030 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2031 # 2 files changed, 6 insertions(+), 1 deletion(-)
2034 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2035 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2036 "Dpkg::Vendor \`current vendor'");
2037 vendor_patches_distro(access_basedistro(),
2038 "(base) distro being accessed");
2039 vendor_patches_distro(access_nomdistro(),
2040 "(nominal) distro being accessed");
2043 sub generate_commits_from_dsc () {
2044 # See big comment in fetch_from_archive, below.
2045 # See also README.dsc-import.
2049 my @dfi = dsc_files_info();
2050 foreach my $fi (@dfi) {
2051 my $f = $fi->{Filename};
2052 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2054 printdebug "considering linking $f: ";
2056 link_ltarget "../../../../$f", $f
2057 or ((printdebug "($!) "), 0)
2061 printdebug "linked.\n";
2063 complete_file_from_dsc('.', $fi)
2066 if (is_orig_file_in_dsc($f, \@dfi)) {
2067 link $f, "../../../../$f"
2073 # We unpack and record the orig tarballs first, so that we only
2074 # need disk space for one private copy of the unpacked source.
2075 # But we can't make them into commits until we have the metadata
2076 # from the debian/changelog, so we record the tree objects now and
2077 # make them into commits later.
2079 my $upstreamv = upstreamversion $dsc->{version};
2080 my $orig_f_base = srcfn $upstreamv, '';
2082 foreach my $fi (@dfi) {
2083 # We actually import, and record as a commit, every tarball
2084 # (unless there is only one file, in which case there seems
2087 my $f = $fi->{Filename};
2088 printdebug "import considering $f ";
2089 (printdebug "only one dfi\n"), next if @dfi == 1;
2090 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2091 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2095 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2097 printdebug "Y ", (join ' ', map { $_//"(none)" }
2098 $compr_ext, $orig_f_part
2101 my $input = new IO::File $f, '<' or die "$f $!";
2105 if (defined $compr_ext) {
2107 Dpkg::Compression::compression_guess_from_filename $f;
2108 fail "Dpkg::Compression cannot handle file $f in source package"
2109 if defined $compr_ext && !defined $cname;
2111 new Dpkg::Compression::Process compression => $cname;
2112 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2113 my $compr_fh = new IO::Handle;
2114 my $compr_pid = open $compr_fh, "-|" // die $!;
2116 open STDIN, "<&", $input or die $!;
2118 die "dgit (child): exec $compr_cmd[0]: $!\n";
2123 rmtree "../unpack-tar";
2124 mkdir "../unpack-tar" or die $!;
2125 my @tarcmd = qw(tar -x -f -
2126 --no-same-owner --no-same-permissions
2127 --no-acls --no-xattrs --no-selinux);
2128 my $tar_pid = fork // die $!;
2130 chdir "../unpack-tar" or die $!;
2131 open STDIN, "<&", $input or die $!;
2133 die "dgit (child): exec $tarcmd[0]: $!";
2135 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2136 !$? or failedcmd @tarcmd;
2139 (@compr_cmd ? failedcmd @compr_cmd
2141 # finally, we have the results in "tarball", but maybe
2142 # with the wrong permissions
2144 runcmd qw(chmod -R +rwX ../unpack-tar);
2145 changedir "../unpack-tar";
2146 my ($tree) = mktree_in_ud_from_only_subdir(1);
2147 changedir "../../unpack";
2148 rmtree "../unpack-tar";
2150 my $ent = [ $f, $tree ];
2152 Orig => !!$orig_f_part,
2153 Sort => (!$orig_f_part ? 2 :
2154 $orig_f_part =~ m/-/g ? 1 :
2162 # put any without "_" first (spec is not clear whether files
2163 # are always in the usual order). Tarballs without "_" are
2164 # the main orig or the debian tarball.
2165 $a->{Sort} <=> $b->{Sort} or
2169 my $any_orig = grep { $_->{Orig} } @tartrees;
2171 my $dscfn = "$package.dsc";
2173 my $treeimporthow = 'package';
2175 open D, ">", $dscfn or die "$dscfn: $!";
2176 print D $dscdata or die "$dscfn: $!";
2177 close D or die "$dscfn: $!";
2178 my @cmd = qw(dpkg-source);
2179 push @cmd, '--no-check' if $dsc_checked;
2180 if (madformat $dsc->{format}) {
2181 push @cmd, '--skip-patches';
2182 $treeimporthow = 'unpatched';
2184 push @cmd, qw(-x --), $dscfn;
2187 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
2188 if (madformat $dsc->{format}) {
2189 check_for_vendor_patches();
2193 if (madformat $dsc->{format}) {
2194 my @pcmd = qw(dpkg-source --before-build .);
2195 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2197 runcmd @git, qw(add -Af);
2198 $dappliedtree = git_write_tree();
2201 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2202 debugcmd "|",@clogcmd;
2203 open CLOGS, "-|", @clogcmd or die $!;
2208 printdebug "import clog search...\n";
2211 my $stanzatext = do { local $/=""; <CLOGS>; };
2212 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2213 last if !defined $stanzatext;
2215 my $desc = "package changelog, entry no.$.";
2216 open my $stanzafh, "<", \$stanzatext or die;
2217 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2218 $clogp //= $thisstanza;
2220 printdebug "import clog $thisstanza->{version} $desc...\n";
2222 last if !$any_orig; # we don't need $r1clogp
2224 # We look for the first (most recent) changelog entry whose
2225 # version number is lower than the upstream version of this
2226 # package. Then the last (least recent) previous changelog
2227 # entry is treated as the one which introduced this upstream
2228 # version and used for the synthetic commits for the upstream
2231 # One might think that a more sophisticated algorithm would be
2232 # necessary. But: we do not want to scan the whole changelog
2233 # file. Stopping when we see an earlier version, which
2234 # necessarily then is an earlier upstream version, is the only
2235 # realistic way to do that. Then, either the earliest
2236 # changelog entry we have seen so far is indeed the earliest
2237 # upload of this upstream version; or there are only changelog
2238 # entries relating to later upstream versions (which is not
2239 # possible unless the changelog and .dsc disagree about the
2240 # version). Then it remains to choose between the physically
2241 # last entry in the file, and the one with the lowest version
2242 # number. If these are not the same, we guess that the
2243 # versions were created in a non-monotic order rather than
2244 # that the changelog entries have been misordered.
2246 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2248 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2249 $r1clogp = $thisstanza;
2251 printdebug "import clog $r1clogp->{version} becomes r1\n";
2253 die $! if CLOGS->error;
2254 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2256 $clogp or fail "package changelog has no entries!";
2258 my $authline = clogp_authline $clogp;
2259 my $changes = getfield $clogp, 'Changes';
2260 my $cversion = getfield $clogp, 'Version';
2263 $r1clogp //= $clogp; # maybe there's only one entry;
2264 my $r1authline = clogp_authline $r1clogp;
2265 # Strictly, r1authline might now be wrong if it's going to be
2266 # unused because !$any_orig. Whatever.
2268 printdebug "import tartrees authline $authline\n";
2269 printdebug "import tartrees r1authline $r1authline\n";
2271 foreach my $tt (@tartrees) {
2272 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2274 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2277 committer $r1authline
2281 [dgit import orig $tt->{F}]
2289 [dgit import tarball $package $cversion $tt->{F}]
2294 printdebug "import main commit\n";
2296 open C, ">../commit.tmp" or die $!;
2297 print C <<END or die $!;
2300 print C <<END or die $! foreach @tartrees;
2303 print C <<END or die $!;
2309 [dgit import $treeimporthow $package $cversion]
2313 my $rawimport_hash = make_commit qw(../commit.tmp);
2315 if (madformat $dsc->{format}) {
2316 printdebug "import apply patches...\n";
2318 # regularise the state of the working tree so that
2319 # the checkout of $rawimport_hash works nicely.
2320 my $dappliedcommit = make_commit_text(<<END);
2327 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2329 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2331 # We need the answers to be reproducible
2332 my @authline = clogp_authline($clogp);
2333 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2334 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2335 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2336 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2337 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2338 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2340 my $path = $ENV{PATH} or die;
2342 foreach my $use_absurd (qw(0 1)) {
2343 local $ENV{PATH} = $path;
2346 progress "warning: $@";
2347 $path = "$absurdity:$path";
2348 progress "$us: trying slow absurd-git-apply...";
2349 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2354 die "forbid absurd git-apply\n" if $use_absurd
2355 && forceing [qw(import-gitapply-no-absurd)];
2356 die "only absurd git-apply!\n" if !$use_absurd
2357 && forceing [qw(import-gitapply-absurd)];
2359 local $ENV{PATH} = $path if $use_absurd;
2361 my @showcmd = (gbp_pq, qw(import));
2362 my @realcmd = shell_cmd
2363 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2364 debugcmd "+",@realcmd;
2365 if (system @realcmd) {
2366 die +(shellquote @showcmd).
2368 failedcmd_waitstatus()."\n";
2371 my $gapplied = git_rev_parse('HEAD');
2372 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2373 $gappliedtree eq $dappliedtree or
2375 gbp-pq import and dpkg-source disagree!
2376 gbp-pq import gave commit $gapplied
2377 gbp-pq import gave tree $gappliedtree
2378 dpkg-source --before-build gave tree $dappliedtree
2380 $rawimport_hash = $gapplied;
2385 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2390 progress "synthesised git commit from .dsc $cversion";
2392 my $rawimport_mergeinput = {
2393 Commit => $rawimport_hash,
2394 Info => "Import of source package",
2396 my @output = ($rawimport_mergeinput);
2398 if ($lastpush_mergeinput) {
2399 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2400 my $oversion = getfield $oldclogp, 'Version';
2402 version_compare($oversion, $cversion);
2404 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2405 { Message => <<END, ReverseParents => 1 });
2406 Record $package ($cversion) in archive suite $csuite
2408 } elsif ($vcmp > 0) {
2409 print STDERR <<END or die $!;
2411 Version actually in archive: $cversion (older)
2412 Last version pushed with dgit: $oversion (newer or same)
2415 @output = $lastpush_mergeinput;
2417 # Same version. Use what's in the server git branch,
2418 # discarding our own import. (This could happen if the
2419 # server automatically imports all packages into git.)
2420 @output = $lastpush_mergeinput;
2423 changedir '../../../..';
2428 sub complete_file_from_dsc ($$) {
2429 our ($dstdir, $fi) = @_;
2430 # Ensures that we have, in $dir, the file $fi, with the correct
2431 # contents. (Downloading it from alongside $dscurl if necessary.)
2433 my $f = $fi->{Filename};
2434 my $tf = "$dstdir/$f";
2437 if (stat_exists $tf) {
2438 progress "using existing $f";
2440 printdebug "$tf does not exist, need to fetch\n";
2442 $furl =~ s{/[^/]+$}{};
2444 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2445 die "$f ?" if $f =~ m#/#;
2446 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2447 return 0 if !act_local();
2451 open F, "<", "$tf" or die "$tf: $!";
2452 $fi->{Digester}->reset();
2453 $fi->{Digester}->addfile(*F);
2454 F->error and die $!;
2455 my $got = $fi->{Digester}->hexdigest();
2456 $got eq $fi->{Hash} or
2457 fail "file $f has hash $got but .dsc".
2458 " demands hash $fi->{Hash} ".
2459 ($downloaded ? "(got wrong file from archive!)"
2460 : "(perhaps you should delete this file?)");
2465 sub ensure_we_have_orig () {
2466 my @dfi = dsc_files_info();
2467 foreach my $fi (@dfi) {
2468 my $f = $fi->{Filename};
2469 next unless is_orig_file_in_dsc($f, \@dfi);
2470 complete_file_from_dsc('..', $fi)
2475 sub git_fetch_us () {
2476 # Want to fetch only what we are going to use, unless
2477 # deliberately-not-ff, in which case we must fetch everything.
2479 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2481 (quiltmode_splitbrain
2482 ? (map { $_->('*',access_nomdistro) }
2483 \&debiantag_new, \&debiantag_maintview)
2484 : debiantags('*',access_nomdistro));
2485 push @specs, server_branch($csuite);
2486 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2488 # This is rather miserable:
2489 # When git fetch --prune is passed a fetchspec ending with a *,
2490 # it does a plausible thing. If there is no * then:
2491 # - it matches subpaths too, even if the supplied refspec
2492 # starts refs, and behaves completely madly if the source
2493 # has refs/refs/something. (See, for example, Debian #NNNN.)
2494 # - if there is no matching remote ref, it bombs out the whole
2496 # We want to fetch a fixed ref, and we don't know in advance
2497 # if it exists, so this is not suitable.
2499 # Our workaround is to use git ls-remote. git ls-remote has its
2500 # own qairks. Notably, it has the absurd multi-tail-matching
2501 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2502 # refs/refs/foo etc.
2504 # Also, we want an idempotent snapshot, but we have to make two
2505 # calls to the remote: one to git ls-remote and to git fetch. The
2506 # solution is use git ls-remote to obtain a target state, and
2507 # git fetch to try to generate it. If we don't manage to generate
2508 # the target state, we try again.
2510 printdebug "git_fetch_us specs @specs\n";
2512 my $specre = join '|', map {
2518 printdebug "git_fetch_us specre=$specre\n";
2519 my $wanted_rref = sub {
2521 return m/^(?:$specre)$/o;
2524 my $fetch_iteration = 0;
2527 printdebug "git_fetch_us iteration $fetch_iteration\n";
2528 if (++$fetch_iteration > 10) {
2529 fail "too many iterations trying to get sane fetch!";
2532 my @look = map { "refs/$_" } @specs;
2533 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2537 open GITLS, "-|", @lcmd or die $!;
2539 printdebug "=> ", $_;
2540 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2541 my ($objid,$rrefname) = ($1,$2);
2542 if (!$wanted_rref->($rrefname)) {
2544 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2548 $wantr{$rrefname} = $objid;
2551 close GITLS or failedcmd @lcmd;
2553 # OK, now %want is exactly what we want for refs in @specs
2555 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2556 "+refs/$_:".lrfetchrefs."/$_";
2559 printdebug "git_fetch_us fspecs @fspecs\n";
2561 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2562 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2565 %lrfetchrefs_f = ();
2568 git_for_each_ref(lrfetchrefs, sub {
2569 my ($objid,$objtype,$lrefname,$reftail) = @_;
2570 $lrfetchrefs_f{$lrefname} = $objid;
2571 $objgot{$objid} = 1;
2574 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2575 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2576 if (!exists $wantr{$rrefname}) {
2577 if ($wanted_rref->($rrefname)) {
2579 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2583 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2586 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2587 delete $lrfetchrefs_f{$lrefname};
2591 foreach my $rrefname (sort keys %wantr) {
2592 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2593 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2594 my $want = $wantr{$rrefname};
2595 next if $got eq $want;
2596 if (!defined $objgot{$want}) {
2598 warning: git ls-remote suggests we want $lrefname
2599 warning: and it should refer to $want
2600 warning: but git fetch didn't fetch that object to any relevant ref.
2601 warning: This may be due to a race with someone updating the server.
2602 warning: Will try again...
2604 next FETCH_ITERATION;
2607 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2609 runcmd_ordryrun_local @git, qw(update-ref -m),
2610 "dgit fetch git fetch fixup", $lrefname, $want;
2611 $lrfetchrefs_f{$lrefname} = $want;
2615 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2616 Dumper(\%lrfetchrefs_f);
2619 my @tagpats = debiantags('*',access_nomdistro);
2621 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2622 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2623 printdebug "currently $fullrefname=$objid\n";
2624 $here{$fullrefname} = $objid;
2626 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2627 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2628 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2629 printdebug "offered $lref=$objid\n";
2630 if (!defined $here{$lref}) {
2631 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2632 runcmd_ordryrun_local @upd;
2633 lrfetchref_used $fullrefname;
2634 } elsif ($here{$lref} eq $objid) {
2635 lrfetchref_used $fullrefname;
2638 "Not updateting $lref from $here{$lref} to $objid.\n";
2643 sub mergeinfo_getclogp ($) {
2644 # Ensures thit $mi->{Clogp} exists and returns it
2646 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2649 sub mergeinfo_version ($) {
2650 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2653 sub fetch_from_archive_record_1 ($) {
2655 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2656 'DGIT_ARCHIVE', $hash;
2657 cmdoutput @git, qw(log -n2), $hash;
2658 # ... gives git a chance to complain if our commit is malformed
2661 sub fetch_from_archive_record_2 ($) {
2663 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2667 dryrun_report @upd_cmd;
2671 sub fetch_from_archive () {
2672 ensure_setup_existing_tree();
2674 # Ensures that lrref() is what is actually in the archive, one way
2675 # or another, according to us - ie this client's
2676 # appropritaely-updated archive view. Also returns the commit id.
2677 # If there is nothing in the archive, leaves lrref alone and
2678 # returns undef. git_fetch_us must have already been called.
2682 foreach my $field (@ourdscfield) {
2683 $dsc_hash = $dsc->{$field};
2684 last if defined $dsc_hash;
2686 if (defined $dsc_hash) {
2687 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2689 progress "last upload to archive specified git hash";
2691 progress "last upload to archive has NO git hash";
2694 progress "no version available from the archive";
2697 # If the archive's .dsc has a Dgit field, there are three
2698 # relevant git commitids we need to choose between and/or merge
2700 # 1. $dsc_hash: the Dgit field from the archive
2701 # 2. $lastpush_hash: the suite branch on the dgit git server
2702 # 3. $lastfetch_hash: our local tracking brach for the suite
2704 # These may all be distinct and need not be in any fast forward
2707 # If the dsc was pushed to this suite, then the server suite
2708 # branch will have been updated; but it might have been pushed to
2709 # a different suite and copied by the archive. Conversely a more
2710 # recent version may have been pushed with dgit but not appeared
2711 # in the archive (yet).
2713 # $lastfetch_hash may be awkward because archive imports
2714 # (particularly, imports of Dgit-less .dscs) are performed only as
2715 # needed on individual clients, so different clients may perform a
2716 # different subset of them - and these imports are only made
2717 # public during push. So $lastfetch_hash may represent a set of
2718 # imports different to a subsequent upload by a different dgit
2721 # Our approach is as follows:
2723 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2724 # descendant of $dsc_hash, then it was pushed by a dgit user who
2725 # had based their work on $dsc_hash, so we should prefer it.
2726 # Otherwise, $dsc_hash was installed into this suite in the
2727 # archive other than by a dgit push, and (necessarily) after the
2728 # last dgit push into that suite (since a dgit push would have
2729 # been descended from the dgit server git branch); thus, in that
2730 # case, we prefer the archive's version (and produce a
2731 # pseudo-merge to overwrite the dgit server git branch).
2733 # (If there is no Dgit field in the archive's .dsc then
2734 # generate_commit_from_dsc uses the version numbers to decide
2735 # whether the suite branch or the archive is newer. If the suite
2736 # branch is newer it ignores the archive's .dsc; otherwise it
2737 # generates an import of the .dsc, and produces a pseudo-merge to
2738 # overwrite the suite branch with the archive contents.)
2740 # The outcome of that part of the algorithm is the `public view',
2741 # and is same for all dgit clients: it does not depend on any
2742 # unpublished history in the local tracking branch.
2744 # As between the public view and the local tracking branch: The
2745 # local tracking branch is only updated by dgit fetch, and
2746 # whenever dgit fetch runs it includes the public view in the
2747 # local tracking branch. Therefore if the public view is not
2748 # descended from the local tracking branch, the local tracking
2749 # branch must contain history which was imported from the archive
2750 # but never pushed; and, its tip is now out of date. So, we make
2751 # a pseudo-merge to overwrite the old imports and stitch the old
2754 # Finally: we do not necessarily reify the public view (as
2755 # described above). This is so that we do not end up stacking two
2756 # pseudo-merges. So what we actually do is figure out the inputs
2757 # to any public view pseudo-merge and put them in @mergeinputs.
2760 # $mergeinputs[]{Commit}
2761 # $mergeinputs[]{Info}
2762 # $mergeinputs[0] is the one whose tree we use
2763 # @mergeinputs is in the order we use in the actual commit)
2766 # $mergeinputs[]{Message} is a commit message to use
2767 # $mergeinputs[]{ReverseParents} if def specifies that parent
2768 # list should be in opposite order
2769 # Such an entry has no Commit or Info. It applies only when found
2770 # in the last entry. (This ugliness is to support making
2771 # identical imports to previous dgit versions.)
2773 my $lastpush_hash = git_get_ref(lrfetchref());
2774 printdebug "previous reference hash=$lastpush_hash\n";
2775 $lastpush_mergeinput = $lastpush_hash && {
2776 Commit => $lastpush_hash,
2777 Info => "dgit suite branch on dgit git server",
2780 my $lastfetch_hash = git_get_ref(lrref());
2781 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2782 my $lastfetch_mergeinput = $lastfetch_hash && {
2783 Commit => $lastfetch_hash,
2784 Info => "dgit client's archive history view",
2787 my $dsc_mergeinput = $dsc_hash && {
2788 Commit => $dsc_hash,
2789 Info => "Dgit field in .dsc from archive",
2793 my $del_lrfetchrefs = sub {
2796 printdebug "del_lrfetchrefs...\n";
2797 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2798 my $objid = $lrfetchrefs_d{$fullrefname};
2799 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2801 $gur ||= new IO::Handle;
2802 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2804 printf $gur "delete %s %s\n", $fullrefname, $objid;
2807 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2811 if (defined $dsc_hash) {
2812 ensure_we_have_orig();
2813 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2814 @mergeinputs = $dsc_mergeinput
2815 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2816 print STDERR <<END or die $!;
2818 Git commit in archive is behind the last version allegedly pushed/uploaded.
2819 Commit referred to by archive: $dsc_hash
2820 Last version pushed with dgit: $lastpush_hash
2823 @mergeinputs = ($lastpush_mergeinput);
2825 # Archive has .dsc which is not a descendant of the last dgit
2826 # push. This can happen if the archive moves .dscs about.
2827 # Just follow its lead.
2828 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2829 progress "archive .dsc names newer git commit";
2830 @mergeinputs = ($dsc_mergeinput);
2832 progress "archive .dsc names other git commit, fixing up";
2833 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2837 @mergeinputs = generate_commits_from_dsc();
2838 # We have just done an import. Now, our import algorithm might
2839 # have been improved. But even so we do not want to generate
2840 # a new different import of the same package. So if the
2841 # version numbers are the same, just use our existing version.
2842 # If the version numbers are different, the archive has changed
2843 # (perhaps, rewound).
2844 if ($lastfetch_mergeinput &&
2845 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2846 (mergeinfo_version $mergeinputs[0]) )) {
2847 @mergeinputs = ($lastfetch_mergeinput);
2849 } elsif ($lastpush_hash) {
2850 # only in git, not in the archive yet
2851 @mergeinputs = ($lastpush_mergeinput);
2852 print STDERR <<END or die $!;
2854 Package not found in the archive, but has allegedly been pushed using dgit.
2858 printdebug "nothing found!\n";
2859 if (defined $skew_warning_vsn) {
2860 print STDERR <<END or die $!;
2862 Warning: relevant archive skew detected.
2863 Archive allegedly contains $skew_warning_vsn
2864 But we were not able to obtain any version from the archive or git.
2868 unshift @end, $del_lrfetchrefs;
2872 if ($lastfetch_hash &&
2874 my $h = $_->{Commit};
2875 $h and is_fast_fwd($lastfetch_hash, $h);
2876 # If true, one of the existing parents of this commit
2877 # is a descendant of the $lastfetch_hash, so we'll
2878 # be ff from that automatically.
2882 push @mergeinputs, $lastfetch_mergeinput;
2885 printdebug "fetch mergeinfos:\n";
2886 foreach my $mi (@mergeinputs) {
2888 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2890 printdebug sprintf " ReverseParents=%d Message=%s",
2891 $mi->{ReverseParents}, $mi->{Message};
2895 my $compat_info= pop @mergeinputs
2896 if $mergeinputs[$#mergeinputs]{Message};
2898 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2901 if (@mergeinputs > 1) {
2903 my $tree_commit = $mergeinputs[0]{Commit};
2905 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2906 $tree =~ m/\n\n/; $tree = $`;
2907 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2910 # We use the changelog author of the package in question the
2911 # author of this pseudo-merge. This is (roughly) correct if
2912 # this commit is simply representing aa non-dgit upload.
2913 # (Roughly because it does not record sponsorship - but we
2914 # don't have sponsorship info because that's in the .changes,
2915 # which isn't in the archivw.)
2917 # But, it might be that we are representing archive history
2918 # updates (including in-archive copies). These are not really
2919 # the responsibility of the person who created the .dsc, but
2920 # there is no-one whose name we should better use. (The
2921 # author of the .dsc-named commit is clearly worse.)
2923 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2924 my $author = clogp_authline $useclogp;
2925 my $cversion = getfield $useclogp, 'Version';
2927 my $mcf = ".git/dgit/mergecommit";
2928 open MC, ">", $mcf or die "$mcf $!";
2929 print MC <<END or die $!;
2933 my @parents = grep { $_->{Commit} } @mergeinputs;
2934 @parents = reverse @parents if $compat_info->{ReverseParents};
2935 print MC <<END or die $! foreach @parents;
2939 print MC <<END or die $!;
2945 if (defined $compat_info->{Message}) {
2946 print MC $compat_info->{Message} or die $!;
2948 print MC <<END or die $!;
2949 Record $package ($cversion) in archive suite $csuite
2953 my $message_add_info = sub {
2955 my $mversion = mergeinfo_version $mi;
2956 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2960 $message_add_info->($mergeinputs[0]);
2961 print MC <<END or die $!;
2962 should be treated as descended from
2964 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2968 $hash = make_commit $mcf;
2970 $hash = $mergeinputs[0]{Commit};
2972 printdebug "fetch hash=$hash\n";
2975 my ($lasth, $what) = @_;
2976 return unless $lasth;
2977 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2980 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
2982 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2984 fetch_from_archive_record_1($hash);
2986 if (defined $skew_warning_vsn) {
2988 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2989 my $gotclogp = commit_getclogp($hash);
2990 my $got_vsn = getfield $gotclogp, 'Version';
2991 printdebug "SKEW CHECK GOT $got_vsn\n";
2992 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2993 print STDERR <<END or die $!;
2995 Warning: archive skew detected. Using the available version:
2996 Archive allegedly contains $skew_warning_vsn
2997 We were able to obtain only $got_vsn
3003 if ($lastfetch_hash ne $hash) {
3004 fetch_from_archive_record_2($hash);
3007 lrfetchref_used lrfetchref();
3009 unshift @end, $del_lrfetchrefs;
3013 sub set_local_git_config ($$) {
3015 runcmd @git, qw(config), $k, $v;
3018 sub setup_mergechangelogs (;$) {
3020 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3022 my $driver = 'dpkg-mergechangelogs';
3023 my $cb = "merge.$driver";
3024 my $attrs = '.git/info/attributes';
3025 ensuredir '.git/info';
3027 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3028 if (!open ATTRS, "<", $attrs) {
3029 $!==ENOENT or die "$attrs: $!";
3033 next if m{^debian/changelog\s};
3034 print NATTRS $_, "\n" or die $!;
3036 ATTRS->error and die $!;
3039 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3042 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3043 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3045 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3048 sub setup_useremail (;$) {
3050 return unless $always || access_cfg_bool(1, 'setup-useremail');
3053 my ($k, $envvar) = @_;
3054 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3055 return unless defined $v;
3056 set_local_git_config "user.$k", $v;
3059 $setup->('email', 'DEBEMAIL');
3060 $setup->('name', 'DEBFULLNAME');
3063 sub ensure_setup_existing_tree () {
3064 my $k = "remote.$remotename.skipdefaultupdate";
3065 my $c = git_get_config $k;
3066 return if defined $c;
3067 set_local_git_config $k, 'true';
3070 sub setup_new_tree () {
3071 setup_mergechangelogs();
3075 sub multisuite_suite_child ($$$) {
3076 my ($tsuite, $merginputs, $fn) = @_;
3077 # in child, sets things up, calls $fn->(), and returns undef
3078 # in parent, returns canonical suite name for $tsuite
3079 my $canonsuitefh = IO::File::new_tmpfile;
3080 my $pid = fork // die $!;
3083 $us .= " [$isuite]";
3084 $debugprefix .= " ";
3085 progress "fetching $tsuite...";
3086 canonicalise_suite();
3087 print $canonsuitefh $csuite, "\n" or die $!;
3088 close $canonsuitefh or die $!;
3092 waitpid $pid,0 == $pid or die $!;
3093 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3094 seek $canonsuitefh,0,0 or die $!;
3095 local $csuite = <$canonsuitefh>;
3096 die $! unless defined $csuite && chomp $csuite;
3098 printdebug "multisuite $tsuite missing\n";
3101 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3102 push @$merginputs, {
3109 sub fork_for_multisuite ($) {
3110 my ($before_fetch_merge) = @_;
3111 # if nothing unusual, just returns ''
3114 # returns 0 to caller in child, to do first of the specified suites
3115 # in child, $csuite is not yet set
3117 # returns 1 to caller in parent, to finish up anything needed after
3118 # in parent, $csuite is set to canonicalised portmanteau
3120 my $org_isuite = $isuite;
3121 my @suites = split /\,/, $isuite;
3122 return '' unless @suites > 1;
3123 printdebug "fork_for_multisuite: @suites\n";
3127 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3129 return 0 unless defined $cbasesuite;
3131 fail "package $package missing in (base suite) $cbasesuite"
3132 unless @mergeinputs;
3134 my @csuites = ($cbasesuite);
3136 $before_fetch_merge->();
3138 foreach my $tsuite (@suites[1..$#suites]) {
3139 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3145 # xxx collecte the ref here
3147 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3148 push @csuites, $csubsuite;
3151 foreach my $mi (@mergeinputs) {
3152 my $ref = git_get_ref $mi->{Ref};
3153 die "$mi->{Ref} ?" unless length $ref;
3154 $mi->{Commit} = $ref;
3157 $csuite = join ",", @csuites;
3159 my $previous = git_get_ref lrref;
3161 unshift @mergeinputs, {
3162 Commit => $previous,
3163 Info => "local combined tracking branch",
3165 "archive seems to have rewound: local tracking branch is ahead!",
3169 foreach my $ix (0..$#mergeinputs) {
3170 $mergeinputs[$ix]{Index} = $ix;
3173 @mergeinputs = sort {
3174 -version_compare(mergeinfo_version $a,
3175 mergeinfo_version $b) # highest version first
3177 $a->{Index} <=> $b->{Index}; # earliest in spec first
3183 foreach my $mi (@mergeinputs) {
3184 printdebug "multisuite merge check $mi->{Info}\n";
3185 foreach my $previous (@needed) {
3186 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3187 printdebug "multisuite merge un-needed $previous->{Info}\n";
3191 printdebug "multisuite merge this-needed\n";
3192 $mi->{Character} = '+';
3195 $needed[0]{Character} = '*';
3197 my $output = $needed[0]{Commit};
3200 printdebug "multisuite merge nontrivial\n";
3201 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3203 my $commit = "tree $tree\n";
3204 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3205 "Input branches:\n";
3207 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3208 printdebug "multisuite merge include $mi->{Info}\n";
3209 $mi->{Character} //= ' ';
3210 $commit .= "parent $mi->{Commit}\n";
3211 $msg .= sprintf " %s %-25s %s\n",
3213 (mergeinfo_version $mi),
3216 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3218 " * marks the highest version branch, which choose to use\n".
3219 " + marks each branch which was not already an ancestor\n\n".
3220 "[dgit multi-suite $csuite]\n";
3222 "author $authline\n".
3223 "committer $authline\n\n";
3224 $output = make_commit_text $commit.$msg;
3225 printdebug "multisuite merge generated $output\n";
3228 fetch_from_archive_record_1($output);
3229 fetch_from_archive_record_2($output);
3231 progress "calculated combined tracking suite $csuite";
3236 sub clone_set_head () {
3237 open H, "> .git/HEAD" or die $!;
3238 print H "ref: ".lref()."\n" or die $!;
3241 sub clone_finish ($) {
3243 runcmd @git, qw(reset --hard), lrref();
3244 runcmd qw(bash -ec), <<'END';
3246 git ls-tree -r --name-only -z HEAD | \
3247 xargs -0r touch -r . --
3249 printdone "ready for work in $dstdir";
3254 badusage "dry run makes no sense with clone" unless act_local();
3256 my $multi_fetched = fork_for_multisuite(sub {
3257 printdebug "multi clone before fetch merge\n";
3260 if ($multi_fetched) {
3261 printdebug "multi clone after fetch merge\n";
3263 clone_finish($dstdir);
3266 printdebug "clone main body\n";
3268 canonicalise_suite();
3269 my $hasgit = check_for_git();
3270 mkdir $dstdir or fail "create \`$dstdir': $!";
3272 runcmd @git, qw(init -q);
3274 my $giturl = access_giturl(1);
3275 if (defined $giturl) {
3276 runcmd @git, qw(remote add), 'origin', $giturl;
3279 progress "fetching existing git history";
3281 runcmd_ordryrun_local @git, qw(fetch origin);
3283 progress "starting new git history";
3285 fetch_from_archive() or no_such_package;
3286 my $vcsgiturl = $dsc->{'Vcs-Git'};
3287 if (length $vcsgiturl) {
3288 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3289 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3292 clone_finish($dstdir);
3296 canonicalise_suite();
3297 if (check_for_git()) {
3300 fetch_from_archive() or no_such_package();
3301 printdone "fetched into ".lrref();
3305 my $multi_fetched = fork_for_multisuite(sub { });
3306 fetch() unless $multi_fetched; # parent
3307 return if $multi_fetched eq '0'; # child
3308 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3310 printdone "fetched to ".lrref()." and merged into HEAD";
3313 sub check_not_dirty () {
3314 foreach my $f (qw(local-options local-patch-header)) {
3315 if (stat_exists "debian/source/$f") {
3316 fail "git tree contains debian/source/$f";
3320 return if $ignoredirty;
3322 my @cmd = (@git, qw(diff --quiet HEAD));
3324 $!=0; $?=-1; system @cmd;
3327 fail "working tree is dirty (does not match HEAD)";
3333 sub commit_admin ($) {
3336 runcmd_ordryrun_local @git, qw(commit -m), $m;
3339 sub commit_quilty_patch () {
3340 my $output = cmdoutput @git, qw(status --porcelain);
3342 foreach my $l (split /\n/, $output) {
3343 next unless $l =~ m/\S/;
3344 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3348 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3350 progress "nothing quilty to commit, ok.";
3353 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3354 runcmd_ordryrun_local @git, qw(add -f), @adds;
3356 Commit Debian 3.0 (quilt) metadata
3358 [dgit ($our_version) quilt-fixup]
3362 sub get_source_format () {
3364 if (open F, "debian/source/options") {
3368 s/\s+$//; # ignore missing final newline
3370 my ($k, $v) = ($`, $'); #');
3371 $v =~ s/^"(.*)"$/$1/;
3377 F->error and die $!;
3380 die $! unless $!==&ENOENT;
3383 if (!open F, "debian/source/format") {
3384 die $! unless $!==&ENOENT;
3388 F->error and die $!;
3390 return ($_, \%options);
3393 sub madformat_wantfixup ($) {
3395 return 0 unless $format eq '3.0 (quilt)';
3396 our $quilt_mode_warned;
3397 if ($quilt_mode eq 'nocheck') {
3398 progress "Not doing any fixup of \`$format' due to".
3399 " ----no-quilt-fixup or --quilt=nocheck"
3400 unless $quilt_mode_warned++;
3403 progress "Format \`$format', need to check/update patch stack"
3404 unless $quilt_mode_warned++;
3408 sub maybe_split_brain_save ($$$) {
3409 my ($headref, $dgitview, $msg) = @_;
3410 # => message fragment "$saved" describing disposition of $dgitview
3411 return "commit id $dgitview" unless defined $split_brain_save;
3412 my @cmd = (shell_cmd "cd ../../../..",
3413 @git, qw(update-ref -m),
3414 "dgit --dgit-view-save $msg HEAD=$headref",
3415 $split_brain_save, $dgitview);
3417 return "and left in $split_brain_save";
3420 # An "infopair" is a tuple [ $thing, $what ]
3421 # (often $thing is a commit hash; $what is a description)
3423 sub infopair_cond_equal ($$) {
3425 $x->[0] eq $y->[0] or fail <<END;
3426 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3430 sub infopair_lrf_tag_lookup ($$) {
3431 my ($tagnames, $what) = @_;
3432 # $tagname may be an array ref
3433 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3434 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3435 foreach my $tagname (@tagnames) {
3436 my $lrefname = lrfetchrefs."/tags/$tagname";
3437 my $tagobj = $lrfetchrefs_f{$lrefname};
3438 next unless defined $tagobj;
3439 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3440 return [ git_rev_parse($tagobj), $what ];
3442 fail @tagnames==1 ? <<END : <<END;
3443 Wanted tag $what (@tagnames) on dgit server, but not found
3445 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3449 sub infopair_cond_ff ($$) {
3450 my ($anc,$desc) = @_;
3451 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3452 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3456 sub pseudomerge_version_check ($$) {
3457 my ($clogp, $archive_hash) = @_;
3459 my $arch_clogp = commit_getclogp $archive_hash;
3460 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3461 'version currently in archive' ];
3462 if (defined $overwrite_version) {
3463 if (length $overwrite_version) {
3464 infopair_cond_equal([ $overwrite_version,
3465 '--overwrite= version' ],
3468 my $v = $i_arch_v->[0];
3469 progress "Checking package changelog for archive version $v ...";
3471 my @xa = ("-f$v", "-t$v");
3472 my $vclogp = parsechangelog @xa;
3473 my $cv = [ (getfield $vclogp, 'Version'),
3474 "Version field from dpkg-parsechangelog @xa" ];
3475 infopair_cond_equal($i_arch_v, $cv);
3478 $@ =~ s/^dgit: //gm;
3480 "Perhaps debian/changelog does not mention $v ?";
3485 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3489 sub pseudomerge_make_commit ($$$$ $$) {
3490 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3491 $msg_cmd, $msg_msg) = @_;
3492 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3494 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3495 my $authline = clogp_authline $clogp;
3499 !defined $overwrite_version ? ""
3500 : !length $overwrite_version ? " --overwrite"
3501 : " --overwrite=".$overwrite_version;
3504 my $pmf = ".git/dgit/pseudomerge";
3505 open MC, ">", $pmf or die "$pmf $!";
3506 print MC <<END or die $!;
3509 parent $archive_hash
3519 return make_commit($pmf);
3522 sub splitbrain_pseudomerge ($$$$) {
3523 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3524 # => $merged_dgitview
3525 printdebug "splitbrain_pseudomerge...\n";
3527 # We: debian/PREVIOUS HEAD($maintview)
3528 # expect: o ----------------- o
3531 # a/d/PREVIOUS $dgitview
3534 # we do: `------------------ o
3538 return $dgitview unless defined $archive_hash;
3540 printdebug "splitbrain_pseudomerge...\n";
3542 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3544 if (!defined $overwrite_version) {
3545 progress "Checking that HEAD inciudes all changes in archive...";
3548 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3550 if (defined $overwrite_version) {
3552 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3553 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3554 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3555 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3556 my $i_archive = [ $archive_hash, "current archive contents" ];
3558 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3560 infopair_cond_equal($i_dgit, $i_archive);
3561 infopair_cond_ff($i_dep14, $i_dgit);
3562 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3566 $us: check failed (maybe --overwrite is needed, consult documentation)
3571 my $r = pseudomerge_make_commit
3572 $clogp, $dgitview, $archive_hash, $i_arch_v,
3573 "dgit --quilt=$quilt_mode",
3574 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3575 Declare fast forward from $i_arch_v->[0]
3577 Make fast forward from $i_arch_v->[0]
3580 maybe_split_brain_save $maintview, $r, "pseudomerge";
3582 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3586 sub plain_overwrite_pseudomerge ($$$) {
3587 my ($clogp, $head, $archive_hash) = @_;
3589 printdebug "plain_overwrite_pseudomerge...";
3591 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3593 return $head if is_fast_fwd $archive_hash, $head;
3595 my $m = "Declare fast forward from $i_arch_v->[0]";
3597 my $r = pseudomerge_make_commit
3598 $clogp, $head, $archive_hash, $i_arch_v,
3601 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3603 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3607 sub push_parse_changelog ($) {
3610 my $clogp = Dpkg::Control::Hash->new();
3611 $clogp->load($clogpfn) or die;
3613 my $clogpackage = getfield $clogp, 'Source';
3614 $package //= $clogpackage;
3615 fail "-p specified $package but changelog specified $clogpackage"
3616 unless $package eq $clogpackage;
3617 my $cversion = getfield $clogp, 'Version';
3618 my $tag = debiantag($cversion, access_nomdistro);
3619 runcmd @git, qw(check-ref-format), $tag;
3621 my $dscfn = dscfn($cversion);
3623 return ($clogp, $cversion, $dscfn);
3626 sub push_parse_dsc ($$$) {
3627 my ($dscfn,$dscfnwhat, $cversion) = @_;
3628 $dsc = parsecontrol($dscfn,$dscfnwhat);
3629 my $dversion = getfield $dsc, 'Version';
3630 my $dscpackage = getfield $dsc, 'Source';
3631 ($dscpackage eq $package && $dversion eq $cversion) or
3632 fail "$dscfn is for $dscpackage $dversion".
3633 " but debian/changelog is for $package $cversion";
3636 sub push_tagwants ($$$$) {
3637 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3640 TagFn => \&debiantag,
3645 if (defined $maintviewhead) {
3647 TagFn => \&debiantag_maintview,
3648 Objid => $maintviewhead,
3649 TfSuffix => '-maintview',
3653 foreach my $tw (@tagwants) {
3654 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3655 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3657 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3661 sub push_mktags ($$ $$ $) {
3663 $changesfile,$changesfilewhat,
3666 die unless $tagwants->[0]{View} eq 'dgit';
3668 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3669 $dsc->save("$dscfn.tmp") or die $!;
3671 my $changes = parsecontrol($changesfile,$changesfilewhat);
3672 foreach my $field (qw(Source Distribution Version)) {
3673 $changes->{$field} eq $clogp->{$field} or
3674 fail "changes field $field \`$changes->{$field}'".
3675 " does not match changelog \`$clogp->{$field}'";
3678 my $cversion = getfield $clogp, 'Version';
3679 my $clogsuite = getfield $clogp, 'Distribution';
3681 # We make the git tag by hand because (a) that makes it easier
3682 # to control the "tagger" (b) we can do remote signing
3683 my $authline = clogp_authline $clogp;
3684 my $delibs = join(" ", "",@deliberatelies);
3685 my $declaredistro = access_nomdistro();
3689 my $tfn = $tw->{Tfn};
3690 my $head = $tw->{Objid};
3691 my $tag = $tw->{Tag};
3693 open TO, '>', $tfn->('.tmp') or die $!;
3694 print TO <<END or die $!;
3701 if ($tw->{View} eq 'dgit') {
3702 print TO <<END or die $!;
3703 $package release $cversion for $clogsuite ($csuite) [dgit]
3704 [dgit distro=$declaredistro$delibs]
3706 foreach my $ref (sort keys %previously) {
3707 print TO <<END or die $!;
3708 [dgit previously:$ref=$previously{$ref}]
3711 } elsif ($tw->{View} eq 'maint') {
3712 print TO <<END or die $!;
3713 $package release $cversion for $clogsuite ($csuite)
3714 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3717 die Dumper($tw)."?";
3722 my $tagobjfn = $tfn->('.tmp');
3724 if (!defined $keyid) {
3725 $keyid = access_cfg('keyid','RETURN-UNDEF');
3727 if (!defined $keyid) {
3728 $keyid = getfield $clogp, 'Maintainer';
3730 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3731 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3732 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3733 push @sign_cmd, $tfn->('.tmp');
3734 runcmd_ordryrun @sign_cmd;
3736 $tagobjfn = $tfn->('.signed.tmp');
3737 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3738 $tfn->('.tmp'), $tfn->('.tmp.asc');
3744 my @r = map { $mktag->($_); } @$tagwants;
3748 sub sign_changes ($) {
3749 my ($changesfile) = @_;
3751 my @debsign_cmd = @debsign;
3752 push @debsign_cmd, "-k$keyid" if defined $keyid;
3753 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3754 push @debsign_cmd, $changesfile;
3755 runcmd_ordryrun @debsign_cmd;
3760 printdebug "actually entering push\n";
3762 supplementary_message(<<'END');
3763 Push failed, while checking state of the archive.
3764 You can retry the push, after fixing the problem, if you like.
3766 if (check_for_git()) {
3769 my $archive_hash = fetch_from_archive();
3770 if (!$archive_hash) {
3772 fail "package appears to be new in this suite;".
3773 " if this is intentional, use --new";
3776 supplementary_message(<<'END');
3777 Push failed, while preparing your push.
3778 You can retry the push, after fixing the problem, if you like.
3781 need_tagformat 'new', "quilt mode $quilt_mode"
3782 if quiltmode_splitbrain;
3786 access_giturl(); # check that success is vaguely likely
3789 my $clogpfn = ".git/dgit/changelog.822.tmp";
3790 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3792 responder_send_file('parsed-changelog', $clogpfn);
3794 my ($clogp, $cversion, $dscfn) =
3795 push_parse_changelog("$clogpfn");
3797 my $dscpath = "$buildproductsdir/$dscfn";
3798 stat_exists $dscpath or
3799 fail "looked for .dsc $dscfn, but $!;".
3800 " maybe you forgot to build";
3802 responder_send_file('dsc', $dscpath);
3804 push_parse_dsc($dscpath, $dscfn, $cversion);
3806 my $format = getfield $dsc, 'Format';
3807 printdebug "format $format\n";
3809 my $actualhead = git_rev_parse('HEAD');
3810 my $dgithead = $actualhead;
3811 my $maintviewhead = undef;
3813 my $upstreamversion = upstreamversion $clogp->{Version};
3815 if (madformat_wantfixup($format)) {
3816 # user might have not used dgit build, so maybe do this now:
3817 if (quiltmode_splitbrain()) {
3819 quilt_make_fake_dsc($upstreamversion);
3821 ($dgithead, $cachekey) =
3822 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3824 "--quilt=$quilt_mode but no cached dgit view:
3825 perhaps tree changed since dgit build[-source] ?";
3827 $dgithead = splitbrain_pseudomerge($clogp,
3828 $actualhead, $dgithead,
3830 $maintviewhead = $actualhead;
3831 changedir '../../../..';
3832 prep_ud(); # so _only_subdir() works, below
3834 commit_quilty_patch();
3838 if (defined $overwrite_version && !defined $maintviewhead) {
3839 $dgithead = plain_overwrite_pseudomerge($clogp,
3847 if ($archive_hash) {
3848 if (is_fast_fwd($archive_hash, $dgithead)) {
3850 } elsif (deliberately_not_fast_forward) {
3853 fail "dgit push: HEAD is not a descendant".
3854 " of the archive's version.\n".
3855 "To overwrite the archive's contents,".
3856 " pass --overwrite[=VERSION].\n".
3857 "To rewind history, if permitted by the archive,".
3858 " use --deliberately-not-fast-forward.";
3863 progress "checking that $dscfn corresponds to HEAD";
3864 runcmd qw(dpkg-source -x --),
3865 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3866 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3867 check_for_vendor_patches() if madformat($dsc->{format});
3868 changedir '../../../..';
3869 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3870 debugcmd "+",@diffcmd;
3872 my $r = system @diffcmd;
3875 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3877 HEAD specifies a different tree to $dscfn:
3879 Perhaps you forgot to build. Or perhaps there is a problem with your
3880 source tree (see dgit(7) for some hints). To see a full diff, run
3887 if (!$changesfile) {
3888 my $pat = changespat $cversion;
3889 my @cs = glob "$buildproductsdir/$pat";
3890 fail "failed to find unique changes file".
3891 " (looked for $pat in $buildproductsdir);".
3892 " perhaps you need to use dgit -C"
3894 ($changesfile) = @cs;
3896 $changesfile = "$buildproductsdir/$changesfile";
3899 # Check that changes and .dsc agree enough
3900 $changesfile =~ m{[^/]*$};
3901 my $changes = parsecontrol($changesfile,$&);
3902 files_compare_inputs($dsc, $changes)
3903 unless forceing [qw(dsc-changes-mismatch)];
3905 # Perhaps adjust .dsc to contain right set of origs
3906 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3908 unless forceing [qw(changes-origs-exactly)];
3910 # Checks complete, we're going to try and go ahead:
3912 responder_send_file('changes',$changesfile);
3913 responder_send_command("param head $dgithead");
3914 responder_send_command("param csuite $csuite");
3915 responder_send_command("param tagformat $tagformat");
3916 if (defined $maintviewhead) {
3917 die unless ($protovsn//4) >= 4;
3918 responder_send_command("param maint-view $maintviewhead");
3921 if (deliberately_not_fast_forward) {
3922 git_for_each_ref(lrfetchrefs, sub {
3923 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3924 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3925 responder_send_command("previously $rrefname=$objid");
3926 $previously{$rrefname} = $objid;
3930 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3934 supplementary_message(<<'END');
3935 Push failed, while signing the tag.
3936 You can retry the push, after fixing the problem, if you like.
3938 # If we manage to sign but fail to record it anywhere, it's fine.
3939 if ($we_are_responder) {
3940 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3941 responder_receive_files('signed-tag', @tagobjfns);
3943 @tagobjfns = push_mktags($clogp,$dscpath,
3944 $changesfile,$changesfile,
3947 supplementary_message(<<'END');
3948 Push failed, *after* signing the tag.
3949 If you want to try again, you should use a new version number.
3952 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3954 foreach my $tw (@tagwants) {
3955 my $tag = $tw->{Tag};
3956 my $tagobjfn = $tw->{TagObjFn};
3958 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3959 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3960 runcmd_ordryrun_local
3961 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3964 supplementary_message(<<'END');
3965 Push failed, while updating the remote git repository - see messages above.
3966 If you want to try again, you should use a new version number.
3968 if (!check_for_git()) {
3969 create_remote_git_repo();
3972 my @pushrefs = $forceflag.$dgithead.":".rrref();
3973 foreach my $tw (@tagwants) {
3974 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3977 runcmd_ordryrun @git,
3978 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3979 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3981 supplementary_message(<<'END');
3982 Push failed, after updating the remote git repository.
3983 If you want to try again, you must use a new version number.
3985 if ($we_are_responder) {
3986 my $dryrunsuffix = act_local() ? "" : ".tmp";
3987 responder_receive_files('signed-dsc-changes',
3988 "$dscpath$dryrunsuffix",
3989 "$changesfile$dryrunsuffix");
3992 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3994 progress "[new .dsc left in $dscpath.tmp]";
3996 sign_changes $changesfile;
3999 supplementary_message(<<END);
4000 Push failed, while uploading package(s) to the archive server.
4001 You can retry the upload of exactly these same files with dput of:
4003 If that .changes file is broken, you will need to use a new version
4004 number for your next attempt at the upload.
4006 my $host = access_cfg('upload-host','RETURN-UNDEF');
4007 my @hostarg = defined($host) ? ($host,) : ();
4008 runcmd_ordryrun @dput, @hostarg, $changesfile;
4009 printdone "pushed and uploaded $cversion";
4011 supplementary_message('');
4012 responder_send_command("complete");
4019 badusage "-p is not allowed with clone; specify as argument instead"
4020 if defined $package;
4023 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4024 ($package,$isuite) = @ARGV;
4025 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4026 ($package,$dstdir) = @ARGV;
4027 } elsif (@ARGV==3) {
4028 ($package,$isuite,$dstdir) = @ARGV;
4030 badusage "incorrect arguments to dgit clone";
4032 $dstdir ||= "$package";
4034 if (stat_exists $dstdir) {
4035 fail "$dstdir already exists";
4039 if ($rmonerror && !$dryrun_level) {
4040 $cwd_remove= getcwd();
4042 return unless defined $cwd_remove;
4043 if (!chdir "$cwd_remove") {
4044 return if $!==&ENOENT;
4045 die "chdir $cwd_remove: $!";
4047 printdebug "clone rmonerror removing $dstdir\n";
4049 rmtree($dstdir) or die "remove $dstdir: $!\n";
4050 } elsif (grep { $! == $_ }
4051 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4053 print STDERR "check whether to remove $dstdir: $!\n";
4059 $cwd_remove = undef;
4062 sub branchsuite () {
4063 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4064 if ($branch =~ m#$lbranch_re#o) {
4071 sub fetchpullargs () {
4073 if (!defined $package) {
4074 my $sourcep = parsecontrol('debian/control','debian/control');
4075 $package = getfield $sourcep, 'Source';
4078 $isuite = branchsuite();
4080 my $clogp = parsechangelog();
4081 $isuite = getfield $clogp, 'Distribution';
4083 } elsif (@ARGV==1) {
4086 badusage "incorrect arguments to dgit fetch or dgit pull";
4093 my $multi_fetched = fork_for_multisuite(sub { });
4094 exit 0 if $multi_fetched;
4101 if (quiltmode_splitbrain()) {
4102 my ($format, $fopts) = get_source_format();
4103 madformat($format) and fail <<END
4104 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4113 badusage "-p is not allowed with dgit push" if defined $package;
4115 my $clogp = parsechangelog();
4116 $package = getfield $clogp, 'Source';
4119 } elsif (@ARGV==1) {
4120 ($specsuite) = (@ARGV);
4122 badusage "incorrect arguments to dgit push";
4124 $isuite = getfield $clogp, 'Distribution';
4126 local ($package) = $existing_package; # this is a hack
4127 canonicalise_suite();
4129 canonicalise_suite();
4131 if (defined $specsuite &&
4132 $specsuite ne $isuite &&
4133 $specsuite ne $csuite) {
4134 fail "dgit push: changelog specifies $isuite ($csuite)".
4135 " but command line specifies $specsuite";
4140 #---------- remote commands' implementation ----------
4142 sub cmd_remote_push_build_host {
4143 my ($nrargs) = shift @ARGV;
4144 my (@rargs) = @ARGV[0..$nrargs-1];
4145 @ARGV = @ARGV[$nrargs..$#ARGV];
4147 my ($dir,$vsnwant) = @rargs;
4148 # vsnwant is a comma-separated list; we report which we have
4149 # chosen in our ready response (so other end can tell if they
4152 $we_are_responder = 1;
4153 $us .= " (build host)";
4157 open PI, "<&STDIN" or die $!;
4158 open STDIN, "/dev/null" or die $!;
4159 open PO, ">&STDOUT" or die $!;
4161 open STDOUT, ">&STDERR" or die $!;
4165 ($protovsn) = grep {
4166 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4167 } @rpushprotovsn_support;
4169 fail "build host has dgit rpush protocol versions ".
4170 (join ",", @rpushprotovsn_support).
4171 " but invocation host has $vsnwant"
4172 unless defined $protovsn;
4174 responder_send_command("dgit-remote-push-ready $protovsn");
4175 rpush_handle_protovsn_bothends();
4180 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4181 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4182 # a good error message)
4184 sub rpush_handle_protovsn_bothends () {
4185 if ($protovsn < 4) {
4186 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4195 my $report = i_child_report();
4196 if (defined $report) {
4197 printdebug "($report)\n";
4198 } elsif ($i_child_pid) {
4199 printdebug "(killing build host child $i_child_pid)\n";
4200 kill 15, $i_child_pid;
4202 if (defined $i_tmp && !defined $initiator_tempdir) {
4204 eval { rmtree $i_tmp; };
4208 END { i_cleanup(); }
4211 my ($base,$selector,@args) = @_;
4212 $selector =~ s/\-/_/g;
4213 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4220 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4228 push @rargs, join ",", @rpushprotovsn_support;
4231 push @rdgit, @ropts;
4232 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4234 my @cmd = (@ssh, $host, shellquote @rdgit);
4237 if (defined $initiator_tempdir) {
4238 rmtree $initiator_tempdir;
4239 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4240 $i_tmp = $initiator_tempdir;
4244 $i_child_pid = open2(\*RO, \*RI, @cmd);
4246 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4247 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4248 $supplementary_message = '' unless $protovsn >= 3;
4250 fail "rpush negotiated protocol version $protovsn".
4251 " which does not support quilt mode $quilt_mode"
4252 if quiltmode_splitbrain;
4254 rpush_handle_protovsn_bothends();
4256 my ($icmd,$iargs) = initiator_expect {
4257 m/^(\S+)(?: (.*))?$/;
4260 i_method "i_resp", $icmd, $iargs;
4264 sub i_resp_progress ($) {
4266 my $msg = protocol_read_bytes \*RO, $rhs;
4270 sub i_resp_supplementary_message ($) {
4272 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4275 sub i_resp_complete {
4276 my $pid = $i_child_pid;
4277 $i_child_pid = undef; # prevents killing some other process with same pid
4278 printdebug "waiting for build host child $pid...\n";
4279 my $got = waitpid $pid, 0;
4280 die $! unless $got == $pid;
4281 die "build host child failed $?" if $?;
4284 printdebug "all done\n";
4288 sub i_resp_file ($) {
4290 my $localname = i_method "i_localname", $keyword;
4291 my $localpath = "$i_tmp/$localname";
4292 stat_exists $localpath and
4293 badproto \*RO, "file $keyword ($localpath) twice";
4294 protocol_receive_file \*RO, $localpath;
4295 i_method "i_file", $keyword;
4300 sub i_resp_param ($) {
4301 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4305 sub i_resp_previously ($) {
4306 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4307 or badproto \*RO, "bad previously spec";
4308 my $r = system qw(git check-ref-format), $1;
4309 die "bad previously ref spec ($r)" if $r;
4310 $previously{$1} = $2;
4315 sub i_resp_want ($) {
4317 die "$keyword ?" if $i_wanted{$keyword}++;
4318 my @localpaths = i_method "i_want", $keyword;
4319 printdebug "[[ $keyword @localpaths\n";
4320 foreach my $localpath (@localpaths) {
4321 protocol_send_file \*RI, $localpath;
4323 print RI "files-end\n" or die $!;
4326 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4328 sub i_localname_parsed_changelog {
4329 return "remote-changelog.822";
4331 sub i_file_parsed_changelog {
4332 ($i_clogp, $i_version, $i_dscfn) =
4333 push_parse_changelog "$i_tmp/remote-changelog.822";
4334 die if $i_dscfn =~ m#/|^\W#;
4337 sub i_localname_dsc {
4338 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4343 sub i_localname_changes {
4344 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4345 $i_changesfn = $i_dscfn;
4346 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4347 return $i_changesfn;
4349 sub i_file_changes { }
4351 sub i_want_signed_tag {
4352 printdebug Dumper(\%i_param, $i_dscfn);
4353 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4354 && defined $i_param{'csuite'}
4355 or badproto \*RO, "premature desire for signed-tag";
4356 my $head = $i_param{'head'};
4357 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4359 my $maintview = $i_param{'maint-view'};
4360 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4363 if ($protovsn >= 4) {
4364 my $p = $i_param{'tagformat'} // '<undef>';
4366 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4369 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4371 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4373 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4376 push_mktags $i_clogp, $i_dscfn,
4377 $i_changesfn, 'remote changes',
4381 sub i_want_signed_dsc_changes {
4382 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4383 sign_changes $i_changesfn;
4384 return ($i_dscfn, $i_changesfn);
4387 #---------- building etc. ----------
4393 #----- `3.0 (quilt)' handling -----
4395 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4397 sub quiltify_dpkg_commit ($$$;$) {
4398 my ($patchname,$author,$msg, $xinfo) = @_;
4402 my $descfn = ".git/dgit/quilt-description.tmp";
4403 open O, '>', $descfn or die "$descfn: $!";
4404 $msg =~ s/\n+/\n\n/;
4405 print O <<END or die $!;
4407 ${xinfo}Subject: $msg
4414 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4415 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4416 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4417 runcmd @dpkgsource, qw(--commit .), $patchname;
4421 sub quiltify_trees_differ ($$;$$$) {
4422 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4423 # returns true iff the two tree objects differ other than in debian/
4424 # with $finegrained,
4425 # returns bitmask 01 - differ in upstream files except .gitignore
4426 # 02 - differ in .gitignore
4427 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4428 # is set for each modified .gitignore filename $fn
4429 # if $unrepres is defined, array ref to which is appeneded
4430 # a list of unrepresentable changes (removals of upstream files
4433 my @cmd = (@git, qw(diff-tree -z));
4434 push @cmd, qw(--name-only) unless $unrepres;
4435 push @cmd, qw(-r) if $finegrained || $unrepres;
4437 my $diffs= cmdoutput @cmd;
4440 foreach my $f (split /\0/, $diffs) {
4441 if ($unrepres && !@lmodes) {
4442 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4445 my ($oldmode,$newmode) = @lmodes;
4448 next if $f =~ m#^debian(?:/.*)?$#s;
4452 die "deleted\n" unless $newmode =~ m/[^0]/;
4453 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4454 if ($oldmode =~ m/[^0]/) {
4455 die "mode changed\n" if $oldmode ne $newmode;
4457 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4461 local $/="\n"; chomp $@;
4462 push @$unrepres, [ $f, $@ ];
4466 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4467 $r |= $isignore ? 02 : 01;
4468 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4470 printdebug "quiltify_trees_differ $x $y => $r\n";
4474 sub quiltify_tree_sentinelfiles ($) {
4475 # lists the `sentinel' files present in the tree
4477 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4478 qw(-- debian/rules debian/control);
4483 sub quiltify_splitbrain_needed () {
4484 if (!$split_brain) {
4485 progress "dgit view: changes are required...";
4486 runcmd @git, qw(checkout -q -b dgit-view);
4491 sub quiltify_splitbrain ($$$$$$) {
4492 my ($clogp, $unapplied, $headref, $diffbits,
4493 $editedignores, $cachekey) = @_;
4494 if ($quilt_mode !~ m/gbp|dpm/) {
4495 # treat .gitignore just like any other upstream file
4496 $diffbits = { %$diffbits };
4497 $_ = !!$_ foreach values %$diffbits;
4499 # We would like any commits we generate to be reproducible
4500 my @authline = clogp_authline($clogp);
4501 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4502 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4503 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4504 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4505 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4506 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4508 if ($quilt_mode =~ m/gbp|unapplied/ &&
4509 ($diffbits->{O2H} & 01)) {
4511 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4512 " but git tree differs from orig in upstream files.";
4513 if (!stat_exists "debian/patches") {
4515 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4519 if ($quilt_mode =~ m/dpm/ &&
4520 ($diffbits->{H2A} & 01)) {
4522 --quilt=$quilt_mode specified, implying patches-applied git tree
4523 but git tree differs from result of applying debian/patches to upstream
4526 if ($quilt_mode =~ m/gbp|unapplied/ &&
4527 ($diffbits->{O2A} & 01)) { # some patches
4528 quiltify_splitbrain_needed();
4529 progress "dgit view: creating patches-applied version using gbp pq";
4530 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4531 # gbp pq import creates a fresh branch; push back to dgit-view
4532 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4533 runcmd @git, qw(checkout -q dgit-view);
4535 if ($quilt_mode =~ m/gbp|dpm/ &&
4536 ($diffbits->{O2A} & 02)) {
4538 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4539 tool which does not create patches for changes to upstream
4540 .gitignores: but, such patches exist in debian/patches.
4543 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4544 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4545 quiltify_splitbrain_needed();
4546 progress "dgit view: creating patch to represent .gitignore changes";
4547 ensuredir "debian/patches";
4548 my $gipatch = "debian/patches/auto-gitignore";
4549 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4550 stat GIPATCH or die "$gipatch: $!";
4551 fail "$gipatch already exists; but want to create it".
4552 " to record .gitignore changes" if (stat _)[7];
4553 print GIPATCH <<END or die "$gipatch: $!";
4554 Subject: Update .gitignore from Debian packaging branch
4556 The Debian packaging git branch contains these updates to the upstream
4557 .gitignore file(s). This patch is autogenerated, to provide these
4558 updates to users of the official Debian archive view of the package.
4560 [dgit ($our_version) update-gitignore]
4563 close GIPATCH or die "$gipatch: $!";
4564 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4565 $unapplied, $headref, "--", sort keys %$editedignores;
4566 open SERIES, "+>>", "debian/patches/series" or die $!;
4567 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4569 defined read SERIES, $newline, 1 or die $!;
4570 print SERIES "\n" or die $! unless $newline eq "\n";
4571 print SERIES "auto-gitignore\n" or die $!;
4572 close SERIES or die $!;
4573 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4575 Commit patch to update .gitignore
4577 [dgit ($our_version) update-gitignore-quilt-fixup]
4581 my $dgitview = git_rev_parse 'HEAD';
4583 changedir '../../../..';
4584 # When we no longer need to support squeeze, use --create-reflog
4586 ensuredir ".git/logs/refs/dgit-intern";
4587 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4590 my $oldcache = git_get_ref "refs/$splitbraincache";
4591 if ($oldcache eq $dgitview) {
4592 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4593 # git update-ref doesn't always update, in this case. *sigh*
4594 my $dummy = make_commit_text <<END;
4597 author Dgit <dgit\@example.com> 1000000000 +0000
4598 committer Dgit <dgit\@example.com> 1000000000 +0000
4600 Dummy commit - do not use
4602 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4603 "refs/$splitbraincache", $dummy;
4605 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4608 changedir '.git/dgit/unpack/work';
4610 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4611 progress "dgit view: created ($saved)";
4614 sub quiltify ($$$$) {
4615 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4617 # Quilt patchification algorithm
4619 # We search backwards through the history of the main tree's HEAD
4620 # (T) looking for a start commit S whose tree object is identical
4621 # to to the patch tip tree (ie the tree corresponding to the
4622 # current dpkg-committed patch series). For these purposes
4623 # `identical' disregards anything in debian/ - this wrinkle is
4624 # necessary because dpkg-source treates debian/ specially.
4626 # We can only traverse edges where at most one of the ancestors'
4627 # trees differs (in changes outside in debian/). And we cannot
4628 # handle edges which change .pc/ or debian/patches. To avoid
4629 # going down a rathole we avoid traversing edges which introduce
4630 # debian/rules or debian/control. And we set a limit on the
4631 # number of edges we are willing to look at.
4633 # If we succeed, we walk forwards again. For each traversed edge
4634 # PC (with P parent, C child) (starting with P=S and ending with
4635 # C=T) to we do this:
4637 # - dpkg-source --commit with a patch name and message derived from C
4638 # After traversing PT, we git commit the changes which
4639 # should be contained within debian/patches.
4641 # The search for the path S..T is breadth-first. We maintain a
4642 # todo list containing search nodes. A search node identifies a
4643 # commit, and looks something like this:
4645 # Commit => $git_commit_id,
4646 # Child => $c, # or undef if P=T
4647 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4648 # Nontrivial => true iff $p..$c has relevant changes
4655 my %considered; # saves being exponential on some weird graphs
4657 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4660 my ($search,$whynot) = @_;
4661 printdebug " search NOT $search->{Commit} $whynot\n";
4662 $search->{Whynot} = $whynot;
4663 push @nots, $search;
4664 no warnings qw(exiting);
4673 my $c = shift @todo;
4674 next if $considered{$c->{Commit}}++;
4676 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4678 printdebug "quiltify investigate $c->{Commit}\n";
4681 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4682 printdebug " search finished hooray!\n";
4687 if ($quilt_mode eq 'nofix') {
4688 fail "quilt fixup required but quilt mode is \`nofix'\n".
4689 "HEAD commit $c->{Commit} differs from tree implied by ".
4690 " debian/patches (tree object $oldtiptree)";
4692 if ($quilt_mode eq 'smash') {
4693 printdebug " search quitting smash\n";
4697 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4698 $not->($c, "has $c_sentinels not $t_sentinels")
4699 if $c_sentinels ne $t_sentinels;
4701 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4702 $commitdata =~ m/\n\n/;
4704 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4705 @parents = map { { Commit => $_, Child => $c } } @parents;
4707 $not->($c, "root commit") if !@parents;
4709 foreach my $p (@parents) {
4710 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4712 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4713 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4715 foreach my $p (@parents) {
4716 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4718 my @cmd= (@git, qw(diff-tree -r --name-only),
4719 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4720 my $patchstackchange = cmdoutput @cmd;
4721 if (length $patchstackchange) {
4722 $patchstackchange =~ s/\n/,/g;
4723 $not->($p, "changed $patchstackchange");
4726 printdebug " search queue P=$p->{Commit} ",
4727 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4733 printdebug "quiltify want to smash\n";
4736 my $x = $_[0]{Commit};
4737 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4740 my $reportnot = sub {
4742 my $s = $abbrev->($notp);
4743 my $c = $notp->{Child};
4744 $s .= "..".$abbrev->($c) if $c;
4745 $s .= ": ".$notp->{Whynot};
4748 if ($quilt_mode eq 'linear') {
4749 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4750 foreach my $notp (@nots) {
4751 print STDERR "$us: ", $reportnot->($notp), "\n";
4753 print STDERR "$us: $_\n" foreach @$failsuggestion;
4754 fail "quilt fixup naive history linearisation failed.\n".
4755 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4756 } elsif ($quilt_mode eq 'smash') {
4757 } elsif ($quilt_mode eq 'auto') {
4758 progress "quilt fixup cannot be linear, smashing...";
4760 die "$quilt_mode ?";
4763 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4764 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4766 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4768 quiltify_dpkg_commit "auto-$version-$target-$time",
4769 (getfield $clogp, 'Maintainer'),
4770 "Automatically generated patch ($clogp->{Version})\n".
4771 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4775 progress "quiltify linearisation planning successful, executing...";
4777 for (my $p = $sref_S;
4778 my $c = $p->{Child};
4780 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4781 next unless $p->{Nontrivial};
4783 my $cc = $c->{Commit};
4785 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4786 $commitdata =~ m/\n\n/ or die "$c ?";
4789 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4792 my $commitdate = cmdoutput
4793 @git, qw(log -n1 --pretty=format:%aD), $cc;
4795 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4797 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4804 my $gbp_check_suitable = sub {
4809 die "contains unexpected slashes\n" if m{//} || m{/$};
4810 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4811 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4812 die "too long" if length > 200;
4814 return $_ unless $@;
4815 print STDERR "quiltifying commit $cc:".
4816 " ignoring/dropping Gbp-Pq $what: $@";
4820 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4822 (\S+) \s* \n //ixm) {
4823 $patchname = $gbp_check_suitable->($1, 'Name');
4825 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4827 (\S+) \s* \n //ixm) {
4828 $patchdir = $gbp_check_suitable->($1, 'Topic');
4833 if (!defined $patchname) {
4834 $patchname = $title;
4835 $patchname =~ s/[.:]$//;
4838 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4839 my $translitname = $converter->convert($patchname);
4840 die unless defined $translitname;
4841 $patchname = $translitname;
4844 "dgit: patch title transliteration error: $@"
4846 $patchname =~ y/ A-Z/-a-z/;
4847 $patchname =~ y/-a-z0-9_.+=~//cd;
4848 $patchname =~ s/^\W/x-$&/;
4849 $patchname = substr($patchname,0,40);
4851 if (!defined $patchdir) {
4854 if (length $patchdir) {
4855 $patchname = "$patchdir/$patchname";
4857 if ($patchname =~ m{^(.*)/}) {
4858 mkpath "debian/patches/$1";
4863 stat "debian/patches/$patchname$index";
4865 $!==ENOENT or die "$patchname$index $!";
4867 runcmd @git, qw(checkout -q), $cc;
4869 # We use the tip's changelog so that dpkg-source doesn't
4870 # produce complaining messages from dpkg-parsechangelog. None
4871 # of the information dpkg-source gets from the changelog is
4872 # actually relevant - it gets put into the original message
4873 # which dpkg-source provides our stunt editor, and then
4875 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4877 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4878 "Date: $commitdate\n".
4879 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4881 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4884 runcmd @git, qw(checkout -q master);
4887 sub build_maybe_quilt_fixup () {
4888 my ($format,$fopts) = get_source_format;
4889 return unless madformat_wantfixup $format;
4892 check_for_vendor_patches();
4894 if (quiltmode_splitbrain) {
4895 foreach my $needtf (qw(new maint)) {
4896 next if grep { $_ eq $needtf } access_cfg_tagformats;
4898 quilt mode $quilt_mode requires split view so server needs to support
4899 both "new" and "maint" tag formats, but config says it doesn't.
4904 my $clogp = parsechangelog();
4905 my $headref = git_rev_parse('HEAD');
4910 my $upstreamversion = upstreamversion $version;
4912 if ($fopts->{'single-debian-patch'}) {
4913 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4915 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4918 die 'bug' if $split_brain && !$need_split_build_invocation;
4920 changedir '../../../..';
4921 runcmd_ordryrun_local
4922 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4925 sub quilt_fixup_mkwork ($) {
4928 mkdir "work" or die $!;
4930 mktree_in_ud_here();
4931 runcmd @git, qw(reset -q --hard), $headref;
4934 sub quilt_fixup_linkorigs ($$) {
4935 my ($upstreamversion, $fn) = @_;
4936 # calls $fn->($leafname);
4938 foreach my $f (<../../../../*>) { #/){
4939 my $b=$f; $b =~ s{.*/}{};
4941 local ($debuglevel) = $debuglevel-1;
4942 printdebug "QF linkorigs $b, $f ?\n";
4944 next unless is_orig_file_of_vsn $b, $upstreamversion;
4945 printdebug "QF linkorigs $b, $f Y\n";
4946 link_ltarget $f, $b or die "$b $!";
4951 sub quilt_fixup_delete_pc () {
4952 runcmd @git, qw(rm -rqf .pc);
4954 Commit removal of .pc (quilt series tracking data)
4956 [dgit ($our_version) upgrade quilt-remove-pc]
4960 sub quilt_fixup_singlepatch ($$$) {
4961 my ($clogp, $headref, $upstreamversion) = @_;
4963 progress "starting quiltify (single-debian-patch)";
4965 # dpkg-source --commit generates new patches even if
4966 # single-debian-patch is in debian/source/options. In order to
4967 # get it to generate debian/patches/debian-changes, it is
4968 # necessary to build the source package.
4970 quilt_fixup_linkorigs($upstreamversion, sub { });
4971 quilt_fixup_mkwork($headref);
4973 rmtree("debian/patches");
4975 runcmd @dpkgsource, qw(-b .);
4977 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4978 rename srcfn("$upstreamversion", "/debian/patches"),
4979 "work/debian/patches";
4982 commit_quilty_patch();
4985 sub quilt_make_fake_dsc ($) {
4986 my ($upstreamversion) = @_;
4988 my $fakeversion="$upstreamversion-~~DGITFAKE";
4990 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4991 print $fakedsc <<END or die $!;
4994 Version: $fakeversion
4998 my $dscaddfile=sub {
5001 my $md = new Digest::MD5;
5003 my $fh = new IO::File $b, '<' or die "$b $!";
5008 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5011 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5013 my @files=qw(debian/source/format debian/rules
5014 debian/control debian/changelog);
5015 foreach my $maybe (qw(debian/patches debian/source/options
5016 debian/tests/control)) {
5017 next unless stat_exists "../../../$maybe";
5018 push @files, $maybe;
5021 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5022 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5024 $dscaddfile->($debtar);
5025 close $fakedsc or die $!;
5028 sub quilt_check_splitbrain_cache ($$) {
5029 my ($headref, $upstreamversion) = @_;
5030 # Called only if we are in (potentially) split brain mode.
5032 # Computes the cache key and looks in the cache.
5033 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5035 my $splitbrain_cachekey;
5038 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5039 # we look in the reflog of dgit-intern/quilt-cache
5040 # we look for an entry whose message is the key for the cache lookup
5041 my @cachekey = (qw(dgit), $our_version);
5042 push @cachekey, $upstreamversion;
5043 push @cachekey, $quilt_mode;
5044 push @cachekey, $headref;
5046 push @cachekey, hashfile('fake.dsc');
5048 my $srcshash = Digest::SHA->new(256);
5049 my %sfs = ( %INC, '$0(dgit)' => $0 );
5050 foreach my $sfk (sort keys %sfs) {
5051 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5052 $srcshash->add($sfk," ");
5053 $srcshash->add(hashfile($sfs{$sfk}));
5054 $srcshash->add("\n");
5056 push @cachekey, $srcshash->hexdigest();
5057 $splitbrain_cachekey = "@cachekey";
5059 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5061 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5062 debugcmd "|(probably)",@cmd;
5063 my $child = open GC, "-|"; defined $child or die $!;
5065 chdir '../../..' or die $!;
5066 if (!stat ".git/logs/refs/$splitbraincache") {
5067 $! == ENOENT or die $!;
5068 printdebug ">(no reflog)\n";
5075 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5076 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5079 quilt_fixup_mkwork($headref);
5080 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5081 if ($cachehit ne $headref) {
5082 progress "dgit view: found cached ($saved)";
5083 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5085 return ($cachehit, $splitbrain_cachekey);
5087 progress "dgit view: found cached, no changes required";
5088 return ($headref, $splitbrain_cachekey);
5090 die $! if GC->error;
5091 failedcmd unless close GC;
5093 printdebug "splitbrain cache miss\n";
5094 return (undef, $splitbrain_cachekey);
5097 sub quilt_fixup_multipatch ($$$) {
5098 my ($clogp, $headref, $upstreamversion) = @_;
5100 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5103 # - honour any existing .pc in case it has any strangeness
5104 # - determine the git commit corresponding to the tip of
5105 # the patch stack (if there is one)
5106 # - if there is such a git commit, convert each subsequent
5107 # git commit into a quilt patch with dpkg-source --commit
5108 # - otherwise convert all the differences in the tree into
5109 # a single git commit
5113 # Our git tree doesn't necessarily contain .pc. (Some versions of
5114 # dgit would include the .pc in the git tree.) If there isn't
5115 # one, we need to generate one by unpacking the patches that we
5118 # We first look for a .pc in the git tree. If there is one, we
5119 # will use it. (This is not the normal case.)
5121 # Otherwise need to regenerate .pc so that dpkg-source --commit
5122 # can work. We do this as follows:
5123 # 1. Collect all relevant .orig from parent directory
5124 # 2. Generate a debian.tar.gz out of
5125 # debian/{patches,rules,source/format,source/options}
5126 # 3. Generate a fake .dsc containing just these fields:
5127 # Format Source Version Files
5128 # 4. Extract the fake .dsc
5129 # Now the fake .dsc has a .pc directory.
5130 # (In fact we do this in every case, because in future we will
5131 # want to search for a good base commit for generating patches.)
5133 # Then we can actually do the dpkg-source --commit
5134 # 1. Make a new working tree with the same object
5135 # store as our main tree and check out the main
5137 # 2. Copy .pc from the fake's extraction, if necessary
5138 # 3. Run dpkg-source --commit
5139 # 4. If the result has changes to debian/, then
5140 # - git add them them
5141 # - git add .pc if we had a .pc in-tree
5143 # 5. If we had a .pc in-tree, delete it, and git commit
5144 # 6. Back in the main tree, fast forward to the new HEAD
5146 # Another situation we may have to cope with is gbp-style
5147 # patches-unapplied trees.
5149 # We would want to detect these, so we know to escape into
5150 # quilt_fixup_gbp. However, this is in general not possible.
5151 # Consider a package with a one patch which the dgit user reverts
5152 # (with git revert or the moral equivalent).
5154 # That is indistinguishable in contents from a patches-unapplied
5155 # tree. And looking at the history to distinguish them is not
5156 # useful because the user might have made a confusing-looking git
5157 # history structure (which ought to produce an error if dgit can't
5158 # cope, not a silent reintroduction of an unwanted patch).
5160 # So gbp users will have to pass an option. But we can usually
5161 # detect their failure to do so: if the tree is not a clean
5162 # patches-applied tree, quilt linearisation fails, but the tree
5163 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5164 # they want --quilt=unapplied.
5166 # To help detect this, when we are extracting the fake dsc, we
5167 # first extract it with --skip-patches, and then apply the patches
5168 # afterwards with dpkg-source --before-build. That lets us save a
5169 # tree object corresponding to .origs.
5171 my $splitbrain_cachekey;
5173 quilt_make_fake_dsc($upstreamversion);
5175 if (quiltmode_splitbrain()) {
5177 ($cachehit, $splitbrain_cachekey) =
5178 quilt_check_splitbrain_cache($headref, $upstreamversion);
5179 return if $cachehit;
5183 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5185 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5186 rename $fakexdir, "fake" or die "$fakexdir $!";
5190 remove_stray_gits();
5191 mktree_in_ud_here();
5195 runcmd @git, qw(add -Af .);
5196 my $unapplied=git_write_tree();
5197 printdebug "fake orig tree object $unapplied\n";
5201 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5203 if (system @bbcmd) {
5204 failedcmd @bbcmd if $? < 0;
5206 failed to apply your git tree's patch stack (from debian/patches/) to
5207 the corresponding upstream tarball(s). Your source tree and .orig
5208 are probably too inconsistent. dgit can only fix up certain kinds of
5209 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5215 quilt_fixup_mkwork($headref);
5218 if (stat_exists ".pc") {
5220 progress "Tree already contains .pc - will use it then delete it.";
5223 rename '../fake/.pc','.pc' or die $!;
5226 changedir '../fake';
5228 runcmd @git, qw(add -Af .);
5229 my $oldtiptree=git_write_tree();
5230 printdebug "fake o+d/p tree object $unapplied\n";
5231 changedir '../work';
5234 # We calculate some guesswork now about what kind of tree this might
5235 # be. This is mostly for error reporting.
5241 # O = orig, without patches applied
5242 # A = "applied", ie orig with H's debian/patches applied
5243 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5244 \%editedignores, \@unrepres),
5245 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5246 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5250 foreach my $b (qw(01 02)) {
5251 foreach my $v (qw(O2H O2A H2A)) {
5252 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5255 printdebug "differences \@dl @dl.\n";
5258 "$us: base trees orig=%.20s o+d/p=%.20s",
5259 $unapplied, $oldtiptree;
5261 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5262 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5263 $dl[0], $dl[1], $dl[3], $dl[4],
5267 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5269 forceable_fail [qw(unrepresentable)], <<END;
5270 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5275 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5276 push @failsuggestion, "This might be a patches-unapplied branch.";
5277 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5278 push @failsuggestion, "This might be a patches-applied branch.";
5280 push @failsuggestion, "Maybe you need to specify one of".
5281 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5283 if (quiltmode_splitbrain()) {
5284 quiltify_splitbrain($clogp, $unapplied, $headref,
5285 $diffbits, \%editedignores,
5286 $splitbrain_cachekey);
5290 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5291 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5293 if (!open P, '>>', ".pc/applied-patches") {
5294 $!==&ENOENT or die $!;
5299 commit_quilty_patch();
5301 if ($mustdeletepc) {
5302 quilt_fixup_delete_pc();
5306 sub quilt_fixup_editor () {
5307 my $descfn = $ENV{$fakeeditorenv};
5308 my $editing = $ARGV[$#ARGV];
5309 open I1, '<', $descfn or die "$descfn: $!";
5310 open I2, '<', $editing or die "$editing: $!";
5311 unlink $editing or die "$editing: $!";
5312 open O, '>', $editing or die "$editing: $!";
5313 while (<I1>) { print O or die $!; } I1->error and die $!;
5316 $copying ||= m/^\-\-\- /;
5317 next unless $copying;
5320 I2->error and die $!;
5325 sub maybe_apply_patches_dirtily () {
5326 return unless $quilt_mode =~ m/gbp|unapplied/;
5327 print STDERR <<END or die $!;
5329 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5330 dgit: Have to apply the patches - making the tree dirty.
5331 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5334 $patches_applied_dirtily = 01;
5335 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5336 runcmd qw(dpkg-source --before-build .);
5339 sub maybe_unapply_patches_again () {
5340 progress "dgit: Unapplying patches again to tidy up the tree."
5341 if $patches_applied_dirtily;
5342 runcmd qw(dpkg-source --after-build .)
5343 if $patches_applied_dirtily & 01;
5345 if $patches_applied_dirtily & 02;
5346 $patches_applied_dirtily = 0;
5349 #----- other building -----
5351 our $clean_using_builder;
5352 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5353 # clean the tree before building (perhaps invoked indirectly by
5354 # whatever we are using to run the build), rather than separately
5355 # and explicitly by us.
5358 return if $clean_using_builder;
5359 if ($cleanmode eq 'dpkg-source') {
5360 maybe_apply_patches_dirtily();
5361 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5362 } elsif ($cleanmode eq 'dpkg-source-d') {
5363 maybe_apply_patches_dirtily();
5364 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5365 } elsif ($cleanmode eq 'git') {
5366 runcmd_ordryrun_local @git, qw(clean -xdf);
5367 } elsif ($cleanmode eq 'git-ff') {
5368 runcmd_ordryrun_local @git, qw(clean -xdff);
5369 } elsif ($cleanmode eq 'check') {
5370 my $leftovers = cmdoutput @git, qw(clean -xdn);
5371 if (length $leftovers) {
5372 print STDERR $leftovers, "\n" or die $!;
5373 fail "tree contains uncommitted files and --clean=check specified";
5375 } elsif ($cleanmode eq 'none') {
5382 badusage "clean takes no additional arguments" if @ARGV;
5385 maybe_unapply_patches_again();
5388 sub build_prep_early () {
5389 our $build_prep_early_done //= 0;
5390 return if $build_prep_early_done++;
5392 badusage "-p is not allowed when building" if defined $package;
5393 my $clogp = parsechangelog();
5394 $isuite = getfield $clogp, 'Distribution';
5395 $package = getfield $clogp, 'Source';
5396 $version = getfield $clogp, 'Version';
5403 build_maybe_quilt_fixup();
5405 my $pat = changespat $version;
5406 foreach my $f (glob "$buildproductsdir/$pat") {
5408 unlink $f or fail "remove old changes file $f: $!";
5410 progress "would remove $f";
5416 sub changesopts_initial () {
5417 my @opts =@changesopts[1..$#changesopts];
5420 sub changesopts_version () {
5421 if (!defined $changes_since_version) {
5422 my @vsns = archive_query('archive_query');
5423 my @quirk = access_quirk();
5424 if ($quirk[0] eq 'backports') {
5425 local $isuite = $quirk[2];
5427 canonicalise_suite();
5428 push @vsns, archive_query('archive_query');
5431 @vsns = map { $_->[0] } @vsns;
5432 @vsns = sort { -version_compare($a, $b) } @vsns;
5433 $changes_since_version = $vsns[0];
5434 progress "changelog will contain changes since $vsns[0]";
5436 $changes_since_version = '_';
5437 progress "package seems new, not specifying -v<version>";
5440 if ($changes_since_version ne '_') {
5441 return ("-v$changes_since_version");
5447 sub changesopts () {
5448 return (changesopts_initial(), changesopts_version());
5451 sub massage_dbp_args ($;$) {
5452 my ($cmd,$xargs) = @_;
5455 # - if we're going to split the source build out so we can
5456 # do strange things to it, massage the arguments to dpkg-buildpackage
5457 # so that the main build doessn't build source (or add an argument
5458 # to stop it building source by default).
5460 # - add -nc to stop dpkg-source cleaning the source tree,
5461 # unless we're not doing a split build and want dpkg-source
5462 # as cleanmode, in which case we can do nothing
5465 # 0 - source will NOT need to be built separately by caller
5466 # +1 - source will need to be built separately by caller
5467 # +2 - source will need to be built separately by caller AND
5468 # dpkg-buildpackage should not in fact be run at all!
5469 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5470 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5471 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5472 $clean_using_builder = 1;
5475 # -nc has the side effect of specifying -b if nothing else specified
5476 # and some combinations of -S, -b, et al, are errors, rather than
5477 # later simply overriding earlie. So we need to:
5478 # - search the command line for these options
5479 # - pick the last one
5480 # - perhaps add our own as a default
5481 # - perhaps adjust it to the corresponding non-source-building version
5483 foreach my $l ($cmd, $xargs) {
5485 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5488 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5490 if ($need_split_build_invocation) {
5491 printdebug "massage split $dmode.\n";
5492 $r = $dmode =~ m/[S]/ ? +2 :
5493 $dmode =~ y/gGF/ABb/ ? +1 :
5494 $dmode =~ m/[ABb]/ ? 0 :
5497 printdebug "massage done $r $dmode.\n";
5499 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5505 my $wasdir = must_getcwd();
5511 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5512 my ($msg_if_onlyone) = @_;
5513 # If there is only one .changes file, fail with $msg_if_onlyone,
5514 # or if that is undef, be a no-op.
5515 # Returns the changes file to report to the user.
5516 my $pat = changespat $version;
5517 my @changesfiles = glob $pat;
5518 @changesfiles = sort {
5519 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5523 if (@changesfiles==1) {
5524 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5525 only one changes file from build (@changesfiles)
5527 $result = $changesfiles[0];
5528 } elsif (@changesfiles==2) {
5529 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5530 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5531 fail "$l found in binaries changes file $binchanges"
5534 runcmd_ordryrun_local @mergechanges, @changesfiles;
5535 my $multichanges = changespat $version,'multi';
5537 stat_exists $multichanges or fail "$multichanges: $!";
5538 foreach my $cf (glob $pat) {
5539 next if $cf eq $multichanges;
5540 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5543 $result = $multichanges;
5545 fail "wrong number of different changes files (@changesfiles)";
5547 printdone "build successful, results in $result\n" or die $!;
5550 sub midbuild_checkchanges () {
5551 my $pat = changespat $version;
5552 return if $rmchanges;
5553 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5554 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5556 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5557 Suggest you delete @unwanted.
5562 sub midbuild_checkchanges_vanilla ($) {
5564 midbuild_checkchanges() if $wantsrc == 1;
5567 sub postbuild_mergechanges_vanilla ($) {
5569 if ($wantsrc == 1) {
5571 postbuild_mergechanges(undef);
5574 printdone "build successful\n";
5579 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5580 my $wantsrc = massage_dbp_args \@dbp;
5583 midbuild_checkchanges_vanilla $wantsrc;
5588 push @dbp, changesopts_version();
5589 maybe_apply_patches_dirtily();
5590 runcmd_ordryrun_local @dbp;
5592 maybe_unapply_patches_again();
5593 postbuild_mergechanges_vanilla $wantsrc;
5597 $quilt_mode //= 'gbp';
5603 # gbp can make .origs out of thin air. In my tests it does this
5604 # even for a 1.0 format package, with no origs present. So I
5605 # guess it keys off just the version number. We don't know
5606 # exactly what .origs ought to exist, but let's assume that we
5607 # should run gbp if: the version has an upstream part and the main
5609 my $upstreamversion = upstreamversion $version;
5610 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5611 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5613 if ($gbp_make_orig) {
5615 $cleanmode = 'none'; # don't do it again
5616 $need_split_build_invocation = 1;
5619 my @dbp = @dpkgbuildpackage;
5621 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5623 if (!length $gbp_build[0]) {
5624 if (length executable_on_path('git-buildpackage')) {
5625 $gbp_build[0] = qw(git-buildpackage);
5627 $gbp_build[0] = 'gbp buildpackage';
5630 my @cmd = opts_opt_multi_cmd @gbp_build;
5632 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5634 if ($gbp_make_orig) {
5635 ensuredir '.git/dgit';
5636 my $ok = '.git/dgit/origs-gen-ok';
5637 unlink $ok or $!==&ENOENT or die $!;
5638 my @origs_cmd = @cmd;
5639 push @origs_cmd, qw(--git-cleaner=true);
5640 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5641 push @origs_cmd, @ARGV;
5643 debugcmd @origs_cmd;
5645 do { local $!; stat_exists $ok; }
5646 or failedcmd @origs_cmd;
5648 dryrun_report @origs_cmd;
5654 midbuild_checkchanges_vanilla $wantsrc;
5656 if (!$clean_using_builder) {
5657 push @cmd, '--git-cleaner=true';
5661 maybe_unapply_patches_again();
5663 push @cmd, changesopts();
5664 runcmd_ordryrun_local @cmd, @ARGV;
5666 postbuild_mergechanges_vanilla $wantsrc;
5668 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5671 my $our_cleanmode = $cleanmode;
5672 if ($need_split_build_invocation) {
5673 # Pretend that clean is being done some other way. This
5674 # forces us not to try to use dpkg-buildpackage to clean and
5675 # build source all in one go; and instead we run dpkg-source
5676 # (and build_prep() will do the clean since $clean_using_builder
5678 $our_cleanmode = 'ELSEWHERE';
5680 if ($our_cleanmode =~ m/^dpkg-source/) {
5681 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5682 $clean_using_builder = 1;
5685 $sourcechanges = changespat $version,'source';
5687 unlink "../$sourcechanges" or $!==ENOENT
5688 or fail "remove $sourcechanges: $!";
5690 $dscfn = dscfn($version);
5691 if ($our_cleanmode eq 'dpkg-source') {
5692 maybe_apply_patches_dirtily();
5693 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5695 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5696 maybe_apply_patches_dirtily();
5697 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5700 my @cmd = (@dpkgsource, qw(-b --));
5703 runcmd_ordryrun_local @cmd, "work";
5704 my @udfiles = <${package}_*>;
5705 changedir "../../..";
5706 foreach my $f (@udfiles) {
5707 printdebug "source copy, found $f\n";
5710 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5711 $f eq srcfn($version, $&));
5712 printdebug "source copy, found $f - renaming\n";
5713 rename "$ud/$f", "../$f" or $!==ENOENT
5714 or fail "put in place new source file ($f): $!";
5717 my $pwd = must_getcwd();
5718 my $leafdir = basename $pwd;
5720 runcmd_ordryrun_local @cmd, $leafdir;
5723 runcmd_ordryrun_local qw(sh -ec),
5724 'exec >$1; shift; exec "$@"','x',
5725 "../$sourcechanges",
5726 @dpkggenchanges, qw(-S), changesopts();
5730 sub cmd_build_source {
5731 badusage "build-source takes no additional arguments" if @ARGV;
5733 maybe_unapply_patches_again();
5734 printdone "source built, results in $dscfn and $sourcechanges";
5739 midbuild_checkchanges();
5742 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5743 stat_exists $sourcechanges
5744 or fail "$sourcechanges (in parent directory): $!";
5746 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5748 maybe_unapply_patches_again();
5750 postbuild_mergechanges(<<END);
5751 perhaps you need to pass -A ? (sbuild's default is to build only
5752 arch-specific binaries; dgit 1.4 used to override that.)
5757 sub cmd_quilt_fixup {
5758 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5759 my $clogp = parsechangelog();
5760 $version = getfield $clogp, 'Version';
5761 $package = getfield $clogp, 'Source';
5764 build_maybe_quilt_fixup();
5767 sub cmd_import_dsc {
5771 last unless $ARGV[0] =~ m/^-/;
5774 if (m/^--require-valid-signature$/) {
5777 badusage "unknown dgit import-dsc sub-option \`$_'";
5781 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5782 my ($dscfn, $dstbranch) = @ARGV;
5784 badusage "dry run makes no sense with import-dsc" unless act_local();
5786 my $force = $dstbranch =~ s/^\+// ? +1 :
5787 $dstbranch =~ s/^\.\.// ? -1 :
5789 my $info = $force ? " $&" : '';
5790 $info = "$dscfn$info";
5792 my $specbranch = $dstbranch;
5793 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5794 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5796 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5797 my $chead = cmdoutput_errok @symcmd;
5798 defined $chead or $?==256 or failedcmd @symcmd;
5800 fail "$dstbranch is checked out - will not update it"
5801 if defined $chead and $chead eq $dstbranch;
5803 my $oldhash = git_get_ref $dstbranch;
5805 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5806 $dscdata = do { local $/ = undef; <D>; };
5807 D->error and fail "read $dscfn: $!";
5810 # we don't normally need this so import it here
5811 use Dpkg::Source::Package;
5812 my $dp = new Dpkg::Source::Package filename => $dscfn,
5813 require_valid_signature => $needsig;
5815 local $SIG{__WARN__} = sub {
5817 return unless $needsig;
5818 fail "import-dsc signature check failed";
5820 if (!$dp->is_signed()) {
5821 warn "$us: warning: importing unsigned .dsc\n";
5823 my $r = $dp->check_signature();
5824 die "->check_signature => $r" if $needsig && $r;
5830 my $dgit_commit = $dsc->{$ourdscfield[0]};
5831 if (defined $dgit_commit &&
5832 !forceing [qw(import-dsc-with-dgit-field)]) {
5833 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5834 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5835 my @cmd = (qw(sh -ec),
5836 "echo $dgit_commit | git cat-file --batch-check");
5837 my $objgot = cmdoutput @cmd;
5838 if ($objgot =~ m#^\w+ missing\b#) {
5840 .dsc contains Dgit field referring to object $dgit_commit
5841 Your git tree does not have that object. Try `git fetch' from a
5842 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5845 if ($oldhash && !is_fast_fwd $oldhash, $dgit_commit) {
5847 progress "Not fast forward, forced update.";
5849 fail "Not fast forward to $dgit_commit";
5852 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5853 $dstbranch, $dgit_commit);
5855 progress "dgit: import-dsc updated git ref $dstbranch";
5860 Branch $dstbranch already exists
5861 Specify ..$specbranch for a pseudo-merge, binding in existing history
5862 Specify +$specbranch to overwrite, discarding existing history
5864 if $oldhash && !$force;
5866 $package = getfield $dsc, 'Source';
5867 my @dfi = dsc_files_info();
5868 foreach my $fi (@dfi) {
5869 my $f = $fi->{Filename};
5871 next if lstat $here;
5872 fail "stat $here: $!" unless $! == ENOENT;
5874 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5876 } elsif ($dscfn =~ m#^/#) {
5879 fail "cannot import $dscfn which seems to be inside working tree!";
5881 $there =~ s#/+[^/]+$## or
5882 fail "cannot import $dscfn which seems to not have a basename";
5884 symlink $there, $here or fail "symlink $there to $here: $!";
5885 progress "made symlink $here -> $there";
5886 print STDERR Dumper($fi);
5888 my @mergeinputs = generate_commits_from_dsc();
5889 die unless @mergeinputs == 1;
5891 my $newhash = $mergeinputs[0]{Commit};
5895 progress "Import, forced update - synthetic orphan git history.";
5896 } elsif ($force < 0) {
5897 progress "Import, merging.";
5898 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
5899 my $version = getfield $dsc, 'Version';
5900 $newhash = make_commit_text <<END;
5905 Merge $package ($version) import into $dstbranch
5908 die; # caught earlier
5912 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
5913 $dstbranch, $newhash);
5915 progress "dgit: import-dsc results are in in git ref $dstbranch";
5918 sub cmd_archive_api_query {
5919 badusage "need only 1 subpath argument" unless @ARGV==1;
5920 my ($subpath) = @ARGV;
5921 my @cmd = archive_api_query_cmd($subpath);
5924 exec @cmd or fail "exec curl: $!\n";
5927 sub cmd_clone_dgit_repos_server {
5928 badusage "need destination argument" unless @ARGV==1;
5929 my ($destdir) = @ARGV;
5930 $package = '_dgit-repos-server';
5931 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5933 exec @cmd or fail "exec git clone: $!\n";
5936 sub cmd_setup_mergechangelogs {
5937 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5938 setup_mergechangelogs(1);
5941 sub cmd_setup_useremail {
5942 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5946 sub cmd_setup_new_tree {
5947 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5951 #---------- argument parsing and main program ----------
5954 print "dgit version $our_version\n" or die $!;
5958 our (%valopts_long, %valopts_short);
5961 sub defvalopt ($$$$) {
5962 my ($long,$short,$val_re,$how) = @_;
5963 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5964 $valopts_long{$long} = $oi;
5965 $valopts_short{$short} = $oi;
5966 # $how subref should:
5967 # do whatever assignemnt or thing it likes with $_[0]
5968 # if the option should not be passed on to remote, @rvalopts=()
5969 # or $how can be a scalar ref, meaning simply assign the value
5972 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5973 defvalopt '--distro', '-d', '.+', \$idistro;
5974 defvalopt '', '-k', '.+', \$keyid;
5975 defvalopt '--existing-package','', '.*', \$existing_package;
5976 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5977 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5978 defvalopt '--package', '-p', $package_re, \$package;
5979 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5981 defvalopt '', '-C', '.+', sub {
5982 ($changesfile) = (@_);
5983 if ($changesfile =~ s#^(.*)/##) {
5984 $buildproductsdir = $1;
5988 defvalopt '--initiator-tempdir','','.*', sub {
5989 ($initiator_tempdir) = (@_);
5990 $initiator_tempdir =~ m#^/# or
5991 badusage "--initiator-tempdir must be used specify an".
5992 " absolute, not relative, directory."
5998 if (defined $ENV{'DGIT_SSH'}) {
5999 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6000 } elsif (defined $ENV{'GIT_SSH'}) {
6001 @ssh = ($ENV{'GIT_SSH'});
6009 if (!defined $val) {
6010 badusage "$what needs a value" unless @ARGV;
6012 push @rvalopts, $val;
6014 badusage "bad value \`$val' for $what" unless
6015 $val =~ m/^$oi->{Re}$(?!\n)/s;
6016 my $how = $oi->{How};
6017 if (ref($how) eq 'SCALAR') {
6022 push @ropts, @rvalopts;
6026 last unless $ARGV[0] =~ m/^-/;
6030 if (m/^--dry-run$/) {
6033 } elsif (m/^--damp-run$/) {
6036 } elsif (m/^--no-sign$/) {
6039 } elsif (m/^--help$/) {
6041 } elsif (m/^--version$/) {
6043 } elsif (m/^--new$/) {
6046 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6047 ($om = $opts_opt_map{$1}) &&
6051 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6052 !$opts_opt_cmdonly{$1} &&
6053 ($om = $opts_opt_map{$1})) {
6056 } elsif (m/^--(gbp|dpm)$/s) {
6057 push @ropts, "--quilt=$1";
6059 } elsif (m/^--ignore-dirty$/s) {
6062 } elsif (m/^--no-quilt-fixup$/s) {
6064 $quilt_mode = 'nocheck';
6065 } elsif (m/^--no-rm-on-error$/s) {
6068 } elsif (m/^--overwrite$/s) {
6070 $overwrite_version = '';
6071 } elsif (m/^--overwrite=(.+)$/s) {
6073 $overwrite_version = $1;
6074 } elsif (m/^--delayed=(\d+)$/s) {
6077 } elsif (m/^--dgit-view-save=(.+)$/s) {
6079 $split_brain_save = $1;
6080 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6081 } elsif (m/^--(no-)?rm-old-changes$/s) {
6084 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6086 push @deliberatelies, $&;
6087 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6091 } elsif (m/^--force-/) {
6093 "$us: warning: ignoring unknown force option $_\n";
6095 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6096 # undocumented, for testing
6098 $tagformat_want = [ $1, 'command line', 1 ];
6099 # 1 menas overrides distro configuration
6100 } elsif (m/^--always-split-source-build$/s) {
6101 # undocumented, for testing
6103 $need_split_build_invocation = 1;
6104 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6105 $val = $2 ? $' : undef; #';
6106 $valopt->($oi->{Long});
6108 badusage "unknown long option \`$_'";
6115 } elsif (s/^-L/-/) {
6118 } elsif (s/^-h/-/) {
6120 } elsif (s/^-D/-/) {
6124 } elsif (s/^-N/-/) {
6129 push @changesopts, $_;
6131 } elsif (s/^-wn$//s) {
6133 $cleanmode = 'none';
6134 } elsif (s/^-wg$//s) {
6137 } elsif (s/^-wgf$//s) {
6139 $cleanmode = 'git-ff';
6140 } elsif (s/^-wd$//s) {
6142 $cleanmode = 'dpkg-source';
6143 } elsif (s/^-wdd$//s) {
6145 $cleanmode = 'dpkg-source-d';
6146 } elsif (s/^-wc$//s) {
6148 $cleanmode = 'check';
6149 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6150 push @git, '-c', $&;
6151 $gitcfgs{cmdline}{$1} = [ $2 ];
6152 } elsif (s/^-c([^=]+)$//s) {
6153 push @git, '-c', $&;
6154 $gitcfgs{cmdline}{$1} = [ 'true' ];
6155 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6157 $val = undef unless length $val;
6158 $valopt->($oi->{Short});
6161 badusage "unknown short option \`$_'";
6168 sub check_env_sanity () {
6169 my $blocked = new POSIX::SigSet;
6170 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6173 foreach my $name (qw(PIPE CHLD)) {
6174 my $signame = "SIG$name";
6175 my $signum = eval "POSIX::$signame" // die;
6176 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6177 die "$signame is set to something other than SIG_DFL\n";
6178 $blocked->ismember($signum) and
6179 die "$signame is blocked\n";
6185 On entry to dgit, $@
6186 This is a bug produced by something in in your execution environment.
6192 sub finalise_opts_opts () {
6193 foreach my $k (keys %opts_opt_map) {
6194 my $om = $opts_opt_map{$k};
6196 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6198 badcfg "cannot set command for $k"
6199 unless length $om->[0];
6203 foreach my $c (access_cfg_cfgs("opts-$k")) {
6205 map { $_ ? @$_ : () }
6206 map { $gitcfgs{$_}{$c} }
6207 reverse @gitcfgsources;
6208 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6209 "\n" if $debuglevel >= 4;
6211 badcfg "cannot configure options for $k"
6212 if $opts_opt_cmdonly{$k};
6213 my $insertpos = $opts_cfg_insertpos{$k};
6214 @$om = ( @$om[0..$insertpos-1],
6216 @$om[$insertpos..$#$om] );
6221 if ($ENV{$fakeeditorenv}) {
6223 quilt_fixup_editor();
6230 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6231 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6232 if $dryrun_level == 1;
6234 print STDERR $helpmsg or die $!;
6237 my $cmd = shift @ARGV;
6240 my $pre_fn = ${*::}{"pre_$cmd"};
6241 $pre_fn->() if $pre_fn;
6243 if (!defined $rmchanges) {
6244 local $access_forpush;
6245 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6248 if (!defined $quilt_mode) {
6249 local $access_forpush;
6250 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6251 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6253 $quilt_mode =~ m/^($quilt_modes_re)$/
6254 or badcfg "unknown quilt-mode \`$quilt_mode'";
6258 $need_split_build_invocation ||= quiltmode_splitbrain();
6260 if (!defined $cleanmode) {
6261 local $access_forpush;
6262 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6263 $cleanmode //= 'dpkg-source';
6265 badcfg "unknown clean-mode \`$cleanmode'" unless
6266 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6269 my $fn = ${*::}{"cmd_$cmd"};
6270 $fn or badusage "unknown operation $cmd";