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';
99 our $rewritemap = 'dgit-rewrite/map';
101 our (@git) = qw(git);
102 our (@dget) = qw(dget);
103 our (@curl) = qw(curl);
104 our (@dput) = qw(dput);
105 our (@debsign) = qw(debsign);
106 our (@gpg) = qw(gpg);
107 our (@sbuild) = qw(sbuild);
109 our (@dgit) = qw(dgit);
110 our (@aptget) = qw(apt-get);
111 our (@aptcache) = qw(apt-cache);
112 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
113 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
114 our (@dpkggenchanges) = qw(dpkg-genchanges);
115 our (@mergechanges) = qw(mergechanges -f);
116 our (@gbp_build) = ('');
117 our (@gbp_pq) = ('gbp pq');
118 our (@changesopts) = ('');
120 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
123 'debsign' => \@debsign,
125 'sbuild' => \@sbuild,
129 'apt-get' => \@aptget,
130 'apt-cache' => \@aptcache,
131 'dpkg-source' => \@dpkgsource,
132 'dpkg-buildpackage' => \@dpkgbuildpackage,
133 'dpkg-genchanges' => \@dpkggenchanges,
134 'gbp-build' => \@gbp_build,
135 'gbp-pq' => \@gbp_pq,
136 'ch' => \@changesopts,
137 'mergechanges' => \@mergechanges);
139 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
140 our %opts_cfg_insertpos = map {
142 scalar @{ $opts_opt_map{$_} }
143 } keys %opts_opt_map;
145 sub parseopts_late_defaults();
151 our $supplementary_message = '';
152 our $need_split_build_invocation = 0;
153 our $split_brain = 0;
157 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
160 our $remotename = 'dgit';
161 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
165 if (!defined $absurdity) {
167 $absurdity =~ s{/[^/]+$}{/absurd} or die;
171 my ($v,$distro) = @_;
172 return $tagformatfn->($v, $distro);
175 sub debiantag_maintview ($$) {
176 my ($v,$distro) = @_;
177 return "$distro/".dep14_version_mangle $v;
180 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
182 sub lbranch () { return "$branchprefix/$csuite"; }
183 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
184 sub lref () { return "refs/heads/".lbranch(); }
185 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
186 sub rrref () { return server_ref($csuite); }
196 return "${package}_".(stripepoch $vsn).$sfx
201 return srcfn($vsn,".dsc");
204 sub changespat ($;$) {
205 my ($vsn, $arch) = @_;
206 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
209 sub upstreamversion ($) {
221 foreach my $f (@end) {
223 print STDERR "$us: cleanup: $@" if length $@;
227 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
229 sub forceable_fail ($$) {
230 my ($forceoptsl, $msg) = @_;
231 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
232 print STDERR "warning: overriding problem due to --force:\n". $msg;
236 my ($forceoptsl) = @_;
237 my @got = grep { $forceopts{$_} } @$forceoptsl;
238 return 0 unless @got;
240 "warning: skipping checks or functionality due to --force-$got[0]\n";
243 sub no_such_package () {
244 print STDERR "$us: package $package does not exist in suite $isuite\n";
250 printdebug "CD $newdir\n";
251 chdir $newdir or confess "chdir: $newdir: $!";
254 sub deliberately ($) {
256 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
259 sub deliberately_not_fast_forward () {
260 foreach (qw(not-fast-forward fresh-repo)) {
261 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
265 sub quiltmode_splitbrain () {
266 $quilt_mode =~ m/gbp|dpm|unapplied/;
269 sub opts_opt_multi_cmd {
271 push @cmd, split /\s+/, shift @_;
277 return opts_opt_multi_cmd @gbp_pq;
280 #---------- remote protocol support, common ----------
282 # remote push initiator/responder protocol:
283 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
284 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
285 # < dgit-remote-push-ready <actual-proto-vsn>
292 # > supplementary-message NBYTES # $protovsn >= 3
297 # > file parsed-changelog
298 # [indicates that output of dpkg-parsechangelog follows]
299 # > data-block NBYTES
300 # > [NBYTES bytes of data (no newline)]
301 # [maybe some more blocks]
310 # > param head DGIT-VIEW-HEAD
311 # > param csuite SUITE
312 # > param tagformat old|new
313 # > param maint-view MAINT-VIEW-HEAD
315 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
316 # # goes into tag, for replay prevention
319 # [indicates that signed tag is wanted]
320 # < data-block NBYTES
321 # < [NBYTES bytes of data (no newline)]
322 # [maybe some more blocks]
326 # > want signed-dsc-changes
327 # < data-block NBYTES [transfer of signed dsc]
329 # < data-block NBYTES [transfer of signed changes]
337 sub i_child_report () {
338 # Sees if our child has died, and reap it if so. Returns a string
339 # describing how it died if it failed, or undef otherwise.
340 return undef unless $i_child_pid;
341 my $got = waitpid $i_child_pid, WNOHANG;
342 return undef if $got <= 0;
343 die unless $got == $i_child_pid;
344 $i_child_pid = undef;
345 return undef unless $?;
346 return "build host child ".waitstatusmsg();
351 fail "connection lost: $!" if $fh->error;
352 fail "protocol violation; $m not expected";
355 sub badproto_badread ($$) {
357 fail "connection lost: $!" if $!;
358 my $report = i_child_report();
359 fail $report if defined $report;
360 badproto $fh, "eof (reading $wh)";
363 sub protocol_expect (&$) {
364 my ($match, $fh) = @_;
367 defined && chomp or badproto_badread $fh, "protocol message";
375 badproto $fh, "\`$_'";
378 sub protocol_send_file ($$) {
379 my ($fh, $ourfn) = @_;
380 open PF, "<", $ourfn or die "$ourfn: $!";
383 my $got = read PF, $d, 65536;
384 die "$ourfn: $!" unless defined $got;
386 print $fh "data-block ".length($d)."\n" or die $!;
387 print $fh $d or die $!;
389 PF->error and die "$ourfn $!";
390 print $fh "data-end\n" or die $!;
394 sub protocol_read_bytes ($$) {
395 my ($fh, $nbytes) = @_;
396 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
398 my $got = read $fh, $d, $nbytes;
399 $got==$nbytes or badproto_badread $fh, "data block";
403 sub protocol_receive_file ($$) {
404 my ($fh, $ourfn) = @_;
405 printdebug "() $ourfn\n";
406 open PF, ">", $ourfn or die "$ourfn: $!";
408 my ($y,$l) = protocol_expect {
409 m/^data-block (.*)$/ ? (1,$1) :
410 m/^data-end$/ ? (0,) :
414 my $d = protocol_read_bytes $fh, $l;
415 print PF $d or die $!;
420 #---------- remote protocol support, responder ----------
422 sub responder_send_command ($) {
424 return unless $we_are_responder;
425 # called even without $we_are_responder
426 printdebug ">> $command\n";
427 print PO $command, "\n" or die $!;
430 sub responder_send_file ($$) {
431 my ($keyword, $ourfn) = @_;
432 return unless $we_are_responder;
433 printdebug "]] $keyword $ourfn\n";
434 responder_send_command "file $keyword";
435 protocol_send_file \*PO, $ourfn;
438 sub responder_receive_files ($@) {
439 my ($keyword, @ourfns) = @_;
440 die unless $we_are_responder;
441 printdebug "[[ $keyword @ourfns\n";
442 responder_send_command "want $keyword";
443 foreach my $fn (@ourfns) {
444 protocol_receive_file \*PI, $fn;
447 protocol_expect { m/^files-end$/ } \*PI;
450 #---------- remote protocol support, initiator ----------
452 sub initiator_expect (&) {
454 protocol_expect { &$match } \*RO;
457 #---------- end remote code ----------
460 if ($we_are_responder) {
462 responder_send_command "progress ".length($m) or die $!;
463 print PO $m or die $!;
473 $ua = LWP::UserAgent->new();
477 progress "downloading $what...";
478 my $r = $ua->get(@_) or die $!;
479 return undef if $r->code == 404;
480 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
481 return $r->decoded_content(charset => 'none');
484 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
489 failedcmd @_ if system @_;
492 sub act_local () { return $dryrun_level <= 1; }
493 sub act_scary () { return !$dryrun_level; }
496 if (!$dryrun_level) {
497 progress "$us ok: @_";
499 progress "would be ok: @_ (but dry run only)";
504 printcmd(\*STDERR,$debugprefix."#",@_);
507 sub runcmd_ordryrun {
515 sub runcmd_ordryrun_local {
524 my ($first_shell, @cmd) = @_;
525 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
528 our $helpmsg = <<END;
530 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
531 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
532 dgit [dgit-opts] build [dpkg-buildpackage-opts]
533 dgit [dgit-opts] sbuild [sbuild-opts]
534 dgit [dgit-opts] push [dgit-opts] [suite]
535 dgit [dgit-opts] rpush build-host:build-dir ...
536 important dgit options:
537 -k<keyid> sign tag and package with <keyid> instead of default
538 --dry-run -n do not change anything, but go through the motions
539 --damp-run -L like --dry-run but make local changes, without signing
540 --new -N allow introducing a new package
541 --debug -D increase debug level
542 -c<name>=<value> set git config option (used directly by dgit too)
545 our $later_warning_msg = <<END;
546 Perhaps the upload is stuck in incoming. Using the version from git.
550 print STDERR "$us: @_\n", $helpmsg or die $!;
555 @ARGV or badusage "too few arguments";
556 return scalar shift @ARGV;
560 print $helpmsg or die $!;
564 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
566 our %defcfg = ('dgit.default.distro' => 'debian',
567 'dgit-suite.*-security.distro' => 'debian-security',
568 'dgit.default.username' => '',
569 'dgit.default.archive-query-default-component' => 'main',
570 'dgit.default.ssh' => 'ssh',
571 'dgit.default.archive-query' => 'madison:',
572 'dgit.default.sshpsql-dbname' => 'service=projectb',
573 'dgit.default.aptget-components' => 'main',
574 'dgit.default.dgit-tag-format' => 'new,old,maint',
575 # old means "repo server accepts pushes with old dgit tags"
576 # new means "repo server accepts pushes with new dgit tags"
577 # maint means "repo server accepts split brain pushes"
578 # hist means "repo server may have old pushes without new tag"
579 # ("hist" is implied by "old")
580 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
581 'dgit-distro.debian.git-check' => 'url',
582 'dgit-distro.debian.git-check-suffix' => '/info/refs',
583 'dgit-distro.debian.new-private-pushers' => 't',
584 'dgit-distro.debian/push.git-url' => '',
585 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
586 'dgit-distro.debian/push.git-user-force' => 'dgit',
587 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
588 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
589 'dgit-distro.debian/push.git-create' => 'true',
590 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
591 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
592 # 'dgit-distro.debian.archive-query-tls-key',
593 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
594 # ^ this does not work because curl is broken nowadays
595 # Fixing #790093 properly will involve providing providing the key
596 # in some pacagke and maybe updating these paths.
598 # 'dgit-distro.debian.archive-query-tls-curl-args',
599 # '--ca-path=/etc/ssl/ca-debian',
600 # ^ this is a workaround but works (only) on DSA-administered machines
601 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
602 'dgit-distro.debian.git-url-suffix' => '',
603 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
604 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
605 'dgit-distro.debian-security.archive-query' => 'aptget:',
606 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
607 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
608 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
609 'dgit-distro.debian-security.nominal-distro' => 'debian',
610 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
611 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
612 'dgit-distro.ubuntu.git-check' => 'false',
613 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
614 'dgit-distro.test-dummy.ssh' => "$td/ssh",
615 'dgit-distro.test-dummy.username' => "alice",
616 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
617 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
618 'dgit-distro.test-dummy.git-url' => "$td/git",
619 'dgit-distro.test-dummy.git-host' => "git",
620 'dgit-distro.test-dummy.git-path' => "$td/git",
621 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
622 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
623 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
624 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
628 our @gitcfgsources = qw(cmdline local global system);
630 sub git_slurp_config () {
631 local ($debuglevel) = $debuglevel-2;
634 # This algoritm is a bit subtle, but this is needed so that for
635 # options which we want to be single-valued, we allow the
636 # different config sources to override properly. See #835858.
637 foreach my $src (@gitcfgsources) {
638 next if $src eq 'cmdline';
639 # we do this ourselves since git doesn't handle it
641 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
644 open GITS, "-|", @cmd or die $!;
647 printdebug "=> ", (messagequote $_), "\n";
649 push @{ $gitcfgs{$src}{$`} }, $'; #';
653 or ($!==0 && $?==256)
658 sub git_get_config ($) {
660 foreach my $src (@gitcfgsources) {
661 my $l = $gitcfgs{$src}{$c};
662 printdebug"C $c ".(defined $l ?
663 join " ", map { messagequote "'$_'" } @$l :
667 @$l==1 or badcfg "multiple values for $c".
668 " (in $src git config)" if @$l > 1;
676 return undef if $c =~ /RETURN-UNDEF/;
677 my $v = git_get_config($c);
678 return $v if defined $v;
679 my $dv = $defcfg{$c};
681 printdebug "CD $c $dv\n" if $debuglevel >= 4;
685 badcfg "need value for one of: @_\n".
686 "$us: distro or suite appears not to be (properly) supported";
689 sub access_basedistro () {
690 if (defined $idistro) {
693 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
694 return $def if defined $def;
695 foreach my $src (@gitcfgsources, 'internal') {
696 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
698 foreach my $k (keys %$kl) {
699 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
701 next unless match_glob $dpat, $isuite;
705 return cfg("dgit.default.distro");
709 sub access_nomdistro () {
710 my $base = access_basedistro();
711 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
712 $r =~ m/^$distro_re$/ or badcfg
713 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
717 sub access_quirk () {
718 # returns (quirk name, distro to use instead or undef, quirk-specific info)
719 my $basedistro = access_basedistro();
720 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
722 if (defined $backports_quirk) {
723 my $re = $backports_quirk;
724 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
726 $re =~ s/\%/([-0-9a-z_]+)/
727 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
728 if ($isuite =~ m/^$re$/) {
729 return ('backports',"$basedistro-backports",$1);
732 return ('none',undef);
737 sub parse_cfg_bool ($$$) {
738 my ($what,$def,$v) = @_;
741 $v =~ m/^[ty1]/ ? 1 :
742 $v =~ m/^[fn0]/ ? 0 :
743 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
746 sub access_forpush_config () {
747 my $d = access_basedistro();
751 parse_cfg_bool('new-private-pushers', 0,
752 cfg("dgit-distro.$d.new-private-pushers",
755 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
758 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
759 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
760 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
761 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
764 sub access_forpush () {
765 $access_forpush //= access_forpush_config();
766 return $access_forpush;
770 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
771 badcfg "pushing but distro is configured readonly"
772 if access_forpush_config() eq '0';
774 $supplementary_message = <<'END' unless $we_are_responder;
775 Push failed, before we got started.
776 You can retry the push, after fixing the problem, if you like.
778 parseopts_late_defaults();
782 parseopts_late_defaults();
785 sub supplementary_message ($) {
787 if (!$we_are_responder) {
788 $supplementary_message = $msg;
790 } elsif ($protovsn >= 3) {
791 responder_send_command "supplementary-message ".length($msg)
793 print PO $msg or die $!;
797 sub access_distros () {
798 # Returns list of distros to try, in order
801 # 0. `instead of' distro name(s) we have been pointed to
802 # 1. the access_quirk distro, if any
803 # 2a. the user's specified distro, or failing that } basedistro
804 # 2b. the distro calculated from the suite }
805 my @l = access_basedistro();
807 my (undef,$quirkdistro) = access_quirk();
808 unshift @l, $quirkdistro;
809 unshift @l, $instead_distro;
810 @l = grep { defined } @l;
812 push @l, access_nomdistro();
814 if (access_forpush()) {
815 @l = map { ("$_/push", $_) } @l;
820 sub access_cfg_cfgs (@) {
823 # The nesting of these loops determines the search order. We put
824 # the key loop on the outside so that we search all the distros
825 # for each key, before going on to the next key. That means that
826 # if access_cfg is called with a more specific, and then a less
827 # specific, key, an earlier distro can override the less specific
828 # without necessarily overriding any more specific keys. (If the
829 # distro wants to override the more specific keys it can simply do
830 # so; whereas if we did the loop the other way around, it would be
831 # impossible to for an earlier distro to override a less specific
832 # key but not the more specific ones without restating the unknown
833 # values of the more specific keys.
836 # We have to deal with RETURN-UNDEF specially, so that we don't
837 # terminate the search prematurely.
839 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
842 foreach my $d (access_distros()) {
843 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
845 push @cfgs, map { "dgit.default.$_" } @realkeys;
852 my (@cfgs) = access_cfg_cfgs(@keys);
853 my $value = cfg(@cfgs);
857 sub access_cfg_bool ($$) {
858 my ($def, @keys) = @_;
859 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
862 sub string_to_ssh ($) {
864 if ($spec =~ m/\s/) {
865 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
871 sub access_cfg_ssh () {
872 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
873 if (!defined $gitssh) {
876 return string_to_ssh $gitssh;
880 sub access_runeinfo ($) {
882 return ": dgit ".access_basedistro()." $info ;";
885 sub access_someuserhost ($) {
887 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
888 defined($user) && length($user) or
889 $user = access_cfg("$some-user",'username');
890 my $host = access_cfg("$some-host");
891 return length($user) ? "$user\@$host" : $host;
894 sub access_gituserhost () {
895 return access_someuserhost('git');
898 sub access_giturl (;$) {
900 my $url = access_cfg('git-url','RETURN-UNDEF');
903 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
904 return undef unless defined $proto;
907 access_gituserhost().
908 access_cfg('git-path');
910 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
913 return "$url/$package$suffix";
916 sub parsecontrolfh ($$;$) {
917 my ($fh, $desc, $allowsigned) = @_;
918 our $dpkgcontrolhash_noissigned;
921 my %opts = ('name' => $desc);
922 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
923 $c = Dpkg::Control::Hash->new(%opts);
924 $c->parse($fh,$desc) or die "parsing of $desc failed";
925 last if $allowsigned;
926 last if $dpkgcontrolhash_noissigned;
927 my $issigned= $c->get_option('is_pgp_signed');
928 if (!defined $issigned) {
929 $dpkgcontrolhash_noissigned= 1;
930 seek $fh, 0,0 or die "seek $desc: $!";
931 } elsif ($issigned) {
932 fail "control file $desc is (already) PGP-signed. ".
933 " Note that dgit push needs to modify the .dsc and then".
934 " do the signature itself";
943 my ($file, $desc, $allowsigned) = @_;
944 my $fh = new IO::Handle;
945 open $fh, '<', $file or die "$file: $!";
946 my $c = parsecontrolfh($fh,$desc,$allowsigned);
947 $fh->error and die $!;
953 my ($dctrl,$field) = @_;
954 my $v = $dctrl->{$field};
955 return $v if defined $v;
956 fail "missing field $field in ".$dctrl->get_option('name');
960 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
961 my $p = new IO::Handle;
962 my @cmd = (qw(dpkg-parsechangelog), @_);
963 open $p, '-|', @cmd or die $!;
965 $?=0; $!=0; close $p or failedcmd @cmd;
969 sub commit_getclogp ($) {
970 # Returns the parsed changelog hashref for a particular commit
972 our %commit_getclogp_memo;
973 my $memo = $commit_getclogp_memo{$objid};
974 return $memo if $memo;
976 my $mclog = ".git/dgit/clog-$objid";
977 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
978 "$objid:debian/changelog";
979 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
984 defined $d or fail "getcwd failed: $!";
988 sub parse_dscdata () {
989 my $dscfh = new IO::File \$dscdata, '<' or die $!;
990 printdebug Dumper($dscdata) if $debuglevel>1;
991 $dsc = parsecontrolfh($dscfh,$dscurl,1);
992 printdebug Dumper($dsc) if $debuglevel>1;
997 sub archive_query ($;@) {
998 my ($method) = shift @_;
999 fail "this operation does not support multiple comma-separated suites"
1001 my $query = access_cfg('archive-query','RETURN-UNDEF');
1002 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1005 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1008 sub archive_query_prepend_mirror {
1009 my $m = access_cfg('mirror');
1010 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1013 sub pool_dsc_subpath ($$) {
1014 my ($vsn,$component) = @_; # $package is implict arg
1015 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1016 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1019 sub cfg_apply_map ($$$) {
1020 my ($varref, $what, $mapspec) = @_;
1021 return unless $mapspec;
1023 printdebug "config $what EVAL{ $mapspec; }\n";
1025 eval "package Dgit::Config; $mapspec;";
1030 #---------- `ftpmasterapi' archive query method (nascent) ----------
1032 sub archive_api_query_cmd ($) {
1034 my @cmd = (@curl, qw(-sS));
1035 my $url = access_cfg('archive-query-url');
1036 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1038 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1039 foreach my $key (split /\:/, $keys) {
1040 $key =~ s/\%HOST\%/$host/g;
1042 fail "for $url: stat $key: $!" unless $!==ENOENT;
1045 fail "config requested specific TLS key but do not know".
1046 " how to get curl to use exactly that EE key ($key)";
1047 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1048 # # Sadly the above line does not work because of changes
1049 # # to gnutls. The real fix for #790093 may involve
1050 # # new curl options.
1053 # Fixing #790093 properly will involve providing a value
1054 # for this on clients.
1055 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1056 push @cmd, split / /, $kargs if defined $kargs;
1058 push @cmd, $url.$subpath;
1062 sub api_query ($$;$) {
1064 my ($data, $subpath, $ok404) = @_;
1065 badcfg "ftpmasterapi archive query method takes no data part"
1067 my @cmd = archive_api_query_cmd($subpath);
1068 my $url = $cmd[$#cmd];
1069 push @cmd, qw(-w %{http_code});
1070 my $json = cmdoutput @cmd;
1071 unless ($json =~ s/\d+\d+\d$//) {
1072 failedcmd_report_cmd undef, @cmd;
1073 fail "curl failed to print 3-digit HTTP code";
1076 return undef if $code eq '404' && $ok404;
1077 fail "fetch of $url gave HTTP code $code"
1078 unless $url =~ m#^file://# or $code =~ m/^2/;
1079 return decode_json($json);
1082 sub canonicalise_suite_ftpmasterapi {
1083 my ($proto,$data) = @_;
1084 my $suites = api_query($data, 'suites');
1086 foreach my $entry (@$suites) {
1088 my $v = $entry->{$_};
1089 defined $v && $v eq $isuite;
1090 } qw(codename name);
1091 push @matched, $entry;
1093 fail "unknown suite $isuite" unless @matched;
1096 @matched==1 or die "multiple matches for suite $isuite\n";
1097 $cn = "$matched[0]{codename}";
1098 defined $cn or die "suite $isuite info has no codename\n";
1099 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1101 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1106 sub archive_query_ftpmasterapi {
1107 my ($proto,$data) = @_;
1108 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1110 my $digester = Digest::SHA->new(256);
1111 foreach my $entry (@$info) {
1113 my $vsn = "$entry->{version}";
1114 my ($ok,$msg) = version_check $vsn;
1115 die "bad version: $msg\n" unless $ok;
1116 my $component = "$entry->{component}";
1117 $component =~ m/^$component_re$/ or die "bad component";
1118 my $filename = "$entry->{filename}";
1119 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1120 or die "bad filename";
1121 my $sha256sum = "$entry->{sha256sum}";
1122 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1123 push @rows, [ $vsn, "/pool/$component/$filename",
1124 $digester, $sha256sum ];
1126 die "bad ftpmaster api response: $@\n".Dumper($entry)
1129 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1130 return archive_query_prepend_mirror @rows;
1133 sub file_in_archive_ftpmasterapi {
1134 my ($proto,$data,$filename) = @_;
1135 my $pat = $filename;
1138 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1139 my $info = api_query($data, "file_in_archive/$pat", 1);
1142 #---------- `aptget' archive query method ----------
1145 our $aptget_releasefile;
1146 our $aptget_configpath;
1148 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1149 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1151 sub aptget_cache_clean {
1152 runcmd_ordryrun_local qw(sh -ec),
1153 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1157 sub aptget_lock_acquire () {
1158 my $lockfile = "$aptget_base/lock";
1159 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1160 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1163 sub aptget_prep ($) {
1165 return if defined $aptget_base;
1167 badcfg "aptget archive query method takes no data part"
1170 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1173 ensuredir "$cache/dgit";
1175 access_cfg('aptget-cachekey','RETURN-UNDEF')
1176 // access_nomdistro();
1178 $aptget_base = "$cache/dgit/aptget";
1179 ensuredir $aptget_base;
1181 my $quoted_base = $aptget_base;
1182 die "$quoted_base contains bad chars, cannot continue"
1183 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1185 ensuredir $aptget_base;
1187 aptget_lock_acquire();
1189 aptget_cache_clean();
1191 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1192 my $sourceslist = "source.list#$cachekey";
1194 my $aptsuites = $isuite;
1195 cfg_apply_map(\$aptsuites, 'suite map',
1196 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1198 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1199 printf SRCS "deb-src %s %s %s\n",
1200 access_cfg('mirror'),
1202 access_cfg('aptget-components')
1205 ensuredir "$aptget_base/cache";
1206 ensuredir "$aptget_base/lists";
1208 open CONF, ">", $aptget_configpath or die $!;
1210 Debug::NoLocking "true";
1211 APT::Get::List-Cleanup "false";
1212 #clear APT::Update::Post-Invoke-Success;
1213 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1214 Dir::State::Lists "$quoted_base/lists";
1215 Dir::Etc::preferences "$quoted_base/preferences";
1216 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1217 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1220 foreach my $key (qw(
1223 Dir::Cache::Archives
1224 Dir::Etc::SourceParts
1225 Dir::Etc::preferencesparts
1227 ensuredir "$aptget_base/$key";
1228 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1231 my $oldatime = (time // die $!) - 1;
1232 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1233 next unless stat_exists $oldlist;
1234 my ($mtime) = (stat _)[9];
1235 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1238 runcmd_ordryrun_local aptget_aptget(), qw(update);
1241 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1242 next unless stat_exists $oldlist;
1243 my ($atime) = (stat _)[8];
1244 next if $atime == $oldatime;
1245 push @releasefiles, $oldlist;
1247 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1248 @releasefiles = @inreleasefiles if @inreleasefiles;
1249 die "apt updated wrong number of Release files (@releasefiles), erk"
1250 unless @releasefiles == 1;
1252 ($aptget_releasefile) = @releasefiles;
1255 sub canonicalise_suite_aptget {
1256 my ($proto,$data) = @_;
1259 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1261 foreach my $name (qw(Codename Suite)) {
1262 my $val = $release->{$name};
1264 printdebug "release file $name: $val\n";
1265 $val =~ m/^$suite_re$/o or fail
1266 "Release file ($aptget_releasefile) specifies intolerable $name";
1267 cfg_apply_map(\$val, 'suite rmap',
1268 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1275 sub archive_query_aptget {
1276 my ($proto,$data) = @_;
1279 ensuredir "$aptget_base/source";
1280 foreach my $old (<$aptget_base/source/*.dsc>) {
1281 unlink $old or die "$old: $!";
1284 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1285 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1286 # avoids apt-get source failing with ambiguous error code
1288 runcmd_ordryrun_local
1289 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1290 aptget_aptget(), qw(--download-only --only-source source), $package;
1292 my @dscs = <$aptget_base/source/*.dsc>;
1293 fail "apt-get source did not produce a .dsc" unless @dscs;
1294 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1296 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1299 my $uri = "file://". uri_escape $dscs[0];
1300 $uri =~ s{\%2f}{/}gi;
1301 return [ (getfield $pre_dsc, 'Version'), $uri ];
1304 #---------- `dummyapicat' archive query method ----------
1306 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1307 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1309 sub file_in_archive_dummycatapi ($$$) {
1310 my ($proto,$data,$filename) = @_;
1311 my $mirror = access_cfg('mirror');
1312 $mirror =~ s#^file://#/# or die "$mirror ?";
1314 my @cmd = (qw(sh -ec), '
1316 find -name "$2" -print0 |
1318 ', qw(x), $mirror, $filename);
1319 debugcmd "-|", @cmd;
1320 open FIA, "-|", @cmd or die $!;
1323 printdebug "| $_\n";
1324 m/^(\w+) (\S+)$/ or die "$_ ?";
1325 push @out, { sha256sum => $1, filename => $2 };
1327 close FIA or die failedcmd @cmd;
1331 #---------- `madison' archive query method ----------
1333 sub archive_query_madison {
1334 return archive_query_prepend_mirror
1335 map { [ @$_[0..1] ] } madison_get_parse(@_);
1338 sub madison_get_parse {
1339 my ($proto,$data) = @_;
1340 die unless $proto eq 'madison';
1341 if (!length $data) {
1342 $data= access_cfg('madison-distro','RETURN-UNDEF');
1343 $data //= access_basedistro();
1345 $rmad{$proto,$data,$package} ||= cmdoutput
1346 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1347 my $rmad = $rmad{$proto,$data,$package};
1350 foreach my $l (split /\n/, $rmad) {
1351 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1352 \s*( [^ \t|]+ )\s* \|
1353 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1354 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1355 $1 eq $package or die "$rmad $package ?";
1362 $component = access_cfg('archive-query-default-component');
1364 $5 eq 'source' or die "$rmad ?";
1365 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1367 return sort { -version_compare($a->[0],$b->[0]); } @out;
1370 sub canonicalise_suite_madison {
1371 # madison canonicalises for us
1372 my @r = madison_get_parse(@_);
1374 "unable to canonicalise suite using package $package".
1375 " which does not appear to exist in suite $isuite;".
1376 " --existing-package may help";
1380 sub file_in_archive_madison { return undef; }
1382 #---------- `sshpsql' archive query method ----------
1385 my ($data,$runeinfo,$sql) = @_;
1386 if (!length $data) {
1387 $data= access_someuserhost('sshpsql').':'.
1388 access_cfg('sshpsql-dbname');
1390 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1391 my ($userhost,$dbname) = ($`,$'); #';
1393 my @cmd = (access_cfg_ssh, $userhost,
1394 access_runeinfo("ssh-psql $runeinfo").
1395 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1396 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1398 open P, "-|", @cmd or die $!;
1401 printdebug(">|$_|\n");
1404 $!=0; $?=0; close P or failedcmd @cmd;
1406 my $nrows = pop @rows;
1407 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1408 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1409 @rows = map { [ split /\|/, $_ ] } @rows;
1410 my $ncols = scalar @{ shift @rows };
1411 die if grep { scalar @$_ != $ncols } @rows;
1415 sub sql_injection_check {
1416 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1419 sub archive_query_sshpsql ($$) {
1420 my ($proto,$data) = @_;
1421 sql_injection_check $isuite, $package;
1422 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1423 SELECT source.version, component.name, files.filename, files.sha256sum
1425 JOIN src_associations ON source.id = src_associations.source
1426 JOIN suite ON suite.id = src_associations.suite
1427 JOIN dsc_files ON dsc_files.source = source.id
1428 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1429 JOIN component ON component.id = files_archive_map.component_id
1430 JOIN files ON files.id = dsc_files.file
1431 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1432 AND source.source='$package'
1433 AND files.filename LIKE '%.dsc';
1435 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1436 my $digester = Digest::SHA->new(256);
1438 my ($vsn,$component,$filename,$sha256sum) = @$_;
1439 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1441 return archive_query_prepend_mirror @rows;
1444 sub canonicalise_suite_sshpsql ($$) {
1445 my ($proto,$data) = @_;
1446 sql_injection_check $isuite;
1447 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1448 SELECT suite.codename
1449 FROM suite where suite_name='$isuite' or codename='$isuite';
1451 @rows = map { $_->[0] } @rows;
1452 fail "unknown suite $isuite" unless @rows;
1453 die "ambiguous $isuite: @rows ?" if @rows>1;
1457 sub file_in_archive_sshpsql ($$$) { return undef; }
1459 #---------- `dummycat' archive query method ----------
1461 sub canonicalise_suite_dummycat ($$) {
1462 my ($proto,$data) = @_;
1463 my $dpath = "$data/suite.$isuite";
1464 if (!open C, "<", $dpath) {
1465 $!==ENOENT or die "$dpath: $!";
1466 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1470 chomp or die "$dpath: $!";
1472 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1476 sub archive_query_dummycat ($$) {
1477 my ($proto,$data) = @_;
1478 canonicalise_suite();
1479 my $dpath = "$data/package.$csuite.$package";
1480 if (!open C, "<", $dpath) {
1481 $!==ENOENT or die "$dpath: $!";
1482 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1490 printdebug "dummycat query $csuite $package $dpath | $_\n";
1491 my @row = split /\s+/, $_;
1492 @row==2 or die "$dpath: $_ ?";
1495 C->error and die "$dpath: $!";
1497 return archive_query_prepend_mirror
1498 sort { -version_compare($a->[0],$b->[0]); } @rows;
1501 sub file_in_archive_dummycat () { return undef; }
1503 #---------- tag format handling ----------
1505 sub access_cfg_tagformats () {
1506 split /\,/, access_cfg('dgit-tag-format');
1509 sub access_cfg_tagformats_can_splitbrain () {
1510 my %y = map { $_ => 1 } access_cfg_tagformats;
1511 foreach my $needtf (qw(new maint)) {
1512 next if $y{$needtf};
1518 sub need_tagformat ($$) {
1519 my ($fmt, $why) = @_;
1520 fail "need to use tag format $fmt ($why) but also need".
1521 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1522 " - no way to proceed"
1523 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1524 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1527 sub select_tagformat () {
1529 return if $tagformatfn && !$tagformat_want;
1530 die 'bug' if $tagformatfn && $tagformat_want;
1531 # ... $tagformat_want assigned after previous select_tagformat
1533 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1534 printdebug "select_tagformat supported @supported\n";
1536 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1537 printdebug "select_tagformat specified @$tagformat_want\n";
1539 my ($fmt,$why,$override) = @$tagformat_want;
1541 fail "target distro supports tag formats @supported".
1542 " but have to use $fmt ($why)"
1544 or grep { $_ eq $fmt } @supported;
1546 $tagformat_want = undef;
1548 $tagformatfn = ${*::}{"debiantag_$fmt"};
1550 fail "trying to use unknown tag format \`$fmt' ($why) !"
1551 unless $tagformatfn;
1554 #---------- archive query entrypoints and rest of program ----------
1556 sub canonicalise_suite () {
1557 return if defined $csuite;
1558 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1559 $csuite = archive_query('canonicalise_suite');
1560 if ($isuite ne $csuite) {
1561 progress "canonical suite name for $isuite is $csuite";
1563 progress "canonical suite name is $csuite";
1567 sub get_archive_dsc () {
1568 canonicalise_suite();
1569 my @vsns = archive_query('archive_query');
1570 foreach my $vinfo (@vsns) {
1571 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1572 $dscurl = $vsn_dscurl;
1573 $dscdata = url_get($dscurl);
1575 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1580 $digester->add($dscdata);
1581 my $got = $digester->hexdigest();
1583 fail "$dscurl has hash $got but".
1584 " archive told us to expect $digest";
1587 my $fmt = getfield $dsc, 'Format';
1588 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1589 "unsupported source format $fmt, sorry";
1591 $dsc_checked = !!$digester;
1592 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1596 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1599 sub check_for_git ();
1600 sub check_for_git () {
1602 my $how = access_cfg('git-check');
1603 if ($how eq 'ssh-cmd') {
1605 (access_cfg_ssh, access_gituserhost(),
1606 access_runeinfo("git-check $package").
1607 " set -e; cd ".access_cfg('git-path').";".
1608 " if test -d $package.git; then echo 1; else echo 0; fi");
1609 my $r= cmdoutput @cmd;
1610 if (defined $r and $r =~ m/^divert (\w+)$/) {
1612 my ($usedistro,) = access_distros();
1613 # NB that if we are pushing, $usedistro will be $distro/push
1614 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1615 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1616 progress "diverting to $divert (using config for $instead_distro)";
1617 return check_for_git();
1619 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1621 } elsif ($how eq 'url') {
1622 my $prefix = access_cfg('git-check-url','git-url');
1623 my $suffix = access_cfg('git-check-suffix','git-suffix',
1624 'RETURN-UNDEF') // '.git';
1625 my $url = "$prefix/$package$suffix";
1626 my @cmd = (@curl, qw(-sS -I), $url);
1627 my $result = cmdoutput @cmd;
1628 $result =~ s/^\S+ 200 .*\n\r?\n//;
1629 # curl -sS -I with https_proxy prints
1630 # HTTP/1.0 200 Connection established
1631 $result =~ m/^\S+ (404|200) /s or
1632 fail "unexpected results from git check query - ".
1633 Dumper($prefix, $result);
1635 if ($code eq '404') {
1637 } elsif ($code eq '200') {
1642 } elsif ($how eq 'true') {
1644 } elsif ($how eq 'false') {
1647 badcfg "unknown git-check \`$how'";
1651 sub create_remote_git_repo () {
1652 my $how = access_cfg('git-create');
1653 if ($how eq 'ssh-cmd') {
1655 (access_cfg_ssh, access_gituserhost(),
1656 access_runeinfo("git-create $package").
1657 "set -e; cd ".access_cfg('git-path').";".
1658 " cp -a _template $package.git");
1659 } elsif ($how eq 'true') {
1662 badcfg "unknown git-create \`$how'";
1666 our ($dsc_hash,$lastpush_mergeinput);
1667 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1669 our $ud = '.git/dgit/unpack';
1679 sub mktree_in_ud_here () {
1680 runcmd qw(git init -q);
1681 runcmd qw(git config gc.auto 0);
1682 rmtree('.git/objects');
1683 symlink '../../../../objects','.git/objects' or die $!;
1686 sub git_write_tree () {
1687 my $tree = cmdoutput @git, qw(write-tree);
1688 $tree =~ m/^\w+$/ or die "$tree ?";
1692 sub git_add_write_tree () {
1693 runcmd @git, qw(add -Af .);
1694 return git_write_tree();
1697 sub remove_stray_gits ($) {
1699 my @gitscmd = qw(find -name .git -prune -print0);
1700 debugcmd "|",@gitscmd;
1701 open GITS, "-|", @gitscmd or die $!;
1706 print STDERR "$us: warning: removing from $what: ",
1707 (messagequote $_), "\n";
1711 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1714 sub mktree_in_ud_from_only_subdir ($;$) {
1715 my ($what,$raw) = @_;
1717 # changes into the subdir
1719 die "expected one subdir but found @dirs ?" unless @dirs==1;
1720 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1724 remove_stray_gits($what);
1725 mktree_in_ud_here();
1727 my ($format, $fopts) = get_source_format();
1728 if (madformat($format)) {
1733 my $tree=git_add_write_tree();
1734 return ($tree,$dir);
1737 our @files_csum_info_fields =
1738 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1739 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1740 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1742 sub dsc_files_info () {
1743 foreach my $csumi (@files_csum_info_fields) {
1744 my ($fname, $module, $method) = @$csumi;
1745 my $field = $dsc->{$fname};
1746 next unless defined $field;
1747 eval "use $module; 1;" or die $@;
1749 foreach (split /\n/, $field) {
1751 m/^(\w+) (\d+) (\S+)$/ or
1752 fail "could not parse .dsc $fname line \`$_'";
1753 my $digester = eval "$module"."->$method;" or die $@;
1758 Digester => $digester,
1763 fail "missing any supported Checksums-* or Files field in ".
1764 $dsc->get_option('name');
1768 map { $_->{Filename} } dsc_files_info();
1771 sub files_compare_inputs (@) {
1776 my $showinputs = sub {
1777 return join "; ", map { $_->get_option('name') } @$inputs;
1780 foreach my $in (@$inputs) {
1782 my $in_name = $in->get_option('name');
1784 printdebug "files_compare_inputs $in_name\n";
1786 foreach my $csumi (@files_csum_info_fields) {
1787 my ($fname) = @$csumi;
1788 printdebug "files_compare_inputs $in_name $fname\n";
1790 my $field = $in->{$fname};
1791 next unless defined $field;
1794 foreach (split /\n/, $field) {
1797 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1798 fail "could not parse $in_name $fname line \`$_'";
1800 printdebug "files_compare_inputs $in_name $fname $f\n";
1804 my $re = \ $record{$f}{$fname};
1806 $fchecked{$f}{$in_name} = 1;
1808 fail "hash or size of $f varies in $fname fields".
1809 " (between: ".$showinputs->().")";
1814 @files = sort @files;
1815 $expected_files //= \@files;
1816 "@$expected_files" eq "@files" or
1817 fail "file list in $in_name varies between hash fields!";
1820 fail "$in_name has no files list field(s)";
1822 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1825 grep { keys %$_ == @$inputs-1 } values %fchecked
1826 or fail "no file appears in all file lists".
1827 " (looked in: ".$showinputs->().")";
1830 sub is_orig_file_in_dsc ($$) {
1831 my ($f, $dsc_files_info) = @_;
1832 return 0 if @$dsc_files_info <= 1;
1833 # One file means no origs, and the filename doesn't have a "what
1834 # part of dsc" component. (Consider versions ending `.orig'.)
1835 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1839 sub is_orig_file_of_vsn ($$) {
1840 my ($f, $upstreamvsn) = @_;
1841 my $base = srcfn $upstreamvsn, '';
1842 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1846 sub changes_update_origs_from_dsc ($$$$) {
1847 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1849 printdebug "checking origs needed ($upstreamvsn)...\n";
1850 $_ = getfield $changes, 'Files';
1851 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1852 fail "cannot find section/priority from .changes Files field";
1853 my $placementinfo = $1;
1855 printdebug "checking origs needed placement '$placementinfo'...\n";
1856 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1857 $l =~ m/\S+$/ or next;
1859 printdebug "origs $file | $l\n";
1860 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1861 printdebug "origs $file is_orig\n";
1862 my $have = archive_query('file_in_archive', $file);
1863 if (!defined $have) {
1865 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1871 printdebug "origs $file \$#\$have=$#$have\n";
1872 foreach my $h (@$have) {
1875 foreach my $csumi (@files_csum_info_fields) {
1876 my ($fname, $module, $method, $archivefield) = @$csumi;
1877 next unless defined $h->{$archivefield};
1878 $_ = $dsc->{$fname};
1879 next unless defined;
1880 m/^(\w+) .* \Q$file\E$/m or
1881 fail ".dsc $fname missing entry for $file";
1882 if ($h->{$archivefield} eq $1) {
1886 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1889 die "$file ".Dumper($h)." ?!" if $same && @differ;
1892 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1895 printdebug "origs $file f.same=$found_same".
1896 " #f._differ=$#found_differ\n";
1897 if (@found_differ && !$found_same) {
1899 "archive contains $file with different checksum",
1902 # Now we edit the changes file to add or remove it
1903 foreach my $csumi (@files_csum_info_fields) {
1904 my ($fname, $module, $method, $archivefield) = @$csumi;
1905 next unless defined $changes->{$fname};
1907 # in archive, delete from .changes if it's there
1908 $changed{$file} = "removed" if
1909 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1910 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1911 # not in archive, but it's here in the .changes
1913 my $dsc_data = getfield $dsc, $fname;
1914 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1916 $extra =~ s/ \d+ /$&$placementinfo /
1917 or die "$fname $extra >$dsc_data< ?"
1918 if $fname eq 'Files';
1919 $changes->{$fname} .= "\n". $extra;
1920 $changed{$file} = "added";
1925 foreach my $file (keys %changed) {
1927 "edited .changes for archive .orig contents: %s %s",
1928 $changed{$file}, $file;
1930 my $chtmp = "$changesfile.tmp";
1931 $changes->save($chtmp);
1933 rename $chtmp,$changesfile or die "$changesfile $!";
1935 progress "[new .changes left in $changesfile]";
1938 progress "$changesfile already has appropriate .orig(s) (if any)";
1942 sub make_commit ($) {
1944 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1947 sub make_commit_text ($) {
1950 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1952 print Dumper($text) if $debuglevel > 1;
1953 my $child = open2($out, $in, @cmd) or die $!;
1956 print $in $text or die $!;
1957 close $in or die $!;
1959 $h =~ m/^\w+$/ or die;
1961 printdebug "=> $h\n";
1964 waitpid $child, 0 == $child or die "$child $!";
1965 $? and failedcmd @cmd;
1969 sub clogp_authline ($) {
1971 my $author = getfield $clogp, 'Maintainer';
1972 $author =~ s#,.*##ms;
1973 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1974 my $authline = "$author $date";
1975 $authline =~ m/$git_authline_re/o or
1976 fail "unexpected commit author line format \`$authline'".
1977 " (was generated from changelog Maintainer field)";
1978 return ($1,$2,$3) if wantarray;
1982 sub vendor_patches_distro ($$) {
1983 my ($checkdistro, $what) = @_;
1984 return unless defined $checkdistro;
1986 my $series = "debian/patches/\L$checkdistro\E.series";
1987 printdebug "checking for vendor-specific $series ($what)\n";
1989 if (!open SERIES, "<", $series) {
1990 die "$series $!" unless $!==ENOENT;
1999 Unfortunately, this source package uses a feature of dpkg-source where
2000 the same source package unpacks to different source code on different
2001 distros. dgit cannot safely operate on such packages on affected
2002 distros, because the meaning of source packages is not stable.
2004 Please ask the distro/maintainer to remove the distro-specific series
2005 files and use a different technique (if necessary, uploading actually
2006 different packages, if different distros are supposed to have
2010 fail "Found active distro-specific series file for".
2011 " $checkdistro ($what): $series, cannot continue";
2013 die "$series $!" if SERIES->error;
2017 sub check_for_vendor_patches () {
2018 # This dpkg-source feature doesn't seem to be documented anywhere!
2019 # But it can be found in the changelog (reformatted):
2021 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2022 # Author: Raphael Hertzog <hertzog@debian.org>
2023 # Date: Sun Oct 3 09:36:48 2010 +0200
2025 # dpkg-source: correctly create .pc/.quilt_series with alternate
2028 # If you have debian/patches/ubuntu.series and you were
2029 # unpacking the source package on ubuntu, quilt was still
2030 # directed to debian/patches/series instead of
2031 # debian/patches/ubuntu.series.
2033 # debian/changelog | 3 +++
2034 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2035 # 2 files changed, 6 insertions(+), 1 deletion(-)
2038 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2039 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2040 "Dpkg::Vendor \`current vendor'");
2041 vendor_patches_distro(access_basedistro(),
2042 "(base) distro being accessed");
2043 vendor_patches_distro(access_nomdistro(),
2044 "(nominal) distro being accessed");
2047 sub generate_commits_from_dsc () {
2048 # See big comment in fetch_from_archive, below.
2049 # See also README.dsc-import.
2053 my @dfi = dsc_files_info();
2054 foreach my $fi (@dfi) {
2055 my $f = $fi->{Filename};
2056 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2058 printdebug "considering linking $f: ";
2060 link_ltarget "../../../../$f", $f
2061 or ((printdebug "($!) "), 0)
2065 printdebug "linked.\n";
2067 complete_file_from_dsc('.', $fi)
2070 if (is_orig_file_in_dsc($f, \@dfi)) {
2071 link $f, "../../../../$f"
2077 # We unpack and record the orig tarballs first, so that we only
2078 # need disk space for one private copy of the unpacked source.
2079 # But we can't make them into commits until we have the metadata
2080 # from the debian/changelog, so we record the tree objects now and
2081 # make them into commits later.
2083 my $upstreamv = upstreamversion $dsc->{version};
2084 my $orig_f_base = srcfn $upstreamv, '';
2086 foreach my $fi (@dfi) {
2087 # We actually import, and record as a commit, every tarball
2088 # (unless there is only one file, in which case there seems
2091 my $f = $fi->{Filename};
2092 printdebug "import considering $f ";
2093 (printdebug "only one dfi\n"), next if @dfi == 1;
2094 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2095 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2099 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2101 printdebug "Y ", (join ' ', map { $_//"(none)" }
2102 $compr_ext, $orig_f_part
2105 my $input = new IO::File $f, '<' or die "$f $!";
2109 if (defined $compr_ext) {
2111 Dpkg::Compression::compression_guess_from_filename $f;
2112 fail "Dpkg::Compression cannot handle file $f in source package"
2113 if defined $compr_ext && !defined $cname;
2115 new Dpkg::Compression::Process compression => $cname;
2116 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2117 my $compr_fh = new IO::Handle;
2118 my $compr_pid = open $compr_fh, "-|" // die $!;
2120 open STDIN, "<&", $input or die $!;
2122 die "dgit (child): exec $compr_cmd[0]: $!\n";
2127 rmtree "_unpack-tar";
2128 mkdir "_unpack-tar" or die $!;
2129 my @tarcmd = qw(tar -x -f -
2130 --no-same-owner --no-same-permissions
2131 --no-acls --no-xattrs --no-selinux);
2132 my $tar_pid = fork // die $!;
2134 chdir "_unpack-tar" or die $!;
2135 open STDIN, "<&", $input or die $!;
2137 die "dgit (child): exec $tarcmd[0]: $!";
2139 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2140 !$? or failedcmd @tarcmd;
2143 (@compr_cmd ? failedcmd @compr_cmd
2145 # finally, we have the results in "tarball", but maybe
2146 # with the wrong permissions
2148 runcmd qw(chmod -R +rwX _unpack-tar);
2149 changedir "_unpack-tar";
2150 remove_stray_gits($f);
2151 mktree_in_ud_here();
2153 my ($tree) = git_add_write_tree();
2154 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2155 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2157 printdebug "one subtree $1\n";
2159 printdebug "multiple subtrees\n";
2162 rmtree "_unpack-tar";
2164 my $ent = [ $f, $tree ];
2166 Orig => !!$orig_f_part,
2167 Sort => (!$orig_f_part ? 2 :
2168 $orig_f_part =~ m/-/g ? 1 :
2176 # put any without "_" first (spec is not clear whether files
2177 # are always in the usual order). Tarballs without "_" are
2178 # the main orig or the debian tarball.
2179 $a->{Sort} <=> $b->{Sort} or
2183 my $any_orig = grep { $_->{Orig} } @tartrees;
2185 my $dscfn = "$package.dsc";
2187 my $treeimporthow = 'package';
2189 open D, ">", $dscfn or die "$dscfn: $!";
2190 print D $dscdata or die "$dscfn: $!";
2191 close D or die "$dscfn: $!";
2192 my @cmd = qw(dpkg-source);
2193 push @cmd, '--no-check' if $dsc_checked;
2194 if (madformat $dsc->{format}) {
2195 push @cmd, '--skip-patches';
2196 $treeimporthow = 'unpatched';
2198 push @cmd, qw(-x --), $dscfn;
2201 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2202 if (madformat $dsc->{format}) {
2203 check_for_vendor_patches();
2207 if (madformat $dsc->{format}) {
2208 my @pcmd = qw(dpkg-source --before-build .);
2209 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2211 $dappliedtree = git_add_write_tree();
2214 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2215 debugcmd "|",@clogcmd;
2216 open CLOGS, "-|", @clogcmd or die $!;
2221 printdebug "import clog search...\n";
2224 my $stanzatext = do { local $/=""; <CLOGS>; };
2225 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2226 last if !defined $stanzatext;
2228 my $desc = "package changelog, entry no.$.";
2229 open my $stanzafh, "<", \$stanzatext or die;
2230 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2231 $clogp //= $thisstanza;
2233 printdebug "import clog $thisstanza->{version} $desc...\n";
2235 last if !$any_orig; # we don't need $r1clogp
2237 # We look for the first (most recent) changelog entry whose
2238 # version number is lower than the upstream version of this
2239 # package. Then the last (least recent) previous changelog
2240 # entry is treated as the one which introduced this upstream
2241 # version and used for the synthetic commits for the upstream
2244 # One might think that a more sophisticated algorithm would be
2245 # necessary. But: we do not want to scan the whole changelog
2246 # file. Stopping when we see an earlier version, which
2247 # necessarily then is an earlier upstream version, is the only
2248 # realistic way to do that. Then, either the earliest
2249 # changelog entry we have seen so far is indeed the earliest
2250 # upload of this upstream version; or there are only changelog
2251 # entries relating to later upstream versions (which is not
2252 # possible unless the changelog and .dsc disagree about the
2253 # version). Then it remains to choose between the physically
2254 # last entry in the file, and the one with the lowest version
2255 # number. If these are not the same, we guess that the
2256 # versions were created in a non-monotic order rather than
2257 # that the changelog entries have been misordered.
2259 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2261 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2262 $r1clogp = $thisstanza;
2264 printdebug "import clog $r1clogp->{version} becomes r1\n";
2266 die $! if CLOGS->error;
2267 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2269 $clogp or fail "package changelog has no entries!";
2271 my $authline = clogp_authline $clogp;
2272 my $changes = getfield $clogp, 'Changes';
2273 my $cversion = getfield $clogp, 'Version';
2276 $r1clogp //= $clogp; # maybe there's only one entry;
2277 my $r1authline = clogp_authline $r1clogp;
2278 # Strictly, r1authline might now be wrong if it's going to be
2279 # unused because !$any_orig. Whatever.
2281 printdebug "import tartrees authline $authline\n";
2282 printdebug "import tartrees r1authline $r1authline\n";
2284 foreach my $tt (@tartrees) {
2285 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2287 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2290 committer $r1authline
2294 [dgit import orig $tt->{F}]
2302 [dgit import tarball $package $cversion $tt->{F}]
2307 printdebug "import main commit\n";
2309 open C, ">../commit.tmp" or die $!;
2310 print C <<END or die $!;
2313 print C <<END or die $! foreach @tartrees;
2316 print C <<END or die $!;
2322 [dgit import $treeimporthow $package $cversion]
2326 my $rawimport_hash = make_commit qw(../commit.tmp);
2328 if (madformat $dsc->{format}) {
2329 printdebug "import apply patches...\n";
2331 # regularise the state of the working tree so that
2332 # the checkout of $rawimport_hash works nicely.
2333 my $dappliedcommit = make_commit_text(<<END);
2340 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2342 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2344 # We need the answers to be reproducible
2345 my @authline = clogp_authline($clogp);
2346 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2347 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2348 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2349 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2350 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2351 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2353 my $path = $ENV{PATH} or die;
2355 foreach my $use_absurd (qw(0 1)) {
2356 runcmd @git, qw(checkout -q unpa);
2357 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2358 local $ENV{PATH} = $path;
2361 progress "warning: $@";
2362 $path = "$absurdity:$path";
2363 progress "$us: trying slow absurd-git-apply...";
2364 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2369 die "forbid absurd git-apply\n" if $use_absurd
2370 && forceing [qw(import-gitapply-no-absurd)];
2371 die "only absurd git-apply!\n" if !$use_absurd
2372 && forceing [qw(import-gitapply-absurd)];
2374 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2375 local $ENV{PATH} = $path if $use_absurd;
2377 my @showcmd = (gbp_pq, qw(import));
2378 my @realcmd = shell_cmd
2379 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2380 debugcmd "+",@realcmd;
2381 if (system @realcmd) {
2382 die +(shellquote @showcmd).
2384 failedcmd_waitstatus()."\n";
2387 my $gapplied = git_rev_parse('HEAD');
2388 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2389 $gappliedtree eq $dappliedtree or
2391 gbp-pq import and dpkg-source disagree!
2392 gbp-pq import gave commit $gapplied
2393 gbp-pq import gave tree $gappliedtree
2394 dpkg-source --before-build gave tree $dappliedtree
2396 $rawimport_hash = $gapplied;
2401 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2406 progress "synthesised git commit from .dsc $cversion";
2408 my $rawimport_mergeinput = {
2409 Commit => $rawimport_hash,
2410 Info => "Import of source package",
2412 my @output = ($rawimport_mergeinput);
2414 if ($lastpush_mergeinput) {
2415 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2416 my $oversion = getfield $oldclogp, 'Version';
2418 version_compare($oversion, $cversion);
2420 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2421 { Message => <<END, ReverseParents => 1 });
2422 Record $package ($cversion) in archive suite $csuite
2424 } elsif ($vcmp > 0) {
2425 print STDERR <<END or die $!;
2427 Version actually in archive: $cversion (older)
2428 Last version pushed with dgit: $oversion (newer or same)
2431 @output = $lastpush_mergeinput;
2433 # Same version. Use what's in the server git branch,
2434 # discarding our own import. (This could happen if the
2435 # server automatically imports all packages into git.)
2436 @output = $lastpush_mergeinput;
2439 changedir '../../../..';
2444 sub complete_file_from_dsc ($$) {
2445 our ($dstdir, $fi) = @_;
2446 # Ensures that we have, in $dir, the file $fi, with the correct
2447 # contents. (Downloading it from alongside $dscurl if necessary.)
2449 my $f = $fi->{Filename};
2450 my $tf = "$dstdir/$f";
2453 if (stat_exists $tf) {
2454 progress "using existing $f";
2456 printdebug "$tf does not exist, need to fetch\n";
2458 $furl =~ s{/[^/]+$}{};
2460 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2461 die "$f ?" if $f =~ m#/#;
2462 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2463 return 0 if !act_local();
2467 open F, "<", "$tf" or die "$tf: $!";
2468 $fi->{Digester}->reset();
2469 $fi->{Digester}->addfile(*F);
2470 F->error and die $!;
2471 my $got = $fi->{Digester}->hexdigest();
2472 $got eq $fi->{Hash} or
2473 fail "file $f has hash $got but .dsc".
2474 " demands hash $fi->{Hash} ".
2475 ($downloaded ? "(got wrong file from archive!)"
2476 : "(perhaps you should delete this file?)");
2481 sub ensure_we_have_orig () {
2482 my @dfi = dsc_files_info();
2483 foreach my $fi (@dfi) {
2484 my $f = $fi->{Filename};
2485 next unless is_orig_file_in_dsc($f, \@dfi);
2486 complete_file_from_dsc('..', $fi)
2491 #---------- git fetch ----------
2493 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2494 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2496 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2497 # locally fetched refs because they have unhelpful names and clutter
2498 # up gitk etc. So we track whether we have "used up" head ref (ie,
2499 # whether we have made another local ref which refers to this object).
2501 # (If we deleted them unconditionally, then we might end up
2502 # re-fetching the same git objects each time dgit fetch was run.)
2504 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
2505 # in git_fetch_us to fetch the refs in question, and possibly a call
2506 # to lrfetchref_used.
2508 our (%lrfetchrefs_f, %lrfetchrefs_d);
2509 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2511 sub lrfetchref_used ($) {
2512 my ($fullrefname) = @_;
2513 my $objid = $lrfetchrefs_f{$fullrefname};
2514 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2517 sub git_lrfetch_sane {
2520 # This is rather miserable:
2521 # When git fetch --prune is passed a fetchspec ending with a *,
2522 # it does a plausible thing. If there is no * then:
2523 # - it matches subpaths too, even if the supplied refspec
2524 # starts refs, and behaves completely madly if the source
2525 # has refs/refs/something. (See, for example, Debian #NNNN.)
2526 # - if there is no matching remote ref, it bombs out the whole
2528 # We want to fetch a fixed ref, and we don't know in advance
2529 # if it exists, so this is not suitable.
2531 # Our workaround is to use git ls-remote. git ls-remote has its
2532 # own qairks. Notably, it has the absurd multi-tail-matching
2533 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2534 # refs/refs/foo etc.
2536 # Also, we want an idempotent snapshot, but we have to make two
2537 # calls to the remote: one to git ls-remote and to git fetch. The
2538 # solution is use git ls-remote to obtain a target state, and
2539 # git fetch to try to generate it. If we don't manage to generate
2540 # the target state, we try again.
2542 my $url = access_giturl();
2544 printdebug "git_lrfetch_sane specs @specs\n";
2546 my $specre = join '|', map {
2552 printdebug "git_lrfetch_sane specre=$specre\n";
2553 my $wanted_rref = sub {
2555 return m/^(?:$specre)$/o;
2558 my $fetch_iteration = 0;
2561 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2562 if (++$fetch_iteration > 10) {
2563 fail "too many iterations trying to get sane fetch!";
2566 my @look = map { "refs/$_" } @specs;
2567 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2571 open GITLS, "-|", @lcmd or die $!;
2573 printdebug "=> ", $_;
2574 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2575 my ($objid,$rrefname) = ($1,$2);
2576 if (!$wanted_rref->($rrefname)) {
2578 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2582 $wantr{$rrefname} = $objid;
2585 close GITLS or failedcmd @lcmd;
2587 # OK, now %want is exactly what we want for refs in @specs
2589 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2590 "+refs/$_:".lrfetchrefs."/$_";
2593 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2595 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2596 runcmd_ordryrun_local @fcmd if @fspecs;
2598 %lrfetchrefs_f = ();
2601 git_for_each_ref(lrfetchrefs, sub {
2602 my ($objid,$objtype,$lrefname,$reftail) = @_;
2603 $lrfetchrefs_f{$lrefname} = $objid;
2604 $objgot{$objid} = 1;
2607 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2608 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2609 if (!exists $wantr{$rrefname}) {
2610 if ($wanted_rref->($rrefname)) {
2612 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2616 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2619 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2620 delete $lrfetchrefs_f{$lrefname};
2624 foreach my $rrefname (sort keys %wantr) {
2625 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2626 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2627 my $want = $wantr{$rrefname};
2628 next if $got eq $want;
2629 if (!defined $objgot{$want}) {
2631 warning: git ls-remote suggests we want $lrefname
2632 warning: and it should refer to $want
2633 warning: but git fetch didn't fetch that object to any relevant ref.
2634 warning: This may be due to a race with someone updating the server.
2635 warning: Will try again...
2637 next FETCH_ITERATION;
2640 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2642 runcmd_ordryrun_local @git, qw(update-ref -m),
2643 "dgit fetch git fetch fixup", $lrefname, $want;
2644 $lrfetchrefs_f{$lrefname} = $want;
2648 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2649 Dumper(\%lrfetchrefs_f);
2652 sub git_fetch_us () {
2653 # Want to fetch only what we are going to use, unless
2654 # deliberately-not-ff, in which case we must fetch everything.
2656 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2658 (quiltmode_splitbrain
2659 ? (map { $_->('*',access_nomdistro) }
2660 \&debiantag_new, \&debiantag_maintview)
2661 : debiantags('*',access_nomdistro));
2662 push @specs, server_branch($csuite);
2663 push @specs, $rewritemap;
2664 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2666 git_lrfetch_sane @specs;
2669 my @tagpats = debiantags('*',access_nomdistro);
2671 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2672 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2673 printdebug "currently $fullrefname=$objid\n";
2674 $here{$fullrefname} = $objid;
2676 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2677 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2678 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2679 printdebug "offered $lref=$objid\n";
2680 if (!defined $here{$lref}) {
2681 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2682 runcmd_ordryrun_local @upd;
2683 lrfetchref_used $fullrefname;
2684 } elsif ($here{$lref} eq $objid) {
2685 lrfetchref_used $fullrefname;
2688 "Not updateting $lref from $here{$lref} to $objid.\n";
2693 #---------- dsc and archive handling ----------
2695 sub mergeinfo_getclogp ($) {
2696 # Ensures thit $mi->{Clogp} exists and returns it
2698 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2701 sub mergeinfo_version ($) {
2702 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2705 sub fetch_from_archive_record_1 ($) {
2707 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2708 'DGIT_ARCHIVE', $hash;
2709 cmdoutput @git, qw(log -n2), $hash;
2710 # ... gives git a chance to complain if our commit is malformed
2713 sub fetch_from_archive_record_2 ($) {
2715 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2719 dryrun_report @upd_cmd;
2723 sub parse_dsc_field ($$) {
2724 my ($dsc, $what) = @_;
2726 foreach my $field (@ourdscfield) {
2727 $f = $dsc->{$field};
2731 progress "$what: NO git hash";
2732 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2733 = $f =~ m/^(\w+) ($distro_re) ($versiontag_re) (\S+)(?:\s|$)/) {
2734 progress "$what: specified git info ($dsc_distro)";
2735 $dsc_hint_tag = [ $dsc_hint_tag ];
2736 } elsif ($f =~ m/^\w+\s*$/) {
2738 $dsc_distro //= 'debian';
2739 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2741 progress "$what: specified git hash";
2743 fail "$what: invalid Dgit info";
2747 sub resolve_dsc_field_commit ($$) {
2748 my ($already_distro, $already_mapref) = @_;
2750 return unless defined $dsc_hash;
2752 my $rewritemapdata = git_cat_file $already_mapref.':map';
2753 if (defined $rewritemapdata
2754 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2755 progress "server's git history rewrite map contains a relevant entry!";
2758 if (defined $dsc_hash) {
2759 progress "using rewritten git hash in place of .dsc value";
2761 progress "server data says .dsc hash is to be disregarded";
2766 sub fetch_from_archive () {
2767 ensure_setup_existing_tree();
2769 # Ensures that lrref() is what is actually in the archive, one way
2770 # or another, according to us - ie this client's
2771 # appropritaely-updated archive view. Also returns the commit id.
2772 # If there is nothing in the archive, leaves lrref alone and
2773 # returns undef. git_fetch_us must have already been called.
2777 parse_dsc_field($dsc, 'last upload to archive');
2778 resolve_dsc_field_commit access_basedistro,
2779 lrfetchrefs."/".$rewritemap
2781 progress "no version available from the archive";
2784 # If the archive's .dsc has a Dgit field, there are three
2785 # relevant git commitids we need to choose between and/or merge
2787 # 1. $dsc_hash: the Dgit field from the archive
2788 # 2. $lastpush_hash: the suite branch on the dgit git server
2789 # 3. $lastfetch_hash: our local tracking brach for the suite
2791 # These may all be distinct and need not be in any fast forward
2794 # If the dsc was pushed to this suite, then the server suite
2795 # branch will have been updated; but it might have been pushed to
2796 # a different suite and copied by the archive. Conversely a more
2797 # recent version may have been pushed with dgit but not appeared
2798 # in the archive (yet).
2800 # $lastfetch_hash may be awkward because archive imports
2801 # (particularly, imports of Dgit-less .dscs) are performed only as
2802 # needed on individual clients, so different clients may perform a
2803 # different subset of them - and these imports are only made
2804 # public during push. So $lastfetch_hash may represent a set of
2805 # imports different to a subsequent upload by a different dgit
2808 # Our approach is as follows:
2810 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2811 # descendant of $dsc_hash, then it was pushed by a dgit user who
2812 # had based their work on $dsc_hash, so we should prefer it.
2813 # Otherwise, $dsc_hash was installed into this suite in the
2814 # archive other than by a dgit push, and (necessarily) after the
2815 # last dgit push into that suite (since a dgit push would have
2816 # been descended from the dgit server git branch); thus, in that
2817 # case, we prefer the archive's version (and produce a
2818 # pseudo-merge to overwrite the dgit server git branch).
2820 # (If there is no Dgit field in the archive's .dsc then
2821 # generate_commit_from_dsc uses the version numbers to decide
2822 # whether the suite branch or the archive is newer. If the suite
2823 # branch is newer it ignores the archive's .dsc; otherwise it
2824 # generates an import of the .dsc, and produces a pseudo-merge to
2825 # overwrite the suite branch with the archive contents.)
2827 # The outcome of that part of the algorithm is the `public view',
2828 # and is same for all dgit clients: it does not depend on any
2829 # unpublished history in the local tracking branch.
2831 # As between the public view and the local tracking branch: The
2832 # local tracking branch is only updated by dgit fetch, and
2833 # whenever dgit fetch runs it includes the public view in the
2834 # local tracking branch. Therefore if the public view is not
2835 # descended from the local tracking branch, the local tracking
2836 # branch must contain history which was imported from the archive
2837 # but never pushed; and, its tip is now out of date. So, we make
2838 # a pseudo-merge to overwrite the old imports and stitch the old
2841 # Finally: we do not necessarily reify the public view (as
2842 # described above). This is so that we do not end up stacking two
2843 # pseudo-merges. So what we actually do is figure out the inputs
2844 # to any public view pseudo-merge and put them in @mergeinputs.
2847 # $mergeinputs[]{Commit}
2848 # $mergeinputs[]{Info}
2849 # $mergeinputs[0] is the one whose tree we use
2850 # @mergeinputs is in the order we use in the actual commit)
2853 # $mergeinputs[]{Message} is a commit message to use
2854 # $mergeinputs[]{ReverseParents} if def specifies that parent
2855 # list should be in opposite order
2856 # Such an entry has no Commit or Info. It applies only when found
2857 # in the last entry. (This ugliness is to support making
2858 # identical imports to previous dgit versions.)
2860 my $lastpush_hash = git_get_ref(lrfetchref());
2861 printdebug "previous reference hash=$lastpush_hash\n";
2862 $lastpush_mergeinput = $lastpush_hash && {
2863 Commit => $lastpush_hash,
2864 Info => "dgit suite branch on dgit git server",
2867 my $lastfetch_hash = git_get_ref(lrref());
2868 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2869 my $lastfetch_mergeinput = $lastfetch_hash && {
2870 Commit => $lastfetch_hash,
2871 Info => "dgit client's archive history view",
2874 my $dsc_mergeinput = $dsc_hash && {
2875 Commit => $dsc_hash,
2876 Info => "Dgit field in .dsc from archive",
2880 my $del_lrfetchrefs = sub {
2883 printdebug "del_lrfetchrefs...\n";
2884 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2885 my $objid = $lrfetchrefs_d{$fullrefname};
2886 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2888 $gur ||= new IO::Handle;
2889 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2891 printf $gur "delete %s %s\n", $fullrefname, $objid;
2894 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2898 if (defined $dsc_hash) {
2899 ensure_we_have_orig();
2900 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2901 @mergeinputs = $dsc_mergeinput
2902 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2903 print STDERR <<END or die $!;
2905 Git commit in archive is behind the last version allegedly pushed/uploaded.
2906 Commit referred to by archive: $dsc_hash
2907 Last version pushed with dgit: $lastpush_hash
2910 @mergeinputs = ($lastpush_mergeinput);
2912 # Archive has .dsc which is not a descendant of the last dgit
2913 # push. This can happen if the archive moves .dscs about.
2914 # Just follow its lead.
2915 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2916 progress "archive .dsc names newer git commit";
2917 @mergeinputs = ($dsc_mergeinput);
2919 progress "archive .dsc names other git commit, fixing up";
2920 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2924 @mergeinputs = generate_commits_from_dsc();
2925 # We have just done an import. Now, our import algorithm might
2926 # have been improved. But even so we do not want to generate
2927 # a new different import of the same package. So if the
2928 # version numbers are the same, just use our existing version.
2929 # If the version numbers are different, the archive has changed
2930 # (perhaps, rewound).
2931 if ($lastfetch_mergeinput &&
2932 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2933 (mergeinfo_version $mergeinputs[0]) )) {
2934 @mergeinputs = ($lastfetch_mergeinput);
2936 } elsif ($lastpush_hash) {
2937 # only in git, not in the archive yet
2938 @mergeinputs = ($lastpush_mergeinput);
2939 print STDERR <<END or die $!;
2941 Package not found in the archive, but has allegedly been pushed using dgit.
2945 printdebug "nothing found!\n";
2946 if (defined $skew_warning_vsn) {
2947 print STDERR <<END or die $!;
2949 Warning: relevant archive skew detected.
2950 Archive allegedly contains $skew_warning_vsn
2951 But we were not able to obtain any version from the archive or git.
2955 unshift @end, $del_lrfetchrefs;
2959 if ($lastfetch_hash &&
2961 my $h = $_->{Commit};
2962 $h and is_fast_fwd($lastfetch_hash, $h);
2963 # If true, one of the existing parents of this commit
2964 # is a descendant of the $lastfetch_hash, so we'll
2965 # be ff from that automatically.
2969 push @mergeinputs, $lastfetch_mergeinput;
2972 printdebug "fetch mergeinfos:\n";
2973 foreach my $mi (@mergeinputs) {
2975 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2977 printdebug sprintf " ReverseParents=%d Message=%s",
2978 $mi->{ReverseParents}, $mi->{Message};
2982 my $compat_info= pop @mergeinputs
2983 if $mergeinputs[$#mergeinputs]{Message};
2985 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2988 if (@mergeinputs > 1) {
2990 my $tree_commit = $mergeinputs[0]{Commit};
2992 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2993 $tree =~ m/\n\n/; $tree = $`;
2994 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2997 # We use the changelog author of the package in question the
2998 # author of this pseudo-merge. This is (roughly) correct if
2999 # this commit is simply representing aa non-dgit upload.
3000 # (Roughly because it does not record sponsorship - but we
3001 # don't have sponsorship info because that's in the .changes,
3002 # which isn't in the archivw.)
3004 # But, it might be that we are representing archive history
3005 # updates (including in-archive copies). These are not really
3006 # the responsibility of the person who created the .dsc, but
3007 # there is no-one whose name we should better use. (The
3008 # author of the .dsc-named commit is clearly worse.)
3010 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3011 my $author = clogp_authline $useclogp;
3012 my $cversion = getfield $useclogp, 'Version';
3014 my $mcf = ".git/dgit/mergecommit";
3015 open MC, ">", $mcf or die "$mcf $!";
3016 print MC <<END or die $!;
3020 my @parents = grep { $_->{Commit} } @mergeinputs;
3021 @parents = reverse @parents if $compat_info->{ReverseParents};
3022 print MC <<END or die $! foreach @parents;
3026 print MC <<END or die $!;
3032 if (defined $compat_info->{Message}) {
3033 print MC $compat_info->{Message} or die $!;
3035 print MC <<END or die $!;
3036 Record $package ($cversion) in archive suite $csuite
3040 my $message_add_info = sub {
3042 my $mversion = mergeinfo_version $mi;
3043 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3047 $message_add_info->($mergeinputs[0]);
3048 print MC <<END or die $!;
3049 should be treated as descended from
3051 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3055 $hash = make_commit $mcf;
3057 $hash = $mergeinputs[0]{Commit};
3059 printdebug "fetch hash=$hash\n";
3062 my ($lasth, $what) = @_;
3063 return unless $lasth;
3064 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3067 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3069 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3071 fetch_from_archive_record_1($hash);
3073 if (defined $skew_warning_vsn) {
3075 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3076 my $gotclogp = commit_getclogp($hash);
3077 my $got_vsn = getfield $gotclogp, 'Version';
3078 printdebug "SKEW CHECK GOT $got_vsn\n";
3079 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3080 print STDERR <<END or die $!;
3082 Warning: archive skew detected. Using the available version:
3083 Archive allegedly contains $skew_warning_vsn
3084 We were able to obtain only $got_vsn
3090 if ($lastfetch_hash ne $hash) {
3091 fetch_from_archive_record_2($hash);
3094 lrfetchref_used lrfetchref();
3096 unshift @end, $del_lrfetchrefs;
3100 sub set_local_git_config ($$) {
3102 runcmd @git, qw(config), $k, $v;
3105 sub setup_mergechangelogs (;$) {
3107 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3109 my $driver = 'dpkg-mergechangelogs';
3110 my $cb = "merge.$driver";
3111 my $attrs = '.git/info/attributes';
3112 ensuredir '.git/info';
3114 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3115 if (!open ATTRS, "<", $attrs) {
3116 $!==ENOENT or die "$attrs: $!";
3120 next if m{^debian/changelog\s};
3121 print NATTRS $_, "\n" or die $!;
3123 ATTRS->error and die $!;
3126 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3129 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3130 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3132 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3135 sub setup_useremail (;$) {
3137 return unless $always || access_cfg_bool(1, 'setup-useremail');
3140 my ($k, $envvar) = @_;
3141 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3142 return unless defined $v;
3143 set_local_git_config "user.$k", $v;
3146 $setup->('email', 'DEBEMAIL');
3147 $setup->('name', 'DEBFULLNAME');
3150 sub ensure_setup_existing_tree () {
3151 my $k = "remote.$remotename.skipdefaultupdate";
3152 my $c = git_get_config $k;
3153 return if defined $c;
3154 set_local_git_config $k, 'true';
3157 sub setup_new_tree () {
3158 setup_mergechangelogs();
3162 sub multisuite_suite_child ($$$) {
3163 my ($tsuite, $merginputs, $fn) = @_;
3164 # in child, sets things up, calls $fn->(), and returns undef
3165 # in parent, returns canonical suite name for $tsuite
3166 my $canonsuitefh = IO::File::new_tmpfile;
3167 my $pid = fork // die $!;
3170 $us .= " [$isuite]";
3171 $debugprefix .= " ";
3172 progress "fetching $tsuite...";
3173 canonicalise_suite();
3174 print $canonsuitefh $csuite, "\n" or die $!;
3175 close $canonsuitefh or die $!;
3179 waitpid $pid,0 == $pid or die $!;
3180 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3181 seek $canonsuitefh,0,0 or die $!;
3182 local $csuite = <$canonsuitefh>;
3183 die $! unless defined $csuite && chomp $csuite;
3185 printdebug "multisuite $tsuite missing\n";
3188 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3189 push @$merginputs, {
3196 sub fork_for_multisuite ($) {
3197 my ($before_fetch_merge) = @_;
3198 # if nothing unusual, just returns ''
3201 # returns 0 to caller in child, to do first of the specified suites
3202 # in child, $csuite is not yet set
3204 # returns 1 to caller in parent, to finish up anything needed after
3205 # in parent, $csuite is set to canonicalised portmanteau
3207 my $org_isuite = $isuite;
3208 my @suites = split /\,/, $isuite;
3209 return '' unless @suites > 1;
3210 printdebug "fork_for_multisuite: @suites\n";
3214 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3216 return 0 unless defined $cbasesuite;
3218 fail "package $package missing in (base suite) $cbasesuite"
3219 unless @mergeinputs;
3221 my @csuites = ($cbasesuite);
3223 $before_fetch_merge->();
3225 foreach my $tsuite (@suites[1..$#suites]) {
3226 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3232 # xxx collecte the ref here
3234 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3235 push @csuites, $csubsuite;
3238 foreach my $mi (@mergeinputs) {
3239 my $ref = git_get_ref $mi->{Ref};
3240 die "$mi->{Ref} ?" unless length $ref;
3241 $mi->{Commit} = $ref;
3244 $csuite = join ",", @csuites;
3246 my $previous = git_get_ref lrref;
3248 unshift @mergeinputs, {
3249 Commit => $previous,
3250 Info => "local combined tracking branch",
3252 "archive seems to have rewound: local tracking branch is ahead!",
3256 foreach my $ix (0..$#mergeinputs) {
3257 $mergeinputs[$ix]{Index} = $ix;
3260 @mergeinputs = sort {
3261 -version_compare(mergeinfo_version $a,
3262 mergeinfo_version $b) # highest version first
3264 $a->{Index} <=> $b->{Index}; # earliest in spec first
3270 foreach my $mi (@mergeinputs) {
3271 printdebug "multisuite merge check $mi->{Info}\n";
3272 foreach my $previous (@needed) {
3273 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3274 printdebug "multisuite merge un-needed $previous->{Info}\n";
3278 printdebug "multisuite merge this-needed\n";
3279 $mi->{Character} = '+';
3282 $needed[0]{Character} = '*';
3284 my $output = $needed[0]{Commit};
3287 printdebug "multisuite merge nontrivial\n";
3288 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3290 my $commit = "tree $tree\n";
3291 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3292 "Input branches:\n";
3294 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3295 printdebug "multisuite merge include $mi->{Info}\n";
3296 $mi->{Character} //= ' ';
3297 $commit .= "parent $mi->{Commit}\n";
3298 $msg .= sprintf " %s %-25s %s\n",
3300 (mergeinfo_version $mi),
3303 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3305 " * marks the highest version branch, which choose to use\n".
3306 " + marks each branch which was not already an ancestor\n\n".
3307 "[dgit multi-suite $csuite]\n";
3309 "author $authline\n".
3310 "committer $authline\n\n";
3311 $output = make_commit_text $commit.$msg;
3312 printdebug "multisuite merge generated $output\n";
3315 fetch_from_archive_record_1($output);
3316 fetch_from_archive_record_2($output);
3318 progress "calculated combined tracking suite $csuite";
3323 sub clone_set_head () {
3324 open H, "> .git/HEAD" or die $!;
3325 print H "ref: ".lref()."\n" or die $!;
3328 sub clone_finish ($) {
3330 runcmd @git, qw(reset --hard), lrref();
3331 runcmd qw(bash -ec), <<'END';
3333 git ls-tree -r --name-only -z HEAD | \
3334 xargs -0r touch -h -r . --
3336 printdone "ready for work in $dstdir";
3341 badusage "dry run makes no sense with clone" unless act_local();
3343 my $multi_fetched = fork_for_multisuite(sub {
3344 printdebug "multi clone before fetch merge\n";
3347 if ($multi_fetched) {
3348 printdebug "multi clone after fetch merge\n";
3350 clone_finish($dstdir);
3353 printdebug "clone main body\n";
3355 canonicalise_suite();
3356 my $hasgit = check_for_git();
3357 mkdir $dstdir or fail "create \`$dstdir': $!";
3359 runcmd @git, qw(init -q);
3361 my $giturl = access_giturl(1);
3362 if (defined $giturl) {
3363 runcmd @git, qw(remote add), 'origin', $giturl;
3366 progress "fetching existing git history";
3368 runcmd_ordryrun_local @git, qw(fetch origin);
3370 progress "starting new git history";
3372 fetch_from_archive() or no_such_package;
3373 my $vcsgiturl = $dsc->{'Vcs-Git'};
3374 if (length $vcsgiturl) {
3375 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3376 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3379 clone_finish($dstdir);
3383 canonicalise_suite();
3384 if (check_for_git()) {
3387 fetch_from_archive() or no_such_package();
3388 printdone "fetched into ".lrref();
3392 my $multi_fetched = fork_for_multisuite(sub { });
3393 fetch() unless $multi_fetched; # parent
3394 return if $multi_fetched eq '0'; # child
3395 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3397 printdone "fetched to ".lrref()." and merged into HEAD";
3400 sub check_not_dirty () {
3401 foreach my $f (qw(local-options local-patch-header)) {
3402 if (stat_exists "debian/source/$f") {
3403 fail "git tree contains debian/source/$f";
3407 return if $ignoredirty;
3409 my @cmd = (@git, qw(diff --quiet HEAD));
3411 $!=0; $?=-1; system @cmd;
3414 fail "working tree is dirty (does not match HEAD)";
3420 sub commit_admin ($) {
3423 runcmd_ordryrun_local @git, qw(commit -m), $m;
3426 sub commit_quilty_patch () {
3427 my $output = cmdoutput @git, qw(status --porcelain);
3429 foreach my $l (split /\n/, $output) {
3430 next unless $l =~ m/\S/;
3431 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3435 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3437 progress "nothing quilty to commit, ok.";
3440 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3441 runcmd_ordryrun_local @git, qw(add -f), @adds;
3443 Commit Debian 3.0 (quilt) metadata
3445 [dgit ($our_version) quilt-fixup]
3449 sub get_source_format () {
3451 if (open F, "debian/source/options") {
3455 s/\s+$//; # ignore missing final newline
3457 my ($k, $v) = ($`, $'); #');
3458 $v =~ s/^"(.*)"$/$1/;
3464 F->error and die $!;
3467 die $! unless $!==&ENOENT;
3470 if (!open F, "debian/source/format") {
3471 die $! unless $!==&ENOENT;
3475 F->error and die $!;
3477 return ($_, \%options);
3480 sub madformat_wantfixup ($) {
3482 return 0 unless $format eq '3.0 (quilt)';
3483 our $quilt_mode_warned;
3484 if ($quilt_mode eq 'nocheck') {
3485 progress "Not doing any fixup of \`$format' due to".
3486 " ----no-quilt-fixup or --quilt=nocheck"
3487 unless $quilt_mode_warned++;
3490 progress "Format \`$format', need to check/update patch stack"
3491 unless $quilt_mode_warned++;
3495 sub maybe_split_brain_save ($$$) {
3496 my ($headref, $dgitview, $msg) = @_;
3497 # => message fragment "$saved" describing disposition of $dgitview
3498 return "commit id $dgitview" unless defined $split_brain_save;
3499 my @cmd = (shell_cmd "cd ../../../..",
3500 @git, qw(update-ref -m),
3501 "dgit --dgit-view-save $msg HEAD=$headref",
3502 $split_brain_save, $dgitview);
3504 return "and left in $split_brain_save";
3507 # An "infopair" is a tuple [ $thing, $what ]
3508 # (often $thing is a commit hash; $what is a description)
3510 sub infopair_cond_equal ($$) {
3512 $x->[0] eq $y->[0] or fail <<END;
3513 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3517 sub infopair_lrf_tag_lookup ($$) {
3518 my ($tagnames, $what) = @_;
3519 # $tagname may be an array ref
3520 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3521 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3522 foreach my $tagname (@tagnames) {
3523 my $lrefname = lrfetchrefs."/tags/$tagname";
3524 my $tagobj = $lrfetchrefs_f{$lrefname};
3525 next unless defined $tagobj;
3526 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3527 return [ git_rev_parse($tagobj), $what ];
3529 fail @tagnames==1 ? <<END : <<END;
3530 Wanted tag $what (@tagnames) on dgit server, but not found
3532 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3536 sub infopair_cond_ff ($$) {
3537 my ($anc,$desc) = @_;
3538 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3539 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3543 sub pseudomerge_version_check ($$) {
3544 my ($clogp, $archive_hash) = @_;
3546 my $arch_clogp = commit_getclogp $archive_hash;
3547 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3548 'version currently in archive' ];
3549 if (defined $overwrite_version) {
3550 if (length $overwrite_version) {
3551 infopair_cond_equal([ $overwrite_version,
3552 '--overwrite= version' ],
3555 my $v = $i_arch_v->[0];
3556 progress "Checking package changelog for archive version $v ...";
3558 my @xa = ("-f$v", "-t$v");
3559 my $vclogp = parsechangelog @xa;
3560 my $cv = [ (getfield $vclogp, 'Version'),
3561 "Version field from dpkg-parsechangelog @xa" ];
3562 infopair_cond_equal($i_arch_v, $cv);
3565 $@ =~ s/^dgit: //gm;
3567 "Perhaps debian/changelog does not mention $v ?";
3572 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3576 sub pseudomerge_make_commit ($$$$ $$) {
3577 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3578 $msg_cmd, $msg_msg) = @_;
3579 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3581 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3582 my $authline = clogp_authline $clogp;
3586 !defined $overwrite_version ? ""
3587 : !length $overwrite_version ? " --overwrite"
3588 : " --overwrite=".$overwrite_version;
3591 my $pmf = ".git/dgit/pseudomerge";
3592 open MC, ">", $pmf or die "$pmf $!";
3593 print MC <<END or die $!;
3596 parent $archive_hash
3606 return make_commit($pmf);
3609 sub splitbrain_pseudomerge ($$$$) {
3610 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3611 # => $merged_dgitview
3612 printdebug "splitbrain_pseudomerge...\n";
3614 # We: debian/PREVIOUS HEAD($maintview)
3615 # expect: o ----------------- o
3618 # a/d/PREVIOUS $dgitview
3621 # we do: `------------------ o
3625 return $dgitview unless defined $archive_hash;
3627 printdebug "splitbrain_pseudomerge...\n";
3629 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3631 if (!defined $overwrite_version) {
3632 progress "Checking that HEAD inciudes all changes in archive...";
3635 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3637 if (defined $overwrite_version) {
3639 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3640 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3641 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3642 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3643 my $i_archive = [ $archive_hash, "current archive contents" ];
3645 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3647 infopair_cond_equal($i_dgit, $i_archive);
3648 infopair_cond_ff($i_dep14, $i_dgit);
3649 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3653 $us: check failed (maybe --overwrite is needed, consult documentation)
3658 my $r = pseudomerge_make_commit
3659 $clogp, $dgitview, $archive_hash, $i_arch_v,
3660 "dgit --quilt=$quilt_mode",
3661 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3662 Declare fast forward from $i_arch_v->[0]
3664 Make fast forward from $i_arch_v->[0]
3667 maybe_split_brain_save $maintview, $r, "pseudomerge";
3669 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3673 sub plain_overwrite_pseudomerge ($$$) {
3674 my ($clogp, $head, $archive_hash) = @_;
3676 printdebug "plain_overwrite_pseudomerge...";
3678 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3680 return $head if is_fast_fwd $archive_hash, $head;
3682 my $m = "Declare fast forward from $i_arch_v->[0]";
3684 my $r = pseudomerge_make_commit
3685 $clogp, $head, $archive_hash, $i_arch_v,
3688 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3690 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3694 sub push_parse_changelog ($) {
3697 my $clogp = Dpkg::Control::Hash->new();
3698 $clogp->load($clogpfn) or die;
3700 my $clogpackage = getfield $clogp, 'Source';
3701 $package //= $clogpackage;
3702 fail "-p specified $package but changelog specified $clogpackage"
3703 unless $package eq $clogpackage;
3704 my $cversion = getfield $clogp, 'Version';
3705 my $tag = debiantag($cversion, access_nomdistro);
3706 runcmd @git, qw(check-ref-format), $tag;
3708 my $dscfn = dscfn($cversion);
3710 return ($clogp, $cversion, $dscfn);
3713 sub push_parse_dsc ($$$) {
3714 my ($dscfn,$dscfnwhat, $cversion) = @_;
3715 $dsc = parsecontrol($dscfn,$dscfnwhat);
3716 my $dversion = getfield $dsc, 'Version';
3717 my $dscpackage = getfield $dsc, 'Source';
3718 ($dscpackage eq $package && $dversion eq $cversion) or
3719 fail "$dscfn is for $dscpackage $dversion".
3720 " but debian/changelog is for $package $cversion";
3723 sub push_tagwants ($$$$) {
3724 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;