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::MoreUtils qw(pairwise);
38 use Text::Glob qw(match_glob);
39 use Fcntl qw(:DEFAULT :flock);
44 our $our_version = 'UNRELEASED'; ###substituted###
45 our $absurdity = undef; ###substituted###
47 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
56 our $dryrun_level = 0;
58 our $buildproductsdir = '..';
64 our $existing_package = 'dpkg';
66 our $changes_since_version;
68 our $overwrite_version; # undef: not specified; '': check changelog
70 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
72 our $split_brain_save;
73 our $we_are_responder;
74 our $we_are_initiator;
75 our $initiator_tempdir;
76 our $patches_applied_dirtily = 00;
80 our $chase_dsc_distro=1;
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();
146 sub setup_gitattrs(;$);
147 sub check_gitattrs($$);
153 our $supplementary_message = '';
154 our $need_split_build_invocation = 0;
155 our $split_brain = 0;
159 return unless forkcheck_mainprocess();
160 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
163 our $remotename = 'dgit';
164 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
168 if (!defined $absurdity) {
170 $absurdity =~ s{/[^/]+$}{/absurd} or die;
174 my ($v,$distro) = @_;
175 return $tagformatfn->($v, $distro);
178 sub debiantag_maintview ($$) {
179 my ($v,$distro) = @_;
180 return "$distro/".dep14_version_mangle $v;
183 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
185 sub lbranch () { return "$branchprefix/$csuite"; }
186 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
187 sub lref () { return "refs/heads/".lbranch(); }
188 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
189 sub rrref () { return server_ref($csuite); }
199 return "${package}_".(stripepoch $vsn).$sfx
204 return srcfn($vsn,".dsc");
207 sub changespat ($;$) {
208 my ($vsn, $arch) = @_;
209 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
212 sub upstreamversion ($) {
224 return unless forkcheck_mainprocess();
225 foreach my $f (@end) {
227 print STDERR "$us: cleanup: $@" if length $@;
231 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
233 sub forceable_fail ($$) {
234 my ($forceoptsl, $msg) = @_;
235 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
236 print STDERR "warning: overriding problem due to --force:\n". $msg;
240 my ($forceoptsl) = @_;
241 my @got = grep { $forceopts{$_} } @$forceoptsl;
242 return 0 unless @got;
244 "warning: skipping checks or functionality due to --force-$got[0]\n";
247 sub no_such_package () {
248 print STDERR "$us: package $package does not exist in suite $isuite\n";
254 printdebug "CD $newdir\n";
255 chdir $newdir or confess "chdir: $newdir: $!";
258 sub deliberately ($) {
260 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
263 sub deliberately_not_fast_forward () {
264 foreach (qw(not-fast-forward fresh-repo)) {
265 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
269 sub quiltmode_splitbrain () {
270 $quilt_mode =~ m/gbp|dpm|unapplied/;
273 sub opts_opt_multi_cmd {
275 push @cmd, split /\s+/, shift @_;
281 return opts_opt_multi_cmd @gbp_pq;
284 #---------- remote protocol support, common ----------
286 # remote push initiator/responder protocol:
287 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
288 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
289 # < dgit-remote-push-ready <actual-proto-vsn>
296 # > supplementary-message NBYTES # $protovsn >= 3
301 # > file parsed-changelog
302 # [indicates that output of dpkg-parsechangelog follows]
303 # > data-block NBYTES
304 # > [NBYTES bytes of data (no newline)]
305 # [maybe some more blocks]
314 # > param head DGIT-VIEW-HEAD
315 # > param csuite SUITE
316 # > param tagformat old|new
317 # > param maint-view MAINT-VIEW-HEAD
319 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
320 # # goes into tag, for replay prevention
323 # [indicates that signed tag is wanted]
324 # < data-block NBYTES
325 # < [NBYTES bytes of data (no newline)]
326 # [maybe some more blocks]
330 # > want signed-dsc-changes
331 # < data-block NBYTES [transfer of signed dsc]
333 # < data-block NBYTES [transfer of signed changes]
341 sub i_child_report () {
342 # Sees if our child has died, and reap it if so. Returns a string
343 # describing how it died if it failed, or undef otherwise.
344 return undef unless $i_child_pid;
345 my $got = waitpid $i_child_pid, WNOHANG;
346 return undef if $got <= 0;
347 die unless $got == $i_child_pid;
348 $i_child_pid = undef;
349 return undef unless $?;
350 return "build host child ".waitstatusmsg();
355 fail "connection lost: $!" if $fh->error;
356 fail "protocol violation; $m not expected";
359 sub badproto_badread ($$) {
361 fail "connection lost: $!" if $!;
362 my $report = i_child_report();
363 fail $report if defined $report;
364 badproto $fh, "eof (reading $wh)";
367 sub protocol_expect (&$) {
368 my ($match, $fh) = @_;
371 defined && chomp or badproto_badread $fh, "protocol message";
379 badproto $fh, "\`$_'";
382 sub protocol_send_file ($$) {
383 my ($fh, $ourfn) = @_;
384 open PF, "<", $ourfn or die "$ourfn: $!";
387 my $got = read PF, $d, 65536;
388 die "$ourfn: $!" unless defined $got;
390 print $fh "data-block ".length($d)."\n" or die $!;
391 print $fh $d or die $!;
393 PF->error and die "$ourfn $!";
394 print $fh "data-end\n" or die $!;
398 sub protocol_read_bytes ($$) {
399 my ($fh, $nbytes) = @_;
400 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
402 my $got = read $fh, $d, $nbytes;
403 $got==$nbytes or badproto_badread $fh, "data block";
407 sub protocol_receive_file ($$) {
408 my ($fh, $ourfn) = @_;
409 printdebug "() $ourfn\n";
410 open PF, ">", $ourfn or die "$ourfn: $!";
412 my ($y,$l) = protocol_expect {
413 m/^data-block (.*)$/ ? (1,$1) :
414 m/^data-end$/ ? (0,) :
418 my $d = protocol_read_bytes $fh, $l;
419 print PF $d or die $!;
424 #---------- remote protocol support, responder ----------
426 sub responder_send_command ($) {
428 return unless $we_are_responder;
429 # called even without $we_are_responder
430 printdebug ">> $command\n";
431 print PO $command, "\n" or die $!;
434 sub responder_send_file ($$) {
435 my ($keyword, $ourfn) = @_;
436 return unless $we_are_responder;
437 printdebug "]] $keyword $ourfn\n";
438 responder_send_command "file $keyword";
439 protocol_send_file \*PO, $ourfn;
442 sub responder_receive_files ($@) {
443 my ($keyword, @ourfns) = @_;
444 die unless $we_are_responder;
445 printdebug "[[ $keyword @ourfns\n";
446 responder_send_command "want $keyword";
447 foreach my $fn (@ourfns) {
448 protocol_receive_file \*PI, $fn;
451 protocol_expect { m/^files-end$/ } \*PI;
454 #---------- remote protocol support, initiator ----------
456 sub initiator_expect (&) {
458 protocol_expect { &$match } \*RO;
461 #---------- end remote code ----------
464 if ($we_are_responder) {
466 responder_send_command "progress ".length($m) or die $!;
467 print PO $m or die $!;
477 $ua = LWP::UserAgent->new();
481 progress "downloading $what...";
482 my $r = $ua->get(@_) or die $!;
483 return undef if $r->code == 404;
484 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
485 return $r->decoded_content(charset => 'none');
488 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
493 failedcmd @_ if system @_;
496 sub act_local () { return $dryrun_level <= 1; }
497 sub act_scary () { return !$dryrun_level; }
500 if (!$dryrun_level) {
501 progress "$us ok: @_";
503 progress "would be ok: @_ (but dry run only)";
508 printcmd(\*STDERR,$debugprefix."#",@_);
511 sub runcmd_ordryrun {
519 sub runcmd_ordryrun_local {
528 my ($first_shell, @cmd) = @_;
529 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
532 our $helpmsg = <<END;
534 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
535 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
536 dgit [dgit-opts] build [dpkg-buildpackage-opts]
537 dgit [dgit-opts] sbuild [sbuild-opts]
538 dgit [dgit-opts] push [dgit-opts] [suite]
539 dgit [dgit-opts] rpush build-host:build-dir ...
540 important dgit options:
541 -k<keyid> sign tag and package with <keyid> instead of default
542 --dry-run -n do not change anything, but go through the motions
543 --damp-run -L like --dry-run but make local changes, without signing
544 --new -N allow introducing a new package
545 --debug -D increase debug level
546 -c<name>=<value> set git config option (used directly by dgit too)
549 our $later_warning_msg = <<END;
550 Perhaps the upload is stuck in incoming. Using the version from git.
554 print STDERR "$us: @_\n", $helpmsg or die $!;
559 @ARGV or badusage "too few arguments";
560 return scalar shift @ARGV;
564 print $helpmsg or die $!;
568 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
570 our %defcfg = ('dgit.default.distro' => 'debian',
571 'dgit.default.default-suite' => 'unstable',
572 'dgit.default.old-dsc-distro' => 'debian',
573 'dgit-suite.*-security.distro' => 'debian-security',
574 'dgit.default.username' => '',
575 'dgit.default.archive-query-default-component' => 'main',
576 'dgit.default.ssh' => 'ssh',
577 'dgit.default.archive-query' => 'madison:',
578 'dgit.default.sshpsql-dbname' => 'service=projectb',
579 'dgit.default.aptget-components' => 'main',
580 'dgit.default.dgit-tag-format' => 'new,old,maint',
581 'dgit.dsc-url-proto-ok.http' => 'true',
582 'dgit.dsc-url-proto-ok.https' => 'true',
583 'dgit.dsc-url-proto-ok.git' => 'true',
584 'dgit.default.dsc-url-proto-ok' => 'false',
585 # old means "repo server accepts pushes with old dgit tags"
586 # new means "repo server accepts pushes with new dgit tags"
587 # maint means "repo server accepts split brain pushes"
588 # hist means "repo server may have old pushes without new tag"
589 # ("hist" is implied by "old")
590 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
591 'dgit-distro.debian.git-check' => 'url',
592 'dgit-distro.debian.git-check-suffix' => '/info/refs',
593 'dgit-distro.debian.new-private-pushers' => 't',
594 'dgit-distro.debian/push.git-url' => '',
595 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
596 'dgit-distro.debian/push.git-user-force' => 'dgit',
597 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
598 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
599 'dgit-distro.debian/push.git-create' => 'true',
600 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
601 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
602 # 'dgit-distro.debian.archive-query-tls-key',
603 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
604 # ^ this does not work because curl is broken nowadays
605 # Fixing #790093 properly will involve providing providing the key
606 # in some pacagke and maybe updating these paths.
608 # 'dgit-distro.debian.archive-query-tls-curl-args',
609 # '--ca-path=/etc/ssl/ca-debian',
610 # ^ this is a workaround but works (only) on DSA-administered machines
611 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
612 'dgit-distro.debian.git-url-suffix' => '',
613 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
614 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
615 'dgit-distro.debian-security.archive-query' => 'aptget:',
616 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
617 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
618 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
619 'dgit-distro.debian-security.nominal-distro' => 'debian',
620 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
621 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
622 'dgit-distro.ubuntu.git-check' => 'false',
623 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
624 'dgit-distro.test-dummy.ssh' => "$td/ssh",
625 'dgit-distro.test-dummy.username' => "alice",
626 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
627 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
628 'dgit-distro.test-dummy.git-url' => "$td/git",
629 'dgit-distro.test-dummy.git-host' => "git",
630 'dgit-distro.test-dummy.git-path' => "$td/git",
631 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
632 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
633 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
634 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
638 our @gitcfgsources = qw(cmdline local global system);
640 sub git_slurp_config () {
641 local ($debuglevel) = $debuglevel-2;
644 # This algoritm is a bit subtle, but this is needed so that for
645 # options which we want to be single-valued, we allow the
646 # different config sources to override properly. See #835858.
647 foreach my $src (@gitcfgsources) {
648 next if $src eq 'cmdline';
649 # we do this ourselves since git doesn't handle it
651 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
654 open GITS, "-|", @cmd or die $!;
657 printdebug "=> ", (messagequote $_), "\n";
659 push @{ $gitcfgs{$src}{$`} }, $'; #';
663 or ($!==0 && $?==256)
668 sub git_get_config ($) {
670 foreach my $src (@gitcfgsources) {
671 my $l = $gitcfgs{$src}{$c};
672 confess "internal error ($l $c)" if $l && !ref $l;
673 printdebug"C $c ".(defined $l ?
674 join " ", map { messagequote "'$_'" } @$l :
678 @$l==1 or badcfg "multiple values for $c".
679 " (in $src git config)" if @$l > 1;
687 return undef if $c =~ /RETURN-UNDEF/;
688 printdebug "C? $c\n" if $debuglevel >= 5;
689 my $v = git_get_config($c);
690 return $v if defined $v;
691 my $dv = $defcfg{$c};
693 printdebug "CD $c $dv\n" if $debuglevel >= 4;
697 badcfg "need value for one of: @_\n".
698 "$us: distro or suite appears not to be (properly) supported";
701 sub access_basedistro__noalias () {
702 if (defined $idistro) {
705 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
706 return $def if defined $def;
707 foreach my $src (@gitcfgsources, 'internal') {
708 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
710 foreach my $k (keys %$kl) {
711 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
713 next unless match_glob $dpat, $isuite;
717 return cfg("dgit.default.distro");
721 sub access_basedistro () {
722 my $noalias = access_basedistro__noalias();
723 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
724 return $canon // $noalias;
727 sub access_nomdistro () {
728 my $base = access_basedistro();
729 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
730 $r =~ m/^$distro_re$/ or badcfg
731 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
735 sub access_quirk () {
736 # returns (quirk name, distro to use instead or undef, quirk-specific info)
737 my $basedistro = access_basedistro();
738 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
740 if (defined $backports_quirk) {
741 my $re = $backports_quirk;
742 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
744 $re =~ s/\%/([-0-9a-z_]+)/
745 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
746 if ($isuite =~ m/^$re$/) {
747 return ('backports',"$basedistro-backports",$1);
750 return ('none',undef);
755 sub parse_cfg_bool ($$$) {
756 my ($what,$def,$v) = @_;
759 $v =~ m/^[ty1]/ ? 1 :
760 $v =~ m/^[fn0]/ ? 0 :
761 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
764 sub access_forpush_config () {
765 my $d = access_basedistro();
769 parse_cfg_bool('new-private-pushers', 0,
770 cfg("dgit-distro.$d.new-private-pushers",
773 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
776 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
777 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
778 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
779 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
782 sub access_forpush () {
783 $access_forpush //= access_forpush_config();
784 return $access_forpush;
788 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
789 badcfg "pushing but distro is configured readonly"
790 if access_forpush_config() eq '0';
792 $supplementary_message = <<'END' unless $we_are_responder;
793 Push failed, before we got started.
794 You can retry the push, after fixing the problem, if you like.
796 parseopts_late_defaults();
800 parseopts_late_defaults();
803 sub supplementary_message ($) {
805 if (!$we_are_responder) {
806 $supplementary_message = $msg;
808 } elsif ($protovsn >= 3) {
809 responder_send_command "supplementary-message ".length($msg)
811 print PO $msg or die $!;
815 sub access_distros () {
816 # Returns list of distros to try, in order
819 # 0. `instead of' distro name(s) we have been pointed to
820 # 1. the access_quirk distro, if any
821 # 2a. the user's specified distro, or failing that } basedistro
822 # 2b. the distro calculated from the suite }
823 my @l = access_basedistro();
825 my (undef,$quirkdistro) = access_quirk();
826 unshift @l, $quirkdistro;
827 unshift @l, $instead_distro;
828 @l = grep { defined } @l;
830 push @l, access_nomdistro();
832 if (access_forpush()) {
833 @l = map { ("$_/push", $_) } @l;
838 sub access_cfg_cfgs (@) {
841 # The nesting of these loops determines the search order. We put
842 # the key loop on the outside so that we search all the distros
843 # for each key, before going on to the next key. That means that
844 # if access_cfg is called with a more specific, and then a less
845 # specific, key, an earlier distro can override the less specific
846 # without necessarily overriding any more specific keys. (If the
847 # distro wants to override the more specific keys it can simply do
848 # so; whereas if we did the loop the other way around, it would be
849 # impossible to for an earlier distro to override a less specific
850 # key but not the more specific ones without restating the unknown
851 # values of the more specific keys.
854 # We have to deal with RETURN-UNDEF specially, so that we don't
855 # terminate the search prematurely.
857 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
860 foreach my $d (access_distros()) {
861 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
863 push @cfgs, map { "dgit.default.$_" } @realkeys;
870 my (@cfgs) = access_cfg_cfgs(@keys);
871 my $value = cfg(@cfgs);
875 sub access_cfg_bool ($$) {
876 my ($def, @keys) = @_;
877 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
880 sub string_to_ssh ($) {
882 if ($spec =~ m/\s/) {
883 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
889 sub access_cfg_ssh () {
890 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
891 if (!defined $gitssh) {
894 return string_to_ssh $gitssh;
898 sub access_runeinfo ($) {
900 return ": dgit ".access_basedistro()." $info ;";
903 sub access_someuserhost ($) {
905 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
906 defined($user) && length($user) or
907 $user = access_cfg("$some-user",'username');
908 my $host = access_cfg("$some-host");
909 return length($user) ? "$user\@$host" : $host;
912 sub access_gituserhost () {
913 return access_someuserhost('git');
916 sub access_giturl (;$) {
918 my $url = access_cfg('git-url','RETURN-UNDEF');
921 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
922 return undef unless defined $proto;
925 access_gituserhost().
926 access_cfg('git-path');
928 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
931 return "$url/$package$suffix";
934 sub parsecontrolfh ($$;$) {
935 my ($fh, $desc, $allowsigned) = @_;
936 our $dpkgcontrolhash_noissigned;
939 my %opts = ('name' => $desc);
940 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
941 $c = Dpkg::Control::Hash->new(%opts);
942 $c->parse($fh,$desc) or die "parsing of $desc failed";
943 last if $allowsigned;
944 last if $dpkgcontrolhash_noissigned;
945 my $issigned= $c->get_option('is_pgp_signed');
946 if (!defined $issigned) {
947 $dpkgcontrolhash_noissigned= 1;
948 seek $fh, 0,0 or die "seek $desc: $!";
949 } elsif ($issigned) {
950 fail "control file $desc is (already) PGP-signed. ".
951 " Note that dgit push needs to modify the .dsc and then".
952 " do the signature itself";
961 my ($file, $desc, $allowsigned) = @_;
962 my $fh = new IO::Handle;
963 open $fh, '<', $file or die "$file: $!";
964 my $c = parsecontrolfh($fh,$desc,$allowsigned);
965 $fh->error and die $!;
971 my ($dctrl,$field) = @_;
972 my $v = $dctrl->{$field};
973 return $v if defined $v;
974 fail "missing field $field in ".$dctrl->get_option('name');
978 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
979 my $p = new IO::Handle;
980 my @cmd = (qw(dpkg-parsechangelog), @_);
981 open $p, '-|', @cmd or die $!;
983 $?=0; $!=0; close $p or failedcmd @cmd;
987 sub commit_getclogp ($) {
988 # Returns the parsed changelog hashref for a particular commit
990 our %commit_getclogp_memo;
991 my $memo = $commit_getclogp_memo{$objid};
992 return $memo if $memo;
994 my $mclog = ".git/dgit/clog-$objid";
995 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
996 "$objid:debian/changelog";
997 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1000 sub must_getcwd () {
1002 defined $d or fail "getcwd failed: $!";
1006 sub parse_dscdata () {
1007 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1008 printdebug Dumper($dscdata) if $debuglevel>1;
1009 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1010 printdebug Dumper($dsc) if $debuglevel>1;
1015 sub archive_query ($;@) {
1016 my ($method) = shift @_;
1017 fail "this operation does not support multiple comma-separated suites"
1019 my $query = access_cfg('archive-query','RETURN-UNDEF');
1020 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1023 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1026 sub archive_query_prepend_mirror {
1027 my $m = access_cfg('mirror');
1028 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1031 sub pool_dsc_subpath ($$) {
1032 my ($vsn,$component) = @_; # $package is implict arg
1033 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1034 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1037 sub cfg_apply_map ($$$) {
1038 my ($varref, $what, $mapspec) = @_;
1039 return unless $mapspec;
1041 printdebug "config $what EVAL{ $mapspec; }\n";
1043 eval "package Dgit::Config; $mapspec;";
1048 #---------- `ftpmasterapi' archive query method (nascent) ----------
1050 sub archive_api_query_cmd ($) {
1052 my @cmd = (@curl, qw(-sS));
1053 my $url = access_cfg('archive-query-url');
1054 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1056 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1057 foreach my $key (split /\:/, $keys) {
1058 $key =~ s/\%HOST\%/$host/g;
1060 fail "for $url: stat $key: $!" unless $!==ENOENT;
1063 fail "config requested specific TLS key but do not know".
1064 " how to get curl to use exactly that EE key ($key)";
1065 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1066 # # Sadly the above line does not work because of changes
1067 # # to gnutls. The real fix for #790093 may involve
1068 # # new curl options.
1071 # Fixing #790093 properly will involve providing a value
1072 # for this on clients.
1073 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1074 push @cmd, split / /, $kargs if defined $kargs;
1076 push @cmd, $url.$subpath;
1080 sub api_query ($$;$) {
1082 my ($data, $subpath, $ok404) = @_;
1083 badcfg "ftpmasterapi archive query method takes no data part"
1085 my @cmd = archive_api_query_cmd($subpath);
1086 my $url = $cmd[$#cmd];
1087 push @cmd, qw(-w %{http_code});
1088 my $json = cmdoutput @cmd;
1089 unless ($json =~ s/\d+\d+\d$//) {
1090 failedcmd_report_cmd undef, @cmd;
1091 fail "curl failed to print 3-digit HTTP code";
1094 return undef if $code eq '404' && $ok404;
1095 fail "fetch of $url gave HTTP code $code"
1096 unless $url =~ m#^file://# or $code =~ m/^2/;
1097 return decode_json($json);
1100 sub canonicalise_suite_ftpmasterapi {
1101 my ($proto,$data) = @_;
1102 my $suites = api_query($data, 'suites');
1104 foreach my $entry (@$suites) {
1106 my $v = $entry->{$_};
1107 defined $v && $v eq $isuite;
1108 } qw(codename name);
1109 push @matched, $entry;
1111 fail "unknown suite $isuite" unless @matched;
1114 @matched==1 or die "multiple matches for suite $isuite\n";
1115 $cn = "$matched[0]{codename}";
1116 defined $cn or die "suite $isuite info has no codename\n";
1117 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1119 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1124 sub archive_query_ftpmasterapi {
1125 my ($proto,$data) = @_;
1126 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1128 my $digester = Digest::SHA->new(256);
1129 foreach my $entry (@$info) {
1131 my $vsn = "$entry->{version}";
1132 my ($ok,$msg) = version_check $vsn;
1133 die "bad version: $msg\n" unless $ok;
1134 my $component = "$entry->{component}";
1135 $component =~ m/^$component_re$/ or die "bad component";
1136 my $filename = "$entry->{filename}";
1137 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1138 or die "bad filename";
1139 my $sha256sum = "$entry->{sha256sum}";
1140 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1141 push @rows, [ $vsn, "/pool/$component/$filename",
1142 $digester, $sha256sum ];
1144 die "bad ftpmaster api response: $@\n".Dumper($entry)
1147 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1148 return archive_query_prepend_mirror @rows;
1151 sub file_in_archive_ftpmasterapi {
1152 my ($proto,$data,$filename) = @_;
1153 my $pat = $filename;
1156 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1157 my $info = api_query($data, "file_in_archive/$pat", 1);
1160 #---------- `aptget' archive query method ----------
1163 our $aptget_releasefile;
1164 our $aptget_configpath;
1166 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1167 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1169 sub aptget_cache_clean {
1170 runcmd_ordryrun_local qw(sh -ec),
1171 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1175 sub aptget_lock_acquire () {
1176 my $lockfile = "$aptget_base/lock";
1177 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1178 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1181 sub aptget_prep ($) {
1183 return if defined $aptget_base;
1185 badcfg "aptget archive query method takes no data part"
1188 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1191 ensuredir "$cache/dgit";
1193 access_cfg('aptget-cachekey','RETURN-UNDEF')
1194 // access_nomdistro();
1196 $aptget_base = "$cache/dgit/aptget";
1197 ensuredir $aptget_base;
1199 my $quoted_base = $aptget_base;
1200 die "$quoted_base contains bad chars, cannot continue"
1201 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1203 ensuredir $aptget_base;
1205 aptget_lock_acquire();
1207 aptget_cache_clean();
1209 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1210 my $sourceslist = "source.list#$cachekey";
1212 my $aptsuites = $isuite;
1213 cfg_apply_map(\$aptsuites, 'suite map',
1214 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1216 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1217 printf SRCS "deb-src %s %s %s\n",
1218 access_cfg('mirror'),
1220 access_cfg('aptget-components')
1223 ensuredir "$aptget_base/cache";
1224 ensuredir "$aptget_base/lists";
1226 open CONF, ">", $aptget_configpath or die $!;
1228 Debug::NoLocking "true";
1229 APT::Get::List-Cleanup "false";
1230 #clear APT::Update::Post-Invoke-Success;
1231 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1232 Dir::State::Lists "$quoted_base/lists";
1233 Dir::Etc::preferences "$quoted_base/preferences";
1234 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1235 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1238 foreach my $key (qw(
1241 Dir::Cache::Archives
1242 Dir::Etc::SourceParts
1243 Dir::Etc::preferencesparts
1245 ensuredir "$aptget_base/$key";
1246 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1249 my $oldatime = (time // die $!) - 1;
1250 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1251 next unless stat_exists $oldlist;
1252 my ($mtime) = (stat _)[9];
1253 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1256 runcmd_ordryrun_local aptget_aptget(), qw(update);
1259 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1260 next unless stat_exists $oldlist;
1261 my ($atime) = (stat _)[8];
1262 next if $atime == $oldatime;
1263 push @releasefiles, $oldlist;
1265 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1266 @releasefiles = @inreleasefiles if @inreleasefiles;
1267 die "apt updated wrong number of Release files (@releasefiles), erk"
1268 unless @releasefiles == 1;
1270 ($aptget_releasefile) = @releasefiles;
1273 sub canonicalise_suite_aptget {
1274 my ($proto,$data) = @_;
1277 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1279 foreach my $name (qw(Codename Suite)) {
1280 my $val = $release->{$name};
1282 printdebug "release file $name: $val\n";
1283 $val =~ m/^$suite_re$/o or fail
1284 "Release file ($aptget_releasefile) specifies intolerable $name";
1285 cfg_apply_map(\$val, 'suite rmap',
1286 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1293 sub archive_query_aptget {
1294 my ($proto,$data) = @_;
1297 ensuredir "$aptget_base/source";
1298 foreach my $old (<$aptget_base/source/*.dsc>) {
1299 unlink $old or die "$old: $!";
1302 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1303 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1304 # avoids apt-get source failing with ambiguous error code
1306 runcmd_ordryrun_local
1307 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1308 aptget_aptget(), qw(--download-only --only-source source), $package;
1310 my @dscs = <$aptget_base/source/*.dsc>;
1311 fail "apt-get source did not produce a .dsc" unless @dscs;
1312 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1314 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1317 my $uri = "file://". uri_escape $dscs[0];
1318 $uri =~ s{\%2f}{/}gi;
1319 return [ (getfield $pre_dsc, 'Version'), $uri ];
1322 sub file_in_archive_aptget () { return undef; }
1324 #---------- `dummyapicat' archive query method ----------
1326 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1327 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1329 sub file_in_archive_dummycatapi ($$$) {
1330 my ($proto,$data,$filename) = @_;
1331 my $mirror = access_cfg('mirror');
1332 $mirror =~ s#^file://#/# or die "$mirror ?";
1334 my @cmd = (qw(sh -ec), '
1336 find -name "$2" -print0 |
1338 ', qw(x), $mirror, $filename);
1339 debugcmd "-|", @cmd;
1340 open FIA, "-|", @cmd or die $!;
1343 printdebug "| $_\n";
1344 m/^(\w+) (\S+)$/ or die "$_ ?";
1345 push @out, { sha256sum => $1, filename => $2 };
1347 close FIA or die failedcmd @cmd;
1351 #---------- `madison' archive query method ----------
1353 sub archive_query_madison {
1354 return archive_query_prepend_mirror
1355 map { [ @$_[0..1] ] } madison_get_parse(@_);
1358 sub madison_get_parse {
1359 my ($proto,$data) = @_;
1360 die unless $proto eq 'madison';
1361 if (!length $data) {
1362 $data= access_cfg('madison-distro','RETURN-UNDEF');
1363 $data //= access_basedistro();
1365 $rmad{$proto,$data,$package} ||= cmdoutput
1366 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1367 my $rmad = $rmad{$proto,$data,$package};
1370 foreach my $l (split /\n/, $rmad) {
1371 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1372 \s*( [^ \t|]+ )\s* \|
1373 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1374 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1375 $1 eq $package or die "$rmad $package ?";
1382 $component = access_cfg('archive-query-default-component');
1384 $5 eq 'source' or die "$rmad ?";
1385 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1387 return sort { -version_compare($a->[0],$b->[0]); } @out;
1390 sub canonicalise_suite_madison {
1391 # madison canonicalises for us
1392 my @r = madison_get_parse(@_);
1394 "unable to canonicalise suite using package $package".
1395 " which does not appear to exist in suite $isuite;".
1396 " --existing-package may help";
1400 sub file_in_archive_madison { return undef; }
1402 #---------- `sshpsql' archive query method ----------
1405 my ($data,$runeinfo,$sql) = @_;
1406 if (!length $data) {
1407 $data= access_someuserhost('sshpsql').':'.
1408 access_cfg('sshpsql-dbname');
1410 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1411 my ($userhost,$dbname) = ($`,$'); #';
1413 my @cmd = (access_cfg_ssh, $userhost,
1414 access_runeinfo("ssh-psql $runeinfo").
1415 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1416 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1418 open P, "-|", @cmd or die $!;
1421 printdebug(">|$_|\n");
1424 $!=0; $?=0; close P or failedcmd @cmd;
1426 my $nrows = pop @rows;
1427 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1428 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1429 @rows = map { [ split /\|/, $_ ] } @rows;
1430 my $ncols = scalar @{ shift @rows };
1431 die if grep { scalar @$_ != $ncols } @rows;
1435 sub sql_injection_check {
1436 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1439 sub archive_query_sshpsql ($$) {
1440 my ($proto,$data) = @_;
1441 sql_injection_check $isuite, $package;
1442 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1443 SELECT source.version, component.name, files.filename, files.sha256sum
1445 JOIN src_associations ON source.id = src_associations.source
1446 JOIN suite ON suite.id = src_associations.suite
1447 JOIN dsc_files ON dsc_files.source = source.id
1448 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1449 JOIN component ON component.id = files_archive_map.component_id
1450 JOIN files ON files.id = dsc_files.file
1451 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1452 AND source.source='$package'
1453 AND files.filename LIKE '%.dsc';
1455 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1456 my $digester = Digest::SHA->new(256);
1458 my ($vsn,$component,$filename,$sha256sum) = @$_;
1459 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1461 return archive_query_prepend_mirror @rows;
1464 sub canonicalise_suite_sshpsql ($$) {
1465 my ($proto,$data) = @_;
1466 sql_injection_check $isuite;
1467 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1468 SELECT suite.codename
1469 FROM suite where suite_name='$isuite' or codename='$isuite';
1471 @rows = map { $_->[0] } @rows;
1472 fail "unknown suite $isuite" unless @rows;
1473 die "ambiguous $isuite: @rows ?" if @rows>1;
1477 sub file_in_archive_sshpsql ($$$) { return undef; }
1479 #---------- `dummycat' archive query method ----------
1481 sub canonicalise_suite_dummycat ($$) {
1482 my ($proto,$data) = @_;
1483 my $dpath = "$data/suite.$isuite";
1484 if (!open C, "<", $dpath) {
1485 $!==ENOENT or die "$dpath: $!";
1486 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1490 chomp or die "$dpath: $!";
1492 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1496 sub archive_query_dummycat ($$) {
1497 my ($proto,$data) = @_;
1498 canonicalise_suite();
1499 my $dpath = "$data/package.$csuite.$package";
1500 if (!open C, "<", $dpath) {
1501 $!==ENOENT or die "$dpath: $!";
1502 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1510 printdebug "dummycat query $csuite $package $dpath | $_\n";
1511 my @row = split /\s+/, $_;
1512 @row==2 or die "$dpath: $_ ?";
1515 C->error and die "$dpath: $!";
1517 return archive_query_prepend_mirror
1518 sort { -version_compare($a->[0],$b->[0]); } @rows;
1521 sub file_in_archive_dummycat () { return undef; }
1523 #---------- tag format handling ----------
1525 sub access_cfg_tagformats () {
1526 split /\,/, access_cfg('dgit-tag-format');
1529 sub access_cfg_tagformats_can_splitbrain () {
1530 my %y = map { $_ => 1 } access_cfg_tagformats;
1531 foreach my $needtf (qw(new maint)) {
1532 next if $y{$needtf};
1538 sub need_tagformat ($$) {
1539 my ($fmt, $why) = @_;
1540 fail "need to use tag format $fmt ($why) but also need".
1541 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1542 " - no way to proceed"
1543 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1544 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1547 sub select_tagformat () {
1549 return if $tagformatfn && !$tagformat_want;
1550 die 'bug' if $tagformatfn && $tagformat_want;
1551 # ... $tagformat_want assigned after previous select_tagformat
1553 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1554 printdebug "select_tagformat supported @supported\n";
1556 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1557 printdebug "select_tagformat specified @$tagformat_want\n";
1559 my ($fmt,$why,$override) = @$tagformat_want;
1561 fail "target distro supports tag formats @supported".
1562 " but have to use $fmt ($why)"
1564 or grep { $_ eq $fmt } @supported;
1566 $tagformat_want = undef;
1568 $tagformatfn = ${*::}{"debiantag_$fmt"};
1570 fail "trying to use unknown tag format \`$fmt' ($why) !"
1571 unless $tagformatfn;
1574 #---------- archive query entrypoints and rest of program ----------
1576 sub canonicalise_suite () {
1577 return if defined $csuite;
1578 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1579 $csuite = archive_query('canonicalise_suite');
1580 if ($isuite ne $csuite) {
1581 progress "canonical suite name for $isuite is $csuite";
1583 progress "canonical suite name is $csuite";
1587 sub get_archive_dsc () {
1588 canonicalise_suite();
1589 my @vsns = archive_query('archive_query');
1590 foreach my $vinfo (@vsns) {
1591 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1592 $dscurl = $vsn_dscurl;
1593 $dscdata = url_get($dscurl);
1595 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1600 $digester->add($dscdata);
1601 my $got = $digester->hexdigest();
1603 fail "$dscurl has hash $got but".
1604 " archive told us to expect $digest";
1607 my $fmt = getfield $dsc, 'Format';
1608 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1609 "unsupported source format $fmt, sorry";
1611 $dsc_checked = !!$digester;
1612 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1616 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1619 sub check_for_git ();
1620 sub check_for_git () {
1622 my $how = access_cfg('git-check');
1623 if ($how eq 'ssh-cmd') {
1625 (access_cfg_ssh, access_gituserhost(),
1626 access_runeinfo("git-check $package").
1627 " set -e; cd ".access_cfg('git-path').";".
1628 " if test -d $package.git; then echo 1; else echo 0; fi");
1629 my $r= cmdoutput @cmd;
1630 if (defined $r and $r =~ m/^divert (\w+)$/) {
1632 my ($usedistro,) = access_distros();
1633 # NB that if we are pushing, $usedistro will be $distro/push
1634 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1635 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1636 progress "diverting to $divert (using config for $instead_distro)";
1637 return check_for_git();
1639 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1641 } elsif ($how eq 'url') {
1642 my $prefix = access_cfg('git-check-url','git-url');
1643 my $suffix = access_cfg('git-check-suffix','git-suffix',
1644 'RETURN-UNDEF') // '.git';
1645 my $url = "$prefix/$package$suffix";
1646 my @cmd = (@curl, qw(-sS -I), $url);
1647 my $result = cmdoutput @cmd;
1648 $result =~ s/^\S+ 200 .*\n\r?\n//;
1649 # curl -sS -I with https_proxy prints
1650 # HTTP/1.0 200 Connection established
1651 $result =~ m/^\S+ (404|200) /s or
1652 fail "unexpected results from git check query - ".
1653 Dumper($prefix, $result);
1655 if ($code eq '404') {
1657 } elsif ($code eq '200') {
1662 } elsif ($how eq 'true') {
1664 } elsif ($how eq 'false') {
1667 badcfg "unknown git-check \`$how'";
1671 sub create_remote_git_repo () {
1672 my $how = access_cfg('git-create');
1673 if ($how eq 'ssh-cmd') {
1675 (access_cfg_ssh, access_gituserhost(),
1676 access_runeinfo("git-create $package").
1677 "set -e; cd ".access_cfg('git-path').";".
1678 " cp -a _template $package.git");
1679 } elsif ($how eq 'true') {
1682 badcfg "unknown git-create \`$how'";
1686 our ($dsc_hash,$lastpush_mergeinput);
1687 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1689 our $ud = '.git/dgit/unpack';
1699 sub mktree_in_ud_here () {
1700 runcmd qw(git init -q);
1701 runcmd qw(git config gc.auto 0);
1702 foreach my $copy (qw(user.email user.name user.useConfigOnly)) {
1703 my $v = $gitcfgs{local}{$copy};
1705 runcmd qw(git config), $copy, $_ foreach @$v;
1707 rmtree('.git/objects');
1708 symlink '../../../../objects','.git/objects' or die $!;
1712 sub git_write_tree () {
1713 my $tree = cmdoutput @git, qw(write-tree);
1714 $tree =~ m/^\w+$/ or die "$tree ?";
1718 sub git_add_write_tree () {
1719 runcmd @git, qw(add -Af .);
1720 return git_write_tree();
1723 sub remove_stray_gits ($) {
1725 my @gitscmd = qw(find -name .git -prune -print0);
1726 debugcmd "|",@gitscmd;
1727 open GITS, "-|", @gitscmd or die $!;
1732 print STDERR "$us: warning: removing from $what: ",
1733 (messagequote $_), "\n";
1737 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1740 sub mktree_in_ud_from_only_subdir ($;$) {
1741 my ($what,$raw) = @_;
1743 # changes into the subdir
1745 die "expected one subdir but found @dirs ?" unless @dirs==1;
1746 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1750 remove_stray_gits($what);
1751 mktree_in_ud_here();
1753 my ($format, $fopts) = get_source_format();
1754 if (madformat($format)) {
1759 my $tree=git_add_write_tree();
1760 return ($tree,$dir);
1763 our @files_csum_info_fields =
1764 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1765 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1766 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1768 sub dsc_files_info () {
1769 foreach my $csumi (@files_csum_info_fields) {
1770 my ($fname, $module, $method) = @$csumi;
1771 my $field = $dsc->{$fname};
1772 next unless defined $field;
1773 eval "use $module; 1;" or die $@;
1775 foreach (split /\n/, $field) {
1777 m/^(\w+) (\d+) (\S+)$/ or
1778 fail "could not parse .dsc $fname line \`$_'";
1779 my $digester = eval "$module"."->$method;" or die $@;
1784 Digester => $digester,
1789 fail "missing any supported Checksums-* or Files field in ".
1790 $dsc->get_option('name');
1794 map { $_->{Filename} } dsc_files_info();
1797 sub files_compare_inputs (@) {
1802 my $showinputs = sub {
1803 return join "; ", map { $_->get_option('name') } @$inputs;
1806 foreach my $in (@$inputs) {
1808 my $in_name = $in->get_option('name');
1810 printdebug "files_compare_inputs $in_name\n";
1812 foreach my $csumi (@files_csum_info_fields) {
1813 my ($fname) = @$csumi;
1814 printdebug "files_compare_inputs $in_name $fname\n";
1816 my $field = $in->{$fname};
1817 next unless defined $field;
1820 foreach (split /\n/, $field) {
1823 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1824 fail "could not parse $in_name $fname line \`$_'";
1826 printdebug "files_compare_inputs $in_name $fname $f\n";
1830 my $re = \ $record{$f}{$fname};
1832 $fchecked{$f}{$in_name} = 1;
1834 fail "hash or size of $f varies in $fname fields".
1835 " (between: ".$showinputs->().")";
1840 @files = sort @files;
1841 $expected_files //= \@files;
1842 "@$expected_files" eq "@files" or
1843 fail "file list in $in_name varies between hash fields!";
1846 fail "$in_name has no files list field(s)";
1848 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1851 grep { keys %$_ == @$inputs-1 } values %fchecked
1852 or fail "no file appears in all file lists".
1853 " (looked in: ".$showinputs->().")";
1856 sub is_orig_file_in_dsc ($$) {
1857 my ($f, $dsc_files_info) = @_;
1858 return 0 if @$dsc_files_info <= 1;
1859 # One file means no origs, and the filename doesn't have a "what
1860 # part of dsc" component. (Consider versions ending `.orig'.)
1861 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1865 sub is_orig_file_of_vsn ($$) {
1866 my ($f, $upstreamvsn) = @_;
1867 my $base = srcfn $upstreamvsn, '';
1868 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1872 sub changes_update_origs_from_dsc ($$$$) {
1873 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1875 printdebug "checking origs needed ($upstreamvsn)...\n";
1876 $_ = getfield $changes, 'Files';
1877 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1878 fail "cannot find section/priority from .changes Files field";
1879 my $placementinfo = $1;
1881 printdebug "checking origs needed placement '$placementinfo'...\n";
1882 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1883 $l =~ m/\S+$/ or next;
1885 printdebug "origs $file | $l\n";
1886 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1887 printdebug "origs $file is_orig\n";
1888 my $have = archive_query('file_in_archive', $file);
1889 if (!defined $have) {
1891 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1897 printdebug "origs $file \$#\$have=$#$have\n";
1898 foreach my $h (@$have) {
1901 foreach my $csumi (@files_csum_info_fields) {
1902 my ($fname, $module, $method, $archivefield) = @$csumi;
1903 next unless defined $h->{$archivefield};
1904 $_ = $dsc->{$fname};
1905 next unless defined;
1906 m/^(\w+) .* \Q$file\E$/m or
1907 fail ".dsc $fname missing entry for $file";
1908 if ($h->{$archivefield} eq $1) {
1912 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1915 die "$file ".Dumper($h)." ?!" if $same && @differ;
1918 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1921 printdebug "origs $file f.same=$found_same".
1922 " #f._differ=$#found_differ\n";
1923 if (@found_differ && !$found_same) {
1925 "archive contains $file with different checksum",
1928 # Now we edit the changes file to add or remove it
1929 foreach my $csumi (@files_csum_info_fields) {
1930 my ($fname, $module, $method, $archivefield) = @$csumi;
1931 next unless defined $changes->{$fname};
1933 # in archive, delete from .changes if it's there
1934 $changed{$file} = "removed" if
1935 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1936 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1937 # not in archive, but it's here in the .changes
1939 my $dsc_data = getfield $dsc, $fname;
1940 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1942 $extra =~ s/ \d+ /$&$placementinfo /
1943 or die "$fname $extra >$dsc_data< ?"
1944 if $fname eq 'Files';
1945 $changes->{$fname} .= "\n". $extra;
1946 $changed{$file} = "added";
1951 foreach my $file (keys %changed) {
1953 "edited .changes for archive .orig contents: %s %s",
1954 $changed{$file}, $file;
1956 my $chtmp = "$changesfile.tmp";
1957 $changes->save($chtmp);
1959 rename $chtmp,$changesfile or die "$changesfile $!";
1961 progress "[new .changes left in $changesfile]";
1964 progress "$changesfile already has appropriate .orig(s) (if any)";
1968 sub make_commit ($) {
1970 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1973 sub make_commit_text ($) {
1976 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1978 print Dumper($text) if $debuglevel > 1;
1979 my $child = open2($out, $in, @cmd) or die $!;
1982 print $in $text or die $!;
1983 close $in or die $!;
1985 $h =~ m/^\w+$/ or die;
1987 printdebug "=> $h\n";
1990 waitpid $child, 0 == $child or die "$child $!";
1991 $? and failedcmd @cmd;
1995 sub clogp_authline ($) {
1997 my $author = getfield $clogp, 'Maintainer';
1998 $author =~ s#,.*##ms;
1999 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2000 my $authline = "$author $date";
2001 $authline =~ m/$git_authline_re/o or
2002 fail "unexpected commit author line format \`$authline'".
2003 " (was generated from changelog Maintainer field)";
2004 return ($1,$2,$3) if wantarray;
2008 sub vendor_patches_distro ($$) {
2009 my ($checkdistro, $what) = @_;
2010 return unless defined $checkdistro;
2012 my $series = "debian/patches/\L$checkdistro\E.series";
2013 printdebug "checking for vendor-specific $series ($what)\n";
2015 if (!open SERIES, "<", $series) {
2016 die "$series $!" unless $!==ENOENT;
2025 Unfortunately, this source package uses a feature of dpkg-source where
2026 the same source package unpacks to different source code on different
2027 distros. dgit cannot safely operate on such packages on affected
2028 distros, because the meaning of source packages is not stable.
2030 Please ask the distro/maintainer to remove the distro-specific series
2031 files and use a different technique (if necessary, uploading actually
2032 different packages, if different distros are supposed to have
2036 fail "Found active distro-specific series file for".
2037 " $checkdistro ($what): $series, cannot continue";
2039 die "$series $!" if SERIES->error;
2043 sub check_for_vendor_patches () {
2044 # This dpkg-source feature doesn't seem to be documented anywhere!
2045 # But it can be found in the changelog (reformatted):
2047 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2048 # Author: Raphael Hertzog <hertzog@debian.org>
2049 # Date: Sun Oct 3 09:36:48 2010 +0200
2051 # dpkg-source: correctly create .pc/.quilt_series with alternate
2054 # If you have debian/patches/ubuntu.series and you were
2055 # unpacking the source package on ubuntu, quilt was still
2056 # directed to debian/patches/series instead of
2057 # debian/patches/ubuntu.series.
2059 # debian/changelog | 3 +++
2060 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2061 # 2 files changed, 6 insertions(+), 1 deletion(-)
2064 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2065 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2066 "Dpkg::Vendor \`current vendor'");
2067 vendor_patches_distro(access_basedistro(),
2068 "(base) distro being accessed");
2069 vendor_patches_distro(access_nomdistro(),
2070 "(nominal) distro being accessed");
2073 sub generate_commits_from_dsc () {
2074 # See big comment in fetch_from_archive, below.
2075 # See also README.dsc-import.
2079 my @dfi = dsc_files_info();
2080 foreach my $fi (@dfi) {
2081 my $f = $fi->{Filename};
2082 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2083 my $upper_f = "../../../../$f";
2085 printdebug "considering reusing $f: ";
2087 if (link_ltarget "$upper_f,fetch", $f) {
2088 printdebug "linked (using ...,fetch).\n";
2089 } elsif ((printdebug "($!) "),
2091 fail "accessing ../$f,fetch: $!";
2092 } elsif (link_ltarget $upper_f, $f) {
2093 printdebug "linked.\n";
2094 } elsif ((printdebug "($!) "),
2096 fail "accessing ../$f: $!";
2098 printdebug "absent.\n";
2102 complete_file_from_dsc('.', $fi, \$refetched)
2105 printdebug "considering saving $f: ";
2107 if (link $f, $upper_f) {
2108 printdebug "linked.\n";
2109 } elsif ((printdebug "($!) "),
2111 fail "saving ../$f: $!";
2112 } elsif (!$refetched) {
2113 printdebug "no need.\n";
2114 } elsif (link $f, "$upper_f,fetch") {
2115 printdebug "linked (using ...,fetch).\n";
2116 } elsif ((printdebug "($!) "),
2118 fail "saving ../$f,fetch: $!";
2120 printdebug "cannot.\n";
2124 # We unpack and record the orig tarballs first, so that we only
2125 # need disk space for one private copy of the unpacked source.
2126 # But we can't make them into commits until we have the metadata
2127 # from the debian/changelog, so we record the tree objects now and
2128 # make them into commits later.
2130 my $upstreamv = upstreamversion $dsc->{version};
2131 my $orig_f_base = srcfn $upstreamv, '';
2133 foreach my $fi (@dfi) {
2134 # We actually import, and record as a commit, every tarball
2135 # (unless there is only one file, in which case there seems
2138 my $f = $fi->{Filename};
2139 printdebug "import considering $f ";
2140 (printdebug "only one dfi\n"), next if @dfi == 1;
2141 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2142 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2146 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2148 printdebug "Y ", (join ' ', map { $_//"(none)" }
2149 $compr_ext, $orig_f_part
2152 my $input = new IO::File $f, '<' or die "$f $!";
2156 if (defined $compr_ext) {
2158 Dpkg::Compression::compression_guess_from_filename $f;
2159 fail "Dpkg::Compression cannot handle file $f in source package"
2160 if defined $compr_ext && !defined $cname;
2162 new Dpkg::Compression::Process compression => $cname;
2163 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2164 my $compr_fh = new IO::Handle;
2165 my $compr_pid = open $compr_fh, "-|" // die $!;
2167 open STDIN, "<&", $input or die $!;
2169 die "dgit (child): exec $compr_cmd[0]: $!\n";
2174 rmtree "_unpack-tar";
2175 mkdir "_unpack-tar" or die $!;
2176 my @tarcmd = qw(tar -x -f -
2177 --no-same-owner --no-same-permissions
2178 --no-acls --no-xattrs --no-selinux);
2179 my $tar_pid = fork // die $!;
2181 chdir "_unpack-tar" or die $!;
2182 open STDIN, "<&", $input or die $!;
2184 die "dgit (child): exec $tarcmd[0]: $!";
2186 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2187 !$? or failedcmd @tarcmd;
2190 (@compr_cmd ? failedcmd @compr_cmd
2192 # finally, we have the results in "tarball", but maybe
2193 # with the wrong permissions
2195 runcmd qw(chmod -R +rwX _unpack-tar);
2196 changedir "_unpack-tar";
2197 remove_stray_gits($f);
2198 mktree_in_ud_here();
2200 my ($tree) = git_add_write_tree();
2201 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2202 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2204 printdebug "one subtree $1\n";
2206 printdebug "multiple subtrees\n";
2209 rmtree "_unpack-tar";
2211 my $ent = [ $f, $tree ];
2213 Orig => !!$orig_f_part,
2214 Sort => (!$orig_f_part ? 2 :
2215 $orig_f_part =~ m/-/g ? 1 :
2223 # put any without "_" first (spec is not clear whether files
2224 # are always in the usual order). Tarballs without "_" are
2225 # the main orig or the debian tarball.
2226 $a->{Sort} <=> $b->{Sort} or
2230 my $any_orig = grep { $_->{Orig} } @tartrees;
2232 my $dscfn = "$package.dsc";
2234 my $treeimporthow = 'package';
2236 open D, ">", $dscfn or die "$dscfn: $!";
2237 print D $dscdata or die "$dscfn: $!";
2238 close D or die "$dscfn: $!";
2239 my @cmd = qw(dpkg-source);
2240 push @cmd, '--no-check' if $dsc_checked;
2241 if (madformat $dsc->{format}) {
2242 push @cmd, '--skip-patches';
2243 $treeimporthow = 'unpatched';
2245 push @cmd, qw(-x --), $dscfn;
2248 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2249 if (madformat $dsc->{format}) {
2250 check_for_vendor_patches();
2254 if (madformat $dsc->{format}) {
2255 my @pcmd = qw(dpkg-source --before-build .);
2256 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2258 $dappliedtree = git_add_write_tree();
2261 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2262 debugcmd "|",@clogcmd;
2263 open CLOGS, "-|", @clogcmd or die $!;
2268 printdebug "import clog search...\n";
2271 my $stanzatext = do { local $/=""; <CLOGS>; };
2272 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2273 last if !defined $stanzatext;
2275 my $desc = "package changelog, entry no.$.";
2276 open my $stanzafh, "<", \$stanzatext or die;
2277 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2278 $clogp //= $thisstanza;
2280 printdebug "import clog $thisstanza->{version} $desc...\n";
2282 last if !$any_orig; # we don't need $r1clogp
2284 # We look for the first (most recent) changelog entry whose
2285 # version number is lower than the upstream version of this
2286 # package. Then the last (least recent) previous changelog
2287 # entry is treated as the one which introduced this upstream
2288 # version and used for the synthetic commits for the upstream
2291 # One might think that a more sophisticated algorithm would be
2292 # necessary. But: we do not want to scan the whole changelog
2293 # file. Stopping when we see an earlier version, which
2294 # necessarily then is an earlier upstream version, is the only
2295 # realistic way to do that. Then, either the earliest
2296 # changelog entry we have seen so far is indeed the earliest
2297 # upload of this upstream version; or there are only changelog
2298 # entries relating to later upstream versions (which is not
2299 # possible unless the changelog and .dsc disagree about the
2300 # version). Then it remains to choose between the physically
2301 # last entry in the file, and the one with the lowest version
2302 # number. If these are not the same, we guess that the
2303 # versions were created in a non-monotic order rather than
2304 # that the changelog entries have been misordered.
2306 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2308 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2309 $r1clogp = $thisstanza;
2311 printdebug "import clog $r1clogp->{version} becomes r1\n";
2313 die $! if CLOGS->error;
2314 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2316 $clogp or fail "package changelog has no entries!";
2318 my $authline = clogp_authline $clogp;
2319 my $changes = getfield $clogp, 'Changes';
2320 $changes =~ s/^\n//; # Changes: \n
2321 my $cversion = getfield $clogp, 'Version';
2324 $r1clogp //= $clogp; # maybe there's only one entry;
2325 my $r1authline = clogp_authline $r1clogp;
2326 # Strictly, r1authline might now be wrong if it's going to be
2327 # unused because !$any_orig. Whatever.
2329 printdebug "import tartrees authline $authline\n";
2330 printdebug "import tartrees r1authline $r1authline\n";
2332 foreach my $tt (@tartrees) {
2333 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2335 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2338 committer $r1authline
2342 [dgit import orig $tt->{F}]
2350 [dgit import tarball $package $cversion $tt->{F}]
2355 printdebug "import main commit\n";
2357 open C, ">../commit.tmp" or die $!;
2358 print C <<END or die $!;
2361 print C <<END or die $! foreach @tartrees;
2364 print C <<END or die $!;
2370 [dgit import $treeimporthow $package $cversion]
2374 my $rawimport_hash = make_commit qw(../commit.tmp);
2376 if (madformat $dsc->{format}) {
2377 printdebug "import apply patches...\n";
2379 # regularise the state of the working tree so that
2380 # the checkout of $rawimport_hash works nicely.
2381 my $dappliedcommit = make_commit_text(<<END);
2388 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2390 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2392 # We need the answers to be reproducible
2393 my @authline = clogp_authline($clogp);
2394 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2395 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2396 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2397 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2398 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2399 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2401 my $path = $ENV{PATH} or die;
2403 foreach my $use_absurd (qw(0 1)) {
2404 runcmd @git, qw(checkout -q unpa);
2405 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2406 local $ENV{PATH} = $path;
2409 progress "warning: $@";
2410 $path = "$absurdity:$path";
2411 progress "$us: trying slow absurd-git-apply...";
2412 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2417 die "forbid absurd git-apply\n" if $use_absurd
2418 && forceing [qw(import-gitapply-no-absurd)];
2419 die "only absurd git-apply!\n" if !$use_absurd
2420 && forceing [qw(import-gitapply-absurd)];
2422 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2423 local $ENV{PATH} = $path if $use_absurd;
2425 my @showcmd = (gbp_pq, qw(import));
2426 my @realcmd = shell_cmd
2427 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2428 debugcmd "+",@realcmd;
2429 if (system @realcmd) {
2430 die +(shellquote @showcmd).
2432 failedcmd_waitstatus()."\n";
2435 my $gapplied = git_rev_parse('HEAD');
2436 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2437 $gappliedtree eq $dappliedtree or
2439 gbp-pq import and dpkg-source disagree!
2440 gbp-pq import gave commit $gapplied
2441 gbp-pq import gave tree $gappliedtree
2442 dpkg-source --before-build gave tree $dappliedtree
2444 $rawimport_hash = $gapplied;
2449 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2454 progress "synthesised git commit from .dsc $cversion";
2456 my $rawimport_mergeinput = {
2457 Commit => $rawimport_hash,
2458 Info => "Import of source package",
2460 my @output = ($rawimport_mergeinput);
2462 if ($lastpush_mergeinput) {
2463 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2464 my $oversion = getfield $oldclogp, 'Version';
2466 version_compare($oversion, $cversion);
2468 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2469 { Message => <<END, ReverseParents => 1 });
2470 Record $package ($cversion) in archive suite $csuite
2472 } elsif ($vcmp > 0) {
2473 print STDERR <<END or die $!;
2475 Version actually in archive: $cversion (older)
2476 Last version pushed with dgit: $oversion (newer or same)
2479 @output = $lastpush_mergeinput;
2481 # Same version. Use what's in the server git branch,
2482 # discarding our own import. (This could happen if the
2483 # server automatically imports all packages into git.)
2484 @output = $lastpush_mergeinput;
2487 changedir '../../../..';
2492 sub complete_file_from_dsc ($$;$) {
2493 our ($dstdir, $fi, $refetched) = @_;
2494 # Ensures that we have, in $dstdir, the file $fi, with the correct
2495 # contents. (Downloading it from alongside $dscurl if necessary.)
2496 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2497 # and will set $$refetched=1 if it did so (or tried to).
2499 my $f = $fi->{Filename};
2500 my $tf = "$dstdir/$f";
2504 my $checkhash = sub {
2505 open F, "<", "$tf" or die "$tf: $!";
2506 $fi->{Digester}->reset();
2507 $fi->{Digester}->addfile(*F);
2508 F->error and die $!;
2509 my $got = $fi->{Digester}->hexdigest();
2510 return $got eq $fi->{Hash};
2513 if (stat_exists $tf) {
2514 if ($checkhash->()) {
2515 progress "using existing $f";
2519 fail "file $f has hash $got but .dsc".
2520 " demands hash $fi->{Hash} ".
2521 "(perhaps you should delete this file?)";
2523 progress "need to fetch correct version of $f";
2524 unlink $tf or die "$tf $!";
2527 printdebug "$tf does not exist, need to fetch\n";
2531 $furl =~ s{/[^/]+$}{};
2533 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2534 die "$f ?" if $f =~ m#/#;
2535 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2536 return 0 if !act_local();
2539 fail "file $f has hash $got but .dsc".
2540 " demands hash $fi->{Hash} ".
2541 "(got wrong file from archive!)";
2546 sub ensure_we_have_orig () {
2547 my @dfi = dsc_files_info();
2548 foreach my $fi (@dfi) {
2549 my $f = $fi->{Filename};
2550 next unless is_orig_file_in_dsc($f, \@dfi);
2551 complete_file_from_dsc('..', $fi)
2556 #---------- git fetch ----------
2558 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2559 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2561 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2562 # locally fetched refs because they have unhelpful names and clutter
2563 # up gitk etc. So we track whether we have "used up" head ref (ie,
2564 # whether we have made another local ref which refers to this object).
2566 # (If we deleted them unconditionally, then we might end up
2567 # re-fetching the same git objects each time dgit fetch was run.)
2569 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2570 # in git_fetch_us to fetch the refs in question, and possibly a call
2571 # to lrfetchref_used.
2573 our (%lrfetchrefs_f, %lrfetchrefs_d);
2574 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2576 sub lrfetchref_used ($) {
2577 my ($fullrefname) = @_;
2578 my $objid = $lrfetchrefs_f{$fullrefname};
2579 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2582 sub git_lrfetch_sane {
2583 my ($url, $supplementary, @specs) = @_;
2584 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2585 # at least as regards @specs. Also leave the results in
2586 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2587 # able to clean these up.
2589 # With $supplementary==1, @specs must not contain wildcards
2590 # and we add to our previous fetches (non-atomically).
2592 # This is rather miserable:
2593 # When git fetch --prune is passed a fetchspec ending with a *,
2594 # it does a plausible thing. If there is no * then:
2595 # - it matches subpaths too, even if the supplied refspec
2596 # starts refs, and behaves completely madly if the source
2597 # has refs/refs/something. (See, for example, Debian #NNNN.)
2598 # - if there is no matching remote ref, it bombs out the whole
2600 # We want to fetch a fixed ref, and we don't know in advance
2601 # if it exists, so this is not suitable.
2603 # Our workaround is to use git ls-remote. git ls-remote has its
2604 # own qairks. Notably, it has the absurd multi-tail-matching
2605 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2606 # refs/refs/foo etc.
2608 # Also, we want an idempotent snapshot, but we have to make two
2609 # calls to the remote: one to git ls-remote and to git fetch. The
2610 # solution is use git ls-remote to obtain a target state, and
2611 # git fetch to try to generate it. If we don't manage to generate
2612 # the target state, we try again.
2614 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2616 my $specre = join '|', map {
2619 my $wildcard = $x =~ s/\\\*$/.*/;
2620 die if $wildcard && $supplementary;
2623 printdebug "git_lrfetch_sane specre=$specre\n";
2624 my $wanted_rref = sub {
2626 return m/^(?:$specre)$/;
2629 my $fetch_iteration = 0;
2632 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2633 if (++$fetch_iteration > 10) {
2634 fail "too many iterations trying to get sane fetch!";
2637 my @look = map { "refs/$_" } @specs;
2638 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2642 open GITLS, "-|", @lcmd or die $!;
2644 printdebug "=> ", $_;
2645 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2646 my ($objid,$rrefname) = ($1,$2);
2647 if (!$wanted_rref->($rrefname)) {
2649 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2653 $wantr{$rrefname} = $objid;
2656 close GITLS or failedcmd @lcmd;
2658 # OK, now %want is exactly what we want for refs in @specs
2660 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2661 "+refs/$_:".lrfetchrefs."/$_";
2664 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2666 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2667 runcmd_ordryrun_local @fcmd if @fspecs;
2669 if (!$supplementary) {
2670 %lrfetchrefs_f = ();
2674 git_for_each_ref(lrfetchrefs, sub {
2675 my ($objid,$objtype,$lrefname,$reftail) = @_;
2676 $lrfetchrefs_f{$lrefname} = $objid;
2677 $objgot{$objid} = 1;
2680 if ($supplementary) {
2684 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2685 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2686 if (!exists $wantr{$rrefname}) {
2687 if ($wanted_rref->($rrefname)) {
2689 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2693 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2696 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2697 delete $lrfetchrefs_f{$lrefname};
2701 foreach my $rrefname (sort keys %wantr) {
2702 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2703 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2704 my $want = $wantr{$rrefname};
2705 next if $got eq $want;
2706 if (!defined $objgot{$want}) {
2708 warning: git ls-remote suggests we want $lrefname
2709 warning: and it should refer to $want
2710 warning: but git fetch didn't fetch that object to any relevant ref.
2711 warning: This may be due to a race with someone updating the server.
2712 warning: Will try again...
2714 next FETCH_ITERATION;
2717 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2719 runcmd_ordryrun_local @git, qw(update-ref -m),
2720 "dgit fetch git fetch fixup", $lrefname, $want;
2721 $lrfetchrefs_f{$lrefname} = $want;
2726 if (defined $csuite) {
2727 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2728 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2729 my ($objid,$objtype,$lrefname,$reftail) = @_;
2730 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2731 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2735 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2736 Dumper(\%lrfetchrefs_f);
2739 sub git_fetch_us () {
2740 # Want to fetch only what we are going to use, unless
2741 # deliberately-not-ff, in which case we must fetch everything.
2743 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2745 (quiltmode_splitbrain
2746 ? (map { $_->('*',access_nomdistro) }
2747 \&debiantag_new, \&debiantag_maintview)
2748 : debiantags('*',access_nomdistro));
2749 push @specs, server_branch($csuite);
2750 push @specs, $rewritemap;
2751 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2753 my $url = access_giturl();
2754 git_lrfetch_sane $url, 0, @specs;
2757 my @tagpats = debiantags('*',access_nomdistro);
2759 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2760 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2761 printdebug "currently $fullrefname=$objid\n";
2762 $here{$fullrefname} = $objid;
2764 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2765 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2766 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2767 printdebug "offered $lref=$objid\n";
2768 if (!defined $here{$lref}) {
2769 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2770 runcmd_ordryrun_local @upd;
2771 lrfetchref_used $fullrefname;
2772 } elsif ($here{$lref} eq $objid) {
2773 lrfetchref_used $fullrefname;
2776 "Not updating $lref from $here{$lref} to $objid.\n";
2781 #---------- dsc and archive handling ----------
2783 sub mergeinfo_getclogp ($) {
2784 # Ensures thit $mi->{Clogp} exists and returns it
2786 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2789 sub mergeinfo_version ($) {
2790 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2793 sub fetch_from_archive_record_1 ($) {
2795 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2796 'DGIT_ARCHIVE', $hash;
2797 cmdoutput @git, qw(log -n2), $hash;
2798 # ... gives git a chance to complain if our commit is malformed
2801 sub fetch_from_archive_record_2 ($) {
2803 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2807 dryrun_report @upd_cmd;
2811 sub parse_dsc_field_def_dsc_distro () {
2812 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2813 dgit.default.distro);
2816 sub parse_dsc_field ($$) {
2817 my ($dsc, $what) = @_;
2819 foreach my $field (@ourdscfield) {
2820 $f = $dsc->{$field};
2825 progress "$what: NO git hash";
2826 parse_dsc_field_def_dsc_distro();
2827 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2828 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2829 progress "$what: specified git info ($dsc_distro)";
2830 $dsc_hint_tag = [ $dsc_hint_tag ];
2831 } elsif ($f =~ m/^\w+\s*$/) {
2833 parse_dsc_field_def_dsc_distro();
2834 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2836 progress "$what: specified git hash";
2838 fail "$what: invalid Dgit info";
2842 sub resolve_dsc_field_commit ($$) {
2843 my ($already_distro, $already_mapref) = @_;
2845 return unless defined $dsc_hash;
2848 defined $already_mapref &&
2849 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2850 ? $already_mapref : undef;
2854 my ($what, @fetch) = @_;
2856 local $idistro = $dsc_distro;
2857 my $lrf = lrfetchrefs;
2859 if (!$chase_dsc_distro) {
2861 "not chasing .dsc distro $dsc_distro: not fetching $what";
2866 ".dsc names distro $dsc_distro: fetching $what";
2868 my $url = access_giturl();
2869 if (!defined $url) {
2870 defined $dsc_hint_url or fail <<END;
2871 .dsc Dgit metadata is in context of distro $dsc_distro
2872 for which we have no configured url and .dsc provides no hint
2875 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2876 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2877 parse_cfg_bool "dsc-url-proto-ok", 'false',
2878 cfg("dgit.dsc-url-proto-ok.$proto",
2879 "dgit.default.dsc-url-proto-ok")
2881 .dsc Dgit metadata is in context of distro $dsc_distro
2882 for which we have no configured url;
2883 .dsc provides hinted url with protocol $proto which is unsafe.
2884 (can be overridden by config - consult documentation)
2886 $url = $dsc_hint_url;
2889 git_lrfetch_sane $url, 1, @fetch;
2894 my $rewrite_enable = do {
2895 local $idistro = $dsc_distro;
2896 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2899 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2900 if (!defined $mapref) {
2901 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2902 $mapref = $lrf.'/'.$rewritemap;
2904 my $rewritemapdata = git_cat_file $mapref.':map';
2905 if (defined $rewritemapdata
2906 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2908 "server's git history rewrite map contains a relevant entry!";
2911 if (defined $dsc_hash) {
2912 progress "using rewritten git hash in place of .dsc value";
2914 progress "server data says .dsc hash is to be disregarded";
2919 if (!defined git_cat_file $dsc_hash) {
2920 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2921 my $lrf = $do_fetch->("additional commits", @tags) &&
2922 defined git_cat_file $dsc_hash
2924 .dsc Dgit metadata requires commit $dsc_hash
2925 but we could not obtain that object anywhere.
2927 foreach my $t (@tags) {
2928 my $fullrefname = $lrf.'/'.$t;
2929 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2930 next unless $lrfetchrefs_f{$fullrefname};
2931 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2932 lrfetchref_used $fullrefname;
2937 sub fetch_from_archive () {
2938 ensure_setup_existing_tree();
2940 # Ensures that lrref() is what is actually in the archive, one way
2941 # or another, according to us - ie this client's
2942 # appropritaely-updated archive view. Also returns the commit id.
2943 # If there is nothing in the archive, leaves lrref alone and
2944 # returns undef. git_fetch_us must have already been called.
2948 parse_dsc_field($dsc, 'last upload to archive');
2949 resolve_dsc_field_commit access_basedistro,
2950 lrfetchrefs."/".$rewritemap
2952 progress "no version available from the archive";
2955 # If the archive's .dsc has a Dgit field, there are three
2956 # relevant git commitids we need to choose between and/or merge
2958 # 1. $dsc_hash: the Dgit field from the archive
2959 # 2. $lastpush_hash: the suite branch on the dgit git server
2960 # 3. $lastfetch_hash: our local tracking brach for the suite
2962 # These may all be distinct and need not be in any fast forward
2965 # If the dsc was pushed to this suite, then the server suite
2966 # branch will have been updated; but it might have been pushed to
2967 # a different suite and copied by the archive. Conversely a more
2968 # recent version may have been pushed with dgit but not appeared
2969 # in the archive (yet).
2971 # $lastfetch_hash may be awkward because archive imports
2972 # (particularly, imports of Dgit-less .dscs) are performed only as
2973 # needed on individual clients, so different clients may perform a
2974 # different subset of them - and these imports are only made
2975 # public during push. So $lastfetch_hash may represent a set of
2976 # imports different to a subsequent upload by a different dgit
2979 # Our approach is as follows:
2981 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2982 # descendant of $dsc_hash, then it was pushed by a dgit user who
2983 # had based their work on $dsc_hash, so we should prefer it.
2984 # Otherwise, $dsc_hash was installed into this suite in the
2985 # archive other than by a dgit push, and (necessarily) after the
2986 # last dgit push into that suite (since a dgit push would have
2987 # been descended from the dgit server git branch); thus, in that
2988 # case, we prefer the archive's version (and produce a
2989 # pseudo-merge to overwrite the dgit server git branch).
2991 # (If there is no Dgit field in the archive's .dsc then
2992 # generate_commit_from_dsc uses the version numbers to decide
2993 # whether the suite branch or the archive is newer. If the suite
2994 # branch is newer it ignores the archive's .dsc; otherwise it
2995 # generates an import of the .dsc, and produces a pseudo-merge to
2996 # overwrite the suite branch with the archive contents.)
2998 # The outcome of that part of the algorithm is the `public view',
2999 # and is same for all dgit clients: it does not depend on any
3000 # unpublished history in the local tracking branch.
3002 # As between the public view and the local tracking branch: The
3003 # local tracking branch is only updated by dgit fetch, and
3004 # whenever dgit fetch runs it includes the public view in the
3005 # local tracking branch. Therefore if the public view is not
3006 # descended from the local tracking branch, the local tracking
3007 # branch must contain history which was imported from the archive
3008 # but never pushed; and, its tip is now out of date. So, we make
3009 # a pseudo-merge to overwrite the old imports and stitch the old
3012 # Finally: we do not necessarily reify the public view (as
3013 # described above). This is so that we do not end up stacking two
3014 # pseudo-merges. So what we actually do is figure out the inputs
3015 # to any public view pseudo-merge and put them in @mergeinputs.
3018 # $mergeinputs[]{Commit}
3019 # $mergeinputs[]{Info}
3020 # $mergeinputs[0] is the one whose tree we use
3021 # @mergeinputs is in the order we use in the actual commit)
3024 # $mergeinputs[]{Message} is a commit message to use
3025 # $mergeinputs[]{ReverseParents} if def specifies that parent
3026 # list should be in opposite order
3027 # Such an entry has no Commit or Info. It applies only when found
3028 # in the last entry. (This ugliness is to support making
3029 # identical imports to previous dgit versions.)
3031 my $lastpush_hash = git_get_ref(lrfetchref());
3032 printdebug "previous reference hash=$lastpush_hash\n";
3033 $lastpush_mergeinput = $lastpush_hash && {
3034 Commit => $lastpush_hash,
3035 Info => "dgit suite branch on dgit git server",
3038 my $lastfetch_hash = git_get_ref(lrref());
3039 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3040 my $lastfetch_mergeinput = $lastfetch_hash && {
3041 Commit => $lastfetch_hash,
3042 Info => "dgit client's archive history view",
3045 my $dsc_mergeinput = $dsc_hash && {
3046 Commit => $dsc_hash,
3047 Info => "Dgit field in .dsc from archive",
3051 my $del_lrfetchrefs = sub {
3054 printdebug "del_lrfetchrefs...\n";
3055 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3056 my $objid = $lrfetchrefs_d{$fullrefname};
3057 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3059 $gur ||= new IO::Handle;
3060 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3062 printf $gur "delete %s %s\n", $fullrefname, $objid;
3065 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3069 if (defined $dsc_hash) {
3070 ensure_we_have_orig();
3071 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3072 @mergeinputs = $dsc_mergeinput
3073 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3074 print STDERR <<END or die $!;
3076 Git commit in archive is behind the last version allegedly pushed/uploaded.
3077 Commit referred to by archive: $dsc_hash
3078 Last version pushed with dgit: $lastpush_hash
3081 @mergeinputs = ($lastpush_mergeinput);
3083 # Archive has .dsc which is not a descendant of the last dgit
3084 # push. This can happen if the archive moves .dscs about.
3085 # Just follow its lead.
3086 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3087 progress "archive .dsc names newer git commit";
3088 @mergeinputs = ($dsc_mergeinput);
3090 progress "archive .dsc names other git commit, fixing up";
3091 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3095 @mergeinputs = generate_commits_from_dsc();
3096 # We have just done an import. Now, our import algorithm might
3097 # have been improved. But even so we do not want to generate
3098 # a new different import of the same package. So if the
3099 # version numbers are the same, just use our existing version.
3100 # If the version numbers are different, the archive has changed
3101 # (perhaps, rewound).
3102 if ($lastfetch_mergeinput &&
3103 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3104 (mergeinfo_version $mergeinputs[0]) )) {
3105 @mergeinputs = ($lastfetch_mergeinput);
3107 } elsif ($lastpush_hash) {
3108 # only in git, not in the archive yet
3109 @mergeinputs = ($lastpush_mergeinput);
3110 print STDERR <<END or die $!;
3112 Package not found in the archive, but has allegedly been pushed using dgit.
3116 printdebug "nothing found!\n";
3117 if (defined $skew_warning_vsn) {
3118 print STDERR <<END or die $!;
3120 Warning: relevant archive skew detected.
3121 Archive allegedly contains $skew_warning_vsn
3122 But we were not able to obtain any version from the archive or git.
3126 unshift @end, $del_lrfetchrefs;
3130 if ($lastfetch_hash &&
3132 my $h = $_->{Commit};
3133 $h and is_fast_fwd($lastfetch_hash, $h);
3134 # If true, one of the existing parents of this commit
3135 # is a descendant of the $lastfetch_hash, so we'll
3136 # be ff from that automatically.
3140 push @mergeinputs, $lastfetch_mergeinput;
3143 printdebug "fetch mergeinfos:\n";
3144 foreach my $mi (@mergeinputs) {
3146 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3148 printdebug sprintf " ReverseParents=%d Message=%s",
3149 $mi->{ReverseParents}, $mi->{Message};
3153 my $compat_info= pop @mergeinputs
3154 if $mergeinputs[$#mergeinputs]{Message};
3156 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3159 if (@mergeinputs > 1) {
3161 my $tree_commit = $mergeinputs[0]{Commit};
3163 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3164 $tree =~ m/\n\n/; $tree = $`;
3165 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3168 # We use the changelog author of the package in question the
3169 # author of this pseudo-merge. This is (roughly) correct if
3170 # this commit is simply representing aa non-dgit upload.
3171 # (Roughly because it does not record sponsorship - but we
3172 # don't have sponsorship info because that's in the .changes,
3173 # which isn't in the archivw.)
3175 # But, it might be that we are representing archive history
3176 # updates (including in-archive copies). These are not really
3177 # the responsibility of the person who created the .dsc, but
3178 # there is no-one whose name we should better use. (The
3179 # author of the .dsc-named commit is clearly worse.)
3181 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3182 my $author = clogp_authline $useclogp;
3183 my $cversion = getfield $useclogp, 'Version';
3185 my $mcf = ".git/dgit/mergecommit";
3186 open MC, ">", $mcf or die "$mcf $!";
3187 print MC <<END or die $!;
3191 my @parents = grep { $_->{Commit} } @mergeinputs;
3192 @parents = reverse @parents if $compat_info->{ReverseParents};
3193 print MC <<END or die $! foreach @parents;
3197 print MC <<END or die $!;
3203 if (defined $compat_info->{Message}) {
3204 print MC $compat_info->{Message} or die $!;
3206 print MC <<END or die $!;
3207 Record $package ($cversion) in archive suite $csuite
3211 my $message_add_info = sub {
3213 my $mversion = mergeinfo_version $mi;
3214 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3218 $message_add_info->($mergeinputs[0]);
3219 print MC <<END or die $!;
3220 should be treated as descended from
3222 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3226 $hash = make_commit $mcf;
3228 $hash = $mergeinputs[0]{Commit};
3230 printdebug "fetch hash=$hash\n";
3233 my ($lasth, $what) = @_;
3234 return unless $lasth;
3235 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3238 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3240 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3242 fetch_from_archive_record_1($hash);
3244 if (defined $skew_warning_vsn) {
3246 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3247 my $gotclogp = commit_getclogp($hash);
3248 my $got_vsn = getfield $gotclogp, 'Version';
3249 printdebug "SKEW CHECK GOT $got_vsn\n";
3250 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3251 print STDERR <<END or die $!;
3253 Warning: archive skew detected. Using the available version:
3254 Archive allegedly contains $skew_warning_vsn
3255 We were able to obtain only $got_vsn
3261 if ($lastfetch_hash ne $hash) {
3262 fetch_from_archive_record_2($hash);
3265 lrfetchref_used lrfetchref();
3267 check_gitattrs($hash, "fetched source tree");
3269 unshift @end, $del_lrfetchrefs;
3273 sub set_local_git_config ($$) {
3275 runcmd @git, qw(config), $k, $v;
3278 sub setup_mergechangelogs (;$) {
3280 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3282 my $driver = 'dpkg-mergechangelogs';
3283 my $cb = "merge.$driver";
3284 my $attrs = '.git/info/attributes';
3285 ensuredir '.git/info';
3287 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3288 if (!open ATTRS, "<", $attrs) {
3289 $!==ENOENT or die "$attrs: $!";
3293 next if m{^debian/changelog\s};
3294 print NATTRS $_, "\n" or die $!;
3296 ATTRS->error and die $!;
3299 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3302 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3303 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3305 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3308 sub setup_useremail (;$) {
3310 return unless $always || access_cfg_bool(1, 'setup-useremail');
3313 my ($k, $envvar) = @_;
3314 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3315 return unless defined $v;
3316 set_local_git_config "user.$k", $v;
3319 $setup->('email', 'DEBEMAIL');
3320 $setup->('name', 'DEBFULLNAME');
3323 sub ensure_setup_existing_tree () {
3324 my $k = "remote.$remotename.skipdefaultupdate";
3325 my $c = git_get_config $k;
3326 return if defined $c;
3327 set_local_git_config $k, 'true';
3330 sub open_gitattrs () {
3331 my $gai = new IO::File ".git/info/attributes"
3333 or die "open .git/info/attributes: $!";
3337 sub is_gitattrs_setup () {
3338 my $gai = open_gitattrs();
3339 return 0 unless $gai;
3341 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3343 $gai->error and die $!;
3347 sub setup_gitattrs (;$) {
3349 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3351 if (is_gitattrs_setup()) {
3353 [attr]dgit-defuse-attrs already found in .git/info/attributes
3354 not doing further gitattributes setup
3358 my $af = ".git/info/attributes";
3359 open GAO, "> $af.new" or die $!;
3360 print GAO <<END or die $!;
3362 [attr]dgit-defuse-attrs -text -eol -crlf -ident -filter
3363 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3365 my $gai = open_gitattrs();
3369 print GAO $_, "\n" or die $!;
3371 $gai->error and die $!;
3373 close GAO or die $!;
3374 rename "$af.new", "$af" or die "install $af: $!";
3377 sub setup_new_tree () {
3378 setup_mergechangelogs();
3383 sub check_gitattrs ($$) {
3384 my ($treeish, $what) = @_;
3386 return if is_gitattrs_setup;
3389 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3391 my $gafl = new IO::File;
3392 open $gafl, "-|", @cmd or die $!;
3395 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3397 next unless m{(?:^|/)\.gitattributes$};
3399 # oh dear, found one
3401 dgit: warning: $what contains .gitattributes
3402 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3407 # tree contains no .gitattributes files
3408 $?=0; $!=0; close $gafl or failedcmd @cmd;
3412 sub multisuite_suite_child ($$$) {
3413 my ($tsuite, $merginputs, $fn) = @_;
3414 # in child, sets things up, calls $fn->(), and returns undef
3415 # in parent, returns canonical suite name for $tsuite
3416 my $canonsuitefh = IO::File::new_tmpfile;
3417 my $pid = fork // die $!;
3421 $us .= " [$isuite]";
3422 $debugprefix .= " ";
3423 progress "fetching $tsuite...";
3424 canonicalise_suite();
3425 print $canonsuitefh $csuite, "\n" or die $!;
3426 close $canonsuitefh or die $!;
3430 waitpid $pid,0 == $pid or die $!;
3431 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3432 seek $canonsuitefh,0,0 or die $!;
3433 local $csuite = <$canonsuitefh>;
3434 die $! unless defined $csuite && chomp $csuite;
3436 printdebug "multisuite $tsuite missing\n";
3439 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3440 push @$merginputs, {
3447 sub fork_for_multisuite ($) {
3448 my ($before_fetch_merge) = @_;
3449 # if nothing unusual, just returns ''
3452 # returns 0 to caller in child, to do first of the specified suites
3453 # in child, $csuite is not yet set
3455 # returns 1 to caller in parent, to finish up anything needed after
3456 # in parent, $csuite is set to canonicalised portmanteau
3458 my $org_isuite = $isuite;
3459 my @suites = split /\,/, $isuite;
3460 return '' unless @suites > 1;
3461 printdebug "fork_for_multisuite: @suites\n";
3465 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3467 return 0 unless defined $cbasesuite;
3469 fail "package $package missing in (base suite) $cbasesuite"
3470 unless @mergeinputs;
3472 my @csuites = ($cbasesuite);
3474 $before_fetch_merge->();
3476 foreach my $tsuite (@suites[1..$#suites]) {
3477 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3483 # xxx collecte the ref here
3485 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3486 push @csuites, $csubsuite;
3489 foreach my $mi (@mergeinputs) {
3490 my $ref = git_get_ref $mi->{Ref};
3491 die "$mi->{Ref} ?" unless length $ref;
3492 $mi->{Commit} = $ref;
3495 $csuite = join ",", @csuites;
3497 my $previous = git_get_ref lrref;
3499 unshift @mergeinputs, {
3500 Commit => $previous,
3501 Info => "local combined tracking branch",
3503 "archive seems to have rewound: local tracking branch is ahead!",
3507 foreach my $ix (0..$#mergeinputs) {
3508 $mergeinputs[$ix]{Index} = $ix;
3511 @mergeinputs = sort {
3512 -version_compare(mergeinfo_version $a,
3513 mergeinfo_version $b) # highest version first
3515 $a->{Index} <=> $b->{Index}; # earliest in spec first
3521 foreach my $mi (@mergeinputs) {
3522 printdebug "multisuite merge check $mi->{Info}\n";
3523 foreach my $previous (@needed) {
3524 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3525 printdebug "multisuite merge un-needed $previous->{Info}\n";
3529 printdebug "multisuite merge this-needed\n";
3530 $mi->{Character} = '+';
3533 $needed[0]{Character} = '*';
3535 my $output = $needed[0]{Commit};
3538 printdebug "multisuite merge nontrivial\n";
3539 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3541 my $commit = "tree $tree\n";
3542 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3543 "Input branches:\n";
3545 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3546 printdebug "multisuite merge include $mi->{Info}\n";
3547 $mi->{Character} //= ' ';
3548 $commit .= "parent $mi->{Commit}\n";
3549 $msg .= sprintf " %s %-25s %s\n",
3551 (mergeinfo_version $mi),
3554 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3556 " * marks the highest version branch, which choose to use\n".
3557 " + marks each branch which was not already an ancestor\n\n".
3558 "[dgit multi-suite $csuite]\n";
3560 "author $authline\n".
3561 "committer $authline\n\n";
3562 $output = make_commit_text $commit.$msg;
3563 printdebug "multisuite merge generated $output\n";
3566 fetch_from_archive_record_1($output);
3567 fetch_from_archive_record_2($output);
3569 progress "calculated combined tracking suite $csuite";
3574 sub clone_set_head () {
3575 open H, "> .git/HEAD" or die $!;
3576 print H "ref: ".lref()."\n" or die $!;
3579 sub clone_finish ($) {
3581 runcmd @git, qw(reset --hard), lrref();
3582 runcmd qw(bash -ec), <<'END';
3584 git ls-tree -r --name-only -z HEAD | \
3585 xargs -0r touch -h -r . --
3587 printdone "ready for work in $dstdir";
3592 badusage "dry run makes no sense with clone" unless act_local();
3594 my $multi_fetched = fork_for_multisuite(sub {
3595 printdebug "multi clone before fetch merge\n";
3598 if ($multi_fetched) {
3599 printdebug "multi clone after fetch merge\n";
3601 clone_finish($dstdir);
3604 printdebug "clone main body\n";
3606 canonicalise_suite();
3607 my $hasgit = check_for_git();
3608 mkdir $dstdir or fail "create \`$dstdir': $!";
3610 runcmd @git, qw(init -q);
3613 my $giturl = access_giturl(1);
3614 if (defined $giturl) {
3615 runcmd @git, qw(remote add), 'origin', $giturl;
3618 progress "fetching existing git history";
3620 runcmd_ordryrun_local @git, qw(fetch origin);
3622 progress "starting new git history";
3624 fetch_from_archive() or no_such_package;
3625 my $vcsgiturl = $dsc->{'Vcs-Git'};
3626 if (length $vcsgiturl) {
3627 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3628 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3630 clone_finish($dstdir);
3634 canonicalise_suite();
3635 if (check_for_git()) {
3638 fetch_from_archive() or no_such_package();
3639 printdone "fetched into ".lrref();
3643 my $multi_fetched = fork_for_multisuite(sub { });
3644 fetch() unless $multi_fetched; # parent
3645 return if $multi_fetched eq '0'; # child
3646 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3648 printdone "fetched to ".lrref()." and merged into HEAD";
3651 sub check_not_dirty () {
3652 foreach my $f (qw(local-options local-patch-header)) {
3653 if (stat_exists "debian/source/$f") {
3654 fail "git tree contains debian/source/$f";
3658 return if $ignoredirty;
3660 my @cmd = (@git, qw(diff --quiet HEAD));
3662 $!=0; $?=-1; system @cmd;
3665 fail "working tree is dirty (does not match HEAD)";
3671 sub commit_admin ($) {
3674 runcmd_ordryrun_local @git, qw(commit -m), $m;
3677 sub commit_quilty_patch () {
3678 my $output = cmdoutput @git, qw(status --porcelain);
3680 foreach my $l (split /\n/, $output) {
3681 next unless $l =~ m/\S/;
3682 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3686 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3688 progress "nothing quilty to commit, ok.";
3691 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3692 runcmd_ordryrun_local @git, qw(add -f), @adds;
3694 Commit Debian 3.0 (quilt) metadata
3696 [dgit ($our_version) quilt-fixup]
3700 sub get_source_format () {
3702 if (open F, "debian/source/options") {
3706 s/\s+$//; # ignore missing final newline
3708 my ($k, $v) = ($`, $'); #');
3709 $v =~ s/^"(.*)"$/$1/;
3715 F->error and die $!;
3718 die $! unless $!==&ENOENT;
3721 if (!open F, "debian/source/format") {
3722 die $! unless $!==&ENOENT;
3726 F->error and die $!;
3728 return ($_, \%options);
3731 sub madformat_wantfixup ($) {
3733 return 0 unless $format eq '3.0 (quilt)';
3734 our $quilt_mode_warned;
3735 if ($quilt_mode eq 'nocheck') {
3736 progress "Not doing any fixup of \`$format' due to".
3737 " ----no-quilt-fixup or --quilt=nocheck"
3738 unless $quilt_mode_warned++;
3741 progress "Format \`$format', need to check/update patch stack"
3742 unless $quilt_mode_warned++;
3746 sub maybe_split_brain_save ($$$) {
3747 my ($headref, $dgitview, $msg) = @_;
3748 # => message fragment "$saved" describing disposition of $dgitview
3749 return "commit id $dgitview" unless defined $split_brain_save;
3750 my @cmd = (shell_cmd "cd ../../../..",
3751 @git, qw(update-ref -m),
3752 "dgit --dgit-view-save $msg HEAD=$headref",
3753 $split_brain_save, $dgitview);
3755 return "and left in $split_brain_save";
3758 # An "infopair" is a tuple [ $thing, $what ]
3759 # (often $thing is a commit hash; $what is a description)
3761 sub infopair_cond_equal ($$) {
3763 $x->[0] eq $y->[0] or fail <<END;
3764 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3768 sub infopair_lrf_tag_lookup ($$) {
3769 my ($tagnames, $what) = @_;
3770 # $tagname may be an array ref
3771 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3772 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3773 foreach my $tagname (@tagnames) {
3774 my $lrefname = lrfetchrefs."/tags/$tagname";
3775 my $tagobj = $lrfetchrefs_f{$lrefname};
3776 next unless defined $tagobj;
3777 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3778 return [ git_rev_parse($tagobj), $what ];
3780 fail @tagnames==1 ? <<END : <<END;
3781 Wanted tag $what (@tagnames) on dgit server, but not found
3783 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3787 sub infopair_cond_ff ($$) {
3788 my ($anc,$desc) = @_;
3789 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3790 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3794 sub pseudomerge_version_check ($$) {
3795 my ($clogp, $archive_hash) = @_;
3797 my $arch_clogp = commit_getclogp $archive_hash;
3798 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3799 'version currently in archive' ];
3800 if (defined $overwrite_version) {
3801 if (length $overwrite_version) {
3802 infopair_cond_equal([ $overwrite_version,
3803 '--overwrite= version' ],
3806 my $v = $i_arch_v->[0];
3807 progress "Checking package changelog for archive version $v ...";
3810 my @xa = ("-f$v", "-t$v");
3811 my $vclogp = parsechangelog @xa;
3814 [ (getfield $vclogp, $fn),
3815 "$fn field from dpkg-parsechangelog @xa" ];
3817 my $cv = $gf->('Version');
3818 infopair_cond_equal($i_arch_v, $cv);
3819 $cd = $gf->('Distribution');
3822 $@ =~ s/^dgit: //gm;
3824 "Perhaps debian/changelog does not mention $v ?";
3826 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3827 $cd->[1] is $cd->[0]
3828 Your tree seems to based on earlier (not uploaded) $v.
3833 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3837 sub pseudomerge_make_commit ($$$$ $$) {
3838 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3839 $msg_cmd, $msg_msg) = @_;
3840 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3842 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3843 my $authline = clogp_authline $clogp;
3847 !defined $overwrite_version ? ""
3848 : !length $overwrite_version ? " --overwrite"
3849 : " --overwrite=".$overwrite_version;
3852 my $pmf = ".git/dgit/pseudomerge";
3853 open MC, ">", $pmf or die "$pmf $!";
3854 print MC <<END or die $!;
3857 parent $archive_hash
3867 return make_commit($pmf);
3870 sub splitbrain_pseudomerge ($$$$) {
3871 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3872 # => $merged_dgitview
3873 printdebug "splitbrain_pseudomerge...\n";
3875 # We: debian/PREVIOUS HEAD($maintview)
3876 # expect: o ----------------- o
3879 # a/d/PREVIOUS $dgitview
3882 # we do: `------------------ o
3886 return $dgitview unless defined $archive_hash;
3888 printdebug "splitbrain_pseudomerge...\n";
3890 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3892 if (!defined $overwrite_version) {
3893 progress "Checking that HEAD inciudes all changes in archive...";
3896 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3898 if (defined $overwrite_version) {
3900 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3901 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3902 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3903 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3904 my $i_archive = [ $archive_hash, "current archive contents" ];
3906 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3908 infopair_cond_equal($i_dgit, $i_archive);
3909 infopair_cond_ff($i_dep14, $i_dgit);
3910 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3914 $us: check failed (maybe --overwrite is needed, consult documentation)
3919 my $r = pseudomerge_make_commit
3920 $clogp, $dgitview, $archive_hash, $i_arch_v,
3921 "dgit --quilt=$quilt_mode",
3922 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3923 Declare fast forward from $i_arch_v->[0]
3925 Make fast forward from $i_arch_v->[0]
3928 maybe_split_brain_save $maintview, $r, "pseudomerge";
3930 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3934 sub plain_overwrite_pseudomerge ($$$) {
3935 my ($clogp, $head, $archive_hash) = @_;
3937 printdebug "plain_overwrite_pseudomerge...";
3939 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3941 return $head if is_fast_fwd $archive_hash, $head;
3943 my $m = "Declare fast forward from $i_arch_v->[0]";
3945 my $r = pseudomerge_make_commit
3946 $clogp, $head, $archive_hash, $i_arch_v,
3949 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3951 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3955 sub push_parse_changelog ($) {
3958 my $clogp = Dpkg::Control::Hash->new();
3959 $clogp->load($clogpfn) or die;
3961 my $clogpackage = getfield $clogp, 'Source';
3962 $package //= $clogpackage;
3963 fail "-p specified $package but changelog specified $clogpackage"
3964 unless $package eq $clogpackage;
3965 my $cversion = getfield $clogp, 'Version';
3967 if (!$we_are_initiator) {
3968 # rpush initiator can't do this because it doesn't have $isuite yet
3969 my $tag = debiantag($cversion, access_nomdistro);
3970 runcmd @git, qw(check-ref-format), $tag;
3973 my $dscfn = dscfn($cversion);
3975 return ($clogp, $cversion, $dscfn);
3978 sub push_parse_dsc ($$$) {
3979 my ($dscfn,$dscfnwhat, $cversion) = @_;
3980 $dsc = parsecontrol($dscfn,$dscfnwhat);
3981 my $dversion = getfield $dsc, 'Version';
3982 my $dscpackage = getfield $dsc, 'Source';
3983 ($dscpackage eq $package && $dversion eq $cversion) or
3984 fail "$dscfn is for $dscpackage $dversion".
3985 " but debian/changelog is for $package $cversion";
3988 sub push_tagwants ($$$$) {
3989 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3992 TagFn => \&debiantag,
3997 if (defined $maintviewhead) {
3999 TagFn => \&debiantag_maintview,
4000 Objid => $maintviewhead,
4001 TfSuffix => '-maintview',
4004 } elsif ($dodep14tag eq 'no' ? 0
4005 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4006 : $dodep14tag eq 'always'
4007 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4008 --dep14tag-always (or equivalent in config) means server must support
4009 both "new" and "maint" tag formats, but config says it doesn't.
4011 : die "$dodep14tag ?") {
4013 TagFn => \&debiantag_maintview,
4015 TfSuffix => '-dgit',
4019 foreach my $tw (@tagwants) {
4020 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4021 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4023 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4027 sub push_mktags ($$ $$ $) {
4029 $changesfile,$changesfilewhat,
4032 die unless $tagwants->[0]{View} eq 'dgit';
4034 my $declaredistro = access_nomdistro();
4035 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4036 $dsc->{$ourdscfield[0]} = join " ",
4037 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4039 $dsc->save("$dscfn.tmp") or die $!;
4041 my $changes = parsecontrol($changesfile,$changesfilewhat);
4042 foreach my $field (qw(Source Distribution Version)) {
4043 $changes->{$field} eq $clogp->{$field} or
4044 fail "changes field $field \`$changes->{$field}'".
4045 " does not match changelog \`$clogp->{$field}'";
4048 my $cversion = getfield $clogp, 'Version';
4049 my $clogsuite = getfield $clogp, 'Distribution';
4051 # We make the git tag by hand because (a) that makes it easier
4052 # to control the "tagger" (b) we can do remote signing
4053 my $authline = clogp_authline $clogp;
4054 my $delibs = join(" ", "",@deliberatelies);
4058 my $tfn = $tw->{Tfn};
4059 my $head = $tw->{Objid};
4060 my $tag = $tw->{Tag};
4062 open TO, '>', $tfn->('.tmp') or die $!;
4063 print TO <<END or die $!;
4070 if ($tw->{View} eq 'dgit') {
4071 print TO <<END or die $!;
4072 $package release $cversion for $clogsuite ($csuite) [dgit]
4073 [dgit distro=$declaredistro$delibs]
4075 foreach my $ref (sort keys %previously) {
4076 print TO <<END or die $!;
4077 [dgit previously:$ref=$previously{$ref}]
4080 } elsif ($tw->{View} eq 'maint') {
4081 print TO <<END or die $!;
4082 $package release $cversion for $clogsuite ($csuite)
4083 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4086 die Dumper($tw)."?";
4091 my $tagobjfn = $tfn->('.tmp');
4093 if (!defined $keyid) {
4094 $keyid = access_cfg('keyid','RETURN-UNDEF');
4096 if (!defined $keyid) {
4097 $keyid = getfield $clogp, 'Maintainer';
4099 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4100 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4101 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4102 push @sign_cmd, $tfn->('.tmp');
4103 runcmd_ordryrun @sign_cmd;
4105 $tagobjfn = $tfn->('.signed.tmp');
4106 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4107 $tfn->('.tmp'), $tfn->('.tmp.asc');
4113 my @r = map { $mktag->($_); } @$tagwants;
4117 sub sign_changes ($) {
4118 my ($changesfile) = @_;
4120 my @debsign_cmd = @debsign;
4121 push @debsign_cmd, "-k$keyid" if defined $keyid;
4122 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4123 push @debsign_cmd, $changesfile;
4124 runcmd_ordryrun @debsign_cmd;
4129 printdebug "actually entering push\n";
4131 supplementary_message(<<'END');
4132 Push failed, while checking state of the archive.
4133 You can retry the push, after fixing the problem, if you like.
4135 if (check_for_git()) {
4138 my $archive_hash = fetch_from_archive();
4139 if (!$archive_hash) {
4141 fail "package appears to be new in this suite;".
4142 " if this is intentional, use --new";
4145 supplementary_message(<<'END');
4146 Push failed, while preparing your push.
4147 You can retry the push, after fixing the problem, if you like.
4150 need_tagformat 'new', "quilt mode $quilt_mode"
4151 if quiltmode_splitbrain;
4155 access_giturl(); # check that success is vaguely likely
4156 rpush_handle_protovsn_bothends() if $we_are_initiator;
4159 my $clogpfn = ".git/dgit/changelog.822.tmp";
4160 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4162 responder_send_file('parsed-changelog', $clogpfn);
4164 my ($clogp, $cversion, $dscfn) =
4165 push_parse_changelog("$clogpfn");
4167 my $dscpath = "$buildproductsdir/$dscfn";
4168 stat_exists $dscpath or
4169 fail "looked for .dsc $dscpath, but $!;".
4170 " maybe you forgot to build";
4172 responder_send_file('dsc', $dscpath);
4174 push_parse_dsc($dscpath, $dscfn, $cversion);
4176 my $format = getfield $dsc, 'Format';
4177 printdebug "format $format\n";
4179 my $actualhead = git_rev_parse('HEAD');
4180 my $dgithead = $actualhead;
4181 my $maintviewhead = undef;
4183 my $upstreamversion = upstreamversion $clogp->{Version};
4185 if (madformat_wantfixup($format)) {
4186 # user might have not used dgit build, so maybe do this now:
4187 if (quiltmode_splitbrain()) {
4189 quilt_make_fake_dsc($upstreamversion);
4191 ($dgithead, $cachekey) =
4192 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4194 "--quilt=$quilt_mode but no cached dgit view:
4195 perhaps tree changed since dgit build[-source] ?";
4197 $dgithead = splitbrain_pseudomerge($clogp,
4198 $actualhead, $dgithead,
4200 $maintviewhead = $actualhead;
4201 changedir '../../../..';
4202 prep_ud(); # so _only_subdir() works, below
4204 commit_quilty_patch();
4208 if (defined $overwrite_version && !defined $maintviewhead) {
4209 $dgithead = plain_overwrite_pseudomerge($clogp,
4217 if ($archive_hash) {
4218 if (is_fast_fwd($archive_hash, $dgithead)) {
4220 } elsif (deliberately_not_fast_forward) {
4223 fail "dgit push: HEAD is not a descendant".
4224 " of the archive's version.\n".
4225 "To overwrite the archive's contents,".
4226 " pass --overwrite[=VERSION].\n".
4227 "To rewind history, if permitted by the archive,".
4228 " use --deliberately-not-fast-forward.";
4233 progress "checking that $dscfn corresponds to HEAD";
4234 runcmd qw(dpkg-source -x --),
4235 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4236 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4237 check_for_vendor_patches() if madformat($dsc->{format});
4238 changedir '../../../..';
4239 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4240 debugcmd "+",@diffcmd;
4242 my $r = system @diffcmd;
4245 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4247 HEAD specifies a different tree to $dscfn:
4249 Perhaps you forgot to build. Or perhaps there is a problem with your
4250 source tree (see dgit(7) for some hints). To see a full diff, run
4257 if (!$changesfile) {
4258 my $pat = changespat $cversion;
4259 my @cs = glob "$buildproductsdir/$pat";
4260 fail "failed to find unique changes file".
4261 " (looked for $pat in $buildproductsdir);".
4262 " perhaps you need to use dgit -C"
4264 ($changesfile) = @cs;
4266 $changesfile = "$buildproductsdir/$changesfile";
4269 # Check that changes and .dsc agree enough
4270 $changesfile =~ m{[^/]*$};
4271 my $changes = parsecontrol($changesfile,$&);
4272 files_compare_inputs($dsc, $changes)
4273 unless forceing [qw(dsc-changes-mismatch)];
4275 # Perhaps adjust .dsc to contain right set of origs
4276 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4278 unless forceing [qw(changes-origs-exactly)];
4280 # Checks complete, we're going to try and go ahead:
4282 responder_send_file('changes',$changesfile);
4283 responder_send_command("param head $dgithead");
4284 responder_send_command("param csuite $csuite");
4285 responder_send_command("param isuite $isuite");
4286 responder_send_command("param tagformat $tagformat");
4287 if (defined $maintviewhead) {
4288 die unless ($protovsn//4) >= 4;
4289 responder_send_command("param maint-view $maintviewhead");
4292 if (deliberately_not_fast_forward) {
4293 git_for_each_ref(lrfetchrefs, sub {
4294 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4295 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4296 responder_send_command("previously $rrefname=$objid");
4297 $previously{$rrefname} = $objid;
4301 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4305 supplementary_message(<<'END');
4306 Push failed, while signing the tag.
4307 You can retry the push, after fixing the problem, if you like.
4309 # If we manage to sign but fail to record it anywhere, it's fine.
4310 if ($we_are_responder) {
4311 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4312 responder_receive_files('signed-tag', @tagobjfns);
4314 @tagobjfns = push_mktags($clogp,$dscpath,
4315 $changesfile,$changesfile,
4318 supplementary_message(<<'END');
4319 Push failed, *after* signing the tag.
4320 If you want to try again, you should use a new version number.
4323 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4325 foreach my $tw (@tagwants) {
4326 my $tag = $tw->{Tag};
4327 my $tagobjfn = $tw->{TagObjFn};
4329 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4330 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4331 runcmd_ordryrun_local
4332 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4335 supplementary_message(<<'END');
4336 Push failed, while updating the remote git repository - see messages above.
4337 If you want to try again, you should use a new version number.
4339 if (!check_for_git()) {
4340 create_remote_git_repo();
4343 my @pushrefs = $forceflag.$dgithead.":".rrref();
4344 foreach my $tw (@tagwants) {
4345 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4348 runcmd_ordryrun @git,
4349 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4350 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4352 supplementary_message(<<'END');
4353 Push failed, while obtaining signatures on the .changes and .dsc.
4354 If it was just that the signature failed, you may try again by using
4355 debsign by hand to sign the changes
4357 and then dput to complete the upload.
4358 If you need to change the package, you must use a new version number.
4360 if ($we_are_responder) {
4361 my $dryrunsuffix = act_local() ? "" : ".tmp";
4362 responder_receive_files('signed-dsc-changes',
4363 "$dscpath$dryrunsuffix",
4364 "$changesfile$dryrunsuffix");
4367 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4369 progress "[new .dsc left in $dscpath.tmp]";
4371 sign_changes $changesfile;
4374 supplementary_message(<<END);
4375 Push failed, while uploading package(s) to the archive server.
4376 You can retry the upload of exactly these same files with dput of:
4378 If that .changes file is broken, you will need to use a new version
4379 number for your next attempt at the upload.
4381 my $host = access_cfg('upload-host','RETURN-UNDEF');
4382 my @hostarg = defined($host) ? ($host,) : ();
4383 runcmd_ordryrun @dput, @hostarg, $changesfile;
4384 printdone "pushed and uploaded $cversion";
4386 supplementary_message('');
4387 responder_send_command("complete");
4393 badusage "-p is not allowed with clone; specify as argument instead"
4394 if defined $package;
4397 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4398 ($package,$isuite) = @ARGV;
4399 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4400 ($package,$dstdir) = @ARGV;
4401 } elsif (@ARGV==3) {
4402 ($package,$isuite,$dstdir) = @ARGV;
4404 badusage "incorrect arguments to dgit clone";
4408 $dstdir ||= "$package";
4409 if (stat_exists $dstdir) {
4410 fail "$dstdir already exists";
4414 if ($rmonerror && !$dryrun_level) {
4415 $cwd_remove= getcwd();
4417 return unless defined $cwd_remove;
4418 if (!chdir "$cwd_remove") {
4419 return if $!==&ENOENT;
4420 die "chdir $cwd_remove: $!";
4422 printdebug "clone rmonerror removing $dstdir\n";
4424 rmtree($dstdir) or die "remove $dstdir: $!\n";
4425 } elsif (grep { $! == $_ }
4426 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4428 print STDERR "check whether to remove $dstdir: $!\n";
4434 $cwd_remove = undef;
4437 sub branchsuite () {
4438 my @cmd = (@git, qw(symbolic-ref -q HEAD));
4439 my $branch = cmdoutput_errok @cmd;
4440 if (!defined $branch) {
4441 $?==256 or failedcmd @cmd;
4444 if ($branch =~ m#$lbranch_re#o) {
4451 sub fetchpullargs () {
4452 if (!defined $package) {
4453 my $sourcep = parsecontrol('debian/control','debian/control');
4454 $package = getfield $sourcep, 'Source';
4457 $isuite = branchsuite();
4459 my $clogp = parsechangelog();
4460 my $clogsuite = getfield $clogp, 'Distribution';
4461 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4463 } elsif (@ARGV==1) {
4466 badusage "incorrect arguments to dgit fetch or dgit pull";
4474 my $multi_fetched = fork_for_multisuite(sub { });
4475 exit 0 if $multi_fetched;
4482 if (quiltmode_splitbrain()) {
4483 my ($format, $fopts) = get_source_format();
4484 madformat($format) and fail <<END
4485 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4493 badusage "-p is not allowed with dgit push" if defined $package;
4495 my $clogp = parsechangelog();
4496 $package = getfield $clogp, 'Source';
4499 } elsif (@ARGV==1) {
4500 ($specsuite) = (@ARGV);
4502 badusage "incorrect arguments to dgit push";
4504 $isuite = getfield $clogp, 'Distribution';
4507 local ($package) = $existing_package; # this is a hack
4508 canonicalise_suite();
4510 canonicalise_suite();
4512 if (defined $specsuite &&
4513 $specsuite ne $isuite &&
4514 $specsuite ne $csuite) {
4515 fail "dgit push: changelog specifies $isuite ($csuite)".
4516 " but command line specifies $specsuite";
4521 #---------- remote commands' implementation ----------
4523 sub cmd_remote_push_build_host {
4524 my ($nrargs) = shift @ARGV;
4525 my (@rargs) = @ARGV[0..$nrargs-1];
4526 @ARGV = @ARGV[$nrargs..$#ARGV];
4528 my ($dir,$vsnwant) = @rargs;
4529 # vsnwant is a comma-separated list; we report which we have
4530 # chosen in our ready response (so other end can tell if they
4533 $we_are_responder = 1;
4534 $us .= " (build host)";
4536 open PI, "<&STDIN" or die $!;
4537 open STDIN, "/dev/null" or die $!;
4538 open PO, ">&STDOUT" or die $!;
4540 open STDOUT, ">&STDERR" or die $!;
4544 ($protovsn) = grep {
4545 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4546 } @rpushprotovsn_support;
4548 fail "build host has dgit rpush protocol versions ".
4549 (join ",", @rpushprotovsn_support).
4550 " but invocation host has $vsnwant"
4551 unless defined $protovsn;
4553 responder_send_command("dgit-remote-push-ready $protovsn");
4558 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4559 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4560 # a good error message)
4562 sub rpush_handle_protovsn_bothends () {
4563 if ($protovsn < 4) {
4564 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4573 my $report = i_child_report();
4574 if (defined $report) {
4575 printdebug "($report)\n";
4576 } elsif ($i_child_pid) {
4577 printdebug "(killing build host child $i_child_pid)\n";
4578 kill 15, $i_child_pid;
4580 if (defined $i_tmp && !defined $initiator_tempdir) {
4582 eval { rmtree $i_tmp; };
4587 return unless forkcheck_mainprocess();
4592 my ($base,$selector,@args) = @_;
4593 $selector =~ s/\-/_/g;
4594 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4600 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4608 push @rargs, join ",", @rpushprotovsn_support;
4611 push @rdgit, @ropts;
4612 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4614 my @cmd = (@ssh, $host, shellquote @rdgit);
4617 $we_are_initiator=1;
4619 if (defined $initiator_tempdir) {
4620 rmtree $initiator_tempdir;
4621 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4622 $i_tmp = $initiator_tempdir;
4626 $i_child_pid = open2(\*RO, \*RI, @cmd);
4628 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4629 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4630 $supplementary_message = '' unless $protovsn >= 3;
4633 my ($icmd,$iargs) = initiator_expect {
4634 m/^(\S+)(?: (.*))?$/;
4637 i_method "i_resp", $icmd, $iargs;
4641 sub i_resp_progress ($) {
4643 my $msg = protocol_read_bytes \*RO, $rhs;
4647 sub i_resp_supplementary_message ($) {
4649 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4652 sub i_resp_complete {
4653 my $pid = $i_child_pid;
4654 $i_child_pid = undef; # prevents killing some other process with same pid
4655 printdebug "waiting for build host child $pid...\n";
4656 my $got = waitpid $pid, 0;
4657 die $! unless $got == $pid;
4658 die "build host child failed $?" if $?;
4661 printdebug "all done\n";
4665 sub i_resp_file ($) {
4667 my $localname = i_method "i_localname", $keyword;
4668 my $localpath = "$i_tmp/$localname";
4669 stat_exists $localpath and
4670 badproto \*RO, "file $keyword ($localpath) twice";
4671 protocol_receive_file \*RO, $localpath;
4672 i_method "i_file", $keyword;
4677 sub i_resp_param ($) {
4678 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4682 sub i_resp_previously ($) {
4683 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4684 or badproto \*RO, "bad previously spec";
4685 my $r = system qw(git check-ref-format), $1;
4686 die "bad previously ref spec ($r)" if $r;
4687 $previously{$1} = $2;
4692 sub i_resp_want ($) {
4694 die "$keyword ?" if $i_wanted{$keyword}++;
4696 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4697 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4698 die unless $isuite =~ m/^$suite_re$/;
4701 rpush_handle_protovsn_bothends();
4703 fail "rpush negotiated protocol version $protovsn".
4704 " which does not support quilt mode $quilt_mode"
4705 if quiltmode_splitbrain;
4707 my @localpaths = i_method "i_want", $keyword;
4708 printdebug "[[ $keyword @localpaths\n";
4709 foreach my $localpath (@localpaths) {
4710 protocol_send_file \*RI, $localpath;
4712 print RI "files-end\n" or die $!;
4715 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4717 sub i_localname_parsed_changelog {
4718 return "remote-changelog.822";
4720 sub i_file_parsed_changelog {
4721 ($i_clogp, $i_version, $i_dscfn) =
4722 push_parse_changelog "$i_tmp/remote-changelog.822";
4723 die if $i_dscfn =~ m#/|^\W#;
4726 sub i_localname_dsc {
4727 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4732 sub i_localname_changes {
4733 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4734 $i_changesfn = $i_dscfn;
4735 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4736 return $i_changesfn;
4738 sub i_file_changes { }
4740 sub i_want_signed_tag {
4741 printdebug Dumper(\%i_param, $i_dscfn);
4742 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4743 && defined $i_param{'csuite'}
4744 or badproto \*RO, "premature desire for signed-tag";
4745 my $head = $i_param{'head'};
4746 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4748 my $maintview = $i_param{'maint-view'};
4749 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4752 if ($protovsn >= 4) {
4753 my $p = $i_param{'tagformat'} // '<undef>';
4755 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4758 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4760 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4762 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4765 push_mktags $i_clogp, $i_dscfn,
4766 $i_changesfn, 'remote changes',
4770 sub i_want_signed_dsc_changes {
4771 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4772 sign_changes $i_changesfn;
4773 return ($i_dscfn, $i_changesfn);
4776 #---------- building etc. ----------
4782 #----- `3.0 (quilt)' handling -----
4784 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4786 sub quiltify_dpkg_commit ($$$;$) {
4787 my ($patchname,$author,$msg, $xinfo) = @_;
4791 my $descfn = ".git/dgit/quilt-description.tmp";
4792 open O, '>', $descfn or die "$descfn: $!";
4793 $msg =~ s/\n+/\n\n/;
4794 print O <<END or die $!;
4796 ${xinfo}Subject: $msg
4803 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4804 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4805 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4806 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4810 sub quiltify_trees_differ ($$;$$$) {
4811 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4812 # returns true iff the two tree objects differ other than in debian/
4813 # with $finegrained,
4814 # returns bitmask 01 - differ in upstream files except .gitignore
4815 # 02 - differ in .gitignore
4816 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4817 # is set for each modified .gitignore filename $fn
4818 # if $unrepres is defined, array ref to which is appeneded
4819 # a list of unrepresentable changes (removals of upstream files
4822 my @cmd = (@git, qw(diff-tree -z));
4823 push @cmd, qw(--name-only) unless $unrepres;
4824 push @cmd, qw(-r) if $finegrained || $unrepres;
4826 my $diffs= cmdoutput @cmd;
4829 foreach my $f (split /\0/, $diffs) {
4830 if ($unrepres && !@lmodes) {
4831 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4834 my ($oldmode,$newmode) = @lmodes;
4837 next if $f =~ m#^debian(?:/.*)?$#s;
4841 die "not a plain file\n"
4842 unless $newmode =~ m/^10\d{4}$/ ||
4843 $oldmode =~ m/^10\d{4}$/;
4844 if ($oldmode =~ m/[^0]/ &&
4845 $newmode =~ m/[^0]/) {
4846 die "mode changed\n" if $oldmode ne $newmode;
4848 die "non-default mode\n"
4849 unless $newmode =~ m/^100644$/ ||
4850 $oldmode =~ m/^100644$/;
4854 local $/="\n"; chomp $@;
4855 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4859 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4860 $r |= $isignore ? 02 : 01;
4861 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4863 printdebug "quiltify_trees_differ $x $y => $r\n";
4867 sub quiltify_tree_sentinelfiles ($) {
4868 # lists the `sentinel' files present in the tree
4870 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4871 qw(-- debian/rules debian/control);
4876 sub quiltify_splitbrain_needed () {
4877 if (!$split_brain) {
4878 progress "dgit view: changes are required...";
4879 runcmd @git, qw(checkout -q -b dgit-view);
4884 sub quiltify_splitbrain ($$$$$$) {
4885 my ($clogp, $unapplied, $headref, $diffbits,
4886 $editedignores, $cachekey) = @_;
4887 if ($quilt_mode !~ m/gbp|dpm/) {
4888 # treat .gitignore just like any other upstream file
4889 $diffbits = { %$diffbits };
4890 $_ = !!$_ foreach values %$diffbits;
4892 # We would like any commits we generate to be reproducible
4893 my @authline = clogp_authline($clogp);
4894 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4895 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4896 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4897 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4898 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4899 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4901 if ($quilt_mode =~ m/gbp|unapplied/ &&
4902 ($diffbits->{O2H} & 01)) {
4904 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4905 " but git tree differs from orig in upstream files.";
4906 if (!stat_exists "debian/patches") {
4908 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4912 if ($quilt_mode =~ m/dpm/ &&
4913 ($diffbits->{H2A} & 01)) {
4915 --quilt=$quilt_mode specified, implying patches-applied git tree
4916 but git tree differs from result of applying debian/patches to upstream
4919 if ($quilt_mode =~ m/gbp|unapplied/ &&
4920 ($diffbits->{O2A} & 01)) { # some patches
4921 quiltify_splitbrain_needed();
4922 progress "dgit view: creating patches-applied version using gbp pq";
4923 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4924 # gbp pq import creates a fresh branch; push back to dgit-view
4925 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4926 runcmd @git, qw(checkout -q dgit-view);
4928 if ($quilt_mode =~ m/gbp|dpm/ &&
4929 ($diffbits->{O2A} & 02)) {
4931 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4932 tool which does not create patches for changes to upstream
4933 .gitignores: but, such patches exist in debian/patches.
4936 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4937 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4938 quiltify_splitbrain_needed();
4939 progress "dgit view: creating patch to represent .gitignore changes";
4940 ensuredir "debian/patches";
4941 my $gipatch = "debian/patches/auto-gitignore";
4942 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4943 stat GIPATCH or die "$gipatch: $!";
4944 fail "$gipatch already exists; but want to create it".
4945 " to record .gitignore changes" if (stat _)[7];
4946 print GIPATCH <<END or die "$gipatch: $!";
4947 Subject: Update .gitignore from Debian packaging branch
4949 The Debian packaging git branch contains these updates to the upstream
4950 .gitignore file(s). This patch is autogenerated, to provide these
4951 updates to users of the official Debian archive view of the package.
4953 [dgit ($our_version) update-gitignore]
4956 close GIPATCH or die "$gipatch: $!";
4957 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4958 $unapplied, $headref, "--", sort keys %$editedignores;
4959 open SERIES, "+>>", "debian/patches/series" or die $!;
4960 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4962 defined read SERIES, $newline, 1 or die $!;
4963 print SERIES "\n" or die $! unless $newline eq "\n";
4964 print SERIES "auto-gitignore\n" or die $!;
4965 close SERIES or die $!;
4966 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4968 Commit patch to update .gitignore
4970 [dgit ($our_version) update-gitignore-quilt-fixup]
4974 my $dgitview = git_rev_parse 'HEAD';
4976 changedir '../../../..';
4977 # When we no longer need to support squeeze, use --create-reflog
4979 ensuredir ".git/logs/refs/dgit-intern";
4980 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4983 my $oldcache = git_get_ref "refs/$splitbraincache";
4984 if ($oldcache eq $dgitview) {
4985 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4986 # git update-ref doesn't always update, in this case. *sigh*
4987 my $dummy = make_commit_text <<END;
4990 author Dgit <dgit\@example.com> 1000000000 +0000
4991 committer Dgit <dgit\@example.com> 1000000000 +0000
4993 Dummy commit - do not use
4995 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4996 "refs/$splitbraincache", $dummy;
4998 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5001 changedir '.git/dgit/unpack/work';
5003 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5004 progress "dgit view: created ($saved)";
5007 sub quiltify ($$$$) {
5008 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5010 # Quilt patchification algorithm
5012 # We search backwards through the history of the main tree's HEAD
5013 # (T) looking for a start commit S whose tree object is identical
5014 # to to the patch tip tree (ie the tree corresponding to the
5015 # current dpkg-committed patch series). For these purposes
5016 # `identical' disregards anything in debian/ - this wrinkle is
5017 # necessary because dpkg-source treates debian/ specially.
5019 # We can only traverse edges where at most one of the ancestors'
5020 # trees differs (in changes outside in debian/). And we cannot
5021 # handle edges which change .pc/ or debian/patches. To avoid
5022 # going down a rathole we avoid traversing edges which introduce
5023 # debian/rules or debian/control. And we set a limit on the
5024 # number of edges we are willing to look at.
5026 # If we succeed, we walk forwards again. For each traversed edge
5027 # PC (with P parent, C child) (starting with P=S and ending with
5028 # C=T) to we do this:
5030 # - dpkg-source --commit with a patch name and message derived from C
5031 # After traversing PT, we git commit the changes which
5032 # should be contained within debian/patches.
5034 # The search for the path S..T is breadth-first. We maintain a
5035 # todo list containing search nodes. A search node identifies a
5036 # commit, and looks something like this:
5038 # Commit => $git_commit_id,
5039 # Child => $c, # or undef if P=T
5040 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5041 # Nontrivial => true iff $p..$c has relevant changes
5048 my %considered; # saves being exponential on some weird graphs
5050 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5053 my ($search,$whynot) = @_;
5054 printdebug " search NOT $search->{Commit} $whynot\n";
5055 $search->{Whynot} = $whynot;
5056 push @nots, $search;
5057 no warnings qw(exiting);
5066 my $c = shift @todo;
5067 next if $considered{$c->{Commit}}++;
5069 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5071 printdebug "quiltify investigate $c->{Commit}\n";
5074 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5075 printdebug " search finished hooray!\n";
5080 if ($quilt_mode eq 'nofix') {
5081 fail "quilt fixup required but quilt mode is \`nofix'\n".
5082 "HEAD commit $c->{Commit} differs from tree implied by ".
5083 " debian/patches (tree object $oldtiptree)";
5085 if ($quilt_mode eq 'smash') {
5086 printdebug " search quitting smash\n";
5090 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5091 $not->($c, "has $c_sentinels not $t_sentinels")
5092 if $c_sentinels ne $t_sentinels;
5094 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5095 $commitdata =~ m/\n\n/;
5097 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5098 @parents = map { { Commit => $_, Child => $c } } @parents;
5100 $not->($c, "root commit") if !@parents;
5102 foreach my $p (@parents) {
5103 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5105 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5106 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5108 foreach my $p (@parents) {
5109 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5111 my @cmd= (@git, qw(diff-tree -r --name-only),
5112 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5113 my $patchstackchange = cmdoutput @cmd;
5114 if (length $patchstackchange) {
5115 $patchstackchange =~ s/\n/,/g;
5116 $not->($p, "changed $patchstackchange");
5119 printdebug " search queue P=$p->{Commit} ",
5120 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5126 printdebug "quiltify want to smash\n";
5129 my $x = $_[0]{Commit};
5130 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5133 my $reportnot = sub {
5135 my $s = $abbrev->($notp);
5136 my $c = $notp->{Child};
5137 $s .= "..".$abbrev->($c) if $c;
5138 $s .= ": ".$notp->{Whynot};
5141 if ($quilt_mode eq 'linear') {
5142 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5143 foreach my $notp (@nots) {
5144 print STDERR "$us: ", $reportnot->($notp), "\n";
5146 print STDERR "$us: $_\n" foreach @$failsuggestion;
5147 fail "quilt fixup naive history linearisation failed.\n".
5148 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5149 } elsif ($quilt_mode eq 'smash') {
5150 } elsif ($quilt_mode eq 'auto') {
5151 progress "quilt fixup cannot be linear, smashing...";
5153 die "$quilt_mode ?";
5156 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5157 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5159 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5161 quiltify_dpkg_commit "auto-$version-$target-$time",
5162 (getfield $clogp, 'Maintainer'),
5163 "Automatically generated patch ($clogp->{Version})\n".
5164 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5168 progress "quiltify linearisation planning successful, executing...";
5170 for (my $p = $sref_S;
5171 my $c = $p->{Child};
5173 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5174 next unless $p->{Nontrivial};
5176 my $cc = $c->{Commit};
5178 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5179 $commitdata =~ m/\n\n/ or die "$c ?";
5182 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5185 my $commitdate = cmdoutput
5186 @git, qw(log -n1 --pretty=format:%aD), $cc;
5188 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5190 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5197 my $gbp_check_suitable = sub {
5202 die "contains unexpected slashes\n" if m{//} || m{/$};
5203 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5204 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5205 die "too long" if length > 200;
5207 return $_ unless $@;
5208 print STDERR "quiltifying commit $cc:".
5209 " ignoring/dropping Gbp-Pq $what: $@";
5213 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5215 (\S+) \s* \n //ixm) {
5216 $patchname = $gbp_check_suitable->($1, 'Name');
5218 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5220 (\S+) \s* \n //ixm) {
5221 $patchdir = $gbp_check_suitable->($1, 'Topic');
5226 if (!defined $patchname) {
5227 $patchname = $title;
5228 $patchname =~ s/[.:]$//;
5231 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5232 my $translitname = $converter->convert($patchname);
5233 die unless defined $translitname;
5234 $patchname = $translitname;
5237 "dgit: patch title transliteration error: $@"
5239 $patchname =~ y/ A-Z/-a-z/;
5240 $patchname =~ y/-a-z0-9_.+=~//cd;
5241 $patchname =~ s/^\W/x-$&/;
5242 $patchname = substr($patchname,0,40);
5244 if (!defined $patchdir) {
5247 if (length $patchdir) {
5248 $patchname = "$patchdir/$patchname";
5250 if ($patchname =~ m{^(.*)/}) {
5251 mkpath "debian/patches/$1";
5256 stat "debian/patches/$patchname$index";
5258 $!==ENOENT or die "$patchname$index $!";
5260 runcmd @git, qw(checkout -q), $cc;
5262 # We use the tip's changelog so that dpkg-source doesn't
5263 # produce complaining messages from dpkg-parsechangelog. None
5264 # of the information dpkg-source gets from the changelog is
5265 # actually relevant - it gets put into the original message
5266 # which dpkg-source provides our stunt editor, and then
5268 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5270 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5271 "Date: $commitdate\n".
5272 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5274 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5277 runcmd @git, qw(checkout -q master);
5280 sub build_maybe_quilt_fixup () {
5281 my ($format,$fopts) = get_source_format;
5282 return unless madformat_wantfixup $format;
5285 check_for_vendor_patches();
5287 if (quiltmode_splitbrain) {
5288 fail <<END unless access_cfg_tagformats_can_splitbrain;
5289 quilt mode $quilt_mode requires split view so server needs to support
5290 both "new" and "maint" tag formats, but config says it doesn't.
5294 my $clogp = parsechangelog();
5295 my $headref = git_rev_parse('HEAD');
5300 my $upstreamversion = upstreamversion $version;
5302 if ($fopts->{'single-debian-patch'}) {
5303 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5305 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5308 die 'bug' if $split_brain && !$need_split_build_invocation;
5310 changedir '../../../..';
5311 runcmd_ordryrun_local
5312 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5315 sub quilt_fixup_mkwork ($) {
5318 mkdir "work" or die $!;
5320 mktree_in_ud_here();
5321 runcmd @git, qw(reset -q --hard), $headref;
5324 sub quilt_fixup_linkorigs ($$) {
5325 my ($upstreamversion, $fn) = @_;
5326 # calls $fn->($leafname);
5328 foreach my $f (<../../../../*>) { #/){
5329 my $b=$f; $b =~ s{.*/}{};
5331 local ($debuglevel) = $debuglevel-1;
5332 printdebug "QF linkorigs $b, $f ?\n";
5334 next unless is_orig_file_of_vsn $b, $upstreamversion;
5335 printdebug "QF linkorigs $b, $f Y\n";
5336 link_ltarget $f, $b or die "$b $!";
5341 sub quilt_fixup_delete_pc () {
5342 runcmd @git, qw(rm -rqf .pc);
5344 Commit removal of .pc (quilt series tracking data)
5346 [dgit ($our_version) upgrade quilt-remove-pc]
5350 sub quilt_fixup_singlepatch ($$$) {
5351 my ($clogp, $headref, $upstreamversion) = @_;
5353 progress "starting quiltify (single-debian-patch)";
5355 # dpkg-source --commit generates new patches even if
5356 # single-debian-patch is in debian/source/options. In order to
5357 # get it to generate debian/patches/debian-changes, it is
5358 # necessary to build the source package.
5360 quilt_fixup_linkorigs($upstreamversion, sub { });
5361 quilt_fixup_mkwork($headref);
5363 rmtree("debian/patches");
5365 runcmd @dpkgsource, qw(-b .);
5367 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5368 rename srcfn("$upstreamversion", "/debian/patches"),
5369 "work/debian/patches";
5372 commit_quilty_patch();
5375 sub quilt_make_fake_dsc ($) {
5376 my ($upstreamversion) = @_;
5378 my $fakeversion="$upstreamversion-~~DGITFAKE";
5380 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5381 print $fakedsc <<END or die $!;
5384 Version: $fakeversion
5388 my $dscaddfile=sub {
5391 my $md = new Digest::MD5;
5393 my $fh = new IO::File $b, '<' or die "$b $!";
5398 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5401 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5403 my @files=qw(debian/source/format debian/rules
5404 debian/control debian/changelog);
5405 foreach my $maybe (qw(debian/patches debian/source/options
5406 debian/tests/control)) {
5407 next unless stat_exists "../../../$maybe";
5408 push @files, $maybe;
5411 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5412 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5414 $dscaddfile->($debtar);
5415 close $fakedsc or die $!;
5418 sub quilt_check_splitbrain_cache ($$) {
5419 my ($headref, $upstreamversion) = @_;
5420 # Called only if we are in (potentially) split brain mode.
5422 # Computes the cache key and looks in the cache.
5423 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5425 my $splitbrain_cachekey;
5428 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5429 # we look in the reflog of dgit-intern/quilt-cache
5430 # we look for an entry whose message is the key for the cache lookup
5431 my @cachekey = (qw(dgit), $our_version);
5432 push @cachekey, $upstreamversion;
5433 push @cachekey, $quilt_mode;
5434 push @cachekey, $headref;
5436 push @cachekey, hashfile('fake.dsc');
5438 my $srcshash = Digest::SHA->new(256);
5439 my %sfs = ( %INC, '$0(dgit)' => $0 );
5440 foreach my $sfk (sort keys %sfs) {
5441 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5442 $srcshash->add($sfk," ");
5443 $srcshash->add(hashfile($sfs{$sfk}));
5444 $srcshash->add("\n");
5446 push @cachekey, $srcshash->hexdigest();
5447 $splitbrain_cachekey = "@cachekey";
5449 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5451 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5452 debugcmd "|(probably)",@cmd;
5453 my $child = open GC, "-|"; defined $child or die $!;
5455 chdir '../../..' or die $!;
5456 if (!stat ".git/logs/refs/$splitbraincache") {
5457 $! == ENOENT or die $!;
5458 printdebug ">(no reflog)\n";
5465 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5466 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5469 quilt_fixup_mkwork($headref);
5470 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5471 if ($cachehit ne $headref) {
5472 progress "dgit view: found cached ($saved)";
5473 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5475 return ($cachehit, $splitbrain_cachekey);
5477 progress "dgit view: found cached, no changes required";
5478 return ($headref, $splitbrain_cachekey);
5480 die $! if GC->error;
5481 failedcmd unless close GC;
5483 printdebug "splitbrain cache miss\n";
5484 return (undef, $splitbrain_cachekey);
5487 sub quilt_fixup_multipatch ($$$) {
5488 my ($clogp, $headref, $upstreamversion) = @_;
5490 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5493 # - honour any existing .pc in case it has any strangeness
5494 # - determine the git commit corresponding to the tip of
5495 # the patch stack (if there is one)
5496 # - if there is such a git commit, convert each subsequent
5497 # git commit into a quilt patch with dpkg-source --commit
5498 # - otherwise convert all the differences in the tree into
5499 # a single git commit
5503 # Our git tree doesn't necessarily contain .pc. (Some versions of
5504 # dgit would include the .pc in the git tree.) If there isn't
5505 # one, we need to generate one by unpacking the patches that we
5508 # We first look for a .pc in the git tree. If there is one, we
5509 # will use it. (This is not the normal case.)
5511 # Otherwise need to regenerate .pc so that dpkg-source --commit
5512 # can work. We do this as follows:
5513 # 1. Collect all relevant .orig from parent directory
5514 # 2. Generate a debian.tar.gz out of
5515 # debian/{patches,rules,source/format,source/options}
5516 # 3. Generate a fake .dsc containing just these fields:
5517 # Format Source Version Files
5518 # 4. Extract the fake .dsc
5519 # Now the fake .dsc has a .pc directory.
5520 # (In fact we do this in every case, because in future we will
5521 # want to search for a good base commit for generating patches.)
5523 # Then we can actually do the dpkg-source --commit
5524 # 1. Make a new working tree with the same object
5525 # store as our main tree and check out the main
5527 # 2. Copy .pc from the fake's extraction, if necessary
5528 # 3. Run dpkg-source --commit
5529 # 4. If the result has changes to debian/, then
5530 # - git add them them
5531 # - git add .pc if we had a .pc in-tree
5533 # 5. If we had a .pc in-tree, delete it, and git commit
5534 # 6. Back in the main tree, fast forward to the new HEAD
5536 # Another situation we may have to cope with is gbp-style
5537 # patches-unapplied trees.
5539 # We would want to detect these, so we know to escape into
5540 # quilt_fixup_gbp. However, this is in general not possible.
5541 # Consider a package with a one patch which the dgit user reverts
5542 # (with git revert or the moral equivalent).
5544 # That is indistinguishable in contents from a patches-unapplied
5545 # tree. And looking at the history to distinguish them is not
5546 # useful because the user might have made a confusing-looking git
5547 # history structure (which ought to produce an error if dgit can't
5548 # cope, not a silent reintroduction of an unwanted patch).
5550 # So gbp users will have to pass an option. But we can usually
5551 # detect their failure to do so: if the tree is not a clean
5552 # patches-applied tree, quilt linearisation fails, but the tree
5553 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5554 # they want --quilt=unapplied.
5556 # To help detect this, when we are extracting the fake dsc, we
5557 # first extract it with --skip-patches, and then apply the patches
5558 # afterwards with dpkg-source --before-build. That lets us save a
5559 # tree object corresponding to .origs.
5561 my $splitbrain_cachekey;
5563 quilt_make_fake_dsc($upstreamversion);
5565 if (quiltmode_splitbrain()) {
5567 ($cachehit, $splitbrain_cachekey) =
5568 quilt_check_splitbrain_cache($headref, $upstreamversion);
5569 return if $cachehit;
5573 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5575 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5576 rename $fakexdir, "fake" or die "$fakexdir $!";
5580 remove_stray_gits("source package");
5581 mktree_in_ud_here();
5585 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5586 my $unapplied=git_add_write_tree();
5587 printdebug "fake orig tree object $unapplied\n";
5591 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5593 if (system @bbcmd) {
5594 failedcmd @bbcmd if $? < 0;
5596 failed to apply your git tree's patch stack (from debian/patches/) to
5597 the corresponding upstream tarball(s). Your source tree and .orig
5598 are probably too inconsistent. dgit can only fix up certain kinds of
5599 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5605 quilt_fixup_mkwork($headref);
5608 if (stat_exists ".pc") {
5610 progress "Tree already contains .pc - will use it then delete it.";
5613 rename '../fake/.pc','.pc' or die $!;
5616 changedir '../fake';
5618 my $oldtiptree=git_add_write_tree();
5619 printdebug "fake o+d/p tree object $unapplied\n";
5620 changedir '../work';
5623 # We calculate some guesswork now about what kind of tree this might
5624 # be. This is mostly for error reporting.
5630 # O = orig, without patches applied
5631 # A = "applied", ie orig with H's debian/patches applied
5632 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5633 \%editedignores, \@unrepres),
5634 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5635 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5639 foreach my $b (qw(01 02)) {
5640 foreach my $v (qw(O2H O2A H2A)) {
5641 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5644 printdebug "differences \@dl @dl.\n";
5647 "$us: base trees orig=%.20s o+d/p=%.20s",
5648 $unapplied, $oldtiptree;
5650 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5651 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5652 $dl[0], $dl[1], $dl[3], $dl[4],
5656 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5658 forceable_fail [qw(unrepresentable)], <<END;
5659 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5664 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5665 push @failsuggestion, "This might be a patches-unapplied branch.";
5666 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5667 push @failsuggestion, "This might be a patches-applied branch.";
5669 push @failsuggestion, "Maybe you need to specify one of".
5670 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5672 if (quiltmode_splitbrain()) {
5673 quiltify_splitbrain($clogp, $unapplied, $headref,
5674 $diffbits, \%editedignores,
5675 $splitbrain_cachekey);
5679 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5680 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5682 if (!open P, '>>', ".pc/applied-patches") {
5683 $!==&ENOENT or die $!;
5688 commit_quilty_patch();
5690 if ($mustdeletepc) {
5691 quilt_fixup_delete_pc();
5695 sub quilt_fixup_editor () {
5696 my $descfn = $ENV{$fakeeditorenv};
5697 my $editing = $ARGV[$#ARGV];
5698 open I1, '<', $descfn or die "$descfn: $!";
5699 open I2, '<', $editing or die "$editing: $!";
5700 unlink $editing or die "$editing: $!";
5701 open O, '>', $editing or die "$editing: $!";
5702 while (<I1>) { print O or die $!; } I1->error and die $!;
5705 $copying ||= m/^\-\-\- /;
5706 next unless $copying;
5709 I2->error and die $!;
5714 sub maybe_apply_patches_dirtily () {
5715 return unless $quilt_mode =~ m/gbp|unapplied/;
5716 print STDERR <<END or die $!;
5718 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5719 dgit: Have to apply the patches - making the tree dirty.
5720 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5723 $patches_applied_dirtily = 01;
5724 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5725 runcmd qw(dpkg-source --before-build .);
5728 sub maybe_unapply_patches_again () {
5729 progress "dgit: Unapplying patches again to tidy up the tree."
5730 if $patches_applied_dirtily;
5731 runcmd qw(dpkg-source --after-build .)
5732 if $patches_applied_dirtily & 01;
5734 if $patches_applied_dirtily & 02;
5735 $patches_applied_dirtily = 0;
5738 #----- other building -----
5740 our $clean_using_builder;
5741 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5742 # clean the tree before building (perhaps invoked indirectly by
5743 # whatever we are using to run the build), rather than separately
5744 # and explicitly by us.
5747 return if $clean_using_builder;
5748 if ($cleanmode eq 'dpkg-source') {
5749 maybe_apply_patches_dirtily();
5750 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5751 } elsif ($cleanmode eq 'dpkg-source-d') {
5752 maybe_apply_patches_dirtily();
5753 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5754 } elsif ($cleanmode eq 'git') {
5755 runcmd_ordryrun_local @git, qw(clean -xdf);
5756 } elsif ($cleanmode eq 'git-ff') {
5757 runcmd_ordryrun_local @git, qw(clean -xdff);
5758 } elsif ($cleanmode eq 'check') {
5759 my $leftovers = cmdoutput @git, qw(clean -xdn);
5760 if (length $leftovers) {
5761 print STDERR $leftovers, "\n" or die $!;
5762 fail "tree contains uncommitted files and --clean=check specified";
5764 } elsif ($cleanmode eq 'none') {
5771 badusage "clean takes no additional arguments" if @ARGV;
5774 maybe_unapply_patches_again();
5777 sub build_prep_early () {
5778 our $build_prep_early_done //= 0;
5779 return if $build_prep_early_done++;
5780 badusage "-p is not allowed when building" if defined $package;
5781 my $clogp = parsechangelog();
5782 $isuite = getfield $clogp, 'Distribution';
5783 $package = getfield $clogp, 'Source';
5784 $version = getfield $clogp, 'Version';
5792 build_maybe_quilt_fixup();
5794 my $pat = changespat $version;
5795 foreach my $f (glob "$buildproductsdir/$pat") {
5797 unlink $f or fail "remove old changes file $f: $!";
5799 progress "would remove $f";
5805 sub changesopts_initial () {
5806 my @opts =@changesopts[1..$#changesopts];
5809 sub changesopts_version () {
5810 if (!defined $changes_since_version) {
5811 my @vsns = archive_query('archive_query');
5812 my @quirk = access_quirk();
5813 if ($quirk[0] eq 'backports') {
5814 local $isuite = $quirk[2];
5816 canonicalise_suite();
5817 push @vsns, archive_query('archive_query');
5820 @vsns = map { $_->[0] } @vsns;
5821 @vsns = sort { -version_compare($a, $b) } @vsns;
5822 $changes_since_version = $vsns[0];
5823 progress "changelog will contain changes since $vsns[0]";
5825 $changes_since_version = '_';
5826 progress "package seems new, not specifying -v<version>";
5829 if ($changes_since_version ne '_') {
5830 return ("-v$changes_since_version");
5836 sub changesopts () {
5837 return (changesopts_initial(), changesopts_version());
5840 sub massage_dbp_args ($;$) {
5841 my ($cmd,$xargs) = @_;
5844 # - if we're going to split the source build out so we can
5845 # do strange things to it, massage the arguments to dpkg-buildpackage
5846 # so that the main build doessn't build source (or add an argument
5847 # to stop it building source by default).
5849 # - add -nc to stop dpkg-source cleaning the source tree,
5850 # unless we're not doing a split build and want dpkg-source
5851 # as cleanmode, in which case we can do nothing
5854 # 0 - source will NOT need to be built separately by caller
5855 # +1 - source will need to be built separately by caller
5856 # +2 - source will need to be built separately by caller AND
5857 # dpkg-buildpackage should not in fact be run at all!
5858 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5859 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5860 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5861 $clean_using_builder = 1;
5864 # -nc has the side effect of specifying -b if nothing else specified
5865 # and some combinations of -S, -b, et al, are errors, rather than
5866 # later simply overriding earlie. So we need to:
5867 # - search the command line for these options
5868 # - pick the last one
5869 # - perhaps add our own as a default
5870 # - perhaps adjust it to the corresponding non-source-building version
5872 foreach my $l ($cmd, $xargs) {
5874 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5877 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5879 if ($need_split_build_invocation) {
5880 printdebug "massage split $dmode.\n";
5881 $r = $dmode =~ m/[S]/ ? +2 :
5882 $dmode =~ y/gGF/ABb/ ? +1 :
5883 $dmode =~ m/[ABb]/ ? 0 :
5886 printdebug "massage done $r $dmode.\n";
5888 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5894 my $wasdir = must_getcwd();
5900 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5901 my ($msg_if_onlyone) = @_;
5902 # If there is only one .changes file, fail with $msg_if_onlyone,
5903 # or if that is undef, be a no-op.
5904 # Returns the changes file to report to the user.
5905 my $pat = changespat $version;
5906 my @changesfiles = glob $pat;
5907 @changesfiles = sort {
5908 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5912 if (@changesfiles==1) {
5913 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5914 only one changes file from build (@changesfiles)
5916 $result = $changesfiles[0];
5917 } elsif (@changesfiles==2) {
5918 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5919 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5920 fail "$l found in binaries changes file $binchanges"
5923 runcmd_ordryrun_local @mergechanges, @changesfiles;
5924 my $multichanges = changespat $version,'multi';
5926 stat_exists $multichanges or fail "$multichanges: $!";
5927 foreach my $cf (glob $pat) {
5928 next if $cf eq $multichanges;
5929 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5932 $result = $multichanges;
5934 fail "wrong number of different changes files (@changesfiles)";
5936 printdone "build successful, results in $result\n" or die $!;
5939 sub midbuild_checkchanges () {
5940 my $pat = changespat $version;
5941 return if $rmchanges;
5942 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5943 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5945 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5946 Suggest you delete @unwanted.
5951 sub midbuild_checkchanges_vanilla ($) {
5953 midbuild_checkchanges() if $wantsrc == 1;
5956 sub postbuild_mergechanges_vanilla ($) {
5958 if ($wantsrc == 1) {
5960 postbuild_mergechanges(undef);
5963 printdone "build successful\n";
5969 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5970 my $wantsrc = massage_dbp_args \@dbp;
5973 midbuild_checkchanges_vanilla $wantsrc;
5978 push @dbp, changesopts_version();
5979 maybe_apply_patches_dirtily();
5980 runcmd_ordryrun_local @dbp;
5982 maybe_unapply_patches_again();
5983 postbuild_mergechanges_vanilla $wantsrc;
5987 $quilt_mode //= 'gbp';
5993 # gbp can make .origs out of thin air. In my tests it does this
5994 # even for a 1.0 format package, with no origs present. So I
5995 # guess it keys off just the version number. We don't know
5996 # exactly what .origs ought to exist, but let's assume that we
5997 # should run gbp if: the version has an upstream part and the main
5999 my $upstreamversion = upstreamversion $version;
6000 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6001 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6003 if ($gbp_make_orig) {
6005 $cleanmode = 'none'; # don't do it again
6006 $need_split_build_invocation = 1;
6009 my @dbp = @dpkgbuildpackage;
6011 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6013 if (!length $gbp_build[0]) {
6014 if (length executable_on_path('git-buildpackage')) {
6015 $gbp_build[0] = qw(git-buildpackage);
6017 $gbp_build[0] = 'gbp buildpackage';
6020 my @cmd = opts_opt_multi_cmd @gbp_build;
6022 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6024 if ($gbp_make_orig) {
6025 ensuredir '.git/dgit';
6026 my $ok = '.git/dgit/origs-gen-ok';
6027 unlink $ok or $!==&ENOENT or die $!;
6028 my @origs_cmd = @cmd;
6029 push @origs_cmd, qw(--git-cleaner=true);
6030 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6031 push @origs_cmd, @ARGV;
6033 debugcmd @origs_cmd;
6035 do { local $!; stat_exists $ok; }
6036 or failedcmd @origs_cmd;
6038 dryrun_report @origs_cmd;
6044 midbuild_checkchanges_vanilla $wantsrc;
6046 if (!$clean_using_builder) {
6047 push @cmd, '--git-cleaner=true';
6051 maybe_unapply_patches_again();
6053 push @cmd, changesopts();
6054 runcmd_ordryrun_local @cmd, @ARGV;
6056 postbuild_mergechanges_vanilla $wantsrc;
6058 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6062 my $our_cleanmode = $cleanmode;
6063 if ($need_split_build_invocation) {
6064 # Pretend that clean is being done some other way. This
6065 # forces us not to try to use dpkg-buildpackage to clean and
6066 # build source all in one go; and instead we run dpkg-source
6067 # (and build_prep() will do the clean since $clean_using_builder
6069 $our_cleanmode = 'ELSEWHERE';
6071 if ($our_cleanmode =~ m/^dpkg-source/) {
6072 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6073 $clean_using_builder = 1;
6076 $sourcechanges = changespat $version,'source';
6078 unlink "../$sourcechanges" or $!==ENOENT
6079 or fail "remove $sourcechanges: $!";
6081 $dscfn = dscfn($version);
6082 if ($our_cleanmode eq 'dpkg-source') {
6083 maybe_apply_patches_dirtily();
6084 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6086 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6087 maybe_apply_patches_dirtily();
6088 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6091 my @cmd = (@dpkgsource, qw(-b --));
6094 runcmd_ordryrun_local @cmd, "work";
6095 my @udfiles = <${package}_*>;
6096 changedir "../../..";
6097 foreach my $f (@udfiles) {
6098 printdebug "source copy, found $f\n";
6101 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6102 $f eq srcfn($version, $&));
6103 printdebug "source copy, found $f - renaming\n";
6104 rename "$ud/$f", "../$f" or $!==ENOENT
6105 or fail "put in place new source file ($f): $!";
6108 my $pwd = must_getcwd();
6109 my $leafdir = basename $pwd;
6111 runcmd_ordryrun_local @cmd, $leafdir;
6114 runcmd_ordryrun_local qw(sh -ec),
6115 'exec >$1; shift; exec "$@"','x',
6116 "../$sourcechanges",
6117 @dpkggenchanges, qw(-S), changesopts();
6121 sub cmd_build_source {
6123 badusage "build-source takes no additional arguments" if @ARGV;
6125 maybe_unapply_patches_again();
6126 printdone "source built, results in $dscfn and $sourcechanges";
6131 midbuild_checkchanges();
6134 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6135 stat_exists $sourcechanges
6136 or fail "$sourcechanges (in parent directory): $!";
6138 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6140 maybe_unapply_patches_again();
6142 postbuild_mergechanges(<<END);
6143 perhaps you need to pass -A ? (sbuild's default is to build only
6144 arch-specific binaries; dgit 1.4 used to override that.)
6149 sub cmd_quilt_fixup {
6150 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6153 build_maybe_quilt_fixup();
6156 sub import_dsc_result {
6157 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6158 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6160 check_gitattrs($newhash, "source tree");
6162 progress "dgit: import-dsc: $what_msg";
6165 sub cmd_import_dsc {
6169 last unless $ARGV[0] =~ m/^-/;
6172 if (m/^--require-valid-signature$/) {
6175 badusage "unknown dgit import-dsc sub-option \`$_'";
6179 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6180 my ($dscfn, $dstbranch) = @ARGV;
6182 badusage "dry run makes no sense with import-dsc" unless act_local();
6184 my $force = $dstbranch =~ s/^\+// ? +1 :
6185 $dstbranch =~ s/^\.\.// ? -1 :
6187 my $info = $force ? " $&" : '';
6188 $info = "$dscfn$info";
6190 my $specbranch = $dstbranch;
6191 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6192 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6194 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6195 my $chead = cmdoutput_errok @symcmd;
6196 defined $chead or $?==256 or failedcmd @symcmd;
6198 fail "$dstbranch is checked out - will not update it"
6199 if defined $chead and $chead eq $dstbranch;
6201 my $oldhash = git_get_ref $dstbranch;
6203 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6204 $dscdata = do { local $/ = undef; <D>; };
6205 D->error and fail "read $dscfn: $!";
6208 # we don't normally need this so import it here
6209 use Dpkg::Source::Package;
6210 my $dp = new Dpkg::Source::Package filename => $dscfn,
6211 require_valid_signature => $needsig;
6213 local $SIG{__WARN__} = sub {
6215 return unless $needsig;
6216 fail "import-dsc signature check failed";
6218 if (!$dp->is_signed()) {
6219 warn "$us: warning: importing unsigned .dsc\n";
6221 my $r = $dp->check_signature();
6222 die "->check_signature => $r" if $needsig && $r;
6228 $package = getfield $dsc, 'Source';
6230 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6231 unless forceing [qw(import-dsc-with-dgit-field)];
6232 parse_dsc_field_def_dsc_distro();
6234 $isuite = 'DGIT-IMPORT-DSC';
6235 $idistro //= $dsc_distro;
6239 if (defined $dsc_hash) {
6240 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6241 resolve_dsc_field_commit undef, undef;
6243 if (defined $dsc_hash) {
6244 my @cmd = (qw(sh -ec),
6245 "echo $dsc_hash | git cat-file --batch-check");
6246 my $objgot = cmdoutput @cmd;
6247 if ($objgot =~ m#^\w+ missing\b#) {
6249 .dsc contains Dgit field referring to object $dsc_hash
6250 Your git tree does not have that object. Try `git fetch' from a
6251 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6254 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6256 progress "Not fast forward, forced update.";
6258 fail "Not fast forward to $dsc_hash";
6261 import_dsc_result $dstbranch, $dsc_hash,
6262 "dgit import-dsc (Dgit): $info",
6263 "updated git ref $dstbranch";
6268 Branch $dstbranch already exists
6269 Specify ..$specbranch for a pseudo-merge, binding in existing history
6270 Specify +$specbranch to overwrite, discarding existing history
6272 if $oldhash && !$force;
6274 my @dfi = dsc_files_info();
6275 foreach my $fi (@dfi) {
6276 my $f = $fi->{Filename};
6278 next if lstat $here;
6279 fail "stat $here: $!" unless $! == ENOENT;
6281 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6283 } elsif ($dscfn =~ m#^/#) {
6286 fail "cannot import $dscfn which seems to be inside working tree!";
6288 $there =~ s#/+[^/]+$## or
6289 fail "cannot import $dscfn which seems to not have a basename";
6291 symlink $there, $here or fail "symlink $there to $here: $!";
6292 progress "made symlink $here -> $there";
6293 # print STDERR Dumper($fi);
6295 my @mergeinputs = generate_commits_from_dsc();
6296 die unless @mergeinputs == 1;
6298 my $newhash = $mergeinputs[0]{Commit};
6302 progress "Import, forced update - synthetic orphan git history.";
6303 } elsif ($force < 0) {
6304 progress "Import, merging.";
6305 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6306 my $version = getfield $dsc, 'Version';
6307 my $clogp = commit_getclogp $newhash;
6308 my $authline = clogp_authline $clogp;
6309 $newhash = make_commit_text <<END;
6316 Merge $package ($version) import into $dstbranch
6319 die; # caught earlier
6323 import_dsc_result $dstbranch, $newhash,
6324 "dgit import-dsc: $info",
6325 "results are in in git ref $dstbranch";
6328 sub cmd_archive_api_query {
6329 badusage "need only 1 subpath argument" unless @ARGV==1;
6330 my ($subpath) = @ARGV;
6331 my @cmd = archive_api_query_cmd($subpath);
6334 exec @cmd or fail "exec curl: $!\n";
6337 sub repos_server_url () {
6338 $package = '_dgit-repos-server';
6339 local $access_forpush = 1;
6340 local $isuite = 'DGIT-REPOS-SERVER';
6341 my $url = access_giturl();
6344 sub cmd_clone_dgit_repos_server {
6345 badusage "need destination argument" unless @ARGV==1;
6346 my ($destdir) = @ARGV;
6347 my $url = repos_server_url();
6348 my @cmd = (@git, qw(clone), $url, $destdir);
6350 exec @cmd or fail "exec git clone: $!\n";
6353 sub cmd_print_dgit_repos_server_source_url {
6354 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6356 my $url = repos_server_url();
6357 print $url, "\n" or die $!;
6360 sub cmd_setup_mergechangelogs {
6361 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6362 local $isuite = 'DGIT-SETUP-TREE';
6363 setup_mergechangelogs(1);
6366 sub cmd_setup_useremail {
6367 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6368 local $isuite = 'DGIT-SETUP-TREE';
6372 sub cmd_setup_gitattributes {
6373 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6374 local $isuite = 'DGIT-SETUP-TREE';
6378 sub cmd_setup_new_tree {
6379 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6380 local $isuite = 'DGIT-SETUP-TREE';
6384 #---------- argument parsing and main program ----------
6387 print "dgit version $our_version\n" or die $!;
6391 our (%valopts_long, %valopts_short);
6392 our (%funcopts_long);
6394 our (@modeopt_cfgs);
6396 sub defvalopt ($$$$) {
6397 my ($long,$short,$val_re,$how) = @_;
6398 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6399 $valopts_long{$long} = $oi;
6400 $valopts_short{$short} = $oi;
6401 # $how subref should:
6402 # do whatever assignemnt or thing it likes with $_[0]
6403 # if the option should not be passed on to remote, @rvalopts=()
6404 # or $how can be a scalar ref, meaning simply assign the value
6407 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6408 defvalopt '--distro', '-d', '.+', \$idistro;
6409 defvalopt '', '-k', '.+', \$keyid;
6410 defvalopt '--existing-package','', '.*', \$existing_package;
6411 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6412 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6413 defvalopt '--package', '-p', $package_re, \$package;
6414 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6416 defvalopt '', '-C', '.+', sub {
6417 ($changesfile) = (@_);
6418 if ($changesfile =~ s#^(.*)/##) {
6419 $buildproductsdir = $1;
6423 defvalopt '--initiator-tempdir','','.*', sub {
6424 ($initiator_tempdir) = (@_);
6425 $initiator_tempdir =~ m#^/# or
6426 badusage "--initiator-tempdir must be used specify an".
6427 " absolute, not relative, directory."
6430 sub defoptmodes ($@) {
6431 my ($varref, $cfgkey, $default, %optmap) = @_;
6433 while (my ($opt,$val) = each %optmap) {
6434 $funcopts_long{$opt} = sub { $$varref = $val; };
6435 $permit{$val} = $val;
6437 push @modeopt_cfgs, {
6440 Default => $default,
6445 defoptmodes \$dodep14tag, qw( dep14tag want
6448 --always-dep14tag always );
6453 if (defined $ENV{'DGIT_SSH'}) {
6454 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6455 } elsif (defined $ENV{'GIT_SSH'}) {
6456 @ssh = ($ENV{'GIT_SSH'});
6464 if (!defined $val) {
6465 badusage "$what needs a value" unless @ARGV;
6467 push @rvalopts, $val;
6469 badusage "bad value \`$val' for $what" unless
6470 $val =~ m/^$oi->{Re}$(?!\n)/s;
6471 my $how = $oi->{How};
6472 if (ref($how) eq 'SCALAR') {
6477 push @ropts, @rvalopts;
6481 last unless $ARGV[0] =~ m/^-/;
6485 if (m/^--dry-run$/) {
6488 } elsif (m/^--damp-run$/) {
6491 } elsif (m/^--no-sign$/) {
6494 } elsif (m/^--help$/) {
6496 } elsif (m/^--version$/) {
6498 } elsif (m/^--new$/) {
6501 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6502 ($om = $opts_opt_map{$1}) &&
6506 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6507 !$opts_opt_cmdonly{$1} &&
6508 ($om = $opts_opt_map{$1})) {
6511 } elsif (m/^--(gbp|dpm)$/s) {
6512 push @ropts, "--quilt=$1";
6514 } elsif (m/^--ignore-dirty$/s) {
6517 } elsif (m/^--no-quilt-fixup$/s) {
6519 $quilt_mode = 'nocheck';
6520 } elsif (m/^--no-rm-on-error$/s) {
6523 } elsif (m/^--no-chase-dsc-distro$/s) {
6525 $chase_dsc_distro = 0;
6526 } elsif (m/^--overwrite$/s) {
6528 $overwrite_version = '';
6529 } elsif (m/^--overwrite=(.+)$/s) {
6531 $overwrite_version = $1;
6532 } elsif (m/^--delayed=(\d+)$/s) {
6535 } elsif (m/^--dgit-view-save=(.+)$/s) {
6537 $split_brain_save = $1;
6538 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6539 } elsif (m/^--(no-)?rm-old-changes$/s) {
6542 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6544 push @deliberatelies, $&;
6545 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6549 } elsif (m/^--force-/) {
6551 "$us: warning: ignoring unknown force option $_\n";
6553 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6554 # undocumented, for testing
6556 $tagformat_want = [ $1, 'command line', 1 ];
6557 # 1 menas overrides distro configuration
6558 } elsif (m/^--always-split-source-build$/s) {
6559 # undocumented, for testing
6561 $need_split_build_invocation = 1;
6562 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6563 # undocumented, for testing
6565 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6566 # ^ it's supposed to be an array ref
6567 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6568 $val = $2 ? $' : undef; #';
6569 $valopt->($oi->{Long});
6570 } elsif ($funcopts_long{$_}) {
6572 $funcopts_long{$_}();
6574 badusage "unknown long option \`$_'";
6581 } elsif (s/^-L/-/) {
6584 } elsif (s/^-h/-/) {
6586 } elsif (s/^-D/-/) {
6590 } elsif (s/^-N/-/) {
6595 push @changesopts, $_;
6597 } elsif (s/^-wn$//s) {
6599 $cleanmode = 'none';
6600 } elsif (s/^-wg$//s) {
6603 } elsif (s/^-wgf$//s) {
6605 $cleanmode = 'git-ff';
6606 } elsif (s/^-wd$//s) {
6608 $cleanmode = 'dpkg-source';
6609 } elsif (s/^-wdd$//s) {
6611 $cleanmode = 'dpkg-source-d';
6612 } elsif (s/^-wc$//s) {
6614 $cleanmode = 'check';
6615 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6616 push @git, '-c', $&;
6617 $gitcfgs{cmdline}{$1} = [ $2 ];
6618 } elsif (s/^-c([^=]+)$//s) {
6619 push @git, '-c', $&;
6620 $gitcfgs{cmdline}{$1} = [ 'true' ];
6621 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6623 $val = undef unless length $val;
6624 $valopt->($oi->{Short});
6627 badusage "unknown short option \`$_'";
6634 sub check_env_sanity () {
6635 my $blocked = new POSIX::SigSet;
6636 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6639 foreach my $name (qw(PIPE CHLD)) {
6640 my $signame = "SIG$name";
6641 my $signum = eval "POSIX::$signame" // die;
6642 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6643 die "$signame is set to something other than SIG_DFL\n";
6644 $blocked->ismember($signum) and
6645 die "$signame is blocked\n";
6651 On entry to dgit, $@
6652 This is a bug produced by something in in your execution environment.
6658 sub parseopts_late_defaults () {
6659 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6660 if defined $idistro;
6661 $isuite //= cfg('dgit.default.default-suite');
6663 foreach my $k (keys %opts_opt_map) {
6664 my $om = $opts_opt_map{$k};
6666 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6668 badcfg "cannot set command for $k"
6669 unless length $om->[0];
6673 foreach my $c (access_cfg_cfgs("opts-$k")) {
6675 map { $_ ? @$_ : () }
6676 map { $gitcfgs{$_}{$c} }
6677 reverse @gitcfgsources;
6678 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6679 "\n" if $debuglevel >= 4;
6681 badcfg "cannot configure options for $k"
6682 if $opts_opt_cmdonly{$k};
6683 my $insertpos = $opts_cfg_insertpos{$k};
6684 @$om = ( @$om[0..$insertpos-1],
6686 @$om[$insertpos..$#$om] );
6690 if (!defined $rmchanges) {
6691 local $access_forpush;
6692 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6695 if (!defined $quilt_mode) {
6696 local $access_forpush;
6697 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6698 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6700 $quilt_mode =~ m/^($quilt_modes_re)$/
6701 or badcfg "unknown quilt-mode \`$quilt_mode'";
6705 foreach my $moc (@modeopt_cfgs) {
6706 local $access_forpush;
6707 my $vr = $moc->{Var};
6708 next if defined $$vr;
6709 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6710 my $v = $moc->{Vals}{$$vr};
6711 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6715 $need_split_build_invocation ||= quiltmode_splitbrain();
6717 if (!defined $cleanmode) {
6718 local $access_forpush;
6719 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6720 $cleanmode //= 'dpkg-source';
6722 badcfg "unknown clean-mode \`$cleanmode'" unless
6723 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6727 if ($ENV{$fakeeditorenv}) {
6729 quilt_fixup_editor();
6736 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6737 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6738 if $dryrun_level == 1;
6740 print STDERR $helpmsg or die $!;
6743 my $cmd = shift @ARGV;
6746 my $pre_fn = ${*::}{"pre_$cmd"};
6747 $pre_fn->() if $pre_fn;
6749 my $fn = ${*::}{"cmd_$cmd"};
6750 $fn or badusage "unknown operation $cmd";