3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::Util qw(any);
38 use List::MoreUtils qw(pairwise);
39 use Text::Glob qw(match_glob);
40 use Fcntl qw(:DEFAULT :flock);
45 our $our_version = 'UNRELEASED'; ###substituted###
46 our $absurdity = undef; ###substituted###
48 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
51 our $isuite = 'unstable';
57 our $dryrun_level = 0;
59 our $buildproductsdir = '..';
65 our $existing_package = 'dpkg';
67 our $changes_since_version;
69 our $overwrite_version; # undef: not specified; '': check changelog
71 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
73 our $dodep14tag_re = 'want|no|always';
74 our $split_brain_save;
75 our $we_are_responder;
76 our $initiator_tempdir;
77 our $patches_applied_dirtily = 00;
82 our %forceopts = map { $_=>0 }
83 qw(unrepresentable unsupported-source-format
84 dsc-changes-mismatch changes-origs-exactly
85 import-gitapply-absurd
86 import-gitapply-no-absurd
87 import-dsc-with-dgit-field);
89 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
91 our $suite_re = '[-+.0-9a-z]+';
92 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
93 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
94 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
95 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
97 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
98 our $splitbraincache = 'dgit-intern/quilt-cache';
100 our (@git) = qw(git);
101 our (@dget) = qw(dget);
102 our (@curl) = qw(curl);
103 our (@dput) = qw(dput);
104 our (@debsign) = qw(debsign);
105 our (@gpg) = qw(gpg);
106 our (@sbuild) = qw(sbuild);
108 our (@dgit) = qw(dgit);
109 our (@aptget) = qw(apt-get);
110 our (@aptcache) = qw(apt-cache);
111 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
112 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
113 our (@dpkggenchanges) = qw(dpkg-genchanges);
114 our (@mergechanges) = qw(mergechanges -f);
115 our (@gbp_build) = ('');
116 our (@gbp_pq) = ('gbp pq');
117 our (@changesopts) = ('');
119 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
122 'debsign' => \@debsign,
124 'sbuild' => \@sbuild,
128 'apt-get' => \@aptget,
129 'apt-cache' => \@aptcache,
130 'dpkg-source' => \@dpkgsource,
131 'dpkg-buildpackage' => \@dpkgbuildpackage,
132 'dpkg-genchanges' => \@dpkggenchanges,
133 'gbp-build' => \@gbp_build,
134 'gbp-pq' => \@gbp_pq,
135 'ch' => \@changesopts,
136 'mergechanges' => \@mergechanges);
138 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
139 our %opts_cfg_insertpos = map {
141 scalar @{ $opts_opt_map{$_} }
142 } keys %opts_opt_map;
144 sub finalise_opts_opts();
150 our $supplementary_message = '';
151 our $need_split_build_invocation = 0;
152 our $split_brain = 0;
156 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
159 our $remotename = 'dgit';
160 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
164 if (!defined $absurdity) {
166 $absurdity =~ s{/[^/]+$}{/absurd} or die;
170 my ($v,$distro) = @_;
171 return $tagformatfn->($v, $distro);
174 sub debiantag_maintview ($$) {
175 my ($v,$distro) = @_;
176 return "$distro/".dep14_version_mangle $v;
179 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
181 sub lbranch () { return "$branchprefix/$csuite"; }
182 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
183 sub lref () { return "refs/heads/".lbranch(); }
184 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
185 sub rrref () { return server_ref($csuite); }
187 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
188 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
190 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
191 # locally fetched refs because they have unhelpful names and clutter
192 # up gitk etc. So we track whether we have "used up" head ref (ie,
193 # whether we have made another local ref which refers to this object).
195 # (If we deleted them unconditionally, then we might end up
196 # re-fetching the same git objects each time dgit fetch was run.)
198 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
199 # in git_fetch_us to fetch the refs in question, and possibly a call
200 # to lrfetchref_used.
202 our (%lrfetchrefs_f, %lrfetchrefs_d);
203 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
205 sub lrfetchref_used ($) {
206 my ($fullrefname) = @_;
207 my $objid = $lrfetchrefs_f{$fullrefname};
208 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
219 return "${package}_".(stripepoch $vsn).$sfx
224 return srcfn($vsn,".dsc");
227 sub changespat ($;$) {
228 my ($vsn, $arch) = @_;
229 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
232 sub upstreamversion ($) {
244 foreach my $f (@end) {
246 print STDERR "$us: cleanup: $@" if length $@;
250 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
252 sub forceable_fail ($$) {
253 my ($forceoptsl, $msg) = @_;
254 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
255 print STDERR "warning: overriding problem due to --force:\n". $msg;
259 my ($forceoptsl) = @_;
260 my @got = grep { $forceopts{$_} } @$forceoptsl;
261 return 0 unless @got;
263 "warning: skipping checks or functionality due to --force-$got[0]\n";
266 sub no_such_package () {
267 print STDERR "$us: package $package does not exist in suite $isuite\n";
273 printdebug "CD $newdir\n";
274 chdir $newdir or confess "chdir: $newdir: $!";
277 sub deliberately ($) {
279 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
282 sub deliberately_not_fast_forward () {
283 foreach (qw(not-fast-forward fresh-repo)) {
284 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
288 sub quiltmode_splitbrain () {
289 $quilt_mode =~ m/gbp|dpm|unapplied/;
292 sub opts_opt_multi_cmd {
294 push @cmd, split /\s+/, shift @_;
300 return opts_opt_multi_cmd @gbp_pq;
303 #---------- remote protocol support, common ----------
305 # remote push initiator/responder protocol:
306 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
307 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
308 # < dgit-remote-push-ready <actual-proto-vsn>
315 # > supplementary-message NBYTES # $protovsn >= 3
320 # > file parsed-changelog
321 # [indicates that output of dpkg-parsechangelog follows]
322 # > data-block NBYTES
323 # > [NBYTES bytes of data (no newline)]
324 # [maybe some more blocks]
333 # > param head DGIT-VIEW-HEAD
334 # > param csuite SUITE
335 # > param tagformat old|new
336 # > param maint-view MAINT-VIEW-HEAD
338 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
339 # # goes into tag, for replay prevention
342 # [indicates that signed tag is wanted]
343 # < data-block NBYTES
344 # < [NBYTES bytes of data (no newline)]
345 # [maybe some more blocks]
349 # > want signed-dsc-changes
350 # < data-block NBYTES [transfer of signed dsc]
352 # < data-block NBYTES [transfer of signed changes]
360 sub i_child_report () {
361 # Sees if our child has died, and reap it if so. Returns a string
362 # describing how it died if it failed, or undef otherwise.
363 return undef unless $i_child_pid;
364 my $got = waitpid $i_child_pid, WNOHANG;
365 return undef if $got <= 0;
366 die unless $got == $i_child_pid;
367 $i_child_pid = undef;
368 return undef unless $?;
369 return "build host child ".waitstatusmsg();
374 fail "connection lost: $!" if $fh->error;
375 fail "protocol violation; $m not expected";
378 sub badproto_badread ($$) {
380 fail "connection lost: $!" if $!;
381 my $report = i_child_report();
382 fail $report if defined $report;
383 badproto $fh, "eof (reading $wh)";
386 sub protocol_expect (&$) {
387 my ($match, $fh) = @_;
390 defined && chomp or badproto_badread $fh, "protocol message";
398 badproto $fh, "\`$_'";
401 sub protocol_send_file ($$) {
402 my ($fh, $ourfn) = @_;
403 open PF, "<", $ourfn or die "$ourfn: $!";
406 my $got = read PF, $d, 65536;
407 die "$ourfn: $!" unless defined $got;
409 print $fh "data-block ".length($d)."\n" or die $!;
410 print $fh $d or die $!;
412 PF->error and die "$ourfn $!";
413 print $fh "data-end\n" or die $!;
417 sub protocol_read_bytes ($$) {
418 my ($fh, $nbytes) = @_;
419 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
421 my $got = read $fh, $d, $nbytes;
422 $got==$nbytes or badproto_badread $fh, "data block";
426 sub protocol_receive_file ($$) {
427 my ($fh, $ourfn) = @_;
428 printdebug "() $ourfn\n";
429 open PF, ">", $ourfn or die "$ourfn: $!";
431 my ($y,$l) = protocol_expect {
432 m/^data-block (.*)$/ ? (1,$1) :
433 m/^data-end$/ ? (0,) :
437 my $d = protocol_read_bytes $fh, $l;
438 print PF $d or die $!;
443 #---------- remote protocol support, responder ----------
445 sub responder_send_command ($) {
447 return unless $we_are_responder;
448 # called even without $we_are_responder
449 printdebug ">> $command\n";
450 print PO $command, "\n" or die $!;
453 sub responder_send_file ($$) {
454 my ($keyword, $ourfn) = @_;
455 return unless $we_are_responder;
456 printdebug "]] $keyword $ourfn\n";
457 responder_send_command "file $keyword";
458 protocol_send_file \*PO, $ourfn;
461 sub responder_receive_files ($@) {
462 my ($keyword, @ourfns) = @_;
463 die unless $we_are_responder;
464 printdebug "[[ $keyword @ourfns\n";
465 responder_send_command "want $keyword";
466 foreach my $fn (@ourfns) {
467 protocol_receive_file \*PI, $fn;
470 protocol_expect { m/^files-end$/ } \*PI;
473 #---------- remote protocol support, initiator ----------
475 sub initiator_expect (&) {
477 protocol_expect { &$match } \*RO;
480 #---------- end remote code ----------
483 if ($we_are_responder) {
485 responder_send_command "progress ".length($m) or die $!;
486 print PO $m or die $!;
496 $ua = LWP::UserAgent->new();
500 progress "downloading $what...";
501 my $r = $ua->get(@_) or die $!;
502 return undef if $r->code == 404;
503 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
504 return $r->decoded_content(charset => 'none');
507 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
512 failedcmd @_ if system @_;
515 sub act_local () { return $dryrun_level <= 1; }
516 sub act_scary () { return !$dryrun_level; }
519 if (!$dryrun_level) {
520 progress "$us ok: @_";
522 progress "would be ok: @_ (but dry run only)";
527 printcmd(\*STDERR,$debugprefix."#",@_);
530 sub runcmd_ordryrun {
538 sub runcmd_ordryrun_local {
547 my ($first_shell, @cmd) = @_;
548 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
551 our $helpmsg = <<END;
553 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
554 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
555 dgit [dgit-opts] build [dpkg-buildpackage-opts]
556 dgit [dgit-opts] sbuild [sbuild-opts]
557 dgit [dgit-opts] push [dgit-opts] [suite]
558 dgit [dgit-opts] rpush build-host:build-dir ...
559 important dgit options:
560 -k<keyid> sign tag and package with <keyid> instead of default
561 --dry-run -n do not change anything, but go through the motions
562 --damp-run -L like --dry-run but make local changes, without signing
563 --new -N allow introducing a new package
564 --debug -D increase debug level
565 -c<name>=<value> set git config option (used directly by dgit too)
568 our $later_warning_msg = <<END;
569 Perhaps the upload is stuck in incoming. Using the version from git.
573 print STDERR "$us: @_\n", $helpmsg or die $!;
578 @ARGV or badusage "too few arguments";
579 return scalar shift @ARGV;
583 print $helpmsg or die $!;
587 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
589 our %defcfg = ('dgit.default.distro' => 'debian',
590 'dgit-suite.*-security.distro' => 'debian-security',
591 'dgit.default.username' => '',
592 'dgit.default.archive-query-default-component' => 'main',
593 'dgit.default.ssh' => 'ssh',
594 'dgit.default.archive-query' => 'madison:',
595 'dgit.default.sshpsql-dbname' => 'service=projectb',
596 'dgit.default.aptget-components' => 'main',
597 'dgit.default.dgit-tag-format' => 'new,old,maint',
598 # old means "repo server accepts pushes with old dgit tags"
599 # new means "repo server accepts pushes with new dgit tags"
600 # maint means "repo server accepts split brain pushes"
601 # hist means "repo server may have old pushes without new tag"
602 # ("hist" is implied by "old")
603 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
604 'dgit-distro.debian.git-check' => 'url',
605 'dgit-distro.debian.git-check-suffix' => '/info/refs',
606 'dgit-distro.debian.new-private-pushers' => 't',
607 'dgit-distro.debian/push.git-url' => '',
608 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
609 'dgit-distro.debian/push.git-user-force' => 'dgit',
610 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
611 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
612 'dgit-distro.debian/push.git-create' => 'true',
613 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
614 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
615 # 'dgit-distro.debian.archive-query-tls-key',
616 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
617 # ^ this does not work because curl is broken nowadays
618 # Fixing #790093 properly will involve providing providing the key
619 # in some pacagke and maybe updating these paths.
621 # 'dgit-distro.debian.archive-query-tls-curl-args',
622 # '--ca-path=/etc/ssl/ca-debian',
623 # ^ this is a workaround but works (only) on DSA-administered machines
624 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
625 'dgit-distro.debian.git-url-suffix' => '',
626 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
627 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
628 'dgit-distro.debian-security.archive-query' => 'aptget:',
629 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
630 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
631 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
632 'dgit-distro.debian-security.nominal-distro' => 'debian',
633 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
634 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
635 'dgit-distro.ubuntu.git-check' => 'false',
636 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
637 'dgit-distro.test-dummy.ssh' => "$td/ssh",
638 'dgit-distro.test-dummy.username' => "alice",
639 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
640 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
641 'dgit-distro.test-dummy.git-url' => "$td/git",
642 'dgit-distro.test-dummy.git-host' => "git",
643 'dgit-distro.test-dummy.git-path' => "$td/git",
644 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
645 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
646 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
647 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
651 our @gitcfgsources = qw(cmdline local global system);
653 sub git_slurp_config () {
654 local ($debuglevel) = $debuglevel-2;
657 # This algoritm is a bit subtle, but this is needed so that for
658 # options which we want to be single-valued, we allow the
659 # different config sources to override properly. See #835858.
660 foreach my $src (@gitcfgsources) {
661 next if $src eq 'cmdline';
662 # we do this ourselves since git doesn't handle it
664 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
667 open GITS, "-|", @cmd or die $!;
670 printdebug "=> ", (messagequote $_), "\n";
672 push @{ $gitcfgs{$src}{$`} }, $'; #';
676 or ($!==0 && $?==256)
681 sub git_get_config ($) {
683 foreach my $src (@gitcfgsources) {
684 my $l = $gitcfgs{$src}{$c};
685 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
688 @$l==1 or badcfg "multiple values for $c".
689 " (in $src git config)" if @$l > 1;
697 return undef if $c =~ /RETURN-UNDEF/;
698 my $v = git_get_config($c);
699 return $v if defined $v;
700 my $dv = $defcfg{$c};
701 return $dv if defined $dv;
703 badcfg "need value for one of: @_\n".
704 "$us: distro or suite appears not to be (properly) supported";
707 sub access_basedistro () {
708 if (defined $idistro) {
711 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
712 return $def if defined $def;
713 foreach my $src (@gitcfgsources, 'internal') {
714 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
716 foreach my $k (keys %$kl) {
717 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
719 next unless match_glob $dpat, $isuite;
723 return cfg("dgit.default.distro");
727 sub access_nomdistro () {
728 my $base = access_basedistro();
729 return cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
732 sub access_quirk () {
733 # returns (quirk name, distro to use instead or undef, quirk-specific info)
734 my $basedistro = access_basedistro();
735 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
737 if (defined $backports_quirk) {
738 my $re = $backports_quirk;
739 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
741 $re =~ s/\%/([-0-9a-z_]+)/
742 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
743 if ($isuite =~ m/^$re$/) {
744 return ('backports',"$basedistro-backports",$1);
747 return ('none',undef);
752 sub parse_cfg_bool ($$$) {
753 my ($what,$def,$v) = @_;
756 $v =~ m/^[ty1]/ ? 1 :
757 $v =~ m/^[fn0]/ ? 0 :
758 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
761 sub access_forpush_config () {
762 my $d = access_basedistro();
766 parse_cfg_bool('new-private-pushers', 0,
767 cfg("dgit-distro.$d.new-private-pushers",
770 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
773 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
774 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
775 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
776 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
779 sub access_forpush () {
780 $access_forpush //= access_forpush_config();
781 return $access_forpush;
785 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
786 badcfg "pushing but distro is configured readonly"
787 if access_forpush_config() eq '0';
789 $supplementary_message = <<'END' unless $we_are_responder;
790 Push failed, before we got started.
791 You can retry the push, after fixing the problem, if you like.
793 finalise_opts_opts();
797 finalise_opts_opts();
800 sub supplementary_message ($) {
802 if (!$we_are_responder) {
803 $supplementary_message = $msg;
805 } elsif ($protovsn >= 3) {
806 responder_send_command "supplementary-message ".length($msg)
808 print PO $msg or die $!;
812 sub access_distros () {
813 # Returns list of distros to try, in order
816 # 0. `instead of' distro name(s) we have been pointed to
817 # 1. the access_quirk distro, if any
818 # 2a. the user's specified distro, or failing that } basedistro
819 # 2b. the distro calculated from the suite }
820 my @l = access_basedistro();
822 my (undef,$quirkdistro) = access_quirk();
823 unshift @l, $quirkdistro;
824 unshift @l, $instead_distro;
825 @l = grep { defined } @l;
827 push @l, access_nomdistro();
829 if (access_forpush()) {
830 @l = map { ("$_/push", $_) } @l;
835 sub access_cfg_cfgs (@) {
838 # The nesting of these loops determines the search order. We put
839 # the key loop on the outside so that we search all the distros
840 # for each key, before going on to the next key. That means that
841 # if access_cfg is called with a more specific, and then a less
842 # specific, key, an earlier distro can override the less specific
843 # without necessarily overriding any more specific keys. (If the
844 # distro wants to override the more specific keys it can simply do
845 # so; whereas if we did the loop the other way around, it would be
846 # impossible to for an earlier distro to override a less specific
847 # key but not the more specific ones without restating the unknown
848 # values of the more specific keys.
851 # We have to deal with RETURN-UNDEF specially, so that we don't
852 # terminate the search prematurely.
854 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
857 foreach my $d (access_distros()) {
858 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
860 push @cfgs, map { "dgit.default.$_" } @realkeys;
867 my (@cfgs) = access_cfg_cfgs(@keys);
868 my $value = cfg(@cfgs);
872 sub access_cfg_bool ($$) {
873 my ($def, @keys) = @_;
874 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
877 sub string_to_ssh ($) {
879 if ($spec =~ m/\s/) {
880 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
886 sub access_cfg_ssh () {
887 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
888 if (!defined $gitssh) {
891 return string_to_ssh $gitssh;
895 sub access_runeinfo ($) {
897 return ": dgit ".access_basedistro()." $info ;";
900 sub access_someuserhost ($) {
902 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
903 defined($user) && length($user) or
904 $user = access_cfg("$some-user",'username');
905 my $host = access_cfg("$some-host");
906 return length($user) ? "$user\@$host" : $host;
909 sub access_gituserhost () {
910 return access_someuserhost('git');
913 sub access_giturl (;$) {
915 my $url = access_cfg('git-url','RETURN-UNDEF');
918 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
919 return undef unless defined $proto;
922 access_gituserhost().
923 access_cfg('git-path');
925 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
928 return "$url/$package$suffix";
931 sub parsecontrolfh ($$;$) {
932 my ($fh, $desc, $allowsigned) = @_;
933 our $dpkgcontrolhash_noissigned;
936 my %opts = ('name' => $desc);
937 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
938 $c = Dpkg::Control::Hash->new(%opts);
939 $c->parse($fh,$desc) or die "parsing of $desc failed";
940 last if $allowsigned;
941 last if $dpkgcontrolhash_noissigned;
942 my $issigned= $c->get_option('is_pgp_signed');
943 if (!defined $issigned) {
944 $dpkgcontrolhash_noissigned= 1;
945 seek $fh, 0,0 or die "seek $desc: $!";
946 } elsif ($issigned) {
947 fail "control file $desc is (already) PGP-signed. ".
948 " Note that dgit push needs to modify the .dsc and then".
949 " do the signature itself";
958 my ($file, $desc, $allowsigned) = @_;
959 my $fh = new IO::Handle;
960 open $fh, '<', $file or die "$file: $!";
961 my $c = parsecontrolfh($fh,$desc,$allowsigned);
962 $fh->error and die $!;
968 my ($dctrl,$field) = @_;
969 my $v = $dctrl->{$field};
970 return $v if defined $v;
971 fail "missing field $field in ".$dctrl->get_option('name');
975 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
976 my $p = new IO::Handle;
977 my @cmd = (qw(dpkg-parsechangelog), @_);
978 open $p, '-|', @cmd or die $!;
980 $?=0; $!=0; close $p or failedcmd @cmd;
984 sub commit_getclogp ($) {
985 # Returns the parsed changelog hashref for a particular commit
987 our %commit_getclogp_memo;
988 my $memo = $commit_getclogp_memo{$objid};
989 return $memo if $memo;
991 my $mclog = ".git/dgit/clog-$objid";
992 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
993 "$objid:debian/changelog";
994 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
999 defined $d or fail "getcwd failed: $!";
1003 sub parse_dscdata () {
1004 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1005 printdebug Dumper($dscdata) if $debuglevel>1;
1006 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1007 printdebug Dumper($dsc) if $debuglevel>1;
1012 sub archive_query ($;@) {
1013 my ($method) = shift @_;
1014 fail "this operation does not support multiple comma-separated suites"
1016 my $query = access_cfg('archive-query','RETURN-UNDEF');
1017 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1020 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1023 sub archive_query_prepend_mirror {
1024 my $m = access_cfg('mirror');
1025 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1028 sub pool_dsc_subpath ($$) {
1029 my ($vsn,$component) = @_; # $package is implict arg
1030 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1031 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1034 sub cfg_apply_map ($$$) {
1035 my ($varref, $what, $mapspec) = @_;
1036 return unless $mapspec;
1038 printdebug "config $what EVAL{ $mapspec; }\n";
1040 eval "package Dgit::Config; $mapspec;";
1045 #---------- `ftpmasterapi' archive query method (nascent) ----------
1047 sub archive_api_query_cmd ($) {
1049 my @cmd = (@curl, qw(-sS));
1050 my $url = access_cfg('archive-query-url');
1051 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1053 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1054 foreach my $key (split /\:/, $keys) {
1055 $key =~ s/\%HOST\%/$host/g;
1057 fail "for $url: stat $key: $!" unless $!==ENOENT;
1060 fail "config requested specific TLS key but do not know".
1061 " how to get curl to use exactly that EE key ($key)";
1062 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1063 # # Sadly the above line does not work because of changes
1064 # # to gnutls. The real fix for #790093 may involve
1065 # # new curl options.
1068 # Fixing #790093 properly will involve providing a value
1069 # for this on clients.
1070 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1071 push @cmd, split / /, $kargs if defined $kargs;
1073 push @cmd, $url.$subpath;
1077 sub api_query ($$;$) {
1079 my ($data, $subpath, $ok404) = @_;
1080 badcfg "ftpmasterapi archive query method takes no data part"
1082 my @cmd = archive_api_query_cmd($subpath);
1083 my $url = $cmd[$#cmd];
1084 push @cmd, qw(-w %{http_code});
1085 my $json = cmdoutput @cmd;
1086 unless ($json =~ s/\d+\d+\d$//) {
1087 failedcmd_report_cmd undef, @cmd;
1088 fail "curl failed to print 3-digit HTTP code";
1091 return undef if $code eq '404' && $ok404;
1092 fail "fetch of $url gave HTTP code $code"
1093 unless $url =~ m#^file://# or $code =~ m/^2/;
1094 return decode_json($json);
1097 sub canonicalise_suite_ftpmasterapi {
1098 my ($proto,$data) = @_;
1099 my $suites = api_query($data, 'suites');
1101 foreach my $entry (@$suites) {
1103 my $v = $entry->{$_};
1104 defined $v && $v eq $isuite;
1105 } qw(codename name);
1106 push @matched, $entry;
1108 fail "unknown suite $isuite" unless @matched;
1111 @matched==1 or die "multiple matches for suite $isuite\n";
1112 $cn = "$matched[0]{codename}";
1113 defined $cn or die "suite $isuite info has no codename\n";
1114 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1116 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1121 sub archive_query_ftpmasterapi {
1122 my ($proto,$data) = @_;
1123 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1125 my $digester = Digest::SHA->new(256);
1126 foreach my $entry (@$info) {
1128 my $vsn = "$entry->{version}";
1129 my ($ok,$msg) = version_check $vsn;
1130 die "bad version: $msg\n" unless $ok;
1131 my $component = "$entry->{component}";
1132 $component =~ m/^$component_re$/ or die "bad component";
1133 my $filename = "$entry->{filename}";
1134 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1135 or die "bad filename";
1136 my $sha256sum = "$entry->{sha256sum}";
1137 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1138 push @rows, [ $vsn, "/pool/$component/$filename",
1139 $digester, $sha256sum ];
1141 die "bad ftpmaster api response: $@\n".Dumper($entry)
1144 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1145 return archive_query_prepend_mirror @rows;
1148 sub file_in_archive_ftpmasterapi {
1149 my ($proto,$data,$filename) = @_;
1150 my $pat = $filename;
1153 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1154 my $info = api_query($data, "file_in_archive/$pat", 1);
1157 #---------- `aptget' archive query method ----------
1160 our $aptget_releasefile;
1161 our $aptget_configpath;
1163 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1164 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1166 sub aptget_cache_clean {
1167 runcmd_ordryrun_local qw(sh -ec),
1168 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1172 sub aptget_lock_acquire () {
1173 my $lockfile = "$aptget_base/lock";
1174 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1175 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1178 sub aptget_prep ($) {
1180 return if defined $aptget_base;
1182 badcfg "aptget archive query method takes no data part"
1185 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1188 ensuredir "$cache/dgit";
1190 access_cfg('aptget-cachekey','RETURN-UNDEF')
1191 // access_nomdistro();
1193 $aptget_base = "$cache/dgit/aptget";
1194 ensuredir $aptget_base;
1196 my $quoted_base = $aptget_base;
1197 die "$quoted_base contains bad chars, cannot continue"
1198 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1200 ensuredir $aptget_base;
1202 aptget_lock_acquire();
1204 aptget_cache_clean();
1206 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1207 my $sourceslist = "source.list#$cachekey";
1209 my $aptsuites = $isuite;
1210 cfg_apply_map(\$aptsuites, 'suite map',
1211 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1213 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1214 printf SRCS "deb-src %s %s %s\n",
1215 access_cfg('mirror'),
1217 access_cfg('aptget-components')
1220 ensuredir "$aptget_base/cache";
1221 ensuredir "$aptget_base/lists";
1223 open CONF, ">", $aptget_configpath or die $!;
1225 Debug::NoLocking "true";
1226 APT::Get::List-Cleanup "false";
1227 #clear APT::Update::Post-Invoke-Success;
1228 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1229 Dir::State::Lists "$quoted_base/lists";
1230 Dir::Etc::preferences "$quoted_base/preferences";
1231 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1232 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1235 foreach my $key (qw(
1238 Dir::Cache::Archives
1239 Dir::Etc::SourceParts
1240 Dir::Etc::preferencesparts
1242 ensuredir "$aptget_base/$key";
1243 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1246 my $oldatime = (time // die $!) - 1;
1247 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1248 next unless stat_exists $oldlist;
1249 my ($mtime) = (stat _)[9];
1250 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1253 runcmd_ordryrun_local aptget_aptget(), qw(update);
1256 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1257 next unless stat_exists $oldlist;
1258 my ($atime) = (stat _)[8];
1259 next if $atime == $oldatime;
1260 push @releasefiles, $oldlist;
1262 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1263 @releasefiles = @inreleasefiles if @inreleasefiles;
1264 die "apt updated wrong number of Release files (@releasefiles), erk"
1265 unless @releasefiles == 1;
1267 ($aptget_releasefile) = @releasefiles;
1270 sub canonicalise_suite_aptget {
1271 my ($proto,$data) = @_;
1274 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1276 foreach my $name (qw(Codename Suite)) {
1277 my $val = $release->{$name};
1279 printdebug "release file $name: $val\n";
1280 $val =~ m/^$suite_re$/o or fail
1281 "Release file ($aptget_releasefile) specifies intolerable $name";
1282 cfg_apply_map(\$val, 'suite rmap',
1283 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1290 sub archive_query_aptget {
1291 my ($proto,$data) = @_;
1294 ensuredir "$aptget_base/source";
1295 foreach my $old (<$aptget_base/source/*.dsc>) {
1296 unlink $old or die "$old: $!";
1299 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1300 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1301 # avoids apt-get source failing with ambiguous error code
1303 runcmd_ordryrun_local
1304 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1305 aptget_aptget(), qw(--download-only --only-source source), $package;
1307 my @dscs = <$aptget_base/source/*.dsc>;
1308 fail "apt-get source did not produce a .dsc" unless @dscs;
1309 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1311 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1314 my $uri = "file://". uri_escape $dscs[0];
1315 $uri =~ s{\%2f}{/}gi;
1316 return [ (getfield $pre_dsc, 'Version'), $uri ];
1319 #---------- `dummyapicat' archive query method ----------
1321 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1322 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1324 sub file_in_archive_dummycatapi ($$$) {
1325 my ($proto,$data,$filename) = @_;
1326 my $mirror = access_cfg('mirror');
1327 $mirror =~ s#^file://#/# or die "$mirror ?";
1329 my @cmd = (qw(sh -ec), '
1331 find -name "$2" -print0 |
1333 ', qw(x), $mirror, $filename);
1334 debugcmd "-|", @cmd;
1335 open FIA, "-|", @cmd or die $!;
1338 printdebug "| $_\n";
1339 m/^(\w+) (\S+)$/ or die "$_ ?";
1340 push @out, { sha256sum => $1, filename => $2 };
1342 close FIA or die failedcmd @cmd;
1346 #---------- `madison' archive query method ----------
1348 sub archive_query_madison {
1349 return archive_query_prepend_mirror
1350 map { [ @$_[0..1] ] } madison_get_parse(@_);
1353 sub madison_get_parse {
1354 my ($proto,$data) = @_;
1355 die unless $proto eq 'madison';
1356 if (!length $data) {
1357 $data= access_cfg('madison-distro','RETURN-UNDEF');
1358 $data //= access_basedistro();
1360 $rmad{$proto,$data,$package} ||= cmdoutput
1361 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1362 my $rmad = $rmad{$proto,$data,$package};
1365 foreach my $l (split /\n/, $rmad) {
1366 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1367 \s*( [^ \t|]+ )\s* \|
1368 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1369 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1370 $1 eq $package or die "$rmad $package ?";
1377 $component = access_cfg('archive-query-default-component');
1379 $5 eq 'source' or die "$rmad ?";
1380 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1382 return sort { -version_compare($a->[0],$b->[0]); } @out;
1385 sub canonicalise_suite_madison {
1386 # madison canonicalises for us
1387 my @r = madison_get_parse(@_);
1389 "unable to canonicalise suite using package $package".
1390 " which does not appear to exist in suite $isuite;".
1391 " --existing-package may help";
1395 sub file_in_archive_madison { return undef; }
1397 #---------- `sshpsql' archive query method ----------
1400 my ($data,$runeinfo,$sql) = @_;
1401 if (!length $data) {
1402 $data= access_someuserhost('sshpsql').':'.
1403 access_cfg('sshpsql-dbname');
1405 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1406 my ($userhost,$dbname) = ($`,$'); #';
1408 my @cmd = (access_cfg_ssh, $userhost,
1409 access_runeinfo("ssh-psql $runeinfo").
1410 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1411 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1413 open P, "-|", @cmd or die $!;
1416 printdebug(">|$_|\n");
1419 $!=0; $?=0; close P or failedcmd @cmd;
1421 my $nrows = pop @rows;
1422 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1423 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1424 @rows = map { [ split /\|/, $_ ] } @rows;
1425 my $ncols = scalar @{ shift @rows };
1426 die if grep { scalar @$_ != $ncols } @rows;
1430 sub sql_injection_check {
1431 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1434 sub archive_query_sshpsql ($$) {
1435 my ($proto,$data) = @_;
1436 sql_injection_check $isuite, $package;
1437 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1438 SELECT source.version, component.name, files.filename, files.sha256sum
1440 JOIN src_associations ON source.id = src_associations.source
1441 JOIN suite ON suite.id = src_associations.suite
1442 JOIN dsc_files ON dsc_files.source = source.id
1443 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1444 JOIN component ON component.id = files_archive_map.component_id
1445 JOIN files ON files.id = dsc_files.file
1446 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1447 AND source.source='$package'
1448 AND files.filename LIKE '%.dsc';
1450 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1451 my $digester = Digest::SHA->new(256);
1453 my ($vsn,$component,$filename,$sha256sum) = @$_;
1454 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1456 return archive_query_prepend_mirror @rows;
1459 sub canonicalise_suite_sshpsql ($$) {
1460 my ($proto,$data) = @_;
1461 sql_injection_check $isuite;
1462 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1463 SELECT suite.codename
1464 FROM suite where suite_name='$isuite' or codename='$isuite';
1466 @rows = map { $_->[0] } @rows;
1467 fail "unknown suite $isuite" unless @rows;
1468 die "ambiguous $isuite: @rows ?" if @rows>1;
1472 sub file_in_archive_sshpsql ($$$) { return undef; }
1474 #---------- `dummycat' archive query method ----------
1476 sub canonicalise_suite_dummycat ($$) {
1477 my ($proto,$data) = @_;
1478 my $dpath = "$data/suite.$isuite";
1479 if (!open C, "<", $dpath) {
1480 $!==ENOENT or die "$dpath: $!";
1481 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1485 chomp or die "$dpath: $!";
1487 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1491 sub archive_query_dummycat ($$) {
1492 my ($proto,$data) = @_;
1493 canonicalise_suite();
1494 my $dpath = "$data/package.$csuite.$package";
1495 if (!open C, "<", $dpath) {
1496 $!==ENOENT or die "$dpath: $!";
1497 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1505 printdebug "dummycat query $csuite $package $dpath | $_\n";
1506 my @row = split /\s+/, $_;
1507 @row==2 or die "$dpath: $_ ?";
1510 C->error and die "$dpath: $!";
1512 return archive_query_prepend_mirror
1513 sort { -version_compare($a->[0],$b->[0]); } @rows;
1516 sub file_in_archive_dummycat () { return undef; }
1518 #---------- tag format handling ----------
1520 sub access_cfg_tagformats () {
1521 split /\,/, access_cfg('dgit-tag-format');
1524 sub access_cfg_tagformats_can_splitbrain () {
1525 my %y = map { $_ => 1 } access_cfg_tagformats;
1526 foreach my $needtf (qw(new maint)) {
1527 next if $y{$needtf};
1533 sub need_tagformat ($$) {
1534 my ($fmt, $why) = @_;
1535 fail "need to use tag format $fmt ($why) but also need".
1536 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1537 " - no way to proceed"
1538 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1539 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1542 sub select_tagformat () {
1544 return if $tagformatfn && !$tagformat_want;
1545 die 'bug' if $tagformatfn && $tagformat_want;
1546 # ... $tagformat_want assigned after previous select_tagformat
1548 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1549 printdebug "select_tagformat supported @supported\n";
1551 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1552 printdebug "select_tagformat specified @$tagformat_want\n";
1554 my ($fmt,$why,$override) = @$tagformat_want;
1556 fail "target distro supports tag formats @supported".
1557 " but have to use $fmt ($why)"
1559 or grep { $_ eq $fmt } @supported;
1561 $tagformat_want = undef;
1563 $tagformatfn = ${*::}{"debiantag_$fmt"};
1565 fail "trying to use unknown tag format \`$fmt' ($why) !"
1566 unless $tagformatfn;
1569 #---------- archive query entrypoints and rest of program ----------
1571 sub canonicalise_suite () {
1572 return if defined $csuite;
1573 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1574 $csuite = archive_query('canonicalise_suite');
1575 if ($isuite ne $csuite) {
1576 progress "canonical suite name for $isuite is $csuite";
1578 progress "canonical suite name is $csuite";
1582 sub get_archive_dsc () {
1583 canonicalise_suite();
1584 my @vsns = archive_query('archive_query');
1585 foreach my $vinfo (@vsns) {
1586 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1587 $dscurl = $vsn_dscurl;
1588 $dscdata = url_get($dscurl);
1590 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1595 $digester->add($dscdata);
1596 my $got = $digester->hexdigest();
1598 fail "$dscurl has hash $got but".
1599 " archive told us to expect $digest";
1602 my $fmt = getfield $dsc, 'Format';
1603 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1604 "unsupported source format $fmt, sorry";
1606 $dsc_checked = !!$digester;
1607 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1611 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1614 sub check_for_git ();
1615 sub check_for_git () {
1617 my $how = access_cfg('git-check');
1618 if ($how eq 'ssh-cmd') {
1620 (access_cfg_ssh, access_gituserhost(),
1621 access_runeinfo("git-check $package").
1622 " set -e; cd ".access_cfg('git-path').";".
1623 " if test -d $package.git; then echo 1; else echo 0; fi");
1624 my $r= cmdoutput @cmd;
1625 if (defined $r and $r =~ m/^divert (\w+)$/) {
1627 my ($usedistro,) = access_distros();
1628 # NB that if we are pushing, $usedistro will be $distro/push
1629 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1630 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1631 progress "diverting to $divert (using config for $instead_distro)";
1632 return check_for_git();
1634 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1636 } elsif ($how eq 'url') {
1637 my $prefix = access_cfg('git-check-url','git-url');
1638 my $suffix = access_cfg('git-check-suffix','git-suffix',
1639 'RETURN-UNDEF') // '.git';
1640 my $url = "$prefix/$package$suffix";
1641 my @cmd = (@curl, qw(-sS -I), $url);
1642 my $result = cmdoutput @cmd;
1643 $result =~ s/^\S+ 200 .*\n\r?\n//;
1644 # curl -sS -I with https_proxy prints
1645 # HTTP/1.0 200 Connection established
1646 $result =~ m/^\S+ (404|200) /s or
1647 fail "unexpected results from git check query - ".
1648 Dumper($prefix, $result);
1650 if ($code eq '404') {
1652 } elsif ($code eq '200') {
1657 } elsif ($how eq 'true') {
1659 } elsif ($how eq 'false') {
1662 badcfg "unknown git-check \`$how'";
1666 sub create_remote_git_repo () {
1667 my $how = access_cfg('git-create');
1668 if ($how eq 'ssh-cmd') {
1670 (access_cfg_ssh, access_gituserhost(),
1671 access_runeinfo("git-create $package").
1672 "set -e; cd ".access_cfg('git-path').";".
1673 " cp -a _template $package.git");
1674 } elsif ($how eq 'true') {
1677 badcfg "unknown git-create \`$how'";
1681 our ($dsc_hash,$lastpush_mergeinput);
1683 our $ud = '.git/dgit/unpack';
1693 sub mktree_in_ud_here () {
1694 runcmd qw(git init -q);
1695 runcmd qw(git config gc.auto 0);
1696 rmtree('.git/objects');
1697 symlink '../../../../objects','.git/objects' or die $!;
1700 sub git_write_tree () {
1701 my $tree = cmdoutput @git, qw(write-tree);
1702 $tree =~ m/^\w+$/ or die "$tree ?";
1706 sub git_add_write_tree () {
1707 runcmd @git, qw(add -Af .);
1708 return git_write_tree();
1711 sub remove_stray_gits ($) {
1713 my @gitscmd = qw(find -name .git -prune -print0);
1714 debugcmd "|",@gitscmd;
1715 open GITS, "-|", @gitscmd or die $!;
1720 print STDERR "$us: warning: removing from $what: ",
1721 (messagequote $_), "\n";
1725 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1728 sub mktree_in_ud_from_only_subdir ($;$) {
1729 my ($what,$raw) = @_;
1731 # changes into the subdir
1733 die "expected one subdir but found @dirs ?" unless @dirs==1;
1734 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1738 remove_stray_gits($what);
1739 mktree_in_ud_here();
1741 my ($format, $fopts) = get_source_format();
1742 if (madformat($format)) {
1747 my $tree=git_add_write_tree();
1748 return ($tree,$dir);
1751 our @files_csum_info_fields =
1752 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1753 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1754 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1756 sub dsc_files_info () {
1757 foreach my $csumi (@files_csum_info_fields) {
1758 my ($fname, $module, $method) = @$csumi;
1759 my $field = $dsc->{$fname};
1760 next unless defined $field;
1761 eval "use $module; 1;" or die $@;
1763 foreach (split /\n/, $field) {
1765 m/^(\w+) (\d+) (\S+)$/ or
1766 fail "could not parse .dsc $fname line \`$_'";
1767 my $digester = eval "$module"."->$method;" or die $@;
1772 Digester => $digester,
1777 fail "missing any supported Checksums-* or Files field in ".
1778 $dsc->get_option('name');
1782 map { $_->{Filename} } dsc_files_info();
1785 sub files_compare_inputs (@) {
1790 my $showinputs = sub {
1791 return join "; ", map { $_->get_option('name') } @$inputs;
1794 foreach my $in (@$inputs) {
1796 my $in_name = $in->get_option('name');
1798 printdebug "files_compare_inputs $in_name\n";
1800 foreach my $csumi (@files_csum_info_fields) {
1801 my ($fname) = @$csumi;
1802 printdebug "files_compare_inputs $in_name $fname\n";
1804 my $field = $in->{$fname};
1805 next unless defined $field;
1808 foreach (split /\n/, $field) {
1811 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1812 fail "could not parse $in_name $fname line \`$_'";
1814 printdebug "files_compare_inputs $in_name $fname $f\n";
1818 my $re = \ $record{$f}{$fname};
1820 $fchecked{$f}{$in_name} = 1;
1822 fail "hash or size of $f varies in $fname fields".
1823 " (between: ".$showinputs->().")";
1828 @files = sort @files;
1829 $expected_files //= \@files;
1830 "@$expected_files" eq "@files" or
1831 fail "file list in $in_name varies between hash fields!";
1834 fail "$in_name has no files list field(s)";
1836 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1839 grep { keys %$_ == @$inputs-1 } values %fchecked
1840 or fail "no file appears in all file lists".
1841 " (looked in: ".$showinputs->().")";
1844 sub is_orig_file_in_dsc ($$) {
1845 my ($f, $dsc_files_info) = @_;
1846 return 0 if @$dsc_files_info <= 1;
1847 # One file means no origs, and the filename doesn't have a "what
1848 # part of dsc" component. (Consider versions ending `.orig'.)
1849 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1853 sub is_orig_file_of_vsn ($$) {
1854 my ($f, $upstreamvsn) = @_;
1855 my $base = srcfn $upstreamvsn, '';
1856 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1860 sub changes_update_origs_from_dsc ($$$$) {
1861 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1863 printdebug "checking origs needed ($upstreamvsn)...\n";
1864 $_ = getfield $changes, 'Files';
1865 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1866 fail "cannot find section/priority from .changes Files field";
1867 my $placementinfo = $1;
1869 printdebug "checking origs needed placement '$placementinfo'...\n";
1870 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1871 $l =~ m/\S+$/ or next;
1873 printdebug "origs $file | $l\n";
1874 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1875 printdebug "origs $file is_orig\n";
1876 my $have = archive_query('file_in_archive', $file);
1877 if (!defined $have) {
1879 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1885 printdebug "origs $file \$#\$have=$#$have\n";
1886 foreach my $h (@$have) {
1889 foreach my $csumi (@files_csum_info_fields) {
1890 my ($fname, $module, $method, $archivefield) = @$csumi;
1891 next unless defined $h->{$archivefield};
1892 $_ = $dsc->{$fname};
1893 next unless defined;
1894 m/^(\w+) .* \Q$file\E$/m or
1895 fail ".dsc $fname missing entry for $file";
1896 if ($h->{$archivefield} eq $1) {
1900 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1903 die "$file ".Dumper($h)." ?!" if $same && @differ;
1906 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1909 printdebug "origs $file f.same=$found_same".
1910 " #f._differ=$#found_differ\n";
1911 if (@found_differ && !$found_same) {
1913 "archive contains $file with different checksum",
1916 # Now we edit the changes file to add or remove it
1917 foreach my $csumi (@files_csum_info_fields) {
1918 my ($fname, $module, $method, $archivefield) = @$csumi;
1919 next unless defined $changes->{$fname};
1921 # in archive, delete from .changes if it's there
1922 $changed{$file} = "removed" if
1923 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1924 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1925 # not in archive, but it's here in the .changes
1927 my $dsc_data = getfield $dsc, $fname;
1928 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1930 $extra =~ s/ \d+ /$&$placementinfo /
1931 or die "$fname $extra >$dsc_data< ?"
1932 if $fname eq 'Files';
1933 $changes->{$fname} .= "\n". $extra;
1934 $changed{$file} = "added";
1939 foreach my $file (keys %changed) {
1941 "edited .changes for archive .orig contents: %s %s",
1942 $changed{$file}, $file;
1944 my $chtmp = "$changesfile.tmp";
1945 $changes->save($chtmp);
1947 rename $chtmp,$changesfile or die "$changesfile $!";
1949 progress "[new .changes left in $changesfile]";
1952 progress "$changesfile already has appropriate .orig(s) (if any)";
1956 sub make_commit ($) {
1958 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1961 sub make_commit_text ($) {
1964 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1966 print Dumper($text) if $debuglevel > 1;
1967 my $child = open2($out, $in, @cmd) or die $!;
1970 print $in $text or die $!;
1971 close $in or die $!;
1973 $h =~ m/^\w+$/ or die;
1975 printdebug "=> $h\n";
1978 waitpid $child, 0 == $child or die "$child $!";
1979 $? and failedcmd @cmd;
1983 sub clogp_authline ($) {
1985 my $author = getfield $clogp, 'Maintainer';
1986 $author =~ s#,.*##ms;
1987 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1988 my $authline = "$author $date";
1989 $authline =~ m/$git_authline_re/o or
1990 fail "unexpected commit author line format \`$authline'".
1991 " (was generated from changelog Maintainer field)";
1992 return ($1,$2,$3) if wantarray;
1996 sub vendor_patches_distro ($$) {
1997 my ($checkdistro, $what) = @_;
1998 return unless defined $checkdistro;
2000 my $series = "debian/patches/\L$checkdistro\E.series";
2001 printdebug "checking for vendor-specific $series ($what)\n";
2003 if (!open SERIES, "<", $series) {
2004 die "$series $!" unless $!==ENOENT;
2013 Unfortunately, this source package uses a feature of dpkg-source where
2014 the same source package unpacks to different source code on different
2015 distros. dgit cannot safely operate on such packages on affected
2016 distros, because the meaning of source packages is not stable.
2018 Please ask the distro/maintainer to remove the distro-specific series
2019 files and use a different technique (if necessary, uploading actually
2020 different packages, if different distros are supposed to have
2024 fail "Found active distro-specific series file for".
2025 " $checkdistro ($what): $series, cannot continue";
2027 die "$series $!" if SERIES->error;
2031 sub check_for_vendor_patches () {
2032 # This dpkg-source feature doesn't seem to be documented anywhere!
2033 # But it can be found in the changelog (reformatted):
2035 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2036 # Author: Raphael Hertzog <hertzog@debian.org>
2037 # Date: Sun Oct 3 09:36:48 2010 +0200
2039 # dpkg-source: correctly create .pc/.quilt_series with alternate
2042 # If you have debian/patches/ubuntu.series and you were
2043 # unpacking the source package on ubuntu, quilt was still
2044 # directed to debian/patches/series instead of
2045 # debian/patches/ubuntu.series.
2047 # debian/changelog | 3 +++
2048 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2049 # 2 files changed, 6 insertions(+), 1 deletion(-)
2052 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2053 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2054 "Dpkg::Vendor \`current vendor'");
2055 vendor_patches_distro(access_basedistro(),
2056 "(base) distro being accessed");
2057 vendor_patches_distro(access_nomdistro(),
2058 "(nominal) distro being accessed");
2061 sub generate_commits_from_dsc () {
2062 # See big comment in fetch_from_archive, below.
2063 # See also README.dsc-import.
2067 my @dfi = dsc_files_info();
2068 foreach my $fi (@dfi) {
2069 my $f = $fi->{Filename};
2070 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2072 printdebug "considering linking $f: ";
2074 link_ltarget "../../../../$f", $f
2075 or ((printdebug "($!) "), 0)
2079 printdebug "linked.\n";
2081 complete_file_from_dsc('.', $fi)
2084 if (is_orig_file_in_dsc($f, \@dfi)) {
2085 link $f, "../../../../$f"
2091 # We unpack and record the orig tarballs first, so that we only
2092 # need disk space for one private copy of the unpacked source.
2093 # But we can't make them into commits until we have the metadata
2094 # from the debian/changelog, so we record the tree objects now and
2095 # make them into commits later.
2097 my $upstreamv = upstreamversion $dsc->{version};
2098 my $orig_f_base = srcfn $upstreamv, '';
2100 foreach my $fi (@dfi) {
2101 # We actually import, and record as a commit, every tarball
2102 # (unless there is only one file, in which case there seems
2105 my $f = $fi->{Filename};
2106 printdebug "import considering $f ";
2107 (printdebug "only one dfi\n"), next if @dfi == 1;
2108 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2109 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2113 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2115 printdebug "Y ", (join ' ', map { $_//"(none)" }
2116 $compr_ext, $orig_f_part
2119 my $input = new IO::File $f, '<' or die "$f $!";
2123 if (defined $compr_ext) {
2125 Dpkg::Compression::compression_guess_from_filename $f;
2126 fail "Dpkg::Compression cannot handle file $f in source package"
2127 if defined $compr_ext && !defined $cname;
2129 new Dpkg::Compression::Process compression => $cname;
2130 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2131 my $compr_fh = new IO::Handle;
2132 my $compr_pid = open $compr_fh, "-|" // die $!;
2134 open STDIN, "<&", $input or die $!;
2136 die "dgit (child): exec $compr_cmd[0]: $!\n";
2141 rmtree "_unpack-tar";
2142 mkdir "_unpack-tar" or die $!;
2143 my @tarcmd = qw(tar -x -f -
2144 --no-same-owner --no-same-permissions
2145 --no-acls --no-xattrs --no-selinux);
2146 my $tar_pid = fork // die $!;
2148 chdir "_unpack-tar" or die $!;
2149 open STDIN, "<&", $input or die $!;
2151 die "dgit (child): exec $tarcmd[0]: $!";
2153 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2154 !$? or failedcmd @tarcmd;
2157 (@compr_cmd ? failedcmd @compr_cmd
2159 # finally, we have the results in "tarball", but maybe
2160 # with the wrong permissions
2162 runcmd qw(chmod -R +rwX _unpack-tar);
2163 changedir "_unpack-tar";
2164 remove_stray_gits($f);
2165 mktree_in_ud_here();
2167 my ($tree) = git_add_write_tree();
2168 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2169 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2171 printdebug "one subtree $1\n";
2173 printdebug "multiple subtrees\n";
2176 rmtree "_unpack-tar";
2178 my $ent = [ $f, $tree ];
2180 Orig => !!$orig_f_part,
2181 Sort => (!$orig_f_part ? 2 :
2182 $orig_f_part =~ m/-/g ? 1 :
2190 # put any without "_" first (spec is not clear whether files
2191 # are always in the usual order). Tarballs without "_" are
2192 # the main orig or the debian tarball.
2193 $a->{Sort} <=> $b->{Sort} or
2197 my $any_orig = grep { $_->{Orig} } @tartrees;
2199 my $dscfn = "$package.dsc";
2201 my $treeimporthow = 'package';
2203 open D, ">", $dscfn or die "$dscfn: $!";
2204 print D $dscdata or die "$dscfn: $!";
2205 close D or die "$dscfn: $!";
2206 my @cmd = qw(dpkg-source);
2207 push @cmd, '--no-check' if $dsc_checked;
2208 if (madformat $dsc->{format}) {
2209 push @cmd, '--skip-patches';
2210 $treeimporthow = 'unpatched';
2212 push @cmd, qw(-x --), $dscfn;
2215 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2216 if (madformat $dsc->{format}) {
2217 check_for_vendor_patches();
2221 if (madformat $dsc->{format}) {
2222 my @pcmd = qw(dpkg-source --before-build .);
2223 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2225 $dappliedtree = git_add_write_tree();
2228 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2229 debugcmd "|",@clogcmd;
2230 open CLOGS, "-|", @clogcmd or die $!;
2235 printdebug "import clog search...\n";
2238 my $stanzatext = do { local $/=""; <CLOGS>; };
2239 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2240 last if !defined $stanzatext;
2242 my $desc = "package changelog, entry no.$.";
2243 open my $stanzafh, "<", \$stanzatext or die;
2244 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2245 $clogp //= $thisstanza;
2247 printdebug "import clog $thisstanza->{version} $desc...\n";
2249 last if !$any_orig; # we don't need $r1clogp
2251 # We look for the first (most recent) changelog entry whose
2252 # version number is lower than the upstream version of this
2253 # package. Then the last (least recent) previous changelog
2254 # entry is treated as the one which introduced this upstream
2255 # version and used for the synthetic commits for the upstream
2258 # One might think that a more sophisticated algorithm would be
2259 # necessary. But: we do not want to scan the whole changelog
2260 # file. Stopping when we see an earlier version, which
2261 # necessarily then is an earlier upstream version, is the only
2262 # realistic way to do that. Then, either the earliest
2263 # changelog entry we have seen so far is indeed the earliest
2264 # upload of this upstream version; or there are only changelog
2265 # entries relating to later upstream versions (which is not
2266 # possible unless the changelog and .dsc disagree about the
2267 # version). Then it remains to choose between the physically
2268 # last entry in the file, and the one with the lowest version
2269 # number. If these are not the same, we guess that the
2270 # versions were created in a non-monotic order rather than
2271 # that the changelog entries have been misordered.
2273 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2275 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2276 $r1clogp = $thisstanza;
2278 printdebug "import clog $r1clogp->{version} becomes r1\n";
2280 die $! if CLOGS->error;
2281 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2283 $clogp or fail "package changelog has no entries!";
2285 my $authline = clogp_authline $clogp;
2286 my $changes = getfield $clogp, 'Changes';
2287 my $cversion = getfield $clogp, 'Version';
2290 $r1clogp //= $clogp; # maybe there's only one entry;
2291 my $r1authline = clogp_authline $r1clogp;
2292 # Strictly, r1authline might now be wrong if it's going to be
2293 # unused because !$any_orig. Whatever.
2295 printdebug "import tartrees authline $authline\n";
2296 printdebug "import tartrees r1authline $r1authline\n";
2298 foreach my $tt (@tartrees) {
2299 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2301 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2304 committer $r1authline
2308 [dgit import orig $tt->{F}]
2316 [dgit import tarball $package $cversion $tt->{F}]
2321 printdebug "import main commit\n";
2323 open C, ">../commit.tmp" or die $!;
2324 print C <<END or die $!;
2327 print C <<END or die $! foreach @tartrees;
2330 print C <<END or die $!;
2336 [dgit import $treeimporthow $package $cversion]
2340 my $rawimport_hash = make_commit qw(../commit.tmp);
2342 if (madformat $dsc->{format}) {
2343 printdebug "import apply patches...\n";
2345 # regularise the state of the working tree so that
2346 # the checkout of $rawimport_hash works nicely.
2347 my $dappliedcommit = make_commit_text(<<END);
2354 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2356 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2358 # We need the answers to be reproducible
2359 my @authline = clogp_authline($clogp);
2360 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2361 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2362 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2363 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2364 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2365 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2367 my $path = $ENV{PATH} or die;
2369 foreach my $use_absurd (qw(0 1)) {
2370 local $ENV{PATH} = $path;
2373 progress "warning: $@";
2374 $path = "$absurdity:$path";
2375 progress "$us: trying slow absurd-git-apply...";
2376 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2381 die "forbid absurd git-apply\n" if $use_absurd
2382 && forceing [qw(import-gitapply-no-absurd)];
2383 die "only absurd git-apply!\n" if !$use_absurd
2384 && forceing [qw(import-gitapply-absurd)];
2386 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2387 local $ENV{PATH} = $path if $use_absurd;
2389 my @showcmd = (gbp_pq, qw(import));
2390 my @realcmd = shell_cmd
2391 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2392 debugcmd "+",@realcmd;
2393 if (system @realcmd) {
2394 die +(shellquote @showcmd).
2396 failedcmd_waitstatus()."\n";
2399 my $gapplied = git_rev_parse('HEAD');
2400 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2401 $gappliedtree eq $dappliedtree or
2403 gbp-pq import and dpkg-source disagree!
2404 gbp-pq import gave commit $gapplied
2405 gbp-pq import gave tree $gappliedtree
2406 dpkg-source --before-build gave tree $dappliedtree
2408 $rawimport_hash = $gapplied;
2413 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2418 progress "synthesised git commit from .dsc $cversion";
2420 my $rawimport_mergeinput = {
2421 Commit => $rawimport_hash,
2422 Info => "Import of source package",
2424 my @output = ($rawimport_mergeinput);
2426 if ($lastpush_mergeinput) {
2427 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2428 my $oversion = getfield $oldclogp, 'Version';
2430 version_compare($oversion, $cversion);
2432 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2433 { Message => <<END, ReverseParents => 1 });
2434 Record $package ($cversion) in archive suite $csuite
2436 } elsif ($vcmp > 0) {
2437 print STDERR <<END or die $!;
2439 Version actually in archive: $cversion (older)
2440 Last version pushed with dgit: $oversion (newer or same)
2443 @output = $lastpush_mergeinput;
2445 # Same version. Use what's in the server git branch,
2446 # discarding our own import. (This could happen if the
2447 # server automatically imports all packages into git.)
2448 @output = $lastpush_mergeinput;
2451 changedir '../../../..';
2456 sub complete_file_from_dsc ($$) {
2457 our ($dstdir, $fi) = @_;
2458 # Ensures that we have, in $dir, the file $fi, with the correct
2459 # contents. (Downloading it from alongside $dscurl if necessary.)
2461 my $f = $fi->{Filename};
2462 my $tf = "$dstdir/$f";
2465 if (stat_exists $tf) {
2466 progress "using existing $f";
2468 printdebug "$tf does not exist, need to fetch\n";
2470 $furl =~ s{/[^/]+$}{};
2472 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2473 die "$f ?" if $f =~ m#/#;
2474 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2475 return 0 if !act_local();
2479 open F, "<", "$tf" or die "$tf: $!";
2480 $fi->{Digester}->reset();
2481 $fi->{Digester}->addfile(*F);
2482 F->error and die $!;
2483 my $got = $fi->{Digester}->hexdigest();
2484 $got eq $fi->{Hash} or
2485 fail "file $f has hash $got but .dsc".
2486 " demands hash $fi->{Hash} ".
2487 ($downloaded ? "(got wrong file from archive!)"
2488 : "(perhaps you should delete this file?)");
2493 sub ensure_we_have_orig () {
2494 my @dfi = dsc_files_info();
2495 foreach my $fi (@dfi) {
2496 my $f = $fi->{Filename};
2497 next unless is_orig_file_in_dsc($f, \@dfi);
2498 complete_file_from_dsc('..', $fi)
2503 sub git_fetch_us () {
2504 # Want to fetch only what we are going to use, unless
2505 # deliberately-not-ff, in which case we must fetch everything.
2507 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2509 (quiltmode_splitbrain
2510 ? (map { $_->('*',access_nomdistro) }
2511 \&debiantag_new, \&debiantag_maintview)
2512 : debiantags('*',access_nomdistro));
2513 push @specs, server_branch($csuite);
2514 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2516 # This is rather miserable:
2517 # When git fetch --prune is passed a fetchspec ending with a *,
2518 # it does a plausible thing. If there is no * then:
2519 # - it matches subpaths too, even if the supplied refspec
2520 # starts refs, and behaves completely madly if the source
2521 # has refs/refs/something. (See, for example, Debian #NNNN.)
2522 # - if there is no matching remote ref, it bombs out the whole
2524 # We want to fetch a fixed ref, and we don't know in advance
2525 # if it exists, so this is not suitable.
2527 # Our workaround is to use git ls-remote. git ls-remote has its
2528 # own qairks. Notably, it has the absurd multi-tail-matching
2529 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2530 # refs/refs/foo etc.
2532 # Also, we want an idempotent snapshot, but we have to make two
2533 # calls to the remote: one to git ls-remote and to git fetch. The
2534 # solution is use git ls-remote to obtain a target state, and
2535 # git fetch to try to generate it. If we don't manage to generate
2536 # the target state, we try again.
2538 printdebug "git_fetch_us specs @specs\n";
2540 my $specre = join '|', map {
2546 printdebug "git_fetch_us specre=$specre\n";
2547 my $wanted_rref = sub {
2549 return m/^(?:$specre)$/o;
2552 my $fetch_iteration = 0;
2555 printdebug "git_fetch_us iteration $fetch_iteration\n";
2556 if (++$fetch_iteration > 10) {
2557 fail "too many iterations trying to get sane fetch!";
2560 my @look = map { "refs/$_" } @specs;
2561 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2565 open GITLS, "-|", @lcmd or die $!;
2567 printdebug "=> ", $_;
2568 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2569 my ($objid,$rrefname) = ($1,$2);
2570 if (!$wanted_rref->($rrefname)) {
2572 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2576 $wantr{$rrefname} = $objid;
2579 close GITLS or failedcmd @lcmd;
2581 # OK, now %want is exactly what we want for refs in @specs
2583 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2584 "+refs/$_:".lrfetchrefs."/$_";
2587 printdebug "git_fetch_us fspecs @fspecs\n";
2589 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2590 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2593 %lrfetchrefs_f = ();
2596 git_for_each_ref(lrfetchrefs, sub {
2597 my ($objid,$objtype,$lrefname,$reftail) = @_;
2598 $lrfetchrefs_f{$lrefname} = $objid;
2599 $objgot{$objid} = 1;
2602 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2603 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2604 if (!exists $wantr{$rrefname}) {
2605 if ($wanted_rref->($rrefname)) {
2607 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2611 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2614 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2615 delete $lrfetchrefs_f{$lrefname};
2619 foreach my $rrefname (sort keys %wantr) {
2620 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2621 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2622 my $want = $wantr{$rrefname};
2623 next if $got eq $want;
2624 if (!defined $objgot{$want}) {
2626 warning: git ls-remote suggests we want $lrefname
2627 warning: and it should refer to $want
2628 warning: but git fetch didn't fetch that object to any relevant ref.
2629 warning: This may be due to a race with someone updating the server.
2630 warning: Will try again...
2632 next FETCH_ITERATION;
2635 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2637 runcmd_ordryrun_local @git, qw(update-ref -m),
2638 "dgit fetch git fetch fixup", $lrefname, $want;
2639 $lrfetchrefs_f{$lrefname} = $want;
2643 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2644 Dumper(\%lrfetchrefs_f);
2647 my @tagpats = debiantags('*',access_nomdistro);
2649 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2650 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2651 printdebug "currently $fullrefname=$objid\n";
2652 $here{$fullrefname} = $objid;
2654 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2655 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2656 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2657 printdebug "offered $lref=$objid\n";
2658 if (!defined $here{$lref}) {
2659 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2660 runcmd_ordryrun_local @upd;
2661 lrfetchref_used $fullrefname;
2662 } elsif ($here{$lref} eq $objid) {
2663 lrfetchref_used $fullrefname;
2666 "Not updateting $lref from $here{$lref} to $objid.\n";
2671 sub mergeinfo_getclogp ($) {
2672 # Ensures thit $mi->{Clogp} exists and returns it
2674 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2677 sub mergeinfo_version ($) {
2678 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2681 sub fetch_from_archive_record_1 ($) {
2683 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2684 'DGIT_ARCHIVE', $hash;
2685 cmdoutput @git, qw(log -n2), $hash;
2686 # ... gives git a chance to complain if our commit is malformed
2689 sub fetch_from_archive_record_2 ($) {
2691 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2695 dryrun_report @upd_cmd;
2699 sub fetch_from_archive () {
2700 ensure_setup_existing_tree();
2702 # Ensures that lrref() is what is actually in the archive, one way
2703 # or another, according to us - ie this client's
2704 # appropritaely-updated archive view. Also returns the commit id.
2705 # If there is nothing in the archive, leaves lrref alone and
2706 # returns undef. git_fetch_us must have already been called.
2710 foreach my $field (@ourdscfield) {
2711 $dsc_hash = $dsc->{$field};
2712 last if defined $dsc_hash;
2714 if (defined $dsc_hash) {
2715 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2717 progress "last upload to archive specified git hash";
2719 progress "last upload to archive has NO git hash";
2722 progress "no version available from the archive";
2725 # If the archive's .dsc has a Dgit field, there are three
2726 # relevant git commitids we need to choose between and/or merge
2728 # 1. $dsc_hash: the Dgit field from the archive
2729 # 2. $lastpush_hash: the suite branch on the dgit git server
2730 # 3. $lastfetch_hash: our local tracking brach for the suite
2732 # These may all be distinct and need not be in any fast forward
2735 # If the dsc was pushed to this suite, then the server suite
2736 # branch will have been updated; but it might have been pushed to
2737 # a different suite and copied by the archive. Conversely a more
2738 # recent version may have been pushed with dgit but not appeared
2739 # in the archive (yet).
2741 # $lastfetch_hash may be awkward because archive imports
2742 # (particularly, imports of Dgit-less .dscs) are performed only as
2743 # needed on individual clients, so different clients may perform a
2744 # different subset of them - and these imports are only made
2745 # public during push. So $lastfetch_hash may represent a set of
2746 # imports different to a subsequent upload by a different dgit
2749 # Our approach is as follows:
2751 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2752 # descendant of $dsc_hash, then it was pushed by a dgit user who
2753 # had based their work on $dsc_hash, so we should prefer it.
2754 # Otherwise, $dsc_hash was installed into this suite in the
2755 # archive other than by a dgit push, and (necessarily) after the
2756 # last dgit push into that suite (since a dgit push would have
2757 # been descended from the dgit server git branch); thus, in that
2758 # case, we prefer the archive's version (and produce a
2759 # pseudo-merge to overwrite the dgit server git branch).
2761 # (If there is no Dgit field in the archive's .dsc then
2762 # generate_commit_from_dsc uses the version numbers to decide
2763 # whether the suite branch or the archive is newer. If the suite
2764 # branch is newer it ignores the archive's .dsc; otherwise it
2765 # generates an import of the .dsc, and produces a pseudo-merge to
2766 # overwrite the suite branch with the archive contents.)
2768 # The outcome of that part of the algorithm is the `public view',
2769 # and is same for all dgit clients: it does not depend on any
2770 # unpublished history in the local tracking branch.
2772 # As between the public view and the local tracking branch: The
2773 # local tracking branch is only updated by dgit fetch, and
2774 # whenever dgit fetch runs it includes the public view in the
2775 # local tracking branch. Therefore if the public view is not
2776 # descended from the local tracking branch, the local tracking
2777 # branch must contain history which was imported from the archive
2778 # but never pushed; and, its tip is now out of date. So, we make
2779 # a pseudo-merge to overwrite the old imports and stitch the old
2782 # Finally: we do not necessarily reify the public view (as
2783 # described above). This is so that we do not end up stacking two
2784 # pseudo-merges. So what we actually do is figure out the inputs
2785 # to any public view pseudo-merge and put them in @mergeinputs.
2788 # $mergeinputs[]{Commit}
2789 # $mergeinputs[]{Info}
2790 # $mergeinputs[0] is the one whose tree we use
2791 # @mergeinputs is in the order we use in the actual commit)
2794 # $mergeinputs[]{Message} is a commit message to use
2795 # $mergeinputs[]{ReverseParents} if def specifies that parent
2796 # list should be in opposite order
2797 # Such an entry has no Commit or Info. It applies only when found
2798 # in the last entry. (This ugliness is to support making
2799 # identical imports to previous dgit versions.)
2801 my $lastpush_hash = git_get_ref(lrfetchref());
2802 printdebug "previous reference hash=$lastpush_hash\n";
2803 $lastpush_mergeinput = $lastpush_hash && {
2804 Commit => $lastpush_hash,
2805 Info => "dgit suite branch on dgit git server",
2808 my $lastfetch_hash = git_get_ref(lrref());
2809 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2810 my $lastfetch_mergeinput = $lastfetch_hash && {
2811 Commit => $lastfetch_hash,
2812 Info => "dgit client's archive history view",
2815 my $dsc_mergeinput = $dsc_hash && {
2816 Commit => $dsc_hash,
2817 Info => "Dgit field in .dsc from archive",
2821 my $del_lrfetchrefs = sub {
2824 printdebug "del_lrfetchrefs...\n";
2825 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2826 my $objid = $lrfetchrefs_d{$fullrefname};
2827 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2829 $gur ||= new IO::Handle;
2830 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2832 printf $gur "delete %s %s\n", $fullrefname, $objid;
2835 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2839 if (defined $dsc_hash) {
2840 ensure_we_have_orig();
2841 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2842 @mergeinputs = $dsc_mergeinput
2843 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2844 print STDERR <<END or die $!;
2846 Git commit in archive is behind the last version allegedly pushed/uploaded.
2847 Commit referred to by archive: $dsc_hash
2848 Last version pushed with dgit: $lastpush_hash
2851 @mergeinputs = ($lastpush_mergeinput);
2853 # Archive has .dsc which is not a descendant of the last dgit
2854 # push. This can happen if the archive moves .dscs about.
2855 # Just follow its lead.
2856 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2857 progress "archive .dsc names newer git commit";
2858 @mergeinputs = ($dsc_mergeinput);
2860 progress "archive .dsc names other git commit, fixing up";
2861 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2865 @mergeinputs = generate_commits_from_dsc();
2866 # We have just done an import. Now, our import algorithm might
2867 # have been improved. But even so we do not want to generate
2868 # a new different import of the same package. So if the
2869 # version numbers are the same, just use our existing version.
2870 # If the version numbers are different, the archive has changed
2871 # (perhaps, rewound).
2872 if ($lastfetch_mergeinput &&
2873 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2874 (mergeinfo_version $mergeinputs[0]) )) {
2875 @mergeinputs = ($lastfetch_mergeinput);
2877 } elsif ($lastpush_hash) {
2878 # only in git, not in the archive yet
2879 @mergeinputs = ($lastpush_mergeinput);
2880 print STDERR <<END or die $!;
2882 Package not found in the archive, but has allegedly been pushed using dgit.
2886 printdebug "nothing found!\n";
2887 if (defined $skew_warning_vsn) {
2888 print STDERR <<END or die $!;
2890 Warning: relevant archive skew detected.
2891 Archive allegedly contains $skew_warning_vsn
2892 But we were not able to obtain any version from the archive or git.
2896 unshift @end, $del_lrfetchrefs;
2900 if ($lastfetch_hash &&
2902 my $h = $_->{Commit};
2903 $h and is_fast_fwd($lastfetch_hash, $h);
2904 # If true, one of the existing parents of this commit
2905 # is a descendant of the $lastfetch_hash, so we'll
2906 # be ff from that automatically.
2910 push @mergeinputs, $lastfetch_mergeinput;
2913 printdebug "fetch mergeinfos:\n";
2914 foreach my $mi (@mergeinputs) {
2916 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2918 printdebug sprintf " ReverseParents=%d Message=%s",
2919 $mi->{ReverseParents}, $mi->{Message};
2923 my $compat_info= pop @mergeinputs
2924 if $mergeinputs[$#mergeinputs]{Message};
2926 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2929 if (@mergeinputs > 1) {
2931 my $tree_commit = $mergeinputs[0]{Commit};
2933 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2934 $tree =~ m/\n\n/; $tree = $`;
2935 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2938 # We use the changelog author of the package in question the
2939 # author of this pseudo-merge. This is (roughly) correct if
2940 # this commit is simply representing aa non-dgit upload.
2941 # (Roughly because it does not record sponsorship - but we
2942 # don't have sponsorship info because that's in the .changes,
2943 # which isn't in the archivw.)
2945 # But, it might be that we are representing archive history
2946 # updates (including in-archive copies). These are not really
2947 # the responsibility of the person who created the .dsc, but
2948 # there is no-one whose name we should better use. (The
2949 # author of the .dsc-named commit is clearly worse.)
2951 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2952 my $author = clogp_authline $useclogp;
2953 my $cversion = getfield $useclogp, 'Version';
2955 my $mcf = ".git/dgit/mergecommit";
2956 open MC, ">", $mcf or die "$mcf $!";
2957 print MC <<END or die $!;
2961 my @parents = grep { $_->{Commit} } @mergeinputs;
2962 @parents = reverse @parents if $compat_info->{ReverseParents};
2963 print MC <<END or die $! foreach @parents;
2967 print MC <<END or die $!;
2973 if (defined $compat_info->{Message}) {
2974 print MC $compat_info->{Message} or die $!;
2976 print MC <<END or die $!;
2977 Record $package ($cversion) in archive suite $csuite
2981 my $message_add_info = sub {
2983 my $mversion = mergeinfo_version $mi;
2984 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2988 $message_add_info->($mergeinputs[0]);
2989 print MC <<END or die $!;
2990 should be treated as descended from
2992 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2996 $hash = make_commit $mcf;
2998 $hash = $mergeinputs[0]{Commit};
3000 printdebug "fetch hash=$hash\n";
3003 my ($lasth, $what) = @_;
3004 return unless $lasth;
3005 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3008 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3010 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3012 fetch_from_archive_record_1($hash);
3014 if (defined $skew_warning_vsn) {
3016 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3017 my $gotclogp = commit_getclogp($hash);
3018 my $got_vsn = getfield $gotclogp, 'Version';
3019 printdebug "SKEW CHECK GOT $got_vsn\n";
3020 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3021 print STDERR <<END or die $!;
3023 Warning: archive skew detected. Using the available version:
3024 Archive allegedly contains $skew_warning_vsn
3025 We were able to obtain only $got_vsn
3031 if ($lastfetch_hash ne $hash) {
3032 fetch_from_archive_record_2($hash);
3035 lrfetchref_used lrfetchref();
3037 unshift @end, $del_lrfetchrefs;
3041 sub set_local_git_config ($$) {
3043 runcmd @git, qw(config), $k, $v;
3046 sub setup_mergechangelogs (;$) {
3048 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3050 my $driver = 'dpkg-mergechangelogs';
3051 my $cb = "merge.$driver";
3052 my $attrs = '.git/info/attributes';
3053 ensuredir '.git/info';
3055 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3056 if (!open ATTRS, "<", $attrs) {
3057 $!==ENOENT or die "$attrs: $!";
3061 next if m{^debian/changelog\s};
3062 print NATTRS $_, "\n" or die $!;
3064 ATTRS->error and die $!;
3067 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3070 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3071 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3073 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3076 sub setup_useremail (;$) {
3078 return unless $always || access_cfg_bool(1, 'setup-useremail');
3081 my ($k, $envvar) = @_;
3082 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3083 return unless defined $v;
3084 set_local_git_config "user.$k", $v;
3087 $setup->('email', 'DEBEMAIL');
3088 $setup->('name', 'DEBFULLNAME');
3091 sub ensure_setup_existing_tree () {
3092 my $k = "remote.$remotename.skipdefaultupdate";
3093 my $c = git_get_config $k;
3094 return if defined $c;
3095 set_local_git_config $k, 'true';
3098 sub setup_new_tree () {
3099 setup_mergechangelogs();
3103 sub multisuite_suite_child ($$$) {
3104 my ($tsuite, $merginputs, $fn) = @_;
3105 # in child, sets things up, calls $fn->(), and returns undef
3106 # in parent, returns canonical suite name for $tsuite
3107 my $canonsuitefh = IO::File::new_tmpfile;
3108 my $pid = fork // die $!;
3111 $us .= " [$isuite]";
3112 $debugprefix .= " ";
3113 progress "fetching $tsuite...";
3114 canonicalise_suite();
3115 print $canonsuitefh $csuite, "\n" or die $!;
3116 close $canonsuitefh or die $!;
3120 waitpid $pid,0 == $pid or die $!;
3121 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3122 seek $canonsuitefh,0,0 or die $!;
3123 local $csuite = <$canonsuitefh>;
3124 die $! unless defined $csuite && chomp $csuite;
3126 printdebug "multisuite $tsuite missing\n";
3129 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3130 push @$merginputs, {
3137 sub fork_for_multisuite ($) {
3138 my ($before_fetch_merge) = @_;
3139 # if nothing unusual, just returns ''
3142 # returns 0 to caller in child, to do first of the specified suites
3143 # in child, $csuite is not yet set
3145 # returns 1 to caller in parent, to finish up anything needed after
3146 # in parent, $csuite is set to canonicalised portmanteau
3148 my $org_isuite = $isuite;
3149 my @suites = split /\,/, $isuite;
3150 return '' unless @suites > 1;
3151 printdebug "fork_for_multisuite: @suites\n";
3155 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3157 return 0 unless defined $cbasesuite;
3159 fail "package $package missing in (base suite) $cbasesuite"
3160 unless @mergeinputs;
3162 my @csuites = ($cbasesuite);
3164 $before_fetch_merge->();
3166 foreach my $tsuite (@suites[1..$#suites]) {
3167 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3173 # xxx collecte the ref here
3175 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3176 push @csuites, $csubsuite;
3179 foreach my $mi (@mergeinputs) {
3180 my $ref = git_get_ref $mi->{Ref};
3181 die "$mi->{Ref} ?" unless length $ref;
3182 $mi->{Commit} = $ref;
3185 $csuite = join ",", @csuites;
3187 my $previous = git_get_ref lrref;
3189 unshift @mergeinputs, {
3190 Commit => $previous,
3191 Info => "local combined tracking branch",
3193 "archive seems to have rewound: local tracking branch is ahead!",
3197 foreach my $ix (0..$#mergeinputs) {
3198 $mergeinputs[$ix]{Index} = $ix;
3201 @mergeinputs = sort {
3202 -version_compare(mergeinfo_version $a,
3203 mergeinfo_version $b) # highest version first
3205 $a->{Index} <=> $b->{Index}; # earliest in spec first
3211 foreach my $mi (@mergeinputs) {
3212 printdebug "multisuite merge check $mi->{Info}\n";
3213 foreach my $previous (@needed) {
3214 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3215 printdebug "multisuite merge un-needed $previous->{Info}\n";
3219 printdebug "multisuite merge this-needed\n";
3220 $mi->{Character} = '+';
3223 $needed[0]{Character} = '*';
3225 my $output = $needed[0]{Commit};
3228 printdebug "multisuite merge nontrivial\n";
3229 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3231 my $commit = "tree $tree\n";
3232 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3233 "Input branches:\n";
3235 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3236 printdebug "multisuite merge include $mi->{Info}\n";
3237 $mi->{Character} //= ' ';
3238 $commit .= "parent $mi->{Commit}\n";
3239 $msg .= sprintf " %s %-25s %s\n",
3241 (mergeinfo_version $mi),
3244 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3246 " * marks the highest version branch, which choose to use\n".
3247 " + marks each branch which was not already an ancestor\n\n".
3248 "[dgit multi-suite $csuite]\n";
3250 "author $authline\n".
3251 "committer $authline\n\n";
3252 $output = make_commit_text $commit.$msg;
3253 printdebug "multisuite merge generated $output\n";
3256 fetch_from_archive_record_1($output);
3257 fetch_from_archive_record_2($output);
3259 progress "calculated combined tracking suite $csuite";
3264 sub clone_set_head () {
3265 open H, "> .git/HEAD" or die $!;
3266 print H "ref: ".lref()."\n" or die $!;
3269 sub clone_finish ($) {
3271 runcmd @git, qw(reset --hard), lrref();
3272 runcmd qw(bash -ec), <<'END';
3274 git ls-tree -r --name-only -z HEAD | \
3275 xargs -0r touch -h -r . --
3277 printdone "ready for work in $dstdir";
3282 badusage "dry run makes no sense with clone" unless act_local();
3284 my $multi_fetched = fork_for_multisuite(sub {
3285 printdebug "multi clone before fetch merge\n";
3288 if ($multi_fetched) {
3289 printdebug "multi clone after fetch merge\n";
3291 clone_finish($dstdir);
3294 printdebug "clone main body\n";
3296 canonicalise_suite();
3297 my $hasgit = check_for_git();
3298 mkdir $dstdir or fail "create \`$dstdir': $!";
3300 runcmd @git, qw(init -q);
3302 my $giturl = access_giturl(1);
3303 if (defined $giturl) {
3304 runcmd @git, qw(remote add), 'origin', $giturl;
3307 progress "fetching existing git history";
3309 runcmd_ordryrun_local @git, qw(fetch origin);
3311 progress "starting new git history";
3313 fetch_from_archive() or no_such_package;
3314 my $vcsgiturl = $dsc->{'Vcs-Git'};
3315 if (length $vcsgiturl) {
3316 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3317 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3320 clone_finish($dstdir);
3324 canonicalise_suite();
3325 if (check_for_git()) {
3328 fetch_from_archive() or no_such_package();
3329 printdone "fetched into ".lrref();
3333 my $multi_fetched = fork_for_multisuite(sub { });
3334 fetch() unless $multi_fetched; # parent
3335 return if $multi_fetched eq '0'; # child
3336 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3338 printdone "fetched to ".lrref()." and merged into HEAD";
3341 sub check_not_dirty () {
3342 foreach my $f (qw(local-options local-patch-header)) {
3343 if (stat_exists "debian/source/$f") {
3344 fail "git tree contains debian/source/$f";
3348 return if $ignoredirty;
3350 my @cmd = (@git, qw(diff --quiet HEAD));
3352 $!=0; $?=-1; system @cmd;
3355 fail "working tree is dirty (does not match HEAD)";
3361 sub commit_admin ($) {
3364 runcmd_ordryrun_local @git, qw(commit -m), $m;
3367 sub commit_quilty_patch () {
3368 my $output = cmdoutput @git, qw(status --porcelain);
3370 foreach my $l (split /\n/, $output) {
3371 next unless $l =~ m/\S/;
3372 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3376 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3378 progress "nothing quilty to commit, ok.";
3381 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3382 runcmd_ordryrun_local @git, qw(add -f), @adds;
3384 Commit Debian 3.0 (quilt) metadata
3386 [dgit ($our_version) quilt-fixup]
3390 sub get_source_format () {
3392 if (open F, "debian/source/options") {
3396 s/\s+$//; # ignore missing final newline
3398 my ($k, $v) = ($`, $'); #');
3399 $v =~ s/^"(.*)"$/$1/;
3405 F->error and die $!;
3408 die $! unless $!==&ENOENT;
3411 if (!open F, "debian/source/format") {
3412 die $! unless $!==&ENOENT;
3416 F->error and die $!;
3418 return ($_, \%options);
3421 sub madformat_wantfixup ($) {
3423 return 0 unless $format eq '3.0 (quilt)';
3424 our $quilt_mode_warned;
3425 if ($quilt_mode eq 'nocheck') {
3426 progress "Not doing any fixup of \`$format' due to".
3427 " ----no-quilt-fixup or --quilt=nocheck"
3428 unless $quilt_mode_warned++;
3431 progress "Format \`$format', need to check/update patch stack"
3432 unless $quilt_mode_warned++;
3436 sub maybe_split_brain_save ($$$) {
3437 my ($headref, $dgitview, $msg) = @_;
3438 # => message fragment "$saved" describing disposition of $dgitview
3439 return "commit id $dgitview" unless defined $split_brain_save;
3440 my @cmd = (shell_cmd "cd ../../../..",
3441 @git, qw(update-ref -m),
3442 "dgit --dgit-view-save $msg HEAD=$headref",
3443 $split_brain_save, $dgitview);
3445 return "and left in $split_brain_save";
3448 # An "infopair" is a tuple [ $thing, $what ]
3449 # (often $thing is a commit hash; $what is a description)
3451 sub infopair_cond_equal ($$) {
3453 $x->[0] eq $y->[0] or fail <<END;
3454 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3458 sub infopair_lrf_tag_lookup ($$) {
3459 my ($tagnames, $what) = @_;
3460 # $tagname may be an array ref
3461 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3462 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3463 foreach my $tagname (@tagnames) {
3464 my $lrefname = lrfetchrefs."/tags/$tagname";
3465 my $tagobj = $lrfetchrefs_f{$lrefname};
3466 next unless defined $tagobj;
3467 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3468 return [ git_rev_parse($tagobj), $what ];
3470 fail @tagnames==1 ? <<END : <<END;
3471 Wanted tag $what (@tagnames) on dgit server, but not found
3473 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3477 sub infopair_cond_ff ($$) {
3478 my ($anc,$desc) = @_;
3479 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3480 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3484 sub pseudomerge_version_check ($$) {
3485 my ($clogp, $archive_hash) = @_;
3487 my $arch_clogp = commit_getclogp $archive_hash;
3488 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3489 'version currently in archive' ];
3490 if (defined $overwrite_version) {
3491 if (length $overwrite_version) {
3492 infopair_cond_equal([ $overwrite_version,
3493 '--overwrite= version' ],
3496 my $v = $i_arch_v->[0];
3497 progress "Checking package changelog for archive version $v ...";
3499 my @xa = ("-f$v", "-t$v");
3500 my $vclogp = parsechangelog @xa;
3501 my $cv = [ (getfield $vclogp, 'Version'),
3502 "Version field from dpkg-parsechangelog @xa" ];
3503 infopair_cond_equal($i_arch_v, $cv);
3506 $@ =~ s/^dgit: //gm;
3508 "Perhaps debian/changelog does not mention $v ?";
3513 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3517 sub pseudomerge_make_commit ($$$$ $$) {
3518 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3519 $msg_cmd, $msg_msg) = @_;
3520 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3522 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3523 my $authline = clogp_authline $clogp;
3527 !defined $overwrite_version ? ""
3528 : !length $overwrite_version ? " --overwrite"
3529 : " --overwrite=".$overwrite_version;
3532 my $pmf = ".git/dgit/pseudomerge";
3533 open MC, ">", $pmf or die "$pmf $!";
3534 print MC <<END or die $!;
3537 parent $archive_hash
3547 return make_commit($pmf);
3550 sub splitbrain_pseudomerge ($$$$) {
3551 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3552 # => $merged_dgitview
3553 printdebug "splitbrain_pseudomerge...\n";
3555 # We: debian/PREVIOUS HEAD($maintview)
3556 # expect: o ----------------- o
3559 # a/d/PREVIOUS $dgitview
3562 # we do: `------------------ o
3566 return $dgitview unless defined $archive_hash;
3568 printdebug "splitbrain_pseudomerge...\n";
3570 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3572 if (!defined $overwrite_version) {
3573 progress "Checking that HEAD inciudes all changes in archive...";
3576 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3578 if (defined $overwrite_version) {
3580 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3581 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3582 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3583 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3584 my $i_archive = [ $archive_hash, "current archive contents" ];
3586 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3588 infopair_cond_equal($i_dgit, $i_archive);
3589 infopair_cond_ff($i_dep14, $i_dgit);
3590 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3594 $us: check failed (maybe --overwrite is needed, consult documentation)
3599 my $r = pseudomerge_make_commit
3600 $clogp, $dgitview, $archive_hash, $i_arch_v,
3601 "dgit --quilt=$quilt_mode",
3602 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3603 Declare fast forward from $i_arch_v->[0]
3605 Make fast forward from $i_arch_v->[0]
3608 maybe_split_brain_save $maintview, $r, "pseudomerge";
3610 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3614 sub plain_overwrite_pseudomerge ($$$) {
3615 my ($clogp, $head, $archive_hash) = @_;
3617 printdebug "plain_overwrite_pseudomerge...";
3619 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3621 return $head if is_fast_fwd $archive_hash, $head;
3623 my $m = "Declare fast forward from $i_arch_v->[0]";
3625 my $r = pseudomerge_make_commit
3626 $clogp, $head, $archive_hash, $i_arch_v,
3629 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3631 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3635 sub push_parse_changelog ($) {
3638 my $clogp = Dpkg::Control::Hash->new();
3639 $clogp->load($clogpfn) or die;
3641 my $clogpackage = getfield $clogp, 'Source';
3642 $package //= $clogpackage;
3643 fail "-p specified $package but changelog specified $clogpackage"
3644 unless $package eq $clogpackage;
3645 my $cversion = getfield $clogp, 'Version';
3646 my $tag = debiantag($cversion, access_nomdistro);
3647 runcmd @git, qw(check-ref-format), $tag;
3649 my $dscfn = dscfn($cversion);
3651 return ($clogp, $cversion, $dscfn);
3654 sub push_parse_dsc ($$$) {
3655 my ($dscfn,$dscfnwhat, $cversion) = @_;
3656 $dsc = parsecontrol($dscfn,$dscfnwhat);
3657 my $dversion = getfield $dsc, 'Version';
3658 my $dscpackage = getfield $dsc, 'Source';
3659 ($dscpackage eq $package && $dversion eq $cversion) or
3660 fail "$dscfn is for $dscpackage $dversion".
3661 " but debian/changelog is for $package $cversion";
3664 sub push_tagwants ($$$$) {
3665 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3668 TagFn => \&debiantag,
3673 if (defined $maintviewhead) {
3675 TagFn => \&debiantag_maintview,
3676 Objid => $maintviewhead,
3677 TfSuffix => '-maintview',
3680 } elsif ($dodep14tag eq 'no' ? 0
3681 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3682 : $dodep14tag eq 'always'
3683 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3684 --dep14tag-always (or equivalent in config) means server must support
3685 both "new" and "maint" tag formats, but config says it doesn't.
3687 : die "$dodep14tag ?") {
3689 TagFn => \&debiantag_maintview,
3691 TfSuffix => '-dgit',
3695 foreach my $tw (@tagwants) {
3696 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3697 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3699 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3703 sub push_mktags ($$ $$ $) {
3705 $changesfile,$changesfilewhat,
3708 die unless $tagwants->[0]{View} eq 'dgit';
3710 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3711 $dsc->save("$dscfn.tmp") or die $!;
3713 my $changes = parsecontrol($changesfile,$changesfilewhat);
3714 foreach my $field (qw(Source Distribution Version)) {
3715 $changes->{$field} eq $clogp->{$field} or
3716 fail "changes field $field \`$changes->{$field}'".
3717 " does not match changelog \`$clogp->{$field}'";
3720 my $cversion = getfield $clogp, 'Version';
3721 my $clogsuite = getfield $clogp, 'Distribution';
3723 # We make the git tag by hand because (a) that makes it easier