3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::Util qw(any);
38 use List::MoreUtils qw(pairwise);
39 use Text::Glob qw(match_glob);
40 use Fcntl qw(:DEFAULT :flock);
45 our $our_version = 'UNRELEASED'; ###substituted###
46 our $absurdity = undef; ###substituted###
48 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
57 our $dryrun_level = 0;
59 our $buildproductsdir = '..';
65 our $existing_package = 'dpkg';
67 our $changes_since_version;
69 our $overwrite_version; # undef: not specified; '': check changelog
71 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
73 our $dodep14tag_re = 'want|no|always';
74 our $split_brain_save;
75 our $we_are_responder;
76 our $we_are_initiator;
77 our $initiator_tempdir;
78 our $patches_applied_dirtily = 00;
82 our $chase_dsc_distro=1;
84 our %forceopts = map { $_=>0 }
85 qw(unrepresentable unsupported-source-format
86 dsc-changes-mismatch changes-origs-exactly
87 import-gitapply-absurd
88 import-gitapply-no-absurd
89 import-dsc-with-dgit-field);
91 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
93 our $suite_re = '[-+.0-9a-z]+';
94 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
95 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
96 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
97 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
99 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
100 our $splitbraincache = 'dgit-intern/quilt-cache';
101 our $rewritemap = 'dgit-rewrite/map';
103 our (@git) = qw(git);
104 our (@dget) = qw(dget);
105 our (@curl) = qw(curl);
106 our (@dput) = qw(dput);
107 our (@debsign) = qw(debsign);
108 our (@gpg) = qw(gpg);
109 our (@sbuild) = qw(sbuild);
111 our (@dgit) = qw(dgit);
112 our (@aptget) = qw(apt-get);
113 our (@aptcache) = qw(apt-cache);
114 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
115 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
116 our (@dpkggenchanges) = qw(dpkg-genchanges);
117 our (@mergechanges) = qw(mergechanges -f);
118 our (@gbp_build) = ('');
119 our (@gbp_pq) = ('gbp pq');
120 our (@changesopts) = ('');
122 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
125 'debsign' => \@debsign,
127 'sbuild' => \@sbuild,
131 'apt-get' => \@aptget,
132 'apt-cache' => \@aptcache,
133 'dpkg-source' => \@dpkgsource,
134 'dpkg-buildpackage' => \@dpkgbuildpackage,
135 'dpkg-genchanges' => \@dpkggenchanges,
136 'gbp-build' => \@gbp_build,
137 'gbp-pq' => \@gbp_pq,
138 'ch' => \@changesopts,
139 'mergechanges' => \@mergechanges);
141 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
142 our %opts_cfg_insertpos = map {
144 scalar @{ $opts_opt_map{$_} }
145 } keys %opts_opt_map;
147 sub parseopts_late_defaults();
153 our $supplementary_message = '';
154 our $need_split_build_invocation = 0;
155 our $split_brain = 0;
159 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
162 our $remotename = 'dgit';
163 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
167 if (!defined $absurdity) {
169 $absurdity =~ s{/[^/]+$}{/absurd} or die;
173 my ($v,$distro) = @_;
174 return $tagformatfn->($v, $distro);
177 sub debiantag_maintview ($$) {
178 my ($v,$distro) = @_;
179 return "$distro/".dep14_version_mangle $v;
182 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
184 sub lbranch () { return "$branchprefix/$csuite"; }
185 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
186 sub lref () { return "refs/heads/".lbranch(); }
187 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
188 sub rrref () { return server_ref($csuite); }
198 return "${package}_".(stripepoch $vsn).$sfx
203 return srcfn($vsn,".dsc");
206 sub changespat ($;$) {
207 my ($vsn, $arch) = @_;
208 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
211 sub upstreamversion ($) {
223 foreach my $f (@end) {
225 print STDERR "$us: cleanup: $@" if length $@;
229 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
231 sub forceable_fail ($$) {
232 my ($forceoptsl, $msg) = @_;
233 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
234 print STDERR "warning: overriding problem due to --force:\n". $msg;
238 my ($forceoptsl) = @_;
239 my @got = grep { $forceopts{$_} } @$forceoptsl;
240 return 0 unless @got;
242 "warning: skipping checks or functionality due to --force-$got[0]\n";
245 sub no_such_package () {
246 print STDERR "$us: package $package does not exist in suite $isuite\n";
252 printdebug "CD $newdir\n";
253 chdir $newdir or confess "chdir: $newdir: $!";
256 sub deliberately ($) {
258 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
261 sub deliberately_not_fast_forward () {
262 foreach (qw(not-fast-forward fresh-repo)) {
263 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
267 sub quiltmode_splitbrain () {
268 $quilt_mode =~ m/gbp|dpm|unapplied/;
271 sub opts_opt_multi_cmd {
273 push @cmd, split /\s+/, shift @_;
279 return opts_opt_multi_cmd @gbp_pq;
282 #---------- remote protocol support, common ----------
284 # remote push initiator/responder protocol:
285 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
286 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
287 # < dgit-remote-push-ready <actual-proto-vsn>
294 # > supplementary-message NBYTES # $protovsn >= 3
299 # > file parsed-changelog
300 # [indicates that output of dpkg-parsechangelog follows]
301 # > data-block NBYTES
302 # > [NBYTES bytes of data (no newline)]
303 # [maybe some more blocks]
312 # > param head DGIT-VIEW-HEAD
313 # > param csuite SUITE
314 # > param tagformat old|new
315 # > param maint-view MAINT-VIEW-HEAD
317 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
318 # # goes into tag, for replay prevention
321 # [indicates that signed tag is wanted]
322 # < data-block NBYTES
323 # < [NBYTES bytes of data (no newline)]
324 # [maybe some more blocks]
328 # > want signed-dsc-changes
329 # < data-block NBYTES [transfer of signed dsc]
331 # < data-block NBYTES [transfer of signed changes]
339 sub i_child_report () {
340 # Sees if our child has died, and reap it if so. Returns a string
341 # describing how it died if it failed, or undef otherwise.
342 return undef unless $i_child_pid;
343 my $got = waitpid $i_child_pid, WNOHANG;
344 return undef if $got <= 0;
345 die unless $got == $i_child_pid;
346 $i_child_pid = undef;
347 return undef unless $?;
348 return "build host child ".waitstatusmsg();
353 fail "connection lost: $!" if $fh->error;
354 fail "protocol violation; $m not expected";
357 sub badproto_badread ($$) {
359 fail "connection lost: $!" if $!;
360 my $report = i_child_report();
361 fail $report if defined $report;
362 badproto $fh, "eof (reading $wh)";
365 sub protocol_expect (&$) {
366 my ($match, $fh) = @_;
369 defined && chomp or badproto_badread $fh, "protocol message";
377 badproto $fh, "\`$_'";
380 sub protocol_send_file ($$) {
381 my ($fh, $ourfn) = @_;
382 open PF, "<", $ourfn or die "$ourfn: $!";
385 my $got = read PF, $d, 65536;
386 die "$ourfn: $!" unless defined $got;
388 print $fh "data-block ".length($d)."\n" or die $!;
389 print $fh $d or die $!;
391 PF->error and die "$ourfn $!";
392 print $fh "data-end\n" or die $!;
396 sub protocol_read_bytes ($$) {
397 my ($fh, $nbytes) = @_;
398 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
400 my $got = read $fh, $d, $nbytes;
401 $got==$nbytes or badproto_badread $fh, "data block";
405 sub protocol_receive_file ($$) {
406 my ($fh, $ourfn) = @_;
407 printdebug "() $ourfn\n";
408 open PF, ">", $ourfn or die "$ourfn: $!";
410 my ($y,$l) = protocol_expect {
411 m/^data-block (.*)$/ ? (1,$1) :
412 m/^data-end$/ ? (0,) :
416 my $d = protocol_read_bytes $fh, $l;
417 print PF $d or die $!;
422 #---------- remote protocol support, responder ----------
424 sub responder_send_command ($) {
426 return unless $we_are_responder;
427 # called even without $we_are_responder
428 printdebug ">> $command\n";
429 print PO $command, "\n" or die $!;
432 sub responder_send_file ($$) {
433 my ($keyword, $ourfn) = @_;
434 return unless $we_are_responder;
435 printdebug "]] $keyword $ourfn\n";
436 responder_send_command "file $keyword";
437 protocol_send_file \*PO, $ourfn;
440 sub responder_receive_files ($@) {
441 my ($keyword, @ourfns) = @_;
442 die unless $we_are_responder;
443 printdebug "[[ $keyword @ourfns\n";
444 responder_send_command "want $keyword";
445 foreach my $fn (@ourfns) {
446 protocol_receive_file \*PI, $fn;
449 protocol_expect { m/^files-end$/ } \*PI;
452 #---------- remote protocol support, initiator ----------
454 sub initiator_expect (&) {
456 protocol_expect { &$match } \*RO;
459 #---------- end remote code ----------
462 if ($we_are_responder) {
464 responder_send_command "progress ".length($m) or die $!;
465 print PO $m or die $!;
475 $ua = LWP::UserAgent->new();
479 progress "downloading $what...";
480 my $r = $ua->get(@_) or die $!;
481 return undef if $r->code == 404;
482 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
483 return $r->decoded_content(charset => 'none');
486 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
491 failedcmd @_ if system @_;
494 sub act_local () { return $dryrun_level <= 1; }
495 sub act_scary () { return !$dryrun_level; }
498 if (!$dryrun_level) {
499 progress "$us ok: @_";
501 progress "would be ok: @_ (but dry run only)";
506 printcmd(\*STDERR,$debugprefix."#",@_);
509 sub runcmd_ordryrun {
517 sub runcmd_ordryrun_local {
526 my ($first_shell, @cmd) = @_;
527 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
530 our $helpmsg = <<END;
532 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
533 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
534 dgit [dgit-opts] build [dpkg-buildpackage-opts]
535 dgit [dgit-opts] sbuild [sbuild-opts]
536 dgit [dgit-opts] push [dgit-opts] [suite]
537 dgit [dgit-opts] rpush build-host:build-dir ...
538 important dgit options:
539 -k<keyid> sign tag and package with <keyid> instead of default
540 --dry-run -n do not change anything, but go through the motions
541 --damp-run -L like --dry-run but make local changes, without signing
542 --new -N allow introducing a new package
543 --debug -D increase debug level
544 -c<name>=<value> set git config option (used directly by dgit too)
547 our $later_warning_msg = <<END;
548 Perhaps the upload is stuck in incoming. Using the version from git.
552 print STDERR "$us: @_\n", $helpmsg or die $!;
557 @ARGV or badusage "too few arguments";
558 return scalar shift @ARGV;
562 print $helpmsg or die $!;
566 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
568 our %defcfg = ('dgit.default.distro' => 'debian',
569 'dgit.default.default-suite' => 'unstable',
570 'dgit.default.old-dsc-distro' => 'debian',
571 'dgit-suite.*-security.distro' => 'debian-security',
572 'dgit.default.username' => '',
573 'dgit.default.archive-query-default-component' => 'main',
574 'dgit.default.ssh' => 'ssh',
575 'dgit.default.archive-query' => 'madison:',
576 'dgit.default.sshpsql-dbname' => 'service=projectb',
577 'dgit.default.aptget-components' => 'main',
578 'dgit.default.dgit-tag-format' => 'new,old,maint',
579 'dgit.dsc-url-proto-ok.http' => 'true',
580 'dgit.dsc-url-proto-ok.https' => 'true',
581 'dgit.dsc-url-proto-ok.git' => 'true',
582 'dgit.default.dsc-url-proto-ok' => 'false',
583 # old means "repo server accepts pushes with old dgit tags"
584 # new means "repo server accepts pushes with new dgit tags"
585 # maint means "repo server accepts split brain pushes"
586 # hist means "repo server may have old pushes without new tag"
587 # ("hist" is implied by "old")
588 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
589 'dgit-distro.debian.git-check' => 'url',
590 'dgit-distro.debian.git-check-suffix' => '/info/refs',
591 'dgit-distro.debian.new-private-pushers' => 't',
592 'dgit-distro.debian/push.git-url' => '',
593 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
594 'dgit-distro.debian/push.git-user-force' => 'dgit',
595 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
596 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
597 'dgit-distro.debian/push.git-create' => 'true',
598 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
599 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
600 # 'dgit-distro.debian.archive-query-tls-key',
601 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
602 # ^ this does not work because curl is broken nowadays
603 # Fixing #790093 properly will involve providing providing the key
604 # in some pacagke and maybe updating these paths.
606 # 'dgit-distro.debian.archive-query-tls-curl-args',
607 # '--ca-path=/etc/ssl/ca-debian',
608 # ^ this is a workaround but works (only) on DSA-administered machines
609 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
610 'dgit-distro.debian.git-url-suffix' => '',
611 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
612 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
613 'dgit-distro.debian-security.archive-query' => 'aptget:',
614 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
615 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
616 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
617 'dgit-distro.debian-security.nominal-distro' => 'debian',
618 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
619 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
620 'dgit-distro.ubuntu.git-check' => 'false',
621 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
622 'dgit-distro.test-dummy.ssh' => "$td/ssh",
623 'dgit-distro.test-dummy.username' => "alice",
624 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
625 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
626 'dgit-distro.test-dummy.git-url' => "$td/git",
627 'dgit-distro.test-dummy.git-host' => "git",
628 'dgit-distro.test-dummy.git-path' => "$td/git",
629 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
630 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
631 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
632 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
636 our @gitcfgsources = qw(cmdline local global system);
638 sub git_slurp_config () {
639 local ($debuglevel) = $debuglevel-2;
642 # This algoritm is a bit subtle, but this is needed so that for
643 # options which we want to be single-valued, we allow the
644 # different config sources to override properly. See #835858.
645 foreach my $src (@gitcfgsources) {
646 next if $src eq 'cmdline';
647 # we do this ourselves since git doesn't handle it
649 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
652 open GITS, "-|", @cmd or die $!;
655 printdebug "=> ", (messagequote $_), "\n";
657 push @{ $gitcfgs{$src}{$`} }, $'; #';
661 or ($!==0 && $?==256)
666 sub git_get_config ($) {
668 foreach my $src (@gitcfgsources) {
669 my $l = $gitcfgs{$src}{$c};
670 croak "$l $c" if $l && !ref $l;
671 printdebug"C $c ".(defined $l ?
672 join " ", map { messagequote "'$_'" } @$l :
676 @$l==1 or badcfg "multiple values for $c".
677 " (in $src git config)" if @$l > 1;
685 return undef if $c =~ /RETURN-UNDEF/;
686 printdebug "C? $c\n" if $debuglevel >= 5;
687 my $v = git_get_config($c);
688 return $v if defined $v;
689 my $dv = $defcfg{$c};
691 printdebug "CD $c $dv\n" if $debuglevel >= 4;
695 badcfg "need value for one of: @_\n".
696 "$us: distro or suite appears not to be (properly) supported";
699 sub access_basedistro__noalias () {
700 if (defined $idistro) {
703 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
704 return $def if defined $def;
705 foreach my $src (@gitcfgsources, 'internal') {
706 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
708 foreach my $k (keys %$kl) {
709 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
711 next unless match_glob $dpat, $isuite;
715 return cfg("dgit.default.distro");
719 sub access_basedistro () {
720 my $noalias = access_basedistro__noalias();
721 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
722 return $canon // $noalias;
725 sub access_nomdistro () {
726 my $base = access_basedistro();
727 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
728 $r =~ m/^$distro_re$/ or badcfg
729 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
733 sub access_quirk () {
734 # returns (quirk name, distro to use instead or undef, quirk-specific info)
735 my $basedistro = access_basedistro();
736 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
738 if (defined $backports_quirk) {
739 my $re = $backports_quirk;
740 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
742 $re =~ s/\%/([-0-9a-z_]+)/
743 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
744 if ($isuite =~ m/^$re$/) {
745 return ('backports',"$basedistro-backports",$1);
748 return ('none',undef);
753 sub parse_cfg_bool ($$$) {
754 my ($what,$def,$v) = @_;
757 $v =~ m/^[ty1]/ ? 1 :
758 $v =~ m/^[fn0]/ ? 0 :
759 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
762 sub access_forpush_config () {
763 my $d = access_basedistro();
767 parse_cfg_bool('new-private-pushers', 0,
768 cfg("dgit-distro.$d.new-private-pushers",
771 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
774 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
775 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
776 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
777 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
780 sub access_forpush () {
781 $access_forpush //= access_forpush_config();
782 return $access_forpush;
786 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
787 badcfg "pushing but distro is configured readonly"
788 if access_forpush_config() eq '0';
790 $supplementary_message = <<'END' unless $we_are_responder;
791 Push failed, before we got started.
792 You can retry the push, after fixing the problem, if you like.
794 parseopts_late_defaults();
798 parseopts_late_defaults();
801 sub supplementary_message ($) {
803 if (!$we_are_responder) {
804 $supplementary_message = $msg;
806 } elsif ($protovsn >= 3) {
807 responder_send_command "supplementary-message ".length($msg)
809 print PO $msg or die $!;
813 sub access_distros () {
814 # Returns list of distros to try, in order
817 # 0. `instead of' distro name(s) we have been pointed to
818 # 1. the access_quirk distro, if any
819 # 2a. the user's specified distro, or failing that } basedistro
820 # 2b. the distro calculated from the suite }
821 my @l = access_basedistro();
823 my (undef,$quirkdistro) = access_quirk();
824 unshift @l, $quirkdistro;
825 unshift @l, $instead_distro;
826 @l = grep { defined } @l;
828 push @l, access_nomdistro();
830 if (access_forpush()) {
831 @l = map { ("$_/push", $_) } @l;
836 sub access_cfg_cfgs (@) {
839 # The nesting of these loops determines the search order. We put
840 # the key loop on the outside so that we search all the distros
841 # for each key, before going on to the next key. That means that
842 # if access_cfg is called with a more specific, and then a less
843 # specific, key, an earlier distro can override the less specific
844 # without necessarily overriding any more specific keys. (If the
845 # distro wants to override the more specific keys it can simply do
846 # so; whereas if we did the loop the other way around, it would be
847 # impossible to for an earlier distro to override a less specific
848 # key but not the more specific ones without restating the unknown
849 # values of the more specific keys.
852 # We have to deal with RETURN-UNDEF specially, so that we don't
853 # terminate the search prematurely.
855 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
858 foreach my $d (access_distros()) {
859 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
861 push @cfgs, map { "dgit.default.$_" } @realkeys;
868 my (@cfgs) = access_cfg_cfgs(@keys);
869 my $value = cfg(@cfgs);
873 sub access_cfg_bool ($$) {
874 my ($def, @keys) = @_;
875 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
878 sub string_to_ssh ($) {
880 if ($spec =~ m/\s/) {
881 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
887 sub access_cfg_ssh () {
888 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
889 if (!defined $gitssh) {
892 return string_to_ssh $gitssh;
896 sub access_runeinfo ($) {
898 return ": dgit ".access_basedistro()." $info ;";
901 sub access_someuserhost ($) {
903 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
904 defined($user) && length($user) or
905 $user = access_cfg("$some-user",'username');
906 my $host = access_cfg("$some-host");
907 return length($user) ? "$user\@$host" : $host;
910 sub access_gituserhost () {
911 return access_someuserhost('git');
914 sub access_giturl (;$) {
916 my $url = access_cfg('git-url','RETURN-UNDEF');
919 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
920 return undef unless defined $proto;
923 access_gituserhost().
924 access_cfg('git-path');
926 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
929 return "$url/$package$suffix";
932 sub parsecontrolfh ($$;$) {
933 my ($fh, $desc, $allowsigned) = @_;
934 our $dpkgcontrolhash_noissigned;
937 my %opts = ('name' => $desc);
938 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
939 $c = Dpkg::Control::Hash->new(%opts);
940 $c->parse($fh,$desc) or die "parsing of $desc failed";
941 last if $allowsigned;
942 last if $dpkgcontrolhash_noissigned;
943 my $issigned= $c->get_option('is_pgp_signed');
944 if (!defined $issigned) {
945 $dpkgcontrolhash_noissigned= 1;
946 seek $fh, 0,0 or die "seek $desc: $!";
947 } elsif ($issigned) {
948 fail "control file $desc is (already) PGP-signed. ".
949 " Note that dgit push needs to modify the .dsc and then".
950 " do the signature itself";
959 my ($file, $desc, $allowsigned) = @_;
960 my $fh = new IO::Handle;
961 open $fh, '<', $file or die "$file: $!";
962 my $c = parsecontrolfh($fh,$desc,$allowsigned);
963 $fh->error and die $!;
969 my ($dctrl,$field) = @_;
970 my $v = $dctrl->{$field};
971 return $v if defined $v;
972 fail "missing field $field in ".$dctrl->get_option('name');
976 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
977 my $p = new IO::Handle;
978 my @cmd = (qw(dpkg-parsechangelog), @_);
979 open $p, '-|', @cmd or die $!;
981 $?=0; $!=0; close $p or failedcmd @cmd;
985 sub commit_getclogp ($) {
986 # Returns the parsed changelog hashref for a particular commit
988 our %commit_getclogp_memo;
989 my $memo = $commit_getclogp_memo{$objid};
990 return $memo if $memo;
992 my $mclog = ".git/dgit/clog-$objid";
993 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
994 "$objid:debian/changelog";
995 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1000 defined $d or fail "getcwd failed: $!";
1004 sub parse_dscdata () {
1005 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1006 printdebug Dumper($dscdata) if $debuglevel>1;
1007 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1008 printdebug Dumper($dsc) if $debuglevel>1;
1013 sub archive_query ($;@) {
1014 my ($method) = shift @_;
1015 fail "this operation does not support multiple comma-separated suites"
1017 my $query = access_cfg('archive-query','RETURN-UNDEF');
1018 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1021 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1024 sub archive_query_prepend_mirror {
1025 my $m = access_cfg('mirror');
1026 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1029 sub pool_dsc_subpath ($$) {
1030 my ($vsn,$component) = @_; # $package is implict arg
1031 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1032 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1035 sub cfg_apply_map ($$$) {
1036 my ($varref, $what, $mapspec) = @_;
1037 return unless $mapspec;
1039 printdebug "config $what EVAL{ $mapspec; }\n";
1041 eval "package Dgit::Config; $mapspec;";
1046 #---------- `ftpmasterapi' archive query method (nascent) ----------
1048 sub archive_api_query_cmd ($) {
1050 my @cmd = (@curl, qw(-sS));
1051 my $url = access_cfg('archive-query-url');
1052 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1054 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1055 foreach my $key (split /\:/, $keys) {
1056 $key =~ s/\%HOST\%/$host/g;
1058 fail "for $url: stat $key: $!" unless $!==ENOENT;
1061 fail "config requested specific TLS key but do not know".
1062 " how to get curl to use exactly that EE key ($key)";
1063 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1064 # # Sadly the above line does not work because of changes
1065 # # to gnutls. The real fix for #790093 may involve
1066 # # new curl options.
1069 # Fixing #790093 properly will involve providing a value
1070 # for this on clients.
1071 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1072 push @cmd, split / /, $kargs if defined $kargs;
1074 push @cmd, $url.$subpath;
1078 sub api_query ($$;$) {
1080 my ($data, $subpath, $ok404) = @_;
1081 badcfg "ftpmasterapi archive query method takes no data part"
1083 my @cmd = archive_api_query_cmd($subpath);
1084 my $url = $cmd[$#cmd];
1085 push @cmd, qw(-w %{http_code});
1086 my $json = cmdoutput @cmd;
1087 unless ($json =~ s/\d+\d+\d$//) {
1088 failedcmd_report_cmd undef, @cmd;
1089 fail "curl failed to print 3-digit HTTP code";
1092 return undef if $code eq '404' && $ok404;
1093 fail "fetch of $url gave HTTP code $code"
1094 unless $url =~ m#^file://# or $code =~ m/^2/;
1095 return decode_json($json);
1098 sub canonicalise_suite_ftpmasterapi {
1099 my ($proto,$data) = @_;
1100 my $suites = api_query($data, 'suites');
1102 foreach my $entry (@$suites) {
1104 my $v = $entry->{$_};
1105 defined $v && $v eq $isuite;
1106 } qw(codename name);
1107 push @matched, $entry;
1109 fail "unknown suite $isuite" unless @matched;
1112 @matched==1 or die "multiple matches for suite $isuite\n";
1113 $cn = "$matched[0]{codename}";
1114 defined $cn or die "suite $isuite info has no codename\n";
1115 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1117 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1122 sub archive_query_ftpmasterapi {
1123 my ($proto,$data) = @_;
1124 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1126 my $digester = Digest::SHA->new(256);
1127 foreach my $entry (@$info) {
1129 my $vsn = "$entry->{version}";
1130 my ($ok,$msg) = version_check $vsn;
1131 die "bad version: $msg\n" unless $ok;
1132 my $component = "$entry->{component}";
1133 $component =~ m/^$component_re$/ or die "bad component";
1134 my $filename = "$entry->{filename}";
1135 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1136 or die "bad filename";
1137 my $sha256sum = "$entry->{sha256sum}";
1138 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1139 push @rows, [ $vsn, "/pool/$component/$filename",
1140 $digester, $sha256sum ];
1142 die "bad ftpmaster api response: $@\n".Dumper($entry)
1145 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1146 return archive_query_prepend_mirror @rows;
1149 sub file_in_archive_ftpmasterapi {
1150 my ($proto,$data,$filename) = @_;
1151 my $pat = $filename;
1154 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1155 my $info = api_query($data, "file_in_archive/$pat", 1);
1158 #---------- `aptget' archive query method ----------
1161 our $aptget_releasefile;
1162 our $aptget_configpath;
1164 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1165 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1167 sub aptget_cache_clean {
1168 runcmd_ordryrun_local qw(sh -ec),
1169 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1173 sub aptget_lock_acquire () {
1174 my $lockfile = "$aptget_base/lock";
1175 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1176 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1179 sub aptget_prep ($) {
1181 return if defined $aptget_base;
1183 badcfg "aptget archive query method takes no data part"
1186 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1189 ensuredir "$cache/dgit";
1191 access_cfg('aptget-cachekey','RETURN-UNDEF')
1192 // access_nomdistro();
1194 $aptget_base = "$cache/dgit/aptget";
1195 ensuredir $aptget_base;
1197 my $quoted_base = $aptget_base;
1198 die "$quoted_base contains bad chars, cannot continue"
1199 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1201 ensuredir $aptget_base;
1203 aptget_lock_acquire();
1205 aptget_cache_clean();
1207 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1208 my $sourceslist = "source.list#$cachekey";
1210 my $aptsuites = $isuite;
1211 cfg_apply_map(\$aptsuites, 'suite map',
1212 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1214 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1215 printf SRCS "deb-src %s %s %s\n",
1216 access_cfg('mirror'),
1218 access_cfg('aptget-components')
1221 ensuredir "$aptget_base/cache";
1222 ensuredir "$aptget_base/lists";
1224 open CONF, ">", $aptget_configpath or die $!;
1226 Debug::NoLocking "true";
1227 APT::Get::List-Cleanup "false";
1228 #clear APT::Update::Post-Invoke-Success;
1229 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1230 Dir::State::Lists "$quoted_base/lists";
1231 Dir::Etc::preferences "$quoted_base/preferences";
1232 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1233 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1236 foreach my $key (qw(
1239 Dir::Cache::Archives
1240 Dir::Etc::SourceParts
1241 Dir::Etc::preferencesparts
1243 ensuredir "$aptget_base/$key";
1244 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1247 my $oldatime = (time // die $!) - 1;
1248 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1249 next unless stat_exists $oldlist;
1250 my ($mtime) = (stat _)[9];
1251 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1254 runcmd_ordryrun_local aptget_aptget(), qw(update);
1257 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1258 next unless stat_exists $oldlist;
1259 my ($atime) = (stat _)[8];
1260 next if $atime == $oldatime;
1261 push @releasefiles, $oldlist;
1263 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1264 @releasefiles = @inreleasefiles if @inreleasefiles;
1265 die "apt updated wrong number of Release files (@releasefiles), erk"
1266 unless @releasefiles == 1;
1268 ($aptget_releasefile) = @releasefiles;
1271 sub canonicalise_suite_aptget {
1272 my ($proto,$data) = @_;
1275 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1277 foreach my $name (qw(Codename Suite)) {
1278 my $val = $release->{$name};
1280 printdebug "release file $name: $val\n";
1281 $val =~ m/^$suite_re$/o or fail
1282 "Release file ($aptget_releasefile) specifies intolerable $name";
1283 cfg_apply_map(\$val, 'suite rmap',
1284 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1291 sub archive_query_aptget {
1292 my ($proto,$data) = @_;
1295 ensuredir "$aptget_base/source";
1296 foreach my $old (<$aptget_base/source/*.dsc>) {
1297 unlink $old or die "$old: $!";
1300 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1301 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1302 # avoids apt-get source failing with ambiguous error code
1304 runcmd_ordryrun_local
1305 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1306 aptget_aptget(), qw(--download-only --only-source source), $package;
1308 my @dscs = <$aptget_base/source/*.dsc>;
1309 fail "apt-get source did not produce a .dsc" unless @dscs;
1310 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1312 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1315 my $uri = "file://". uri_escape $dscs[0];
1316 $uri =~ s{\%2f}{/}gi;
1317 return [ (getfield $pre_dsc, 'Version'), $uri ];
1320 #---------- `dummyapicat' archive query method ----------
1322 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1323 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1325 sub file_in_archive_dummycatapi ($$$) {
1326 my ($proto,$data,$filename) = @_;
1327 my $mirror = access_cfg('mirror');
1328 $mirror =~ s#^file://#/# or die "$mirror ?";
1330 my @cmd = (qw(sh -ec), '
1332 find -name "$2" -print0 |
1334 ', qw(x), $mirror, $filename);
1335 debugcmd "-|", @cmd;
1336 open FIA, "-|", @cmd or die $!;
1339 printdebug "| $_\n";
1340 m/^(\w+) (\S+)$/ or die "$_ ?";
1341 push @out, { sha256sum => $1, filename => $2 };
1343 close FIA or die failedcmd @cmd;
1347 #---------- `madison' archive query method ----------
1349 sub archive_query_madison {
1350 return archive_query_prepend_mirror
1351 map { [ @$_[0..1] ] } madison_get_parse(@_);
1354 sub madison_get_parse {
1355 my ($proto,$data) = @_;
1356 die unless $proto eq 'madison';
1357 if (!length $data) {
1358 $data= access_cfg('madison-distro','RETURN-UNDEF');
1359 $data //= access_basedistro();
1361 $rmad{$proto,$data,$package} ||= cmdoutput
1362 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1363 my $rmad = $rmad{$proto,$data,$package};
1366 foreach my $l (split /\n/, $rmad) {
1367 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1368 \s*( [^ \t|]+ )\s* \|
1369 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1370 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1371 $1 eq $package or die "$rmad $package ?";
1378 $component = access_cfg('archive-query-default-component');
1380 $5 eq 'source' or die "$rmad ?";
1381 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1383 return sort { -version_compare($a->[0],$b->[0]); } @out;
1386 sub canonicalise_suite_madison {
1387 # madison canonicalises for us
1388 my @r = madison_get_parse(@_);
1390 "unable to canonicalise suite using package $package".
1391 " which does not appear to exist in suite $isuite;".
1392 " --existing-package may help";
1396 sub file_in_archive_madison { return undef; }
1398 #---------- `sshpsql' archive query method ----------
1401 my ($data,$runeinfo,$sql) = @_;
1402 if (!length $data) {
1403 $data= access_someuserhost('sshpsql').':'.
1404 access_cfg('sshpsql-dbname');
1406 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1407 my ($userhost,$dbname) = ($`,$'); #';
1409 my @cmd = (access_cfg_ssh, $userhost,
1410 access_runeinfo("ssh-psql $runeinfo").
1411 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1412 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1414 open P, "-|", @cmd or die $!;
1417 printdebug(">|$_|\n");
1420 $!=0; $?=0; close P or failedcmd @cmd;
1422 my $nrows = pop @rows;
1423 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1424 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1425 @rows = map { [ split /\|/, $_ ] } @rows;
1426 my $ncols = scalar @{ shift @rows };
1427 die if grep { scalar @$_ != $ncols } @rows;
1431 sub sql_injection_check {
1432 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1435 sub archive_query_sshpsql ($$) {
1436 my ($proto,$data) = @_;
1437 sql_injection_check $isuite, $package;
1438 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1439 SELECT source.version, component.name, files.filename, files.sha256sum
1441 JOIN src_associations ON source.id = src_associations.source
1442 JOIN suite ON suite.id = src_associations.suite
1443 JOIN dsc_files ON dsc_files.source = source.id
1444 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1445 JOIN component ON component.id = files_archive_map.component_id
1446 JOIN files ON files.id = dsc_files.file
1447 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1448 AND source.source='$package'
1449 AND files.filename LIKE '%.dsc';
1451 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1452 my $digester = Digest::SHA->new(256);
1454 my ($vsn,$component,$filename,$sha256sum) = @$_;
1455 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1457 return archive_query_prepend_mirror @rows;
1460 sub canonicalise_suite_sshpsql ($$) {
1461 my ($proto,$data) = @_;
1462 sql_injection_check $isuite;
1463 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1464 SELECT suite.codename
1465 FROM suite where suite_name='$isuite' or codename='$isuite';
1467 @rows = map { $_->[0] } @rows;
1468 fail "unknown suite $isuite" unless @rows;
1469 die "ambiguous $isuite: @rows ?" if @rows>1;
1473 sub file_in_archive_sshpsql ($$$) { return undef; }
1475 #---------- `dummycat' archive query method ----------
1477 sub canonicalise_suite_dummycat ($$) {
1478 my ($proto,$data) = @_;
1479 my $dpath = "$data/suite.$isuite";
1480 if (!open C, "<", $dpath) {
1481 $!==ENOENT or die "$dpath: $!";
1482 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1486 chomp or die "$dpath: $!";
1488 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1492 sub archive_query_dummycat ($$) {
1493 my ($proto,$data) = @_;
1494 canonicalise_suite();
1495 my $dpath = "$data/package.$csuite.$package";
1496 if (!open C, "<", $dpath) {
1497 $!==ENOENT or die "$dpath: $!";
1498 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1506 printdebug "dummycat query $csuite $package $dpath | $_\n";
1507 my @row = split /\s+/, $_;
1508 @row==2 or die "$dpath: $_ ?";
1511 C->error and die "$dpath: $!";
1513 return archive_query_prepend_mirror
1514 sort { -version_compare($a->[0],$b->[0]); } @rows;
1517 sub file_in_archive_dummycat () { return undef; }
1519 #---------- tag format handling ----------
1521 sub access_cfg_tagformats () {
1522 split /\,/, access_cfg('dgit-tag-format');
1525 sub access_cfg_tagformats_can_splitbrain () {
1526 my %y = map { $_ => 1 } access_cfg_tagformats;
1527 foreach my $needtf (qw(new maint)) {
1528 next if $y{$needtf};
1534 sub need_tagformat ($$) {
1535 my ($fmt, $why) = @_;
1536 fail "need to use tag format $fmt ($why) but also need".
1537 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1538 " - no way to proceed"
1539 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1540 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1543 sub select_tagformat () {
1545 return if $tagformatfn && !$tagformat_want;
1546 die 'bug' if $tagformatfn && $tagformat_want;
1547 # ... $tagformat_want assigned after previous select_tagformat
1549 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1550 printdebug "select_tagformat supported @supported\n";
1552 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1553 printdebug "select_tagformat specified @$tagformat_want\n";
1555 my ($fmt,$why,$override) = @$tagformat_want;
1557 fail "target distro supports tag formats @supported".
1558 " but have to use $fmt ($why)"
1560 or grep { $_ eq $fmt } @supported;
1562 $tagformat_want = undef;
1564 $tagformatfn = ${*::}{"debiantag_$fmt"};
1566 fail "trying to use unknown tag format \`$fmt' ($why) !"
1567 unless $tagformatfn;
1570 #---------- archive query entrypoints and rest of program ----------
1572 sub canonicalise_suite () {
1573 return if defined $csuite;
1574 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1575 $csuite = archive_query('canonicalise_suite');
1576 if ($isuite ne $csuite) {
1577 progress "canonical suite name for $isuite is $csuite";
1579 progress "canonical suite name is $csuite";
1583 sub get_archive_dsc () {
1584 canonicalise_suite();
1585 my @vsns = archive_query('archive_query');
1586 foreach my $vinfo (@vsns) {
1587 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1588 $dscurl = $vsn_dscurl;
1589 $dscdata = url_get($dscurl);
1591 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1596 $digester->add($dscdata);
1597 my $got = $digester->hexdigest();
1599 fail "$dscurl has hash $got but".
1600 " archive told us to expect $digest";
1603 my $fmt = getfield $dsc, 'Format';
1604 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1605 "unsupported source format $fmt, sorry";
1607 $dsc_checked = !!$digester;
1608 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1612 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1615 sub check_for_git ();
1616 sub check_for_git () {
1618 my $how = access_cfg('git-check');
1619 if ($how eq 'ssh-cmd') {
1621 (access_cfg_ssh, access_gituserhost(),
1622 access_runeinfo("git-check $package").
1623 " set -e; cd ".access_cfg('git-path').";".
1624 " if test -d $package.git; then echo 1; else echo 0; fi");
1625 my $r= cmdoutput @cmd;
1626 if (defined $r and $r =~ m/^divert (\w+)$/) {
1628 my ($usedistro,) = access_distros();
1629 # NB that if we are pushing, $usedistro will be $distro/push
1630 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1631 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1632 progress "diverting to $divert (using config for $instead_distro)";
1633 return check_for_git();
1635 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1637 } elsif ($how eq 'url') {
1638 my $prefix = access_cfg('git-check-url','git-url');
1639 my $suffix = access_cfg('git-check-suffix','git-suffix',
1640 'RETURN-UNDEF') // '.git';
1641 my $url = "$prefix/$package$suffix";
1642 my @cmd = (@curl, qw(-sS -I), $url);
1643 my $result = cmdoutput @cmd;
1644 $result =~ s/^\S+ 200 .*\n\r?\n//;
1645 # curl -sS -I with https_proxy prints
1646 # HTTP/1.0 200 Connection established
1647 $result =~ m/^\S+ (404|200) /s or
1648 fail "unexpected results from git check query - ".
1649 Dumper($prefix, $result);
1651 if ($code eq '404') {
1653 } elsif ($code eq '200') {
1658 } elsif ($how eq 'true') {
1660 } elsif ($how eq 'false') {
1663 badcfg "unknown git-check \`$how'";
1667 sub create_remote_git_repo () {
1668 my $how = access_cfg('git-create');
1669 if ($how eq 'ssh-cmd') {
1671 (access_cfg_ssh, access_gituserhost(),
1672 access_runeinfo("git-create $package").
1673 "set -e; cd ".access_cfg('git-path').";".
1674 " cp -a _template $package.git");
1675 } elsif ($how eq 'true') {
1678 badcfg "unknown git-create \`$how'";
1682 our ($dsc_hash,$lastpush_mergeinput);
1683 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1685 our $ud = '.git/dgit/unpack';
1695 sub mktree_in_ud_here () {
1696 runcmd qw(git init -q);
1697 runcmd qw(git config gc.auto 0);
1698 rmtree('.git/objects');
1699 symlink '../../../../objects','.git/objects' or die $!;
1702 sub git_write_tree () {
1703 my $tree = cmdoutput @git, qw(write-tree);
1704 $tree =~ m/^\w+$/ or die "$tree ?";
1708 sub git_add_write_tree () {
1709 runcmd @git, qw(add -Af .);
1710 return git_write_tree();
1713 sub remove_stray_gits ($) {
1715 my @gitscmd = qw(find -name .git -prune -print0);
1716 debugcmd "|",@gitscmd;
1717 open GITS, "-|", @gitscmd or die $!;
1722 print STDERR "$us: warning: removing from $what: ",
1723 (messagequote $_), "\n";
1727 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1730 sub mktree_in_ud_from_only_subdir ($;$) {
1731 my ($what,$raw) = @_;
1733 # changes into the subdir
1735 die "expected one subdir but found @dirs ?" unless @dirs==1;
1736 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1740 remove_stray_gits($what);
1741 mktree_in_ud_here();
1743 my ($format, $fopts) = get_source_format();
1744 if (madformat($format)) {
1749 my $tree=git_add_write_tree();
1750 return ($tree,$dir);
1753 our @files_csum_info_fields =
1754 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1755 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1756 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1758 sub dsc_files_info () {
1759 foreach my $csumi (@files_csum_info_fields) {
1760 my ($fname, $module, $method) = @$csumi;
1761 my $field = $dsc->{$fname};
1762 next unless defined $field;
1763 eval "use $module; 1;" or die $@;
1765 foreach (split /\n/, $field) {
1767 m/^(\w+) (\d+) (\S+)$/ or
1768 fail "could not parse .dsc $fname line \`$_'";
1769 my $digester = eval "$module"."->$method;" or die $@;
1774 Digester => $digester,
1779 fail "missing any supported Checksums-* or Files field in ".
1780 $dsc->get_option('name');
1784 map { $_->{Filename} } dsc_files_info();
1787 sub files_compare_inputs (@) {
1792 my $showinputs = sub {
1793 return join "; ", map { $_->get_option('name') } @$inputs;
1796 foreach my $in (@$inputs) {
1798 my $in_name = $in->get_option('name');
1800 printdebug "files_compare_inputs $in_name\n";
1802 foreach my $csumi (@files_csum_info_fields) {
1803 my ($fname) = @$csumi;
1804 printdebug "files_compare_inputs $in_name $fname\n";
1806 my $field = $in->{$fname};
1807 next unless defined $field;
1810 foreach (split /\n/, $field) {
1813 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1814 fail "could not parse $in_name $fname line \`$_'";
1816 printdebug "files_compare_inputs $in_name $fname $f\n";
1820 my $re = \ $record{$f}{$fname};
1822 $fchecked{$f}{$in_name} = 1;
1824 fail "hash or size of $f varies in $fname fields".
1825 " (between: ".$showinputs->().")";
1830 @files = sort @files;
1831 $expected_files //= \@files;
1832 "@$expected_files" eq "@files" or
1833 fail "file list in $in_name varies between hash fields!";
1836 fail "$in_name has no files list field(s)";
1838 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1841 grep { keys %$_ == @$inputs-1 } values %fchecked
1842 or fail "no file appears in all file lists".
1843 " (looked in: ".$showinputs->().")";
1846 sub is_orig_file_in_dsc ($$) {
1847 my ($f, $dsc_files_info) = @_;
1848 return 0 if @$dsc_files_info <= 1;
1849 # One file means no origs, and the filename doesn't have a "what
1850 # part of dsc" component. (Consider versions ending `.orig'.)
1851 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1855 sub is_orig_file_of_vsn ($$) {
1856 my ($f, $upstreamvsn) = @_;
1857 my $base = srcfn $upstreamvsn, '';
1858 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1862 sub changes_update_origs_from_dsc ($$$$) {
1863 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1865 printdebug "checking origs needed ($upstreamvsn)...\n";
1866 $_ = getfield $changes, 'Files';
1867 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1868 fail "cannot find section/priority from .changes Files field";
1869 my $placementinfo = $1;
1871 printdebug "checking origs needed placement '$placementinfo'...\n";
1872 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1873 $l =~ m/\S+$/ or next;
1875 printdebug "origs $file | $l\n";
1876 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1877 printdebug "origs $file is_orig\n";
1878 my $have = archive_query('file_in_archive', $file);
1879 if (!defined $have) {
1881 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1887 printdebug "origs $file \$#\$have=$#$have\n";
1888 foreach my $h (@$have) {
1891 foreach my $csumi (@files_csum_info_fields) {
1892 my ($fname, $module, $method, $archivefield) = @$csumi;
1893 next unless defined $h->{$archivefield};
1894 $_ = $dsc->{$fname};
1895 next unless defined;
1896 m/^(\w+) .* \Q$file\E$/m or
1897 fail ".dsc $fname missing entry for $file";
1898 if ($h->{$archivefield} eq $1) {
1902 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1905 die "$file ".Dumper($h)." ?!" if $same && @differ;
1908 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1911 printdebug "origs $file f.same=$found_same".
1912 " #f._differ=$#found_differ\n";
1913 if (@found_differ && !$found_same) {
1915 "archive contains $file with different checksum",
1918 # Now we edit the changes file to add or remove it
1919 foreach my $csumi (@files_csum_info_fields) {
1920 my ($fname, $module, $method, $archivefield) = @$csumi;
1921 next unless defined $changes->{$fname};
1923 # in archive, delete from .changes if it's there
1924 $changed{$file} = "removed" if
1925 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1926 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1927 # not in archive, but it's here in the .changes
1929 my $dsc_data = getfield $dsc, $fname;
1930 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1932 $extra =~ s/ \d+ /$&$placementinfo /
1933 or die "$fname $extra >$dsc_data< ?"
1934 if $fname eq 'Files';
1935 $changes->{$fname} .= "\n". $extra;
1936 $changed{$file} = "added";
1941 foreach my $file (keys %changed) {
1943 "edited .changes for archive .orig contents: %s %s",
1944 $changed{$file}, $file;
1946 my $chtmp = "$changesfile.tmp";
1947 $changes->save($chtmp);
1949 rename $chtmp,$changesfile or die "$changesfile $!";
1951 progress "[new .changes left in $changesfile]";
1954 progress "$changesfile already has appropriate .orig(s) (if any)";
1958 sub make_commit ($) {
1960 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1963 sub make_commit_text ($) {
1966 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1968 print Dumper($text) if $debuglevel > 1;
1969 my $child = open2($out, $in, @cmd) or die $!;
1972 print $in $text or die $!;
1973 close $in or die $!;
1975 $h =~ m/^\w+$/ or die;
1977 printdebug "=> $h\n";
1980 waitpid $child, 0 == $child or die "$child $!";
1981 $? and failedcmd @cmd;
1985 sub clogp_authline ($) {
1987 my $author = getfield $clogp, 'Maintainer';
1988 $author =~ s#,.*##ms;
1989 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1990 my $authline = "$author $date";
1991 $authline =~ m/$git_authline_re/o or
1992 fail "unexpected commit author line format \`$authline'".
1993 " (was generated from changelog Maintainer field)";
1994 return ($1,$2,$3) if wantarray;
1998 sub vendor_patches_distro ($$) {
1999 my ($checkdistro, $what) = @_;
2000 return unless defined $checkdistro;
2002 my $series = "debian/patches/\L$checkdistro\E.series";
2003 printdebug "checking for vendor-specific $series ($what)\n";
2005 if (!open SERIES, "<", $series) {
2006 die "$series $!" unless $!==ENOENT;
2015 Unfortunately, this source package uses a feature of dpkg-source where
2016 the same source package unpacks to different source code on different
2017 distros. dgit cannot safely operate on such packages on affected
2018 distros, because the meaning of source packages is not stable.
2020 Please ask the distro/maintainer to remove the distro-specific series
2021 files and use a different technique (if necessary, uploading actually
2022 different packages, if different distros are supposed to have
2026 fail "Found active distro-specific series file for".
2027 " $checkdistro ($what): $series, cannot continue";
2029 die "$series $!" if SERIES->error;
2033 sub check_for_vendor_patches () {
2034 # This dpkg-source feature doesn't seem to be documented anywhere!
2035 # But it can be found in the changelog (reformatted):
2037 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2038 # Author: Raphael Hertzog <hertzog@debian.org>
2039 # Date: Sun Oct 3 09:36:48 2010 +0200
2041 # dpkg-source: correctly create .pc/.quilt_series with alternate
2044 # If you have debian/patches/ubuntu.series and you were
2045 # unpacking the source package on ubuntu, quilt was still
2046 # directed to debian/patches/series instead of
2047 # debian/patches/ubuntu.series.
2049 # debian/changelog | 3 +++
2050 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2051 # 2 files changed, 6 insertions(+), 1 deletion(-)
2054 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2055 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2056 "Dpkg::Vendor \`current vendor'");
2057 vendor_patches_distro(access_basedistro(),
2058 "(base) distro being accessed");
2059 vendor_patches_distro(access_nomdistro(),
2060 "(nominal) distro being accessed");
2063 sub generate_commits_from_dsc () {
2064 # See big comment in fetch_from_archive, below.
2065 # See also README.dsc-import.
2069 my @dfi = dsc_files_info();
2070 foreach my $fi (@dfi) {
2071 my $f = $fi->{Filename};
2072 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2073 my $upper_f = "../../../../$f";
2075 printdebug "considering linking $f: ";
2077 link_ltarget $upper_f, $f
2078 or ((printdebug "($!) "), 0)
2082 printdebug "linked.\n";
2084 complete_file_from_dsc('.', $fi)
2092 # We unpack and record the orig tarballs first, so that we only
2093 # need disk space for one private copy of the unpacked source.
2094 # But we can't make them into commits until we have the metadata
2095 # from the debian/changelog, so we record the tree objects now and
2096 # make them into commits later.
2098 my $upstreamv = upstreamversion $dsc->{version};
2099 my $orig_f_base = srcfn $upstreamv, '';
2101 foreach my $fi (@dfi) {
2102 # We actually import, and record as a commit, every tarball
2103 # (unless there is only one file, in which case there seems
2106 my $f = $fi->{Filename};
2107 printdebug "import considering $f ";
2108 (printdebug "only one dfi\n"), next if @dfi == 1;
2109 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2110 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2114 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2116 printdebug "Y ", (join ' ', map { $_//"(none)" }
2117 $compr_ext, $orig_f_part
2120 my $input = new IO::File $f, '<' or die "$f $!";
2124 if (defined $compr_ext) {
2126 Dpkg::Compression::compression_guess_from_filename $f;
2127 fail "Dpkg::Compression cannot handle file $f in source package"
2128 if defined $compr_ext && !defined $cname;
2130 new Dpkg::Compression::Process compression => $cname;
2131 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2132 my $compr_fh = new IO::Handle;
2133 my $compr_pid = open $compr_fh, "-|" // die $!;
2135 open STDIN, "<&", $input or die $!;
2137 die "dgit (child): exec $compr_cmd[0]: $!\n";
2142 rmtree "_unpack-tar";
2143 mkdir "_unpack-tar" or die $!;
2144 my @tarcmd = qw(tar -x -f -
2145 --no-same-owner --no-same-permissions
2146 --no-acls --no-xattrs --no-selinux);
2147 my $tar_pid = fork // die $!;
2149 chdir "_unpack-tar" or die $!;
2150 open STDIN, "<&", $input or die $!;
2152 die "dgit (child): exec $tarcmd[0]: $!";
2154 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2155 !$? or failedcmd @tarcmd;
2158 (@compr_cmd ? failedcmd @compr_cmd
2160 # finally, we have the results in "tarball", but maybe
2161 # with the wrong permissions
2163 runcmd qw(chmod -R +rwX _unpack-tar);
2164 changedir "_unpack-tar";
2165 remove_stray_gits($f);
2166 mktree_in_ud_here();
2168 my ($tree) = git_add_write_tree();
2169 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2170 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2172 printdebug "one subtree $1\n";
2174 printdebug "multiple subtrees\n";
2177 rmtree "_unpack-tar";
2179 my $ent = [ $f, $tree ];
2181 Orig => !!$orig_f_part,
2182 Sort => (!$orig_f_part ? 2 :
2183 $orig_f_part =~ m/-/g ? 1 :
2191 # put any without "_" first (spec is not clear whether files
2192 # are always in the usual order). Tarballs without "_" are
2193 # the main orig or the debian tarball.
2194 $a->{Sort} <=> $b->{Sort} or
2198 my $any_orig = grep { $_->{Orig} } @tartrees;
2200 my $dscfn = "$package.dsc";
2202 my $treeimporthow = 'package';
2204 open D, ">", $dscfn or die "$dscfn: $!";
2205 print D $dscdata or die "$dscfn: $!";
2206 close D or die "$dscfn: $!";
2207 my @cmd = qw(dpkg-source);
2208 push @cmd, '--no-check' if $dsc_checked;
2209 if (madformat $dsc->{format}) {
2210 push @cmd, '--skip-patches';
2211 $treeimporthow = 'unpatched';
2213 push @cmd, qw(-x --), $dscfn;
2216 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2217 if (madformat $dsc->{format}) {
2218 check_for_vendor_patches();
2222 if (madformat $dsc->{format}) {
2223 my @pcmd = qw(dpkg-source --before-build .);
2224 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2226 $dappliedtree = git_add_write_tree();
2229 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2230 debugcmd "|",@clogcmd;
2231 open CLOGS, "-|", @clogcmd or die $!;
2236 printdebug "import clog search...\n";
2239 my $stanzatext = do { local $/=""; <CLOGS>; };
2240 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2241 last if !defined $stanzatext;
2243 my $desc = "package changelog, entry no.$.";
2244 open my $stanzafh, "<", \$stanzatext or die;
2245 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2246 $clogp //= $thisstanza;
2248 printdebug "import clog $thisstanza->{version} $desc...\n";
2250 last if !$any_orig; # we don't need $r1clogp
2252 # We look for the first (most recent) changelog entry whose
2253 # version number is lower than the upstream version of this
2254 # package. Then the last (least recent) previous changelog
2255 # entry is treated as the one which introduced this upstream
2256 # version and used for the synthetic commits for the upstream
2259 # One might think that a more sophisticated algorithm would be
2260 # necessary. But: we do not want to scan the whole changelog
2261 # file. Stopping when we see an earlier version, which
2262 # necessarily then is an earlier upstream version, is the only
2263 # realistic way to do that. Then, either the earliest
2264 # changelog entry we have seen so far is indeed the earliest
2265 # upload of this upstream version; or there are only changelog
2266 # entries relating to later upstream versions (which is not
2267 # possible unless the changelog and .dsc disagree about the
2268 # version). Then it remains to choose between the physically
2269 # last entry in the file, and the one with the lowest version
2270 # number. If these are not the same, we guess that the
2271 # versions were created in a non-monotic order rather than
2272 # that the changelog entries have been misordered.
2274 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2276 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2277 $r1clogp = $thisstanza;
2279 printdebug "import clog $r1clogp->{version} becomes r1\n";
2281 die $! if CLOGS->error;
2282 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2284 $clogp or fail "package changelog has no entries!";
2286 my $authline = clogp_authline $clogp;
2287 my $changes = getfield $clogp, 'Changes';
2288 my $cversion = getfield $clogp, 'Version';
2291 $r1clogp //= $clogp; # maybe there's only one entry;
2292 my $r1authline = clogp_authline $r1clogp;
2293 # Strictly, r1authline might now be wrong if it's going to be
2294 # unused because !$any_orig. Whatever.
2296 printdebug "import tartrees authline $authline\n";
2297 printdebug "import tartrees r1authline $r1authline\n";
2299 foreach my $tt (@tartrees) {
2300 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2302 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2305 committer $r1authline
2309 [dgit import orig $tt->{F}]
2317 [dgit import tarball $package $cversion $tt->{F}]
2322 printdebug "import main commit\n";
2324 open C, ">../commit.tmp" or die $!;
2325 print C <<END or die $!;
2328 print C <<END or die $! foreach @tartrees;
2331 print C <<END or die $!;
2337 [dgit import $treeimporthow $package $cversion]
2341 my $rawimport_hash = make_commit qw(../commit.tmp);
2343 if (madformat $dsc->{format}) {
2344 printdebug "import apply patches...\n";
2346 # regularise the state of the working tree so that
2347 # the checkout of $rawimport_hash works nicely.
2348 my $dappliedcommit = make_commit_text(<<END);
2355 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2357 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2359 # We need the answers to be reproducible
2360 my @authline = clogp_authline($clogp);
2361 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2362 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2363 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2364 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2365 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2366 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2368 my $path = $ENV{PATH} or die;
2370 foreach my $use_absurd (qw(0 1)) {
2371 runcmd @git, qw(checkout -q unpa);
2372 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2373 local $ENV{PATH} = $path;
2376 progress "warning: $@";
2377 $path = "$absurdity:$path";
2378 progress "$us: trying slow absurd-git-apply...";
2379 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2384 die "forbid absurd git-apply\n" if $use_absurd
2385 && forceing [qw(import-gitapply-no-absurd)];
2386 die "only absurd git-apply!\n" if !$use_absurd
2387 && forceing [qw(import-gitapply-absurd)];
2389 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2390 local $ENV{PATH} = $path if $use_absurd;
2392 my @showcmd = (gbp_pq, qw(import));
2393 my @realcmd = shell_cmd
2394 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2395 debugcmd "+",@realcmd;
2396 if (system @realcmd) {
2397 die +(shellquote @showcmd).
2399 failedcmd_waitstatus()."\n";
2402 my $gapplied = git_rev_parse('HEAD');
2403 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2404 $gappliedtree eq $dappliedtree or
2406 gbp-pq import and dpkg-source disagree!
2407 gbp-pq import gave commit $gapplied
2408 gbp-pq import gave tree $gappliedtree
2409 dpkg-source --before-build gave tree $dappliedtree
2411 $rawimport_hash = $gapplied;
2416 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2421 progress "synthesised git commit from .dsc $cversion";
2423 my $rawimport_mergeinput = {
2424 Commit => $rawimport_hash,
2425 Info => "Import of source package",
2427 my @output = ($rawimport_mergeinput);
2429 if ($lastpush_mergeinput) {
2430 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2431 my $oversion = getfield $oldclogp, 'Version';
2433 version_compare($oversion, $cversion);
2435 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2436 { Message => <<END, ReverseParents => 1 });
2437 Record $package ($cversion) in archive suite $csuite
2439 } elsif ($vcmp > 0) {
2440 print STDERR <<END or die $!;
2442 Version actually in archive: $cversion (older)
2443 Last version pushed with dgit: $oversion (newer or same)
2446 @output = $lastpush_mergeinput;
2448 # Same version. Use what's in the server git branch,
2449 # discarding our own import. (This could happen if the
2450 # server automatically imports all packages into git.)
2451 @output = $lastpush_mergeinput;
2454 changedir '../../../..';
2459 sub complete_file_from_dsc ($$) {
2460 our ($dstdir, $fi) = @_;
2461 # Ensures that we have, in $dir, the file $fi, with the correct
2462 # contents. (Downloading it from alongside $dscurl if necessary.)
2464 my $f = $fi->{Filename};
2465 my $tf = "$dstdir/$f";
2469 my $checkhash = sub {
2470 open F, "<", "$tf" or die "$tf: $!";
2471 $fi->{Digester}->reset();
2472 $fi->{Digester}->addfile(*F);
2473 F->error and die $!;
2474 my $got = $fi->{Digester}->hexdigest();
2475 return $got eq $fi->{Hash};
2478 if (stat_exists $tf) {
2479 progress "using existing $f";
2481 printdebug "$tf does not exist, need to fetch\n";
2483 $furl =~ s{/[^/]+$}{};
2485 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2486 die "$f ?" if $f =~ m#/#;
2487 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2488 return 0 if !act_local();
2493 fail "file $f has hash $got but .dsc".
2494 " demands hash $fi->{Hash} ".
2495 ($downloaded ? "(got wrong file from archive!)"
2496 : "(perhaps you should delete this file?)");
2501 sub ensure_we_have_orig () {
2502 my @dfi = dsc_files_info();
2503 foreach my $fi (@dfi) {
2504 my $f = $fi->{Filename};
2505 next unless is_orig_file_in_dsc($f, \@dfi);
2506 complete_file_from_dsc('..', $fi)
2511 #---------- git fetch ----------
2513 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2514 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2516 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2517 # locally fetched refs because they have unhelpful names and clutter
2518 # up gitk etc. So we track whether we have "used up" head ref (ie,
2519 # whether we have made another local ref which refers to this object).
2521 # (If we deleted them unconditionally, then we might end up
2522 # re-fetching the same git objects each time dgit fetch was run.)
2524 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
2525 # in git_fetch_us to fetch the refs in question, and possibly a call
2526 # to lrfetchref_used.
2528 our (%lrfetchrefs_f, %lrfetchrefs_d);
2529 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2531 sub lrfetchref_used ($) {
2532 my ($fullrefname) = @_;
2533 my $objid = $lrfetchrefs_f{$fullrefname};
2534 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2537 sub git_lrfetch_sane {
2538 my ($supplementary, @specs) = @_;
2539 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2540 # at least as regards @specs. Also leave the results in
2541 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2542 # able to clean these up.
2544 # With $supplementary==1, @specs must not contain wildcards
2545 # and we add to our previous fetches (non-atomically).
2547 # This is rather miserable:
2548 # When git fetch --prune is passed a fetchspec ending with a *,
2549 # it does a plausible thing. If there is no * then:
2550 # - it matches subpaths too, even if the supplied refspec
2551 # starts refs, and behaves completely madly if the source
2552 # has refs/refs/something. (See, for example, Debian #NNNN.)
2553 # - if there is no matching remote ref, it bombs out the whole
2555 # We want to fetch a fixed ref, and we don't know in advance
2556 # if it exists, so this is not suitable.
2558 # Our workaround is to use git ls-remote. git ls-remote has its
2559 # own qairks. Notably, it has the absurd multi-tail-matching
2560 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2561 # refs/refs/foo etc.
2563 # Also, we want an idempotent snapshot, but we have to make two
2564 # calls to the remote: one to git ls-remote and to git fetch. The
2565 # solution is use git ls-remote to obtain a target state, and
2566 # git fetch to try to generate it. If we don't manage to generate
2567 # the target state, we try again.
2569 my $url = access_giturl();
2571 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2573 my $specre = join '|', map {
2576 my $wildcard = $x =~ s/\\\*$/.*/;
2577 die if $wildcard && $supplementary;
2580 printdebug "git_lrfetch_sane specre=$specre\n";
2581 my $wanted_rref = sub {
2583 return m/^(?:$specre)$/;
2586 my $fetch_iteration = 0;
2589 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2590 if (++$fetch_iteration > 10) {
2591 fail "too many iterations trying to get sane fetch!";
2594 my @look = map { "refs/$_" } @specs;
2595 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2599 open GITLS, "-|", @lcmd or die $!;
2601 printdebug "=> ", $_;
2602 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2603 my ($objid,$rrefname) = ($1,$2);
2604 if (!$wanted_rref->($rrefname)) {
2606 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2610 $wantr{$rrefname} = $objid;
2613 close GITLS or failedcmd @lcmd;
2615 # OK, now %want is exactly what we want for refs in @specs
2617 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2618 "+refs/$_:".lrfetchrefs."/$_";
2621 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2623 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2624 runcmd_ordryrun_local @fcmd if @fspecs;
2626 if (!$supplementary) {
2627 %lrfetchrefs_f = ();
2631 git_for_each_ref(lrfetchrefs, sub {
2632 my ($objid,$objtype,$lrefname,$reftail) = @_;
2633 $lrfetchrefs_f{$lrefname} = $objid;
2634 $objgot{$objid} = 1;
2637 if ($supplementary) {
2641 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2642 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2643 if (!exists $wantr{$rrefname}) {
2644 if ($wanted_rref->($rrefname)) {
2646 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2650 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2653 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2654 delete $lrfetchrefs_f{$lrefname};
2658 foreach my $rrefname (sort keys %wantr) {
2659 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2660 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2661 my $want = $wantr{$rrefname};
2662 next if $got eq $want;
2663 if (!defined $objgot{$want}) {
2665 warning: git ls-remote suggests we want $lrefname
2666 warning: and it should refer to $want
2667 warning: but git fetch didn't fetch that object to any relevant ref.
2668 warning: This may be due to a race with someone updating the server.
2669 warning: Will try again...
2671 next FETCH_ITERATION;
2674 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2676 runcmd_ordryrun_local @git, qw(update-ref -m),
2677 "dgit fetch git fetch fixup", $lrefname, $want;
2678 $lrfetchrefs_f{$lrefname} = $want;
2683 if (defined $csuite) {
2684 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2685 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2686 my ($objid,$objtype,$lrefname,$reftail) = @_;
2687 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2688 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2692 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2693 Dumper(\%lrfetchrefs_f);
2696 sub git_fetch_us () {
2697 # Want to fetch only what we are going to use, unless
2698 # deliberately-not-ff, in which case we must fetch everything.
2700 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2702 (quiltmode_splitbrain
2703 ? (map { $_->('*',access_nomdistro) }
2704 \&debiantag_new, \&debiantag_maintview)
2705 : debiantags('*',access_nomdistro));
2706 push @specs, server_branch($csuite);
2707 push @specs, $rewritemap;
2708 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2710 git_lrfetch_sane 0, @specs;
2713 my @tagpats = debiantags('*',access_nomdistro);
2715 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2716 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2717 printdebug "currently $fullrefname=$objid\n";
2718 $here{$fullrefname} = $objid;
2720 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2721 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2722 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2723 printdebug "offered $lref=$objid\n";
2724 if (!defined $here{$lref}) {
2725 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2726 runcmd_ordryrun_local @upd;
2727 lrfetchref_used $fullrefname;
2728 } elsif ($here{$lref} eq $objid) {
2729 lrfetchref_used $fullrefname;
2732 "Not updateting $lref from $here{$lref} to $objid.\n";
2737 #---------- dsc and archive handling ----------
2739 sub mergeinfo_getclogp ($) {
2740 # Ensures thit $mi->{Clogp} exists and returns it
2742 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2745 sub mergeinfo_version ($) {
2746 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2749 sub fetch_from_archive_record_1 ($) {
2751 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2752 'DGIT_ARCHIVE', $hash;
2753 cmdoutput @git, qw(log -n2), $hash;
2754 # ... gives git a chance to complain if our commit is malformed
2757 sub fetch_from_archive_record_2 ($) {
2759 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2763 dryrun_report @upd_cmd;
2767 sub parse_dsc_field ($$) {
2768 my ($dsc, $what) = @_;
2770 foreach my $field (@ourdscfield) {
2771 $f = $dsc->{$field};
2775 progress "$what: NO git hash";
2776 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2777 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2778 progress "$what: specified git info ($dsc_distro)";
2779 $dsc_hint_tag = [ $dsc_hint_tag ];
2780 } elsif ($f =~ m/^\w+\s*$/) {
2782 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2783 dgit.default.distro);
2784 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2786 progress "$what: specified git hash";
2788 fail "$what: invalid Dgit info";
2792 sub resolve_dsc_field_commit ($$) {
2793 my ($already_distro, $already_mapref) = @_;
2795 return unless defined $dsc_hash;
2798 defined $already_mapref &&
2799 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2800 ? $already_mapref : undef;
2804 my ($what, @fetch) = @_;
2806 local $idistro = $dsc_distro;
2807 my $lrf = lrfetchrefs;
2809 if (!$chase_dsc_distro) {
2811 "not chasing .dsc distro $dsc_distro: not fetching $what";
2816 ".dsc names distro $dsc_distro: fetching $what";
2818 my $url = access_giturl();
2819 if (!defined $url) {
2820 defined $dsc_hint_url or fail <<END;
2821 .dsc Dgit metadata is in context of distro $dsc_distro
2822 for which we have no configured url and .dsc provides no hint
2825 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2826 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2827 parse_cfg_bool "dsc-url-proto-ok", 'false',
2828 cfg("dgit.dsc-url-proto-ok.$proto",
2829 "dgit.default.dsc-url-proto-ok")
2831 .dsc Dgit metadata is in context of distro $dsc_distro
2832 for which we have no configured url;
2833 .dsc provices hinted url with protocol $proto which is unsafe.
2834 (can be overridden by config - consult documentation)
2836 $url = $dsc_hint_url;
2839 git_lrfetch_sane 1, @fetch;
2844 my $rewrite_enable = do {
2845 local $idistro = $dsc_distro;
2846 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2849 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2850 if (!defined $mapref) {
2851 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2852 $mapref = $lrf.'/'.$rewritemap;
2854 my $rewritemapdata = git_cat_file $mapref.':map';
2855 if (defined $rewritemapdata
2856 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2858 "server's git history rewrite map contains a relevant entry!";
2861 if (defined $dsc_hash) {
2862 progress "using rewritten git hash in place of .dsc value";
2864 progress "server data says .dsc hash is to be disregarded";
2869 if (!defined git_cat_file $dsc_hash) {
2870 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2871 my $lrf = $do_fetch->("additional commits", @tags) &&
2872 defined git_cat_file $dsc_hash
2874 .dsc Dgit metadata requires commit $dsc_hash
2875 but we could not obtain that object anywhere.
2877 foreach my $t (@tags) {
2878 my $fullrefname = $lrf.'/'.$t;
2879 print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2880 next unless $lrfetchrefs_f{$fullrefname};
2881 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2882 lrfetchref_used $fullrefname;
2887 sub fetch_from_archive () {
2888 ensure_setup_existing_tree();
2890 # Ensures that lrref() is what is actually in the archive, one way
2891 # or another, according to us - ie this client's
2892 # appropritaely-updated archive view. Also returns the commit id.
2893 # If there is nothing in the archive, leaves lrref alone and
2894 # returns undef. git_fetch_us must have already been called.
2898 parse_dsc_field($dsc, 'last upload to archive');
2899 resolve_dsc_field_commit access_basedistro,
2900 lrfetchrefs."/".$rewritemap
2902 progress "no version available from the archive";
2905 # If the archive's .dsc has a Dgit field, there are three
2906 # relevant git commitids we need to choose between and/or merge
2908 # 1. $dsc_hash: the Dgit field from the archive
2909 # 2. $lastpush_hash: the suite branch on the dgit git server
2910 # 3. $lastfetch_hash: our local tracking brach for the suite
2912 # These may all be distinct and need not be in any fast forward
2915 # If the dsc was pushed to this suite, then the server suite
2916 # branch will have been updated; but it might have been pushed to
2917 # a different suite and copied by the archive. Conversely a more
2918 # recent version may have been pushed with dgit but not appeared
2919 # in the archive (yet).
2921 # $lastfetch_hash may be awkward because archive imports
2922 # (particularly, imports of Dgit-less .dscs) are performed only as
2923 # needed on individual clients, so different clients may perform a
2924 # different subset of them - and these imports are only made
2925 # public during push. So $lastfetch_hash may represent a set of
2926 # imports different to a subsequent upload by a different dgit
2929 # Our approach is as follows:
2931 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2932 # descendant of $dsc_hash, then it was pushed by a dgit user who
2933 # had based their work on $dsc_hash, so we should prefer it.
2934 # Otherwise, $dsc_hash was installed into this suite in the
2935 # archive other than by a dgit push, and (necessarily) after the
2936 # last dgit push into that suite (since a dgit push would have
2937 # been descended from the dgit server git branch); thus, in that
2938 # case, we prefer the archive's version (and produce a
2939 # pseudo-merge to overwrite the dgit server git branch).
2941 # (If there is no Dgit field in the archive's .dsc then
2942 # generate_commit_from_dsc uses the version numbers to decide
2943 # whether the suite branch or the archive is newer. If the suite
2944 # branch is newer it ignores the archive's .dsc; otherwise it
2945 # generates an import of the .dsc, and produces a pseudo-merge to
2946 # overwrite the suite branch with the archive contents.)
2948 # The outcome of that part of the algorithm is the `public view',
2949 # and is same for all dgit clients: it does not depend on any
2950 # unpublished history in the local tracking branch.
2952 # As between the public view and the local tracking branch: The
2953 # local tracking branch is only updated by dgit fetch, and
2954 # whenever dgit fetch runs it includes the public view in the
2955 # local tracking branch. Therefore if the public view is not
2956 # descended from the local tracking branch, the local tracking
2957 # branch must contain history which was imported from the archive
2958 # but never pushed; and, its tip is now out of date. So, we make
2959 # a pseudo-merge to overwrite the old imports and stitch the old
2962 # Finally: we do not necessarily reify the public view (as
2963 # described above). This is so that we do not end up stacking two
2964 # pseudo-merges. So what we actually do is figure out the inputs
2965 # to any public view pseudo-merge and put them in @mergeinputs.
2968 # $mergeinputs[]{Commit}
2969 # $mergeinputs[]{Info}
2970 # $mergeinputs[0] is the one whose tree we use
2971 # @mergeinputs is in the order we use in the actual commit)
2974 # $mergeinputs[]{Message} is a commit message to use
2975 # $mergeinputs[]{ReverseParents} if def specifies that parent
2976 # list should be in opposite order
2977 # Such an entry has no Commit or Info. It applies only when found
2978 # in the last entry. (This ugliness is to support making
2979 # identical imports to previous dgit versions.)
2981 my $lastpush_hash = git_get_ref(lrfetchref());
2982 printdebug "previous reference hash=$lastpush_hash\n";
2983 $lastpush_mergeinput = $lastpush_hash && {
2984 Commit => $lastpush_hash,
2985 Info => "dgit suite branch on dgit git server",
2988 my $lastfetch_hash = git_get_ref(lrref());
2989 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2990 my $lastfetch_mergeinput = $lastfetch_hash && {
2991 Commit => $lastfetch_hash,
2992 Info => "dgit client's archive history view",
2995 my $dsc_mergeinput = $dsc_hash && {
2996 Commit => $dsc_hash,
2997 Info => "Dgit field in .dsc from archive",
3001 my $del_lrfetchrefs = sub {
3004 printdebug "del_lrfetchrefs...\n";
3005 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3006 my $objid = $lrfetchrefs_d{$fullrefname};
3007 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3009 $gur ||= new IO::Handle;
3010 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3012 printf $gur "delete %s %s\n", $fullrefname, $objid;
3015 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3019 if (defined $dsc_hash) {
3020 ensure_we_have_orig();
3021 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3022 @mergeinputs = $dsc_mergeinput
3023 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3024 print STDERR <<END or die $!;
3026 Git commit in archive is behind the last version allegedly pushed/uploaded.
3027 Commit referred to by archive: $dsc_hash
3028 Last version pushed with dgit: $lastpush_hash
3031 @mergeinputs = ($lastpush_mergeinput);
3033 # Archive has .dsc which is not a descendant of the last dgit
3034 # push. This can happen if the archive moves .dscs about.
3035 # Just follow its lead.
3036 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3037 progress "archive .dsc names newer git commit";
3038 @mergeinputs = ($dsc_mergeinput);
3040 progress "archive .dsc names other git commit, fixing up";
3041 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3045 @mergeinputs = generate_commits_from_dsc();
3046 # We have just done an import. Now, our import algorithm might
3047 # have been improved. But even so we do not want to generate
3048 # a new different import of the same package. So if the
3049 # version numbers are the same, just use our existing version.
3050 # If the version numbers are different, the archive has changed
3051 # (perhaps, rewound).
3052 if ($lastfetch_mergeinput &&
3053 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3054 (mergeinfo_version $mergeinputs[0]) )) {
3055 @mergeinputs = ($lastfetch_mergeinput);
3057 } elsif ($lastpush_hash) {
3058 # only in git, not in the archive yet
3059 @mergeinputs = ($lastpush_mergeinput);
3060 print STDERR <<END or die $!;
3062 Package not found in the archive, but has allegedly been pushed using dgit.
3066 printdebug "nothing found!\n";
3067 if (defined $skew_warning_vsn) {
3068 print STDERR <<END or die $!;
3070 Warning: relevant archive skew detected.
3071 Archive allegedly contains $skew_warning_vsn
3072 But we were not able to obtain any version from the archive or git.
3076 unshift @end, $del_lrfetchrefs;
3080 if ($lastfetch_hash &&
3082 my $h = $_->{Commit};
3083 $h and is_fast_fwd($lastfetch_hash, $h);
3084 # If true, one of the existing parents of this commit
3085 # is a descendant of the $lastfetch_hash, so we'll
3086 # be ff from that automatically.
3090 push @mergeinputs, $lastfetch_mergeinput;
3093 printdebug "fetch mergeinfos:\n";
3094 foreach my $mi (@mergeinputs) {
3096 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3098 printdebug sprintf " ReverseParents=%d Message=%s",
3099 $mi->{ReverseParents}, $mi->{Message};
3103 my $compat_info= pop @mergeinputs
3104 if $mergeinputs[$#mergeinputs]{Message};
3106 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3109 if (@mergeinputs > 1) {
3111 my $tree_commit = $mergeinputs[0]{Commit};
3113 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3114 $tree =~ m/\n\n/; $tree = $`;
3115 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3118 # We use the changelog author of the package in question the
3119 # author of this pseudo-merge. This is (roughly) correct if
3120 # this commit is simply representing aa non-dgit upload.
3121 # (Roughly because it does not record sponsorship - but we
3122 # don't have sponsorship info because that's in the .changes,
3123 # which isn't in the archivw.)
3125 # But, it might be that we are representing archive history
3126 # updates (including in-archive copies). These are not really
3127 # the responsibility of the person who created the .dsc, but
3128 # there is no-one whose name we should better use. (The
3129 # author of the .dsc-named commit is clearly worse.)
3131 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3132 my $author = clogp_authline $useclogp;
3133 my $cversion = getfield $useclogp, 'Version';
3135 my $mcf = ".git/dgit/mergecommit";
3136 open MC, ">", $mcf or die "$mcf $!";
3137 print MC <<END or die $!;
3141 my @parents = grep { $_->{Commit} } @mergeinputs;
3142 @parents = reverse @parents if $compat_info->{ReverseParents};
3143 print MC <<END or die $! foreach @parents;
3147 print MC <<END or die $!;
3153 if (defined $compat_info->{Message}) {
3154 print MC $compat_info->{Message} or die $!;
3156 print MC <<END or die $!;
3157 Record $package ($cversion) in archive suite $csuite
3161 my $message_add_info = sub {
3163 my $mversion = mergeinfo_version $mi;
3164 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3168 $message_add_info->($mergeinputs[0]);
3169 print MC <<END or die $!;
3170 should be treated as descended from
3172 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3176 $hash = make_commit $mcf;
3178 $hash = $mergeinputs[0]{Commit};
3180 printdebug "fetch hash=$hash\n";
3183 my ($lasth, $what) = @_;
3184 return unless $lasth;
3185 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3188 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3190 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3192 fetch_from_archive_record_1($hash);
3194 if (defined $skew_warning_vsn) {
3196 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3197 my $gotclogp = commit_getclogp($hash);
3198 my $got_vsn = getfield $gotclogp, 'Version';
3199 printdebug "SKEW CHECK GOT $got_vsn\n";
3200 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3201 print STDERR <<END or die $!;
3203 Warning: archive skew detected. Using the available version:
3204 Archive allegedly contains $skew_warning_vsn
3205 We were able to obtain only $got_vsn
3211 if ($lastfetch_hash ne $hash) {
3212 fetch_from_archive_record_2($hash);
3215 lrfetchref_used lrfetchref();
3217 unshift @end, $del_lrfetchrefs;
3221 sub set_local_git_config ($$) {
3223 runcmd @git, qw(config), $k, $v;
3226 sub setup_mergechangelogs (;$) {
3228 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3230 my $driver = 'dpkg-mergechangelogs';
3231 my $cb = "merge.$driver";
3232 my $attrs = '.git/info/attributes';
3233 ensuredir '.git/info';
3235 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3236 if (!open ATTRS, "<", $attrs) {
3237 $!==ENOENT or die "$attrs: $!";
3241 next if m{^debian/changelog\s};
3242 print NATTRS $_, "\n" or die $!;
3244 ATTRS->error and die $!;
3247 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3250 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3251 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3253 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3256 sub setup_useremail (;$) {
3258 return unless $always || access_cfg_bool(1, 'setup-useremail');
3261 my ($k, $envvar) = @_;
3262 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3263 return unless defined $v;
3264 set_local_git_config "user.$k", $v;
3267 $setup->('email', 'DEBEMAIL');
3268 $setup->('name', 'DEBFULLNAME');
3271 sub ensure_setup_existing_tree () {
3272 my $k = "remote.$remotename.skipdefaultupdate";
3273 my $c = git_get_config $k;
3274 return if defined $c;
3275 set_local_git_config $k, 'true';
3278 sub setup_new_tree () {
3279 setup_mergechangelogs();
3283 sub multisuite_suite_child ($$$) {
3284 my ($tsuite, $merginputs, $fn) = @_;
3285 # in child, sets things up, calls $fn->(), and returns undef
3286 # in parent, returns canonical suite name for $tsuite
3287 my $canonsuitefh = IO::File::new_tmpfile;
3288 my $pid = fork // die $!;
3291 $us .= " [$isuite]";
3292 $debugprefix .= " ";
3293 progress "fetching $tsuite...";
3294 canonicalise_suite();
3295 print $canonsuitefh $csuite, "\n" or die $!;
3296 close $canonsuitefh or die $!;
3300 waitpid $pid,0 == $pid or die $!;
3301 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3302 seek $canonsuitefh,0,0 or die $!;
3303 local $csuite = <$canonsuitefh>;
3304 die $! unless defined $csuite && chomp $csuite;
3306 printdebug "multisuite $tsuite missing\n";
3309 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3310 push @$merginputs, {
3317 sub fork_for_multisuite ($) {
3318 my ($before_fetch_merge) = @_;
3319 # if nothing unusual, just returns ''
3322 # returns 0 to caller in child, to do first of the specified suites
3323 # in child, $csuite is not yet set
3325 # returns 1 to caller in parent, to finish up anything needed after
3326 # in parent, $csuite is set to canonicalised portmanteau
3328 my $org_isuite = $isuite;
3329 my @suites = split /\,/, $isuite;
3330 return '' unless @suites > 1;
3331 printdebug "fork_for_multisuite: @suites\n";
3335 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3337 return 0 unless defined $cbasesuite;
3339 fail "package $package missing in (base suite) $cbasesuite"
3340 unless @mergeinputs;
3342 my @csuites = ($cbasesuite);
3344 $before_fetch_merge->();
3346 foreach my $tsuite (@suites[1..$#suites]) {
3347 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3353 # xxx collecte the ref here
3355 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3356 push @csuites, $csubsuite;
3359 foreach my $mi (@mergeinputs) {
3360 my $ref = git_get_ref $mi->{Ref};
3361 die "$mi->{Ref} ?" unless length $ref;
3362 $mi->{Commit} = $ref;
3365 $csuite = join ",", @csuites;
3367 my $previous = git_get_ref lrref;
3369 unshift @mergeinputs, {
3370 Commit => $previous,
3371 Info => "local combined tracking branch",
3373 "archive seems to have rewound: local tracking branch is ahead!",
3377 foreach my $ix (0..$#mergeinputs) {
3378 $mergeinputs[$ix]{Index} = $ix;
3381 @mergeinputs = sort {
3382 -version_compare(mergeinfo_version $a,
3383 mergeinfo_version $b) # highest version first
3385 $a->{Index} <=> $b->{Index}; # earliest in spec first
3391 foreach my $mi (@mergeinputs) {
3392 printdebug "multisuite merge check $mi->{Info}\n";
3393 foreach my $previous (@needed) {
3394 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3395 printdebug "multisuite merge un-needed $previous->{Info}\n";
3399 printdebug "multisuite merge this-needed\n";
3400 $mi->{Character} = '+';
3403 $needed[0]{Character} = '*';
3405 my $output = $needed[0]{Commit};
3408 printdebug "multisuite merge nontrivial\n";
3409 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3411 my $commit = "tree $tree\n";
3412 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3413 "Input branches:\n";
3415 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3416 printdebug "multisuite merge include $mi->{Info}\n";
3417 $mi->{Character} //= ' ';
3418 $commit .= "parent $mi->{Commit}\n";
3419 $msg .= sprintf " %s %-25s %s\n",
3421 (mergeinfo_version $mi),
3424 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3426 " * marks the highest version branch, which choose to use\n".
3427 " + marks each branch which was not already an ancestor\n\n".
3428 "[dgit multi-suite $csuite]\n";
3430 "author $authline\n".
3431 "committer $authline\n\n";
3432 $output = make_commit_text $commit.$msg;
3433 printdebug "multisuite merge generated $output\n";
3436 fetch_from_archive_record_1($output);
3437 fetch_from_archive_record_2($output);
3439 progress "calculated combined tracking suite $csuite";
3444 sub clone_set_head () {
3445 open H, "> .git/HEAD" or die $!;
3446 print H "ref: ".lref()."\n" or die $!;
3449 sub clone_finish ($) {
3451 runcmd @git, qw(reset --hard), lrref();
3452 runcmd qw(bash -ec), <<'END';
3454 git ls-tree -r --name-only -z HEAD | \
3455 xargs -0r touch -h -r . --
3457 printdone "ready for work in $dstdir";
3462 badusage "dry run makes no sense with clone" unless act_local();
3464 my $multi_fetched = fork_for_multisuite(sub {
3465 printdebug "multi clone before fetch merge\n";
3468 if ($multi_fetched) {
3469 printdebug "multi clone after fetch merge\n";
3471 clone_finish($dstdir);
3474 printdebug "clone main body\n";
3476 canonicalise_suite();
3477 my $hasgit = check_for_git();
3478 mkdir $dstdir or fail "create \`$dstdir': $!";
3480 runcmd @git, qw(init -q);
3482 my $giturl = access_giturl(1);
3483 if (defined $giturl) {
3484 runcmd @git, qw(remote add), 'origin', $giturl;
3487 progress "fetching existing git history";
3489 runcmd_ordryrun_local @git, qw(fetch origin);
3491 progress "starting new git history";
3493 fetch_from_archive() or no_such_package;
3494 my $vcsgiturl = $dsc->{'Vcs-Git'};
3495 if (length $vcsgiturl) {
3496 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3497 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3500 clone_finish($dstdir);
3504 canonicalise_suite();
3505 if (check_for_git()) {
3508 fetch_from_archive() or no_such_package();
3509 printdone "fetched into ".lrref();
3513 my $multi_fetched = fork_for_multisuite(sub { });
3514 fetch() unless $multi_fetched; # parent
3515 return if $multi_fetched eq '0'; # child
3516 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3518 printdone "fetched to ".lrref()." and merged into HEAD";
3521 sub check_not_dirty () {
3522 foreach my $f (qw(local-options local-patch-header)) {
3523 if (stat_exists "debian/source/$f") {
3524 fail "git tree contains debian/source/$f";
3528 return if $ignoredirty;
3530 my @cmd = (@git, qw(diff --quiet HEAD));
3532 $!=0; $?=-1; system @cmd;
3535 fail "working tree is dirty (does not match HEAD)";
3541 sub commit_admin ($) {
3544 runcmd_ordryrun_local @git, qw(commit -m), $m;
3547 sub commit_quilty_patch () {
3548 my $output = cmdoutput @git, qw(status --porcelain);
3550 foreach my $l (split /\n/, $output) {
3551 next unless $l =~ m/\S/;
3552 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3556 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3558 progress "nothing quilty to commit, ok.";
3561 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3562 runcmd_ordryrun_local @git, qw(add -f), @adds;
3564 Commit Debian 3.0 (quilt) metadata
3566 [dgit ($our_version) quilt-fixup]
3570 sub get_source_format () {
3572 if (open F, "debian/source/options") {
3576 s/\s+$//; # ignore missing final newline
3578 my ($k, $v) = ($`, $'); #');
3579 $v =~ s/^"(.*)"$/$1/;
3585 F->error and die $!;
3588 die $! unless $!==&ENOENT;
3591 if (!open F, "debian/source/format") {
3592 die $! unless $!==&ENOENT;
3596 F->error and die $!;
3598 return ($_, \%options);
3601 sub madformat_wantfixup ($) {
3603 return 0 unless $format eq '3.0 (quilt)';
3604 our $quilt_mode_warned;
3605 if ($quilt_mode eq 'nocheck') {
3606 progress "Not doing any fixup of \`$format' due to".
3607 " ----no-quilt-fixup or --quilt=nocheck"
3608 unless $quilt_mode_warned++;
3611 progress "Format \`$format', need to check/update patch stack"
3612 unless $quilt_mode_warned++;
3616 sub maybe_split_brain_save ($$$) {
3617 my ($headref, $dgitview, $msg) = @_;
3618 # => message fragment "$saved" describing disposition of $dgitview
3619 return "commit id $dgitview" unless defined $split_brain_save;
3620 my @cmd = (shell_cmd "cd ../../../..",
3621 @git, qw(update-ref -m),
3622 "dgit --dgit-view-save $msg HEAD=$headref",
3623 $split_brain_save, $dgitview);
3625 return "and left in $split_brain_save";
3628 # An "infopair" is a tuple [ $thing, $what ]
3629 # (often $thing is a commit hash; $what is a description)
3631 sub infopair_cond_equal ($$) {
3633 $x->[0] eq $y->[0] or fail <<END;
3634 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3638 sub infopair_lrf_tag_lookup ($$) {
3639 my ($tagnames, $what) = @_;
3640 # $tagname may be an array ref
3641 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3642 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3643 foreach my $tagname (@tagnames) {
3644 my $lrefname = lrfetchrefs."/tags/$tagname";
3645 my $tagobj = $lrfetchrefs_f{$lrefname};
3646 next unless defined $tagobj;
3647 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3648 return [ git_rev_parse($tagobj), $what ];
3650 fail @tagnames==1 ? <<END : <<END;
3651 Wanted tag $what (@tagnames) on dgit server, but not found
3653 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3657 sub infopair_cond_ff ($$) {
3658 my ($anc,$desc) = @_;
3659 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3660 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3664 sub pseudomerge_version_check ($$) {
3665 my ($clogp, $archive_hash) = @_;
3667 my $arch_clogp = commit_getclogp $archive_hash;
3668 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3669 'version currently in archive' ];
3670 if (defined $overwrite_version) {
3671 if (length $overwrite_version) {
3672 infopair_cond_equal([ $overwrite_version,
3673 '--overwrite= version' ],
3676 my $v = $i_arch_v->[0];
3677 progress "Checking package changelog for archive version $v ...";
3679 my @xa = ("-f$v", "-t$v");
3680 my $vclogp = parsechangelog @xa;
3681 my $cv = [ (getfield $vclogp, 'Version'),
3682 "Version field from dpkg-parsechangelog @xa" ];
3683 infopair_cond_equal($i_arch_v, $cv);
3686 $@ =~ s/^dgit: //gm;
3688 "Perhaps debian/changelog does not mention $v ?";
3693 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3697 sub pseudomerge_make_commit ($$$$ $$) {
3698 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3699 $msg_cmd, $msg_msg) = @_;
3700 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3702 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3703 my $authline = clogp_authline $clogp;
3707 !defined $overwrite_version ? ""
3708 : !length $overwrite_version ? " --overwrite"
3709 : " --overwrite=".$overwrite_version;
3712 my $pmf = ".git/dgit/pseudomerge";
3713 open MC, ">", $pmf or die "$pmf $!";
3714 print MC <<END or die $!;
3717 parent $archive_hash
3727 return make_commit($pmf);
3730 sub splitbrain_pseudomerge ($$$$) {
3731 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3732 # => $merged_dgitview
3733 printdebug "splitbrain_pseudomerge...\n";
3735 # We: debian/PREVIOUS HEAD($maintview)
3736 # expect: o ----------------- o
3739 # a/d/PREVIOUS $dgitview
3742 # we do: `------------------ o
3746 return $dgitview unless defined $archive_hash;
3748 printdebug "splitbrain_pseudomerge...\n";
3750 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3752 if (!defined $overwrite_version) {
3753 progress "Checking that HEAD inciudes all changes in archive...";
3756 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3758 if (defined $overwrite_version) {
3760 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3761 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3762 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3763 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3764 my $i_archive = [ $archive_hash, "current archive contents" ];
3766 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3768 infopair_cond_equal($i_dgit, $i_archive);
3769 infopair_cond_ff($i_dep14, $i_dgit);
3770 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3774 $us: check failed (maybe --overwrite is needed, consult documentation)
3779 my $r = pseudomerge_make_commit
3780 $clogp, $dgitview, $archive_hash, $i_arch_v,
3781 "dgit --quilt=$quilt_mode",
3782 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3783 Declare fast forward from $i_arch_v->[0]
3785 Make fast forward from $i_arch_v->[0]
3788 maybe_split_brain_save $maintview, $r, "pseudomerge";
3790 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3794 sub plain_overwrite_pseudomerge ($$$) {
3795 my ($clogp, $head, $archive_hash) = @_;
3797 printdebug "plain_overwrite_pseudomerge...";
3799 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3801 return $head if is_fast_fwd $archive_hash, $head;
3803 my $m = "Declare fast forward from $i_arch_v->[0]";
3805 my $r = pseudomerge_make_commit
3806 $clogp, $head, $archive_hash, $i_arch_v,
3809 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3811 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3815 sub push_parse_changelog ($) {
3818 my $clogp = Dpkg::Control::Hash->new();
3819 $clogp->load($clogpfn) or die;
3821 my $clogpackage = getfield $clogp, 'Source';
3822 $package //= $clogpackage;
3823 fail "-p specified $package but changelog specified $clogpackage"
3824 unless $package eq $clogpackage;
3825 my $cversion = getfield $clogp, 'Version';
3827 if (!$we_are_initiator) {
3828 # rpush initiator can't do this because it doesn't have $isuite yet
3829 my $tag = debiantag($cversion, access_nomdistro);
3830 runcmd @git, qw(check-ref-format), $tag;
3833 my $dscfn = dscfn($cversion);
3835 return ($clogp, $cversion, $dscfn);
3838 sub push_parse_dsc ($$$) {
3839 my ($dscfn,$dscfnwhat, $cversion) = @_;
3840 $dsc = parsecontrol($dscfn,$dscfnwhat);
3841 my $dversion = getfield $dsc, 'Version';
3842 my $dscpackage = getfield $dsc, 'Source';
3843 ($dscpackage eq $package && $dversion eq $cversion) or
3844 fail "$dscfn is for $dscpackage $dversion".
3845 " but debian/changelog is for $package $cversion";
3848 sub push_tagwants ($$$$) {
3849 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3852 TagFn => \&debiantag,
3857 if (defined $maintviewhead) {
3859 TagFn => \&debiantag_maintview,
3860 Objid => $maintviewhead,
3861 TfSuffix => '-maintview',
3864 } elsif ($dodep14tag eq 'no' ? 0
3865 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3866 : $dodep14tag eq 'always'
3867 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3868 --dep14tag-always (or equivalent in config) means server must support
3869 both "new" and "maint" tag formats, but config says it doesn't.
3871 : die "$dodep14tag ?") {
3873 TagFn => \&debiantag_maintview,
3875 TfSuffix => '-dgit',
3879 foreach my $tw (@tagwants) {
3880 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3881 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3883 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3887 sub push_mktags ($$ $$ $) {
3889 $changesfile,$changesfilewhat,
3892 die unless $tagwants->[0]{View} eq 'dgit';
3894 my $declaredistro = access_nomdistro();
3895 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
3896 $dsc->{$ourdscfield[0]} = join " ",
3897 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
3899 $dsc->save("$dscfn.tmp") or die $!;
3901 my $changes = parsecontrol($changesfile,$changesfilewhat);
3902 foreach my $field (qw(Source Distribution Version)) {
3903 $changes->{$field} eq $clogp->{$field} or
3904 fail "changes field $field \`$changes->{$field}'".
3905 " does not match changelog \`$clogp->{$field}'";
3908 my $cversion = getfield $clogp, 'Version';
3909 my $clogsuite = getfield $clogp, 'Distribution';
3911 # We make the git tag by hand because (a) that makes it easier
3912 # to control the "tagger" (b) we can do remote signing
3913 my $authline = clogp_authline $clogp;
3914 my $delibs = join(" ", "",@deliberatelies);
3918 my $tfn = $tw->{Tfn};
3919 my $head = $tw->{Objid};
3920 my $tag = $tw->{Tag};
3922 open TO, '>', $tfn->('.tmp') or die $!;
3923 print TO <<END or die $!;
3930 if ($tw->{View} eq 'dgit') {
3931 print TO <<END or die $!;
3932 $package release $cversion for $clogsuite ($csuite) [dgit]
3933 [dgit distro=$declaredistro$delibs]
3935 foreach my $ref (sort keys %previously) {
3936 print TO <<END or die $!;
3937 [dgit previously:$ref=$previously{$ref}]
3940 } elsif ($tw->{View} eq 'maint') {
3941 print TO <<END or die $!;
3942 $package release $cversion for $clogsuite ($csuite)
3943 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3946 die Dumper($tw)."?";
3951 my $tagobjfn = $tfn->('.tmp');
3953 if (!defined $keyid) {
3954 $keyid = access_cfg('keyid','RETURN-UNDEF');
3956 if (!defined $keyid) {
3957 $keyid = getfield $clogp, 'Maintainer';
3959 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3960 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3961 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3962 push @sign_cmd, $tfn->('.tmp');
3963 runcmd_ordryrun @sign_cmd;
3965 $tagobjfn = $tfn->('.signed.tmp');
3966 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3967 $tfn->('.tmp'), $tfn->('.tmp.asc');
3973 my @r = map { $mktag->($_); } @$tagwants;
3977 sub sign_changes ($) {
3978 my ($changesfile) = @_;
3980 my @debsign_cmd = @debsign;
3981 push @debsign_cmd, "-k$keyid" if defined $keyid;
3982 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3983 push @debsign_cmd, $changesfile;
3984 runcmd_ordryrun @debsign_cmd;
3989 printdebug "actually entering push\n";
3991 supplementary_message(<<'END');
3992 Push failed, while checking state of the archive.
3993 You can retry the push, after fixing the problem, if you like.
3995 if (check_for_git()) {
3998 my $archive_hash = fetch_from_archive();
3999 if (!$archive_hash) {
4001 fail "package appears to be new in this suite;".
4002 " if this is intentional, use --new";
4005 supplementary_message(<<'END');
4006 Push failed, while preparing your push.
4007 You can retry the push, after fixing the problem, if you like.
4010 need_tagformat 'new', "quilt mode $quilt_mode"
4011 if quiltmode_splitbrain;
4015 access_giturl(); # check that success is vaguely likely
4016 rpush_handle_protovsn_bothends() if $we_are_initiator;
4019 my $clogpfn = ".git/dgit/changelog.822.tmp";
4020 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4022 responder_send_file('parsed-changelog', $clogpfn);
4024 my ($clogp, $cversion, $dscfn) =
4025 push_parse_changelog("$clogpfn");
4027 my $dscpath = "$buildproductsdir/$dscfn";
4028 stat_exists $dscpath or
4029 fail "looked for .dsc $dscpath, but $!;".
4030 " maybe you forgot to build";
4032 responder_send_file('dsc', $dscpath);
4034 push_parse_dsc($dscpath, $dscfn, $cversion);
4036 my $format = getfield $dsc, 'Format';
4037 printdebug "format $format\n";
4039 my $actualhead = git_rev_parse('HEAD');
4040 my $dgithead = $actualhead;
4041 my $maintviewhead = undef;
4043 my $upstreamversion = upstreamversion $clogp->{Version};
4045 if (madformat_wantfixup($format)) {
4046 # user might have not used dgit build, so maybe do this now:
4047 if (quiltmode_splitbrain()) {
4049 quilt_make_fake_dsc($upstreamversion);
4051 ($dgithead, $cachekey) =
4052 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4054 "--quilt=$quilt_mode but no cached dgit view:
4055 perhaps tree changed since dgit build[-source] ?";
4057 $dgithead = splitbrain_pseudomerge($clogp,
4058 $actualhead, $dgithead,
4060 $maintviewhead = $actualhead;
4061 changedir '../../../..';
4062 prep_ud(); # so _only_subdir() works, below
4064 commit_quilty_patch();
4068 if (defined $overwrite_version && !defined $maintviewhead) {
4069 $dgithead = plain_overwrite_pseudomerge($clogp,
4077 if ($archive_hash) {
4078 if (is_fast_fwd($archive_hash, $dgithead)) {
4080 } elsif (deliberately_not_fast_forward) {
4083 fail "dgit push: HEAD is not a descendant".
4084 " of the archive's version.\n".
4085 "To overwrite the archive's contents,".
4086 " pass --overwrite[=VERSION].\n".
4087 "To rewind history, if permitted by the archive,".
4088 " use --deliberately-not-fast-forward.";
4093 progress "checking that $dscfn corresponds to HEAD";
4094 runcmd qw(dpkg-source -x --),
4095 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4096 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4097 check_for_vendor_patches() if madformat($dsc->{format});
4098 changedir '../../../..';
4099 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4100 debugcmd "+",@diffcmd;
4102 my $r = system @diffcmd;
4105 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4107 HEAD specifies a different tree to $dscfn:
4109 Perhaps you forgot to build. Or perhaps there is a problem with your
4110 source tree (see dgit(7) for some hints). To see a full diff, run
4117 if (!$changesfile) {
4118 my $pat = changespat $cversion;
4119 my @cs = glob "$buildproductsdir/$pat";
4120 fail "failed to find unique changes file".
4121 " (looked for $pat in $buildproductsdir);".
4122 " perhaps you need to use dgit -C"
4124 ($changesfile) = @cs;
4126 $changesfile = "$buildproductsdir/$changesfile";
4129 # Check that changes and .dsc agree enough
4130 $changesfile =~ m{[^/]*$};
4131 my $changes = parsecontrol($changesfile,$&);
4132 files_compare_inputs($dsc, $changes)
4133 unless forceing [qw(dsc-changes-mismatch)];
4135 # Perhaps adjust .dsc to contain right set of origs
4136 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4138 unless forceing [qw(changes-origs-exactly)];
4140 # Checks complete, we're going to try and go ahead:
4142 responder_send_file('changes',$changesfile);
4143 responder_send_command("param head $dgithead");
4144 responder_send_command("param csuite $csuite");
4145 responder_send_command("param isuite $isuite");
4146 responder_send_command("param tagformat $tagformat");
4147 if (defined $maintviewhead) {
4148 die unless ($protovsn//4) >= 4;
4149 responder_send_command("param maint-view $maintviewhead");
4152 if (deliberately_not_fast_forward) {
4153 git_for_each_ref(lrfetchrefs, sub {
4154 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4155 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4156 responder_send_command("previously $rrefname=$objid");
4157 $previously{$rrefname} = $objid;
4161 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4165 supplementary_message(<<'END');
4166 Push failed, while signing the tag.
4167 You can retry the push, after fixing the problem, if you like.
4169 # If we manage to sign but fail to record it anywhere, it's fine.
4170 if ($we_are_responder) {
4171 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4172 responder_receive_files('signed-tag', @tagobjfns);
4174 @tagobjfns = push_mktags($clogp,$dscpath,
4175 $changesfile,$changesfile,
4178 supplementary_message(<<'END');
4179 Push failed, *after* signing the tag.
4180 If you want to try again, you should use a new version number.
4183 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4185 foreach my $tw (@tagwants) {
4186 my $tag = $tw->{Tag};
4187 my $tagobjfn = $tw->{TagObjFn};
4189 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4190 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4191 runcmd_ordryrun_local
4192 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4195 supplementary_message(<<'END');
4196 Push failed, while updating the remote git repository - see messages above.
4197 If you want to try again, you should use a new version number.
4199 if (!check_for_git()) {
4200 create_remote_git_repo();
4203 my @pushrefs = $forceflag.$dgithead.":".rrref();
4204 foreach my $tw (@tagwants) {
4205 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4208 runcmd_ordryrun @git,
4209 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4210 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4212 supplementary_message(<<'END');
4213 Push failed, while obtaining signatures on the .changes and .dsc.
4214 If it was just that the signature failed, you may try again by using
4215 debsign by hand to sign the changes
4217 and then dput to complete the upload.
4218 If you need to change the package, you must use a new version number.
4220 if ($we_are_responder) {
4221 my $dryrunsuffix = act_local() ? "" : ".tmp";
4222 responder_receive_files('signed-dsc-changes',
4223 "$dscpath$dryrunsuffix",
4224 "$changesfile$dryrunsuffix");
4227 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4229 progress "[new .dsc left in $dscpath.tmp]";
4231 sign_changes $changesfile;
4234 supplementary_message(<<END);
4235 Push failed, while uploading package(s) to the archive server.
4236 You can retry the upload of exactly these same files with dput of:
4238 If that .changes file is broken, you will need to use a new version
4239 number for your next attempt at the upload.
4241 my $host = access_cfg('upload-host','RETURN-UNDEF');
4242 my @hostarg = defined($host) ? ($host,) : ();
4243 runcmd_ordryrun @dput, @hostarg, $changesfile;
4244 printdone "pushed and uploaded $cversion";
4246 supplementary_message('');
4247 responder_send_command("complete");
4253 badusage "-p is not allowed with clone; specify as argument instead"
4254 if defined $package;
4257 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4258 ($package,$isuite) = @ARGV;
4259 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4260 ($package,$dstdir) = @ARGV;
4261 } elsif (@ARGV==3) {
4262 ($package,$isuite,$dstdir) = @ARGV;
4264 badusage "incorrect arguments to dgit clone";
4268 $dstdir ||= "$package";
4269 if (stat_exists $dstdir) {
4270 fail "$dstdir already exists";
4274 if ($rmonerror && !$dryrun_level) {
4275 $cwd_remove= getcwd();
4277 return unless defined $cwd_remove;
4278 if (!chdir "$cwd_remove") {
4279 return if $!==&ENOENT;
4280 die "chdir $cwd_remove: $!";
4282 printdebug "clone rmonerror removing $dstdir\n";
4284 rmtree($dstdir) or die "remove $dstdir: $!\n";
4285 } elsif (grep { $! == $_ }
4286 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4288 print STDERR "check whether to remove $dstdir: $!\n";
4294 $cwd_remove = undef;
4297 sub branchsuite () {
4298 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4299 if ($branch =~ m#$lbranch_re#o) {
4306 sub fetchpullargs () {
4307 if (!defined $package) {
4308 my $sourcep = parsecontrol('debian/control','debian/control');
4309 $package = getfield $sourcep, 'Source';
4312 $isuite = branchsuite();
4314 my $clogp = parsechangelog();
4315 my $clogsuite = getfield $clogp, 'Distribution';
4316 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4318 } elsif (@ARGV==1) {
4321 badusage "incorrect arguments to dgit fetch or dgit pull";
4329 my $multi_fetched = fork_for_multisuite(sub { });
4330 exit 0 if $multi_fetched;
4337 if (quiltmode_splitbrain()) {
4338 my ($format, $fopts) = get_source_format();
4339 madformat($format) and fail <<END
4340 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4348 badusage "-p is not allowed with dgit push" if defined $package;
4350 my $clogp = parsechangelog();
4351 $package = getfield $clogp, 'Source';
4354 } elsif (@ARGV==1) {
4355 ($specsuite) = (@ARGV);
4357 badusage "incorrect arguments to dgit push";
4359 $isuite = getfield $clogp, 'Distribution';
4362 local ($package) = $existing_package; # this is a hack
4363 canonicalise_suite();
4365 canonicalise_suite();
4367 if (defined $specsuite &&
4368 $specsuite ne $isuite &&
4369 $specsuite ne $csuite) {
4370 fail "dgit push: changelog specifies $isuite ($csuite)".
4371 " but command line specifies $specsuite";
4376 #---------- remote commands' implementation ----------
4378 sub cmd_remote_push_build_host {
4379 my ($nrargs) = shift @ARGV;
4380 my (@rargs) = @ARGV[0..$nrargs-1];
4381 @ARGV = @ARGV[$nrargs..$#ARGV];
4383 my ($dir,$vsnwant) = @rargs;
4384 # vsnwant is a comma-separated list; we report which we have
4385 # chosen in our ready response (so other end can tell if they
4388 $we_are_responder = 1;
4389 $us .= " (build host)";
4391 open PI, "<&STDIN" or die $!;
4392 open STDIN, "/dev/null" or die $!;
4393 open PO, ">&STDOUT" or die $!;
4395 open STDOUT, ">&STDERR" or die $!;
4399 ($protovsn) = grep {
4400 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4401 } @rpushprotovsn_support;
4403 fail "build host has dgit rpush protocol versions ".
4404 (join ",", @rpushprotovsn_support).
4405 " but invocation host has $vsnwant"
4406 unless defined $protovsn;
4408 responder_send_command("dgit-remote-push-ready $protovsn");
4413 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4414 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4415 # a good error message)
4417 sub rpush_handle_protovsn_bothends () {
4418 if ($protovsn < 4) {
4419 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4428 my $report = i_child_report();
4429 if (defined $report) {
4430 printdebug "($report)\n";
4431 } elsif ($i_child_pid) {
4432 printdebug "(killing build host child $i_child_pid)\n";
4433 kill 15, $i_child_pid;
4435 if (defined $i_tmp && !defined $initiator_tempdir) {
4437 eval { rmtree $i_tmp; };
4441 END { i_cleanup(); }
4444 my ($base,$selector,@args) = @_;
4445 $selector =~ s/\-/_/g;
4446 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4452 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4460 push @rargs, join ",", @rpushprotovsn_support;
4463 push @rdgit, @ropts;
4464 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4466 my @cmd = (@ssh, $host, shellquote @rdgit);
4469 $we_are_initiator=1;
4471 if (defined $initiator_tempdir) {
4472 rmtree $initiator_tempdir;
4473 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4474 $i_tmp = $initiator_tempdir;
4478 $i_child_pid = open2(\*RO, \*RI, @cmd);
4480 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4481 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4482 $supplementary_message = '' unless $protovsn >= 3;
4485 my ($icmd,$iargs) = initiator_expect {
4486 m/^(\S+)(?: (.*))?$/;
4489 i_method "i_resp", $icmd, $iargs;
4493 sub i_resp_progress ($) {
4495 my $msg = protocol_read_bytes \*RO, $rhs;
4499 sub i_resp_supplementary_message ($) {
4501 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4504 sub i_resp_complete {
4505 my $pid = $i_child_pid;
4506 $i_child_pid = undef; # prevents killing some other process with same pid
4507 printdebug "waiting for build host child $pid...\n";
4508 my $got = waitpid $pid, 0;
4509 die $! unless $got == $pid;
4510 die "build host child failed $?" if $?;
4513 printdebug "all done\n";
4517 sub i_resp_file ($) {
4519 my $localname = i_method "i_localname", $keyword;
4520 my $localpath = "$i_tmp/$localname";
4521 stat_exists $localpath and
4522 badproto \*RO, "file $keyword ($localpath) twice";
4523 protocol_receive_file \*RO, $localpath;
4524 i_method "i_file", $keyword;
4529 sub i_resp_param ($) {
4530 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4534 sub i_resp_previously ($) {
4535 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4536 or badproto \*RO, "bad previously spec";
4537 my $r = system qw(git check-ref-format), $1;
4538 die "bad previously ref spec ($r)" if $r;
4539 $previously{$1} = $2;
4544 sub i_resp_want ($) {
4546 die "$keyword ?" if $i_wanted{$keyword}++;
4548 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4549 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4550 die unless $isuite =~ m/^$suite_re$/;
4553 rpush_handle_protovsn_bothends();
4555 fail "rpush negotiated protocol version $protovsn".
4556 " which does not support quilt mode $quilt_mode"
4557 if quiltmode_splitbrain;
4559 my @localpaths = i_method "i_want", $keyword;
4560 printdebug "[[ $keyword @localpaths\n";
4561 foreach my $localpath (@localpaths) {
4562 protocol_send_file \*RI, $localpath;
4564 print RI "files-end\n" or die $!;
4567 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4569 sub i_localname_parsed_changelog {
4570 return "remote-changelog.822";
4572 sub i_file_parsed_changelog {
4573 ($i_clogp, $i_version, $i_dscfn) =
4574 push_parse_changelog "$i_tmp/remote-changelog.822";
4575 die if $i_dscfn =~ m#/|^\W#;
4578 sub i_localname_dsc {
4579 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4584 sub i_localname_changes {
4585 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4586 $i_changesfn = $i_dscfn;
4587 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4588 return $i_changesfn;
4590 sub i_file_changes { }
4592 sub i_want_signed_tag {
4593 printdebug Dumper(\%i_param, $i_dscfn);
4594 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4595 && defined $i_param{'csuite'}
4596 or badproto \*RO, "premature desire for signed-tag";
4597 my $head = $i_param{'head'};
4598 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4600 my $maintview = $i_param{'maint-view'};
4601 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4604 if ($protovsn >= 4) {
4605 my $p = $i_param{'tagformat'} // '<undef>';
4607 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4610 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4612 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4614 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4617 push_mktags $i_clogp, $i_dscfn,
4618 $i_changesfn, 'remote changes',
4622 sub i_want_signed_dsc_changes {
4623 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4624 sign_changes $i_changesfn;
4625 return ($i_dscfn, $i_changesfn);
4628 #---------- building etc. ----------
4634 #----- `3.0 (quilt)' handling -----
4636 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4638 sub quiltify_dpkg_commit ($$$;$) {
4639 my ($patchname,$author,$msg, $xinfo) = @_;
4643 my $descfn = ".git/dgit/quilt-description.tmp";
4644 open O, '>', $descfn or die "$descfn: $!";
4645 $msg =~ s/\n+/\n\n/;
4646 print O <<END or die $!;
4648 ${xinfo}Subject: $msg
4655 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4656 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4657 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4658 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4662 sub quiltify_trees_differ ($$;$$$) {
4663 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4664 # returns true iff the two tree objects differ other than in debian/
4665 # with $finegrained,
4666 # returns bitmask 01 - differ in upstream files except .gitignore
4667 # 02 - differ in .gitignore
4668 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4669 # is set for each modified .gitignore filename $fn
4670 # if $unrepres is defined, array ref to which is appeneded
4671 # a list of unrepresentable changes (removals of upstream files
4674 my @cmd = (@git, qw(diff-tree -z));
4675 push @cmd, qw(--name-only) unless $unrepres;
4676 push @cmd, qw(-r) if $finegrained || $unrepres;
4678 my $diffs= cmdoutput @cmd;
4681 foreach my $f (split /\0/, $diffs) {
4682 if ($unrepres && !@lmodes) {
4683 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4686 my ($oldmode,$newmode) = @lmodes;
4689 next if $f =~ m#^debian(?:/.*)?$#s;
4693 die "not a plain file\n"
4694 unless $newmode =~ m/^10\d{4}$/ ||
4695 $oldmode =~ m/^10\d{4}$/;
4696 if ($oldmode =~ m/[^0]/ &&
4697 $newmode =~ m/[^0]/) {
4698 die "mode changed\n" if $oldmode ne $newmode;
4700 die "non-default mode\n"
4701 unless $newmode =~ m/^100644$/ ||
4702 $oldmode =~ m/^100644$/;
4706 local $/="\n"; chomp $@;
4707 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4711 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4712 $r |= $isignore ? 02 : 01;
4713 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4715 printdebug "quiltify_trees_differ $x $y => $r\n";
4719 sub quiltify_tree_sentinelfiles ($) {
4720 # lists the `sentinel' files present in the tree
4722 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4723 qw(-- debian/rules debian/control);
4728 sub quiltify_splitbrain_needed () {
4729 if (!$split_brain) {
4730 progress "dgit view: changes are required...";
4731 runcmd @git, qw(checkout -q -b dgit-view);
4736 sub quiltify_splitbrain ($$$$$$) {
4737 my ($clogp, $unapplied, $headref, $diffbits,
4738 $editedignores, $cachekey) = @_;
4739 if ($quilt_mode !~ m/gbp|dpm/) {
4740 # treat .gitignore just like any other upstream file
4741 $diffbits = { %$diffbits };
4742 $_ = !!$_ foreach values %$diffbits;
4744 # We would like any commits we generate to be reproducible
4745 my @authline = clogp_authline($clogp);
4746 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4747 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4748 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4749 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4750 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4751 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4753 if ($quilt_mode =~ m/gbp|unapplied/ &&
4754 ($diffbits->{O2H} & 01)) {
4756 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4757 " but git tree differs from orig in upstream files.";
4758 if (!stat_exists "debian/patches") {
4760 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4764 if ($quilt_mode =~ m/dpm/ &&
4765 ($diffbits->{H2A} & 01)) {
4767 --quilt=$quilt_mode specified, implying patches-applied git tree
4768 but git tree differs from result of applying debian/patches to upstream
4771 if ($quilt_mode =~ m/gbp|unapplied/ &&
4772 ($diffbits->{O2A} & 01)) { # some patches
4773 quiltify_splitbrain_needed();
4774 progress "dgit view: creating patches-applied version using gbp pq";
4775 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4776 # gbp pq import creates a fresh branch; push back to dgit-view
4777 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4778 runcmd @git, qw(checkout -q dgit-view);
4780 if ($quilt_mode =~ m/gbp|dpm/ &&
4781 ($diffbits->{O2A} & 02)) {
4783 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4784 tool which does not create patches for changes to upstream
4785 .gitignores: but, such patches exist in debian/patches.
4788 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4789 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4790 quiltify_splitbrain_needed();
4791 progress "dgit view: creating patch to represent .gitignore changes";
4792 ensuredir "debian/patches";
4793 my $gipatch = "debian/patches/auto-gitignore";
4794 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4795 stat GIPATCH or die "$gipatch: $!";
4796 fail "$gipatch already exists; but want to create it".
4797 " to record .gitignore changes" if (stat _)[7];
4798 print GIPATCH <<END or die "$gipatch: $!";
4799 Subject: Update .gitignore from Debian packaging branch
4801 The Debian packaging git branch contains these updates to the upstream
4802 .gitignore file(s). This patch is autogenerated, to provide these
4803 updates to users of the official Debian archive view of the package.
4805 [dgit ($our_version) update-gitignore]
4808 close GIPATCH or die "$gipatch: $!";
4809 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4810 $unapplied, $headref, "--", sort keys %$editedignores;
4811 open SERIES, "+>>", "debian/patches/series" or die $!;
4812 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4814 defined read SERIES, $newline, 1 or die $!;
4815 print SERIES "\n" or die $! unless $newline eq "\n";
4816 print SERIES "auto-gitignore\n" or die $!;
4817 close SERIES or die $!;
4818 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4820 Commit patch to update .gitignore
4822 [dgit ($our_version) update-gitignore-quilt-fixup]
4826 my $dgitview = git_rev_parse 'HEAD';
4828 changedir '../../../..';
4829 # When we no longer need to support squeeze, use --create-reflog
4831 ensuredir ".git/logs/refs/dgit-intern";
4832 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4835 my $oldcache = git_get_ref "refs/$splitbraincache";
4836 if ($oldcache eq $dgitview) {
4837 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4838 # git update-ref doesn't always update, in this case. *sigh*
4839 my $dummy = make_commit_text <<END;
4842 author Dgit <dgit\@example.com> 1000000000 +0000
4843 committer Dgit <dgit\@example.com> 1000000000 +0000
4845 Dummy commit - do not use
4847 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4848 "refs/$splitbraincache", $dummy;
4850 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4853 changedir '.git/dgit/unpack/work';
4855 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4856 progress "dgit view: created ($saved)";
4859 sub quiltify ($$$$) {
4860 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4862 # Quilt patchification algorithm
4864 # We search backwards through the history of the main tree's HEAD
4865 # (T) looking for a start commit S whose tree object is identical
4866 # to to the patch tip tree (ie the tree corresponding to the
4867 # current dpkg-committed patch series). For these purposes
4868 # `identical' disregards anything in debian/ - this wrinkle is
4869 # necessary because dpkg-source treates debian/ specially.
4871 # We can only traverse edges where at most one of the ancestors'
4872 # trees differs (in changes outside in debian/). And we cannot
4873 # handle edges which change .pc/ or debian/patches. To avoid
4874 # going down a rathole we avoid traversing edges which introduce
4875 # debian/rules or debian/control. And we set a limit on the
4876 # number of edges we are willing to look at.
4878 # If we succeed, we walk forwards again. For each traversed edge
4879 # PC (with P parent, C child) (starting with P=S and ending with
4880 # C=T) to we do this:
4882 # - dpkg-source --commit with a patch name and message derived from C
4883 # After traversing PT, we git commit the changes which
4884 # should be contained within debian/patches.
4886 # The search for the path S..T is breadth-first. We maintain a
4887 # todo list containing search nodes. A search node identifies a
4888 # commit, and looks something like this:
4890 # Commit => $git_commit_id,
4891 # Child => $c, # or undef if P=T
4892 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4893 # Nontrivial => true iff $p..$c has relevant changes
4900 my %considered; # saves being exponential on some weird graphs
4902 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4905 my ($search,$whynot) = @_;
4906 printdebug " search NOT $search->{Commit} $whynot\n";
4907 $search->{Whynot} = $whynot;
4908 push @nots, $search;
4909 no warnings qw(exiting);
4918 my $c = shift @todo;
4919 next if $considered{$c->{Commit}}++;
4921 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4923 printdebug "quiltify investigate $c->{Commit}\n";
4926 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4927 printdebug " search finished hooray!\n";
4932 if ($quilt_mode eq 'nofix') {
4933 fail "quilt fixup required but quilt mode is \`nofix'\n".
4934 "HEAD commit $c->{Commit} differs from tree implied by ".
4935 " debian/patches (tree object $oldtiptree)";
4937 if ($quilt_mode eq 'smash') {
4938 printdebug " search quitting smash\n";
4942 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4943 $not->($c, "has $c_sentinels not $t_sentinels")
4944 if $c_sentinels ne $t_sentinels;
4946 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4947 $commitdata =~ m/\n\n/;
4949 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4950 @parents = map { { Commit => $_, Child => $c } } @parents;
4952 $not->($c, "root commit") if !@parents;
4954 foreach my $p (@parents) {
4955 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4957 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4958 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4960 foreach my $p (@parents) {
4961 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4963 my @cmd= (@git, qw(diff-tree -r --name-only),
4964 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4965 my $patchstackchange = cmdoutput @cmd;
4966 if (length $patchstackchange) {
4967 $patchstackchange =~ s/\n/,/g;
4968 $not->($p, "changed $patchstackchange");
4971 printdebug " search queue P=$p->{Commit} ",
4972 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4978 printdebug "quiltify want to smash\n";
4981 my $x = $_[0]{Commit};
4982 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4985 my $reportnot = sub {
4987 my $s = $abbrev->($notp);
4988 my $c = $notp->{Child};
4989 $s .= "..".$abbrev->($c) if $c;
4990 $s .= ": ".$notp->{Whynot};
4993 if ($quilt_mode eq 'linear') {
4994 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4995 foreach my $notp (@nots) {
4996 print STDERR "$us: ", $reportnot->($notp), "\n";
4998 print STDERR "$us: $_\n" foreach @$failsuggestion;
4999 fail "quilt fixup naive history linearisation failed.\n".
5000 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5001 } elsif ($quilt_mode eq 'smash') {
5002 } elsif ($quilt_mode eq 'auto') {
5003 progress "quilt fixup cannot be linear, smashing...";
5005 die "$quilt_mode ?";
5008 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5009 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5011 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5013 quiltify_dpkg_commit "auto-$version-$target-$time",
5014 (getfield $clogp, 'Maintainer'),
5015 "Automatically generated patch ($clogp->{Version})\n".
5016 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5020 progress "quiltify linearisation planning successful, executing...";
5022 for (my $p = $sref_S;
5023 my $c = $p->{Child};
5025 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5026 next unless $p->{Nontrivial};
5028 my $cc = $c->{Commit};
5030 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5031 $commitdata =~ m/\n\n/ or die "$c ?";
5034 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5037 my $commitdate = cmdoutput
5038 @git, qw(log -n1 --pretty=format:%aD), $cc;
5040 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5042 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5049 my $gbp_check_suitable = sub {
5054 die "contains unexpected slashes\n" if m{//} || m{/$};
5055 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5056 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5057 die "too long" if length > 200;
5059 return $_ unless $@;
5060 print STDERR "quiltifying commit $cc:".
5061 " ignoring/dropping Gbp-Pq $what: $@";
5065 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5067 (\S+) \s* \n //ixm) {
5068 $patchname = $gbp_check_suitable->($1, 'Name');
5070 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5072 (\S+) \s* \n //ixm) {
5073 $patchdir = $gbp_check_suitable->($1, 'Topic');
5078 if (!defined $patchname) {
5079 $patchname = $title;
5080 $patchname =~ s/[.:]$//;
5083 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5084 my $translitname = $converter->convert($patchname);
5085 die unless defined $translitname;
5086 $patchname = $translitname;
5089 "dgit: patch title transliteration error: $@"
5091 $patchname =~ y/ A-Z/-a-z/;
5092 $patchname =~ y/-a-z0-9_.+=~//cd;
5093 $patchname =~ s/^\W/x-$&/;
5094 $patchname = substr($patchname,0,40);
5096 if (!defined $patchdir) {
5099 if (length $patchdir) {
5100 $patchname = "$patchdir/$patchname";
5102 if ($patchname =~ m{^(.*)/}) {
5103 mkpath "debian/patches/$1";
5108 stat "debian/patches/$patchname$index";
5110 $!==ENOENT or die "$patchname$index $!";
5112 runcmd @git, qw(checkout -q), $cc;
5114 # We use the tip's changelog so that dpkg-source doesn't
5115 # produce complaining messages from dpkg-parsechangelog. None
5116 # of the information dpkg-source gets from the changelog is
5117 # actually relevant - it gets put into the original message
5118 # which dpkg-source provides our stunt editor, and then
5120 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5122 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5123 "Date: $commitdate\n".
5124 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5126 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5129 runcmd @git, qw(checkout -q master);
5132 sub build_maybe_quilt_fixup () {
5133 my ($format,$fopts) = get_source_format;
5134 return unless madformat_wantfixup $format;
5137 check_for_vendor_patches();
5139 if (quiltmode_splitbrain) {
5140 fail <<END unless access_cfg_tagformats_can_splitbrain;
5141 quilt mode $quilt_mode requires split view so server needs to support
5142 both "new" and "maint" tag formats, but config says it doesn't.
5146 my $clogp = parsechangelog();
5147 my $headref = git_rev_parse('HEAD');
5152 my $upstreamversion = upstreamversion $version;
5154 if ($fopts->{'single-debian-patch'}) {
5155 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5157 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5160 die 'bug' if $split_brain && !$need_split_build_invocation;
5162 changedir '../../../..';
5163 runcmd_ordryrun_local
5164 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5167 sub quilt_fixup_mkwork ($) {
5170 mkdir "work" or die $!;
5172 mktree_in_ud_here();
5173 runcmd @git, qw(reset -q --hard), $headref;
5176 sub quilt_fixup_linkorigs ($$) {
5177 my ($upstreamversion, $fn) = @_;
5178 # calls $fn->($leafname);
5180 foreach my $f (<../../../../*>) { #/){
5181 my $b=$f; $b =~ s{.*/}{};
5183 local ($debuglevel) = $debuglevel-1;
5184 printdebug "QF linkorigs $b, $f ?\n";
5186 next unless is_orig_file_of_vsn $b, $upstreamversion;
5187 printdebug "QF linkorigs $b, $f Y\n";
5188 link_ltarget $f, $b or die "$b $!";
5193 sub quilt_fixup_delete_pc () {
5194 runcmd @git, qw(rm -rqf .pc);
5196 Commit removal of .pc (quilt series tracking data)
5198 [dgit ($our_version) upgrade quilt-remove-pc]
5202 sub quilt_fixup_singlepatch ($$$) {
5203 my ($clogp, $headref, $upstreamversion) = @_;
5205 progress "starting quiltify (single-debian-patch)";
5207 # dpkg-source --commit generates new patches even if
5208 # single-debian-patch is in debian/source/options. In order to
5209 # get it to generate debian/patches/debian-changes, it is
5210 # necessary to build the source package.
5212 quilt_fixup_linkorigs($upstreamversion, sub { });
5213 quilt_fixup_mkwork($headref);
5215 rmtree("debian/patches");
5217 runcmd @dpkgsource, qw(-b .);
5219 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5220 rename srcfn("$upstreamversion", "/debian/patches"),
5221 "work/debian/patches";
5224 commit_quilty_patch();
5227 sub quilt_make_fake_dsc ($) {
5228 my ($upstreamversion) = @_;
5230 my $fakeversion="$upstreamversion-~~DGITFAKE";
5232 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5233 print $fakedsc <<END or die $!;
5236 Version: $fakeversion
5240 my $dscaddfile=sub {
5243 my $md = new Digest::MD5;
5245 my $fh = new IO::File $b, '<' or die "$b $!";
5250 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5253 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5255 my @files=qw(debian/source/format debian/rules
5256 debian/control debian/changelog);
5257 foreach my $maybe (qw(debian/patches debian/source/options
5258 debian/tests/control)) {
5259 next unless stat_exists "../../../$maybe";
5260 push @files, $maybe;
5263 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5264 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5266 $dscaddfile->($debtar);
5267 close $fakedsc or die $!;
5270 sub quilt_check_splitbrain_cache ($$) {
5271 my ($headref, $upstreamversion) = @_;
5272 # Called only if we are in (potentially) split brain mode.
5274 # Computes the cache key and looks in the cache.
5275 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5277 my $splitbrain_cachekey;
5280 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5281 # we look in the reflog of dgit-intern/quilt-cache
5282 # we look for an entry whose message is the key for the cache lookup
5283 my @cachekey = (qw(dgit), $our_version);
5284 push @cachekey, $upstreamversion;
5285 push @cachekey, $quilt_mode;
5286 push @cachekey, $headref;
5288 push @cachekey, hashfile('fake.dsc');
5290 my $srcshash = Digest::SHA->new(256);
5291 my %sfs = ( %INC, '$0(dgit)' => $0 );
5292 foreach my $sfk (sort keys %sfs) {
5293 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5294 $srcshash->add($sfk," ");
5295 $srcshash->add(hashfile($sfs{$sfk}));
5296 $srcshash->add("\n");
5298 push @cachekey, $srcshash->hexdigest();
5299 $splitbrain_cachekey = "@cachekey";
5301 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5303 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5304 debugcmd "|(probably)",@cmd;
5305 my $child = open GC, "-|"; defined $child or die $!;
5307 chdir '../../..' or die $!;
5308 if (!stat ".git/logs/refs/$splitbraincache") {
5309 $! == ENOENT or die $!;
5310 printdebug ">(no reflog)\n";
5317 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5318 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5321 quilt_fixup_mkwork($headref);
5322 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5323 if ($cachehit ne $headref) {
5324 progress "dgit view: found cached ($saved)";
5325 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5327 return ($cachehit, $splitbrain_cachekey);
5329 progress "dgit view: found cached, no changes required";
5330 return ($headref, $splitbrain_cachekey);
5332 die $! if GC->error;
5333 failedcmd unless close GC;
5335 printdebug "splitbrain cache miss\n";
5336 return (undef, $splitbrain_cachekey);
5339 sub quilt_fixup_multipatch ($$$) {
5340 my ($clogp, $headref, $upstreamversion) = @_;
5342 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5345 # - honour any existing .pc in case it has any strangeness
5346 # - determine the git commit corresponding to the tip of
5347 # the patch stack (if there is one)
5348 # - if there is such a git commit, convert each subsequent
5349 # git commit into a quilt patch with dpkg-source --commit
5350 # - otherwise convert all the differences in the tree into
5351 # a single git commit
5355 # Our git tree doesn't necessarily contain .pc. (Some versions of
5356 # dgit would include the .pc in the git tree.) If there isn't
5357 # one, we need to generate one by unpacking the patches that we
5360 # We first look for a .pc in the git tree. If there is one, we
5361 # will use it. (This is not the normal case.)
5363 # Otherwise need to regenerate .pc so that dpkg-source --commit
5364 # can work. We do this as follows:
5365 # 1. Collect all relevant .orig from parent directory
5366 # 2. Generate a debian.tar.gz out of
5367 # debian/{patches,rules,source/format,source/options}
5368 # 3. Generate a fake .dsc containing just these fields:
5369 # Format Source Version Files
5370 # 4. Extract the fake .dsc
5371 # Now the fake .dsc has a .pc directory.
5372 # (In fact we do this in every case, because in future we will
5373 # want to search for a good base commit for generating patches.)
5375 # Then we can actually do the dpkg-source --commit
5376 # 1. Make a new working tree with the same object
5377 # store as our main tree and check out the main
5379 # 2. Copy .pc from the fake's extraction, if necessary
5380 # 3. Run dpkg-source --commit
5381 # 4. If the result has changes to debian/, then
5382 # - git add them them
5383 # - git add .pc if we had a .pc in-tree
5385 # 5. If we had a .pc in-tree, delete it, and git commit
5386 # 6. Back in the main tree, fast forward to the new HEAD
5388 # Another situation we may have to cope with is gbp-style
5389 # patches-unapplied trees.
5391 # We would want to detect these, so we know to escape into
5392 # quilt_fixup_gbp. However, this is in general not possible.
5393 # Consider a package with a one patch which the dgit user reverts
5394 # (with git revert or the moral equivalent).
5396 # That is indistinguishable in contents from a patches-unapplied
5397 # tree. And looking at the history to distinguish them is not
5398 # useful because the user might have made a confusing-looking git
5399 # history structure (which ought to produce an error if dgit can't
5400 # cope, not a silent reintroduction of an unwanted patch).
5402 # So gbp users will have to pass an option. But we can usually
5403 # detect their failure to do so: if the tree is not a clean
5404 # patches-applied tree, quilt linearisation fails, but the tree
5405 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5406 # they want --quilt=unapplied.
5408 # To help detect this, when we are extracting the fake dsc, we
5409 # first extract it with --skip-patches, and then apply the patches
5410 # afterwards with dpkg-source --before-build. That lets us save a
5411 # tree object corresponding to .origs.
5413 my $splitbrain_cachekey;
5415 quilt_make_fake_dsc($upstreamversion);
5417 if (quiltmode_splitbrain()) {
5419 ($cachehit, $splitbrain_cachekey) =
5420 quilt_check_splitbrain_cache($headref, $upstreamversion);
5421 return if $cachehit;
5425 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5427 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5428 rename $fakexdir, "fake" or die "$fakexdir $!";
5432 remove_stray_gits("source package");
5433 mktree_in_ud_here();
5437 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5438 my $unapplied=git_add_write_tree();
5439 printdebug "fake orig tree object $unapplied\n";
5443 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5445 if (system @bbcmd) {
5446 failedcmd @bbcmd if $? < 0;
5448 failed to apply your git tree's patch stack (from debian/patches/) to
5449 the corresponding upstream tarball(s). Your source tree and .orig
5450 are probably too inconsistent. dgit can only fix up certain kinds of
5451 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5457 quilt_fixup_mkwork($headref);
5460 if (stat_exists ".pc") {
5462 progress "Tree already contains .pc - will use it then delete it.";
5465 rename '../fake/.pc','.pc' or die $!;
5468 changedir '../fake';
5470 my $oldtiptree=git_add_write_tree();
5471 printdebug "fake o+d/p tree object $unapplied\n";
5472 changedir '../work';
5475 # We calculate some guesswork now about what kind of tree this might
5476 # be. This is mostly for error reporting.
5482 # O = orig, without patches applied
5483 # A = "applied", ie orig with H's debian/patches applied
5484 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5485 \%editedignores, \@unrepres),
5486 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5487 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5491 foreach my $b (qw(01 02)) {
5492 foreach my $v (qw(O2H O2A H2A)) {
5493 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5496 printdebug "differences \@dl @dl.\n";
5499 "$us: base trees orig=%.20s o+d/p=%.20s",
5500 $unapplied, $oldtiptree;
5502 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5503 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5504 $dl[0], $dl[1], $dl[3], $dl[4],
5508 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5510 forceable_fail [qw(unrepresentable)], <<END;
5511 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5516 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5517 push @failsuggestion, "This might be a patches-unapplied branch.";
5518 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5519 push @failsuggestion, "This might be a patches-applied branch.";
5521 push @failsuggestion, "Maybe you need to specify one of".
5522 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5524 if (quiltmode_splitbrain()) {
5525 quiltify_splitbrain($clogp, $unapplied, $headref,
5526 $diffbits, \%editedignores,
5527 $splitbrain_cachekey);
5531 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5532 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5534 if (!open P, '>>', ".pc/applied-patches") {
5535 $!==&ENOENT or die $!;
5540 commit_quilty_patch();
5542 if ($mustdeletepc) {
5543 quilt_fixup_delete_pc();
5547 sub quilt_fixup_editor () {
5548 my $descfn = $ENV{$fakeeditorenv};
5549 my $editing = $ARGV[$#ARGV];
5550 open I1, '<', $descfn or die "$descfn: $!";
5551 open I2, '<', $editing or die "$editing: $!";
5552 unlink $editing or die "$editing: $!";
5553 open O, '>', $editing or die "$editing: $!";
5554 while (<I1>) { print O or die $!; } I1->error and die $!;
5557 $copying ||= m/^\-\-\- /;
5558 next unless $copying;
5561 I2->error and die $!;
5566 sub maybe_apply_patches_dirtily () {
5567 return unless $quilt_mode =~ m/gbp|unapplied/;
5568 print STDERR <<END or die $!;
5570 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5571 dgit: Have to apply the patches - making the tree dirty.
5572 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5575 $patches_applied_dirtily = 01;
5576 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5577 runcmd qw(dpkg-source --before-build .);
5580 sub maybe_unapply_patches_again () {
5581 progress "dgit: Unapplying patches again to tidy up the tree."
5582 if $patches_applied_dirtily;
5583 runcmd qw(dpkg-source --after-build .)
5584 if $patches_applied_dirtily & 01;
5586 if $patches_applied_dirtily & 02;
5587 $patches_applied_dirtily = 0;
5590 #----- other building -----
5592 our $clean_using_builder;
5593 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5594 # clean the tree before building (perhaps invoked indirectly by
5595 # whatever we are using to run the build), rather than separately
5596 # and explicitly by us.
5599 return if $clean_using_builder;
5600 if ($cleanmode eq 'dpkg-source') {
5601 maybe_apply_patches_dirtily();
5602 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5603 } elsif ($cleanmode eq 'dpkg-source-d') {
5604 maybe_apply_patches_dirtily();
5605 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5606 } elsif ($cleanmode eq 'git') {
5607 runcmd_ordryrun_local @git, qw(clean -xdf);
5608 } elsif ($cleanmode eq 'git-ff') {
5609 runcmd_ordryrun_local @git, qw(clean -xdff);
5610 } elsif ($cleanmode eq 'check') {
5611 my $leftovers = cmdoutput @git, qw(clean -xdn);
5612 if (length $leftovers) {
5613 print STDERR $leftovers, "\n" or die $!;
5614 fail "tree contains uncommitted files and --clean=check specified";
5616 } elsif ($cleanmode eq 'none') {
5623 badusage "clean takes no additional arguments" if @ARGV;
5626 maybe_unapply_patches_again();
5629 sub build_prep_early () {
5630 our $build_prep_early_done //= 0;
5631 return if $build_prep_early_done++;
5633 badusage "-p is not allowed when building" if defined $package;
5634 my $clogp = parsechangelog();
5635 $isuite = getfield $clogp, 'Distribution';
5636 $package = getfield $clogp, 'Source';
5637 $version = getfield $clogp, 'Version';
5644 build_maybe_quilt_fixup();
5646 my $pat = changespat $version;
5647 foreach my $f (glob "$buildproductsdir/$pat") {
5649 unlink $f or fail "remove old changes file $f: $!";
5651 progress "would remove $f";
5657 sub changesopts_initial () {
5658 my @opts =@changesopts[1..$#changesopts];
5661 sub changesopts_version () {
5662 if (!defined $changes_since_version) {
5663 my @vsns = archive_query('archive_query');
5664 my @quirk = access_quirk();
5665 if ($quirk[0] eq 'backports') {
5666 local $isuite = $quirk[2];
5668 canonicalise_suite();
5669 push @vsns, archive_query('archive_query');
5672 @vsns = map { $_->[0] } @vsns;
5673 @vsns = sort { -version_compare($a, $b) } @vsns;
5674 $changes_since_version = $vsns[0];
5675 progress "changelog will contain changes since $vsns[0]";
5677 $changes_since_version = '_';
5678 progress "package seems new, not specifying -v<version>";
5681 if ($changes_since_version ne '_') {
5682 return ("-v$changes_since_version");
5688 sub changesopts () {
5689 return (changesopts_initial(), changesopts_version());
5692 sub massage_dbp_args ($;$) {
5693 my ($cmd,$xargs) = @_;
5696 # - if we're going to split the source build out so we can
5697 # do strange things to it, massage the arguments to dpkg-buildpackage
5698 # so that the main build doessn't build source (or add an argument
5699 # to stop it building source by default).
5701 # - add -nc to stop dpkg-source cleaning the source tree,
5702 # unless we're not doing a split build and want dpkg-source
5703 # as cleanmode, in which case we can do nothing
5706 # 0 - source will NOT need to be built separately by caller
5707 # +1 - source will need to be built separately by caller
5708 # +2 - source will need to be built separately by caller AND
5709 # dpkg-buildpackage should not in fact be run at all!
5710 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5711 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5712 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5713 $clean_using_builder = 1;
5716 # -nc has the side effect of specifying -b if nothing else specified
5717 # and some combinations of -S, -b, et al, are errors, rather than
5718 # later simply overriding earlie. So we need to:
5719 # - search the command line for these options
5720 # - pick the last one
5721 # - perhaps add our own as a default
5722 # - perhaps adjust it to the corresponding non-source-building version
5724 foreach my $l ($cmd, $xargs) {
5726 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5729 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5731 if ($need_split_build_invocation) {
5732 printdebug "massage split $dmode.\n";
5733 $r = $dmode =~ m/[S]/ ? +2 :
5734 $dmode =~ y/gGF/ABb/ ? +1 :
5735 $dmode =~ m/[ABb]/ ? 0 :
5738 printdebug "massage done $r $dmode.\n";
5740 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5746 my $wasdir = must_getcwd();
5752 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5753 my ($msg_if_onlyone) = @_;
5754 # If there is only one .changes file, fail with $msg_if_onlyone,
5755 # or if that is undef, be a no-op.
5756 # Returns the changes file to report to the user.
5757 my $pat = changespat $version;
5758 my @changesfiles = glob $pat;
5759 @changesfiles = sort {
5760 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5764 if (@changesfiles==1) {
5765 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5766 only one changes file from build (@changesfiles)
5768 $result = $changesfiles[0];
5769 } elsif (@changesfiles==2) {
5770 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5771 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5772 fail "$l found in binaries changes file $binchanges"
5775 runcmd_ordryrun_local @mergechanges, @changesfiles;
5776 my $multichanges = changespat $version,'multi';
5778 stat_exists $multichanges or fail "$multichanges: $!";
5779 foreach my $cf (glob $pat) {
5780 next if $cf eq $multichanges;
5781 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5784 $result = $multichanges;
5786 fail "wrong number of different changes files (@changesfiles)";
5788 printdone "build successful, results in $result\n" or die $!;
5791 sub midbuild_checkchanges () {
5792 my $pat = changespat $version;
5793 return if $rmchanges;
5794 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5795 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5797 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5798 Suggest you delete @unwanted.
5803 sub midbuild_checkchanges_vanilla ($) {
5805 midbuild_checkchanges() if $wantsrc == 1;
5808 sub postbuild_mergechanges_vanilla ($) {
5810 if ($wantsrc == 1) {
5812 postbuild_mergechanges(undef);
5815 printdone "build successful\n";
5821 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5822 my $wantsrc = massage_dbp_args \@dbp;
5825 midbuild_checkchanges_vanilla $wantsrc;
5830 push @dbp, changesopts_version();
5831 maybe_apply_patches_dirtily();
5832 runcmd_ordryrun_local @dbp;
5834 maybe_unapply_patches_again();
5835 postbuild_mergechanges_vanilla $wantsrc;
5839 $quilt_mode //= 'gbp';
5845 # gbp can make .origs out of thin air. In my tests it does this
5846 # even for a 1.0 format package, with no origs present. So I
5847 # guess it keys off just the version number. We don't know
5848 # exactly what .origs ought to exist, but let's assume that we
5849 # should run gbp if: the version has an upstream part and the main
5851 my $upstreamversion = upstreamversion $version;
5852 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5853 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5855 if ($gbp_make_orig) {
5857 $cleanmode = 'none'; # don't do it again
5858 $need_split_build_invocation = 1;
5861 my @dbp = @dpkgbuildpackage;
5863 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5865 if (!length $gbp_build[0]) {
5866 if (length executable_on_path('git-buildpackage')) {
5867 $gbp_build[0] = qw(git-buildpackage);
5869 $gbp_build[0] = 'gbp buildpackage';
5872 my @cmd = opts_opt_multi_cmd @gbp_build;
5874 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5876 if ($gbp_make_orig) {
5877 ensuredir '.git/dgit';
5878 my $ok = '.git/dgit/origs-gen-ok';
5879 unlink $ok or $!==&ENOENT or die $!;
5880 my @origs_cmd = @cmd;
5881 push @origs_cmd, qw(--git-cleaner=true);
5882 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5883 push @origs_cmd, @ARGV;
5885 debugcmd @origs_cmd;
5887 do { local $!; stat_exists $ok; }
5888 or failedcmd @origs_cmd;
5890 dryrun_report @origs_cmd;
5896 midbuild_checkchanges_vanilla $wantsrc;
5898 if (!$clean_using_builder) {
5899 push @cmd, '--git-cleaner=true';
5903 maybe_unapply_patches_again();
5905 push @cmd, changesopts();
5906 runcmd_ordryrun_local @cmd, @ARGV;
5908 postbuild_mergechanges_vanilla $wantsrc;
5910 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5914 my $our_cleanmode = $cleanmode;
5915 if ($need_split_build_invocation) {
5916 # Pretend that clean is being done some other way. This
5917 # forces us not to try to use dpkg-buildpackage to clean and
5918 # build source all in one go; and instead we run dpkg-source
5919 # (and build_prep() will do the clean since $clean_using_builder
5921 $our_cleanmode = 'ELSEWHERE';
5923 if ($our_cleanmode =~ m/^dpkg-source/) {
5924 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5925 $clean_using_builder = 1;
5928 $sourcechanges = changespat $version,'source';
5930 unlink "../$sourcechanges" or $!==ENOENT
5931 or fail "remove $sourcechanges: $!";
5933 $dscfn = dscfn($version);
5934 if ($our_cleanmode eq 'dpkg-source') {
5935 maybe_apply_patches_dirtily();
5936 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5938 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5939 maybe_apply_patches_dirtily();
5940 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5943 my @cmd = (@dpkgsource, qw(-b --));
5946 runcmd_ordryrun_local @cmd, "work";
5947 my @udfiles = <${package}_*>;
5948 changedir "../../..";
5949 foreach my $f (@udfiles) {
5950 printdebug "source copy, found $f\n";
5953 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5954 $f eq srcfn($version, $&));
5955 printdebug "source copy, found $f - renaming\n";
5956 rename "$ud/$f", "../$f" or $!==ENOENT
5957 or fail "put in place new source file ($f): $!";
5960 my $pwd = must_getcwd();
5961 my $leafdir = basename $pwd;
5963 runcmd_ordryrun_local @cmd, $leafdir;
5966 runcmd_ordryrun_local qw(sh -ec),
5967 'exec >$1; shift; exec "$@"','x',
5968 "../$sourcechanges",
5969 @dpkggenchanges, qw(-S), changesopts();
5973 sub cmd_build_source {
5975 badusage "build-source takes no additional arguments" if @ARGV;
5977 maybe_unapply_patches_again();
5978 printdone "source built, results in $dscfn and $sourcechanges";
5983 midbuild_checkchanges();
5986 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5987 stat_exists $sourcechanges
5988 or fail "$sourcechanges (in parent directory): $!";
5990 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5992 maybe_unapply_patches_again();
5994 postbuild_mergechanges(<<END);
5995 perhaps you need to pass -A ? (sbuild's default is to build only
5996 arch-specific binaries; dgit 1.4 used to override that.)
6001 sub cmd_quilt_fixup {
6002 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6005 build_maybe_quilt_fixup();
6008 sub cmd_import_dsc {
6012 last unless $ARGV[0] =~ m/^-/;
6015 if (m/^--require-valid-signature$/) {
6018 badusage "unknown dgit import-dsc sub-option \`$_'";
6022 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6023 my ($dscfn, $dstbranch) = @ARGV;
6025 badusage "dry run makes no sense with import-dsc" unless act_local();
6027 my $force = $dstbranch =~ s/^\+// ? +1 :
6028 $dstbranch =~ s/^\.\.// ? -1 :
6030 my $info = $force ? " $&" : '';
6031 $info = "$dscfn$info";
6033 my $specbranch = $dstbranch;
6034 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6035 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6037 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6038 my $chead = cmdoutput_errok @symcmd;
6039 defined $chead or $?==256 or failedcmd @symcmd;
6041 fail "$dstbranch is checked out - will not update it"
6042 if defined $chead and $chead eq $dstbranch;
6044 my $oldhash = git_get_ref $dstbranch;
6046 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6047 $dscdata = do { local $/ = undef; <D>; };
6048 D->error and fail "read $dscfn: $!";
6051 # we don't normally need this so import it here
6052 use Dpkg::Source::Package;
6053 my $dp = new Dpkg::Source::Package filename => $dscfn,
6054 require_valid_signature => $needsig;
6056 local $SIG{__WARN__} = sub {
6058 return unless $needsig;
6059 fail "import-dsc signature check failed";
6061 if (!$dp->is_signed()) {
6062 warn "$us: warning: importing unsigned .dsc\n";
6064 my $r = $dp->check_signature();
6065 die "->check_signature => $r" if $needsig && $r;
6071 $package = getfield $dsc, 'Source';
6073 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6074 unless forceing [qw(import-dsc-with-dgit-field)];
6076 if (defined $dsc_hash) {
6077 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6078 resolve_dsc_field_commit undef, undef;
6080 if (defined $dsc_hash) {
6081 my @cmd = (qw(sh -ec),
6082 "echo $dsc_hash | git cat-file --batch-check");
6083 my $objgot = cmdoutput @cmd;
6084 if ($objgot =~ m#^\w+ missing\b#) {
6086 .dsc contains Dgit field referring to object $dsc_hash
6087 Your git tree does not have that object. Try `git fetch' from a
6088 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6091 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6093 progress "Not fast forward, forced update.";
6095 fail "Not fast forward to $dsc_hash";
6098 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
6099 $dstbranch, $dsc_hash);
6101 progress "dgit: import-dsc updated git ref $dstbranch";
6106 Branch $dstbranch already exists
6107 Specify ..$specbranch for a pseudo-merge, binding in existing history
6108 Specify +$specbranch to overwrite, discarding existing history
6110 if $oldhash && !$force;
6114 my @dfi = dsc_files_info();
6115 foreach my $fi (@dfi) {
6116 my $f = $fi->{Filename};
6118 next if lstat $here;
6119 fail "stat $here: $!" unless $! == ENOENT;
6121 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6123 } elsif ($dscfn =~ m#^/#) {
6126 fail "cannot import $dscfn which seems to be inside working tree!";
6128 $there =~ s#/+[^/]+$## or
6129 fail "cannot import $dscfn which seems to not have a basename";
6131 symlink $there, $here or fail "symlink $there to $here: $!";
6132 progress "made symlink $here -> $there";
6133 # print STDERR Dumper($fi);
6135 my @mergeinputs = generate_commits_from_dsc();
6136 die unless @mergeinputs == 1;
6138 my $newhash = $mergeinputs[0]{Commit};
6142 progress "Import, forced update - synthetic orphan git history.";
6143 } elsif ($force < 0) {
6144 progress "Import, merging.";
6145 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6146 my $version = getfield $dsc, 'Version';
6147 my $clogp = commit_getclogp $newhash;
6148 my $authline = clogp_authline $clogp;
6149 $newhash = make_commit_text <<END;
6156 Merge $package ($version) import into $dstbranch
6159 die; # caught earlier
6163 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
6164 $dstbranch, $newhash);
6166 progress "dgit: import-dsc results are in in git ref $dstbranch";
6169 sub cmd_archive_api_query {
6170 badusage "need only 1 subpath argument" unless @ARGV==1;
6171 my ($subpath) = @ARGV;
6172 my @cmd = archive_api_query_cmd($subpath);
6175 exec @cmd or fail "exec curl: $!\n";
6178 sub cmd_clone_dgit_repos_server {
6179 badusage "need destination argument" unless @ARGV==1;
6180 my ($destdir) = @ARGV;
6181 $package = '_dgit-repos-server';
6182 local $access_forpush = 0;
6183 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6185 exec @cmd or fail "exec git clone: $!\n";
6188 sub cmd_print_dgit_repos_server_source_url {
6189 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6191 $package = '_dgit-repos-server';
6192 local $access_forpush = 0;
6193 my $url = access_giturl();
6194 print $url, "\n" or die $!;
6197 sub cmd_setup_mergechangelogs {
6198 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6199 setup_mergechangelogs(1);
6202 sub cmd_setup_useremail {
6203 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6207 sub cmd_setup_new_tree {
6208 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6212 #---------- argument parsing and main program ----------
6215 print "dgit version $our_version\n" or die $!;
6219 our (%valopts_long, %valopts_short);
6222 sub defvalopt ($$$$) {
6223 my ($long,$short,$val_re,$how) = @_;
6224 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6225 $valopts_long{$long} = $oi;
6226 $valopts_short{$short} = $oi;
6227 # $how subref should:
6228 # do whatever assignemnt or thing it likes with $_[0]
6229 # if the option should not be passed on to remote, @rvalopts=()
6230 # or $how can be a scalar ref, meaning simply assign the value
6233 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6234 defvalopt '--distro', '-d', '.+', \$idistro;
6235 defvalopt '', '-k', '.+', \$keyid;
6236 defvalopt '--existing-package','', '.*', \$existing_package;
6237 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6238 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6239 defvalopt '--package', '-p', $package_re, \$package;
6240 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6242 defvalopt '', '-C', '.+', sub {
6243 ($changesfile) = (@_);
6244 if ($changesfile =~ s#^(.*)/##) {
6245 $buildproductsdir = $1;
6249 defvalopt '--initiator-tempdir','','.*', sub {
6250 ($initiator_tempdir) = (@_);
6251 $initiator_tempdir =~ m#^/# or
6252 badusage "--initiator-tempdir must be used specify an".
6253 " absolute, not relative, directory."
6259 if (defined $ENV{'DGIT_SSH'}) {
6260 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6261 } elsif (defined $ENV{'GIT_SSH'}) {
6262 @ssh = ($ENV{'GIT_SSH'});
6270 if (!defined $val) {
6271 badusage "$what needs a value" unless @ARGV;
6273 push @rvalopts, $val;
6275 badusage "bad value \`$val' for $what" unless
6276 $val =~ m/^$oi->{Re}$(?!\n)/s;
6277 my $how = $oi->{How};
6278 if (ref($how) eq 'SCALAR') {
6283 push @ropts, @rvalopts;
6287 last unless $ARGV[0] =~ m/^-/;
6291 if (m/^--dry-run$/) {
6294 } elsif (m/^--damp-run$/) {
6297 } elsif (m/^--no-sign$/) {
6300 } elsif (m/^--help$/) {
6302 } elsif (m/^--version$/) {
6304 } elsif (m/^--new$/) {
6307 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6308 ($om = $opts_opt_map{$1}) &&
6312 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6313 !$opts_opt_cmdonly{$1} &&
6314 ($om = $opts_opt_map{$1})) {
6317 } elsif (m/^--(gbp|dpm)$/s) {
6318 push @ropts, "--quilt=$1";
6320 } elsif (m/^--ignore-dirty$/s) {
6323 } elsif (m/^--no-quilt-fixup$/s) {
6325 $quilt_mode = 'nocheck';
6326 } elsif (m/^--no-rm-on-error$/s) {
6329 } elsif (m/^--no-chase-dsc-distro$/s) {
6331 $chase_dsc_distro = 0;
6332 } elsif (m/^--overwrite$/s) {
6334 $overwrite_version = '';
6335 } elsif (m/^--overwrite=(.+)$/s) {
6337 $overwrite_version = $1;
6338 } elsif (m/^--dep14tag$/s) {
6340 $dodep14tag= 'want';
6341 } elsif (m/^--no-dep14tag$/s) {
6344 } elsif (m/^--always-dep14tag$/s) {
6346 $dodep14tag= 'always';
6347 } elsif (m/^--delayed=(\d+)$/s) {
6350 } elsif (m/^--dgit-view-save=(.+)$/s) {
6352 $split_brain_save = $1;
6353 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6354 } elsif (m/^--(no-)?rm-old-changes$/s) {
6357 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6359 push @deliberatelies, $&;
6360 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6364 } elsif (m/^--force-/) {
6366 "$us: warning: ignoring unknown force option $_\n";
6368 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6369 # undocumented, for testing
6371 $tagformat_want = [ $1, 'command line', 1 ];
6372 # 1 menas overrides distro configuration
6373 } elsif (m/^--always-split-source-build$/s) {
6374 # undocumented, for testing
6376 $need_split_build_invocation = 1;
6377 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6378 # undocumented, for testing
6380 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6381 # ^ it's supposed to be an array ref
6382 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6383 $val = $2 ? $' : undef; #';
6384 $valopt->($oi->{Long});
6386 badusage "unknown long option \`$_'";
6393 } elsif (s/^-L/-/) {
6396 } elsif (s/^-h/-/) {
6398 } elsif (s/^-D/-/) {
6402 } elsif (s/^-N/-/) {
6407 push @changesopts, $_;
6409 } elsif (s/^-wn$//s) {
6411 $cleanmode = 'none';
6412 } elsif (s/^-wg$//s) {
6415 } elsif (s/^-wgf$//s) {
6417 $cleanmode = 'git-ff';
6418 } elsif (s/^-wd$//s) {
6420 $cleanmode = 'dpkg-source';
6421 } elsif (s/^-wdd$//s) {
6423 $cleanmode = 'dpkg-source-d';
6424 } elsif (s/^-wc$//s) {
6426 $cleanmode = 'check';
6427 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6428 push @git, '-c', $&;
6429 $gitcfgs{cmdline}{$1} = [ $2 ];
6430 } elsif (s/^-c([^=]+)$//s) {
6431 push @git, '-c', $&;
6432 $gitcfgs{cmdline}{$1} = [ 'true' ];
6433 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6435 $val = undef unless length $val;
6436 $valopt->($oi->{Short});
6439 badusage "unknown short option \`$_'";
6446 sub check_env_sanity () {
6447 my $blocked = new POSIX::SigSet;
6448 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6451 foreach my $name (qw(PIPE CHLD)) {
6452 my $signame = "SIG$name";
6453 my $signum = eval "POSIX::$signame" // die;
6454 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6455 die "$signame is set to something other than SIG_DFL\n";
6456 $blocked->ismember($signum) and
6457 die "$signame is blocked\n";
6463 On entry to dgit, $@
6464 This is a bug produced by something in in your execution environment.
6470 sub parseopts_late_defaults () {
6471 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6472 if defined $idistro;
6473 $isuite //= cfg('dgit.default.default-suite');
6475 foreach my $k (keys %opts_opt_map) {
6476 my $om = $opts_opt_map{$k};
6478 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6480 badcfg "cannot set command for $k"
6481 unless length $om->[0];
6485 foreach my $c (access_cfg_cfgs("opts-$k")) {
6487 map { $_ ? @$_ : () }
6488 map { $gitcfgs{$_}{$c} }
6489 reverse @gitcfgsources;
6490 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6491 "\n" if $debuglevel >= 4;
6493 badcfg "cannot configure options for $k"
6494 if $opts_opt_cmdonly{$k};
6495 my $insertpos = $opts_cfg_insertpos{$k};
6496 @$om = ( @$om[0..$insertpos-1],
6498 @$om[$insertpos..$#$om] );
6502 if (!defined $rmchanges) {
6503 local $access_forpush;
6504 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6507 if (!defined $quilt_mode) {
6508 local $access_forpush;
6509 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6510 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6512 $quilt_mode =~ m/^($quilt_modes_re)$/
6513 or badcfg "unknown quilt-mode \`$quilt_mode'";
6517 if (!defined $dodep14tag) {
6518 local $access_forpush;
6519 $dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
6520 $dodep14tag =~ m/^($dodep14tag_re)$/
6521 or badcfg "unknown dep14tag setting \`$dodep14tag'";
6525 $need_split_build_invocation ||= quiltmode_splitbrain();
6527 if (!defined $cleanmode) {
6528 local $access_forpush;
6529 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6530 $cleanmode //= 'dpkg-source';
6532 badcfg "unknown clean-mode \`$cleanmode'" unless
6533 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6537 if ($ENV{$fakeeditorenv}) {
6539 quilt_fixup_editor();
6546 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6547 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6548 if $dryrun_level == 1;
6550 print STDERR $helpmsg or die $!;
6553 my $cmd = shift @ARGV;
6556 my $pre_fn = ${*::}{"pre_$cmd"};
6557 $pre_fn->() if $pre_fn;
6559 my $fn = ${*::}{"cmd_$cmd"};
6560 $fn or badusage "unknown operation $cmd";