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";
2468 my $checkhash = sub {
2469 open F, "<", "$tf" or die "$tf: $!";
2470 $fi->{Digester}->reset();
2471 $fi->{Digester}->addfile(*F);
2472 F->error and die $!;
2473 my $got = $fi->{Digester}->hexdigest();
2474 $got eq $fi->{Hash} or
2475 fail "file $f has hash $got but .dsc".
2476 " demands hash $fi->{Hash} ".
2477 ($downloaded ? "(got wrong file from archive!)"
2478 : "(perhaps you should delete this file?)");
2481 if (stat_exists $tf) {
2482 progress "using existing $f";
2484 printdebug "$tf does not exist, need to fetch\n";
2486 $furl =~ s{/[^/]+$}{};
2488 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2489 die "$f ?" if $f =~ m#/#;
2490 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2491 return 0 if !act_local();
2500 sub ensure_we_have_orig () {
2501 my @dfi = dsc_files_info();
2502 foreach my $fi (@dfi) {
2503 my $f = $fi->{Filename};
2504 next unless is_orig_file_in_dsc($f, \@dfi);
2505 complete_file_from_dsc('..', $fi)
2510 #---------- git fetch ----------
2512 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2513 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2515 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2516 # locally fetched refs because they have unhelpful names and clutter
2517 # up gitk etc. So we track whether we have "used up" head ref (ie,
2518 # whether we have made another local ref which refers to this object).
2520 # (If we deleted them unconditionally, then we might end up
2521 # re-fetching the same git objects each time dgit fetch was run.)
2523 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
2524 # in git_fetch_us to fetch the refs in question, and possibly a call
2525 # to lrfetchref_used.
2527 our (%lrfetchrefs_f, %lrfetchrefs_d);
2528 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2530 sub lrfetchref_used ($) {
2531 my ($fullrefname) = @_;
2532 my $objid = $lrfetchrefs_f{$fullrefname};
2533 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2536 sub git_lrfetch_sane {
2537 my ($supplementary, @specs) = @_;
2538 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2539 # at least as regards @specs. Also leave the results in
2540 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2541 # able to clean these up.
2543 # With $supplementary==1, @specs must not contain wildcards
2544 # and we add to our previous fetches (non-atomically).
2546 # This is rather miserable:
2547 # When git fetch --prune is passed a fetchspec ending with a *,
2548 # it does a plausible thing. If there is no * then:
2549 # - it matches subpaths too, even if the supplied refspec
2550 # starts refs, and behaves completely madly if the source
2551 # has refs/refs/something. (See, for example, Debian #NNNN.)
2552 # - if there is no matching remote ref, it bombs out the whole
2554 # We want to fetch a fixed ref, and we don't know in advance
2555 # if it exists, so this is not suitable.
2557 # Our workaround is to use git ls-remote. git ls-remote has its
2558 # own qairks. Notably, it has the absurd multi-tail-matching
2559 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2560 # refs/refs/foo etc.
2562 # Also, we want an idempotent snapshot, but we have to make two
2563 # calls to the remote: one to git ls-remote and to git fetch. The
2564 # solution is use git ls-remote to obtain a target state, and
2565 # git fetch to try to generate it. If we don't manage to generate
2566 # the target state, we try again.
2568 my $url = access_giturl();
2570 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2572 my $specre = join '|', map {
2575 my $wildcard = $x =~ s/\\\*$/.*/;
2576 die if $wildcard && $supplementary;
2579 printdebug "git_lrfetch_sane specre=$specre\n";
2580 my $wanted_rref = sub {
2582 return m/^(?:$specre)$/;
2585 my $fetch_iteration = 0;
2588 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2589 if (++$fetch_iteration > 10) {
2590 fail "too many iterations trying to get sane fetch!";
2593 my @look = map { "refs/$_" } @specs;
2594 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2598 open GITLS, "-|", @lcmd or die $!;
2600 printdebug "=> ", $_;
2601 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2602 my ($objid,$rrefname) = ($1,$2);
2603 if (!$wanted_rref->($rrefname)) {
2605 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2609 $wantr{$rrefname} = $objid;
2612 close GITLS or failedcmd @lcmd;
2614 # OK, now %want is exactly what we want for refs in @specs
2616 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2617 "+refs/$_:".lrfetchrefs."/$_";
2620 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2622 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2623 runcmd_ordryrun_local @fcmd if @fspecs;
2625 if (!$supplementary) {
2626 %lrfetchrefs_f = ();
2630 git_for_each_ref(lrfetchrefs, sub {
2631 my ($objid,$objtype,$lrefname,$reftail) = @_;
2632 $lrfetchrefs_f{$lrefname} = $objid;
2633 $objgot{$objid} = 1;
2636 if ($supplementary) {
2640 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2641 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2642 if (!exists $wantr{$rrefname}) {
2643 if ($wanted_rref->($rrefname)) {
2645 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2649 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2652 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2653 delete $lrfetchrefs_f{$lrefname};
2657 foreach my $rrefname (sort keys %wantr) {
2658 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2659 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2660 my $want = $wantr{$rrefname};
2661 next if $got eq $want;
2662 if (!defined $objgot{$want}) {
2664 warning: git ls-remote suggests we want $lrefname
2665 warning: and it should refer to $want
2666 warning: but git fetch didn't fetch that object to any relevant ref.
2667 warning: This may be due to a race with someone updating the server.
2668 warning: Will try again...
2670 next FETCH_ITERATION;
2673 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2675 runcmd_ordryrun_local @git, qw(update-ref -m),
2676 "dgit fetch git fetch fixup", $lrefname, $want;
2677 $lrfetchrefs_f{$lrefname} = $want;
2682 if (defined $csuite) {
2683 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2684 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2685 my ($objid,$objtype,$lrefname,$reftail) = @_;
2686 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2687 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2691 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2692 Dumper(\%lrfetchrefs_f);
2695 sub git_fetch_us () {
2696 # Want to fetch only what we are going to use, unless
2697 # deliberately-not-ff, in which case we must fetch everything.
2699 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2701 (quiltmode_splitbrain
2702 ? (map { $_->('*',access_nomdistro) }
2703 \&debiantag_new, \&debiantag_maintview)
2704 : debiantags('*',access_nomdistro));
2705 push @specs, server_branch($csuite);
2706 push @specs, $rewritemap;
2707 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2709 git_lrfetch_sane 0, @specs;
2712 my @tagpats = debiantags('*',access_nomdistro);
2714 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2715 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2716 printdebug "currently $fullrefname=$objid\n";
2717 $here{$fullrefname} = $objid;
2719 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2720 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2721 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2722 printdebug "offered $lref=$objid\n";
2723 if (!defined $here{$lref}) {
2724 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2725 runcmd_ordryrun_local @upd;
2726 lrfetchref_used $fullrefname;
2727 } elsif ($here{$lref} eq $objid) {
2728 lrfetchref_used $fullrefname;
2731 "Not updateting $lref from $here{$lref} to $objid.\n";
2736 #---------- dsc and archive handling ----------
2738 sub mergeinfo_getclogp ($) {
2739 # Ensures thit $mi->{Clogp} exists and returns it
2741 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2744 sub mergeinfo_version ($) {
2745 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2748 sub fetch_from_archive_record_1 ($) {
2750 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2751 'DGIT_ARCHIVE', $hash;
2752 cmdoutput @git, qw(log -n2), $hash;
2753 # ... gives git a chance to complain if our commit is malformed
2756 sub fetch_from_archive_record_2 ($) {
2758 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2762 dryrun_report @upd_cmd;
2766 sub parse_dsc_field ($$) {
2767 my ($dsc, $what) = @_;
2769 foreach my $field (@ourdscfield) {
2770 $f = $dsc->{$field};
2774 progress "$what: NO git hash";
2775 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2776 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2777 progress "$what: specified git info ($dsc_distro)";
2778 $dsc_hint_tag = [ $dsc_hint_tag ];
2779 } elsif ($f =~ m/^\w+\s*$/) {
2781 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2782 dgit.default.distro);
2783 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2785 progress "$what: specified git hash";
2787 fail "$what: invalid Dgit info";
2791 sub resolve_dsc_field_commit ($$) {
2792 my ($already_distro, $already_mapref) = @_;
2794 return unless defined $dsc_hash;
2797 defined $already_mapref &&
2798 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2799 ? $already_mapref : undef;
2803 my ($what, @fetch) = @_;
2805 local $idistro = $dsc_distro;
2806 my $lrf = lrfetchrefs;
2808 if (!$chase_dsc_distro) {
2810 "not chasing .dsc distro $dsc_distro: not fetching $what";
2815 ".dsc names distro $dsc_distro: fetching $what";
2817 my $url = access_giturl();
2818 if (!defined $url) {
2819 defined $dsc_hint_url or fail <<END;
2820 .dsc Dgit metadata is in context of distro $dsc_distro
2821 for which we have no configured url and .dsc provides no hint
2824 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2825 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2826 parse_cfg_bool "dsc-url-proto-ok", 'false',
2827 cfg("dgit.dsc-url-proto-ok.$proto",
2828 "dgit.default.dsc-url-proto-ok")
2830 .dsc Dgit metadata is in context of distro $dsc_distro
2831 for which we have no configured url;
2832 .dsc provices hinted url with protocol $proto which is unsafe.
2833 (can be overridden by config - consult documentation)
2835 $url = $dsc_hint_url;
2838 git_lrfetch_sane 1, @fetch;
2843 my $rewrite_enable = do {
2844 local $idistro = $dsc_distro;
2845 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2848 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2849 if (!defined $mapref) {
2850 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2851 $mapref = $lrf.'/'.$rewritemap;
2853 my $rewritemapdata = git_cat_file $mapref.':map';
2854 if (defined $rewritemapdata
2855 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2857 "server's git history rewrite map contains a relevant entry!";
2860 if (defined $dsc_hash) {
2861 progress "using rewritten git hash in place of .dsc value";
2863 progress "server data says .dsc hash is to be disregarded";
2868 if (!defined git_cat_file $dsc_hash) {
2869 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2870 my $lrf = $do_fetch->("additional commits", @tags) &&
2871 defined git_cat_file $dsc_hash
2873 .dsc Dgit metadata requires commit $dsc_hash
2874 but we could not obtain that object anywhere.
2876 foreach my $t (@tags) {
2877 my $fullrefname = $lrf.'/'.$t;
2878 print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2879 next unless $lrfetchrefs_f{$fullrefname};
2880 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2881 lrfetchref_used $fullrefname;
2886 sub fetch_from_archive () {
2887 ensure_setup_existing_tree();
2889 # Ensures that lrref() is what is actually in the archive, one way
2890 # or another, according to us - ie this client's
2891 # appropritaely-updated archive view. Also returns the commit id.
2892 # If there is nothing in the archive, leaves lrref alone and
2893 # returns undef. git_fetch_us must have already been called.
2897 parse_dsc_field($dsc, 'last upload to archive');
2898 resolve_dsc_field_commit access_basedistro,
2899 lrfetchrefs."/".$rewritemap
2901 progress "no version available from the archive";
2904 # If the archive's .dsc has a Dgit field, there are three
2905 # relevant git commitids we need to choose between and/or merge
2907 # 1. $dsc_hash: the Dgit field from the archive
2908 # 2. $lastpush_hash: the suite branch on the dgit git server
2909 # 3. $lastfetch_hash: our local tracking brach for the suite
2911 # These may all be distinct and need not be in any fast forward
2914 # If the dsc was pushed to this suite, then the server suite
2915 # branch will have been updated; but it might have been pushed to
2916 # a different suite and copied by the archive. Conversely a more
2917 # recent version may have been pushed with dgit but not appeared
2918 # in the archive (yet).
2920 # $lastfetch_hash may be awkward because archive imports
2921 # (particularly, imports of Dgit-less .dscs) are performed only as
2922 # needed on individual clients, so different clients may perform a
2923 # different subset of them - and these imports are only made
2924 # public during push. So $lastfetch_hash may represent a set of
2925 # imports different to a subsequent upload by a different dgit
2928 # Our approach is as follows:
2930 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2931 # descendant of $dsc_hash, then it was pushed by a dgit user who
2932 # had based their work on $dsc_hash, so we should prefer it.
2933 # Otherwise, $dsc_hash was installed into this suite in the
2934 # archive other than by a dgit push, and (necessarily) after the
2935 # last dgit push into that suite (since a dgit push would have
2936 # been descended from the dgit server git branch); thus, in that
2937 # case, we prefer the archive's version (and produce a
2938 # pseudo-merge to overwrite the dgit server git branch).
2940 # (If there is no Dgit field in the archive's .dsc then
2941 # generate_commit_from_dsc uses the version numbers to decide
2942 # whether the suite branch or the archive is newer. If the suite
2943 # branch is newer it ignores the archive's .dsc; otherwise it
2944 # generates an import of the .dsc, and produces a pseudo-merge to
2945 # overwrite the suite branch with the archive contents.)
2947 # The outcome of that part of the algorithm is the `public view',
2948 # and is same for all dgit clients: it does not depend on any
2949 # unpublished history in the local tracking branch.
2951 # As between the public view and the local tracking branch: The
2952 # local tracking branch is only updated by dgit fetch, and
2953 # whenever dgit fetch runs it includes the public view in the
2954 # local tracking branch. Therefore if the public view is not
2955 # descended from the local tracking branch, the local tracking
2956 # branch must contain history which was imported from the archive
2957 # but never pushed; and, its tip is now out of date. So, we make
2958 # a pseudo-merge to overwrite the old imports and stitch the old
2961 # Finally: we do not necessarily reify the public view (as
2962 # described above). This is so that we do not end up stacking two
2963 # pseudo-merges. So what we actually do is figure out the inputs
2964 # to any public view pseudo-merge and put them in @mergeinputs.
2967 # $mergeinputs[]{Commit}
2968 # $mergeinputs[]{Info}
2969 # $mergeinputs[0] is the one whose tree we use
2970 # @mergeinputs is in the order we use in the actual commit)
2973 # $mergeinputs[]{Message} is a commit message to use
2974 # $mergeinputs[]{ReverseParents} if def specifies that parent
2975 # list should be in opposite order
2976 # Such an entry has no Commit or Info. It applies only when found
2977 # in the last entry. (This ugliness is to support making
2978 # identical imports to previous dgit versions.)
2980 my $lastpush_hash = git_get_ref(lrfetchref());
2981 printdebug "previous reference hash=$lastpush_hash\n";
2982 $lastpush_mergeinput = $lastpush_hash && {
2983 Commit => $lastpush_hash,
2984 Info => "dgit suite branch on dgit git server",
2987 my $lastfetch_hash = git_get_ref(lrref());
2988 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2989 my $lastfetch_mergeinput = $lastfetch_hash && {
2990 Commit => $lastfetch_hash,
2991 Info => "dgit client's archive history view",
2994 my $dsc_mergeinput = $dsc_hash && {
2995 Commit => $dsc_hash,
2996 Info => "Dgit field in .dsc from archive",
3000 my $del_lrfetchrefs = sub {
3003 printdebug "del_lrfetchrefs...\n";
3004 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3005 my $objid = $lrfetchrefs_d{$fullrefname};
3006 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3008 $gur ||= new IO::Handle;
3009 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3011 printf $gur "delete %s %s\n", $fullrefname, $objid;
3014 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3018 if (defined $dsc_hash) {
3019 ensure_we_have_orig();
3020 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3021 @mergeinputs = $dsc_mergeinput
3022 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3023 print STDERR <<END or die $!;
3025 Git commit in archive is behind the last version allegedly pushed/uploaded.
3026 Commit referred to by archive: $dsc_hash
3027 Last version pushed with dgit: $lastpush_hash
3030 @mergeinputs = ($lastpush_mergeinput);
3032 # Archive has .dsc which is not a descendant of the last dgit
3033 # push. This can happen if the archive moves .dscs about.
3034 # Just follow its lead.
3035 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3036 progress "archive .dsc names newer git commit";
3037 @mergeinputs = ($dsc_mergeinput);
3039 progress "archive .dsc names other git commit, fixing up";
3040 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3044 @mergeinputs = generate_commits_from_dsc();
3045 # We have just done an import. Now, our import algorithm might
3046 # have been improved. But even so we do not want to generate
3047 # a new different import of the same package. So if the
3048 # version numbers are the same, just use our existing version.
3049 # If the version numbers are different, the archive has changed
3050 # (perhaps, rewound).
3051 if ($lastfetch_mergeinput &&
3052 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3053 (mergeinfo_version $mergeinputs[0]) )) {
3054 @mergeinputs = ($lastfetch_mergeinput);
3056 } elsif ($lastpush_hash) {
3057 # only in git, not in the archive yet
3058 @mergeinputs = ($lastpush_mergeinput);
3059 print STDERR <<END or die $!;
3061 Package not found in the archive, but has allegedly been pushed using dgit.
3065 printdebug "nothing found!\n";
3066 if (defined $skew_warning_vsn) {
3067 print STDERR <<END or die $!;
3069 Warning: relevant archive skew detected.
3070 Archive allegedly contains $skew_warning_vsn
3071 But we were not able to obtain any version from the archive or git.
3075 unshift @end, $del_lrfetchrefs;
3079 if ($lastfetch_hash &&
3081 my $h = $_->{Commit};
3082 $h and is_fast_fwd($lastfetch_hash, $h);
3083 # If true, one of the existing parents of this commit
3084 # is a descendant of the $lastfetch_hash, so we'll
3085 # be ff from that automatically.
3089 push @mergeinputs, $lastfetch_mergeinput;
3092 printdebug "fetch mergeinfos:\n";
3093 foreach my $mi (@mergeinputs) {
3095 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3097 printdebug sprintf " ReverseParents=%d Message=%s",
3098 $mi->{ReverseParents}, $mi->{Message};
3102 my $compat_info= pop @mergeinputs
3103 if $mergeinputs[$#mergeinputs]{Message};
3105 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3108 if (@mergeinputs > 1) {
3110 my $tree_commit = $mergeinputs[0]{Commit};
3112 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3113 $tree =~ m/\n\n/; $tree = $`;
3114 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3117 # We use the changelog author of the package in question the
3118 # author of this pseudo-merge. This is (roughly) correct if
3119 # this commit is simply representing aa non-dgit upload.
3120 # (Roughly because it does not record sponsorship - but we
3121 # don't have sponsorship info because that's in the .changes,
3122 # which isn't in the archivw.)
3124 # But, it might be that we are representing archive history
3125 # updates (including in-archive copies). These are not really
3126 # the responsibility of the person who created the .dsc, but
3127 # there is no-one whose name we should better use. (The
3128 # author of the .dsc-named commit is clearly worse.)
3130 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3131 my $author = clogp_authline $useclogp;
3132 my $cversion = getfield $useclogp, 'Version';
3134 my $mcf = ".git/dgit/mergecommit";
3135 open MC, ">", $mcf or die "$mcf $!";
3136 print MC <<END or die $!;
3140 my @parents = grep { $_->{Commit} } @mergeinputs;
3141 @parents = reverse @parents if $compat_info->{ReverseParents};
3142 print MC <<END or die $! foreach @parents;
3146 print MC <<END or die $!;
3152 if (defined $compat_info->{Message}) {
3153 print MC $compat_info->{Message} or die $!;
3155 print MC <<END or die $!;
3156 Record $package ($cversion) in archive suite $csuite
3160 my $message_add_info = sub {
3162 my $mversion = mergeinfo_version $mi;
3163 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3167 $message_add_info->($mergeinputs[0]);
3168 print MC <<END or die $!;
3169 should be treated as descended from
3171 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3175 $hash = make_commit $mcf;
3177 $hash = $mergeinputs[0]{Commit};
3179 printdebug "fetch hash=$hash\n";
3182 my ($lasth, $what) = @_;
3183 return unless $lasth;
3184 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3187 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3189 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3191 fetch_from_archive_record_1($hash);
3193 if (defined $skew_warning_vsn) {
3195 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3196 my $gotclogp = commit_getclogp($hash);
3197 my $got_vsn = getfield $gotclogp, 'Version';
3198 printdebug "SKEW CHECK GOT $got_vsn\n";
3199 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3200 print STDERR <<END or die $!;
3202 Warning: archive skew detected. Using the available version:
3203 Archive allegedly contains $skew_warning_vsn
3204 We were able to obtain only $got_vsn
3210 if ($lastfetch_hash ne $hash) {
3211 fetch_from_archive_record_2($hash);
3214 lrfetchref_used lrfetchref();
3216 unshift @end, $del_lrfetchrefs;
3220 sub set_local_git_config ($$) {
3222 runcmd @git, qw(config), $k, $v;
3225 sub setup_mergechangelogs (;$) {
3227 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3229 my $driver = 'dpkg-mergechangelogs';
3230 my $cb = "merge.$driver";
3231 my $attrs = '.git/info/attributes';
3232 ensuredir '.git/info';
3234 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3235 if (!open ATTRS, "<", $attrs) {
3236 $!==ENOENT or die "$attrs: $!";
3240 next if m{^debian/changelog\s};
3241 print NATTRS $_, "\n" or die $!;
3243 ATTRS->error and die $!;
3246 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3249 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3250 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3252 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3255 sub setup_useremail (;$) {
3257 return unless $always || access_cfg_bool(1, 'setup-useremail');
3260 my ($k, $envvar) = @_;
3261 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3262 return unless defined $v;
3263 set_local_git_config "user.$k", $v;
3266 $setup->('email', 'DEBEMAIL');
3267 $setup->('name', 'DEBFULLNAME');
3270 sub ensure_setup_existing_tree () {
3271 my $k = "remote.$remotename.skipdefaultupdate";
3272 my $c = git_get_config $k;
3273 return if defined $c;
3274 set_local_git_config $k, 'true';
3277 sub setup_new_tree () {
3278 setup_mergechangelogs();
3282 sub multisuite_suite_child ($$$) {
3283 my ($tsuite, $merginputs, $fn) = @_;
3284 # in child, sets things up, calls $fn->(), and returns undef
3285 # in parent, returns canonical suite name for $tsuite
3286 my $canonsuitefh = IO::File::new_tmpfile;
3287 my $pid = fork // die $!;
3290 $us .= " [$isuite]";
3291 $debugprefix .= " ";
3292 progress "fetching $tsuite...";
3293 canonicalise_suite();
3294 print $canonsuitefh $csuite, "\n" or die $!;
3295 close $canonsuitefh or die $!;
3299 waitpid $pid,0 == $pid or die $!;
3300 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3301 seek $canonsuitefh,0,0 or die $!;
3302 local $csuite = <$canonsuitefh>;
3303 die $! unless defined $csuite && chomp $csuite;
3305 printdebug "multisuite $tsuite missing\n";
3308 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3309 push @$merginputs, {
3316 sub fork_for_multisuite ($) {
3317 my ($before_fetch_merge) = @_;
3318 # if nothing unusual, just returns ''
3321 # returns 0 to caller in child, to do first of the specified suites
3322 # in child, $csuite is not yet set
3324 # returns 1 to caller in parent, to finish up anything needed after
3325 # in parent, $csuite is set to canonicalised portmanteau
3327 my $org_isuite = $isuite;
3328 my @suites = split /\,/, $isuite;
3329 return '' unless @suites > 1;
3330 printdebug "fork_for_multisuite: @suites\n";
3334 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3336 return 0 unless defined $cbasesuite;
3338 fail "package $package missing in (base suite) $cbasesuite"
3339 unless @mergeinputs;
3341 my @csuites = ($cbasesuite);
3343 $before_fetch_merge->();
3345 foreach my $tsuite (@suites[1..$#suites]) {
3346 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3352 # xxx collecte the ref here
3354 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3355 push @csuites, $csubsuite;
3358 foreach my $mi (@mergeinputs) {
3359 my $ref = git_get_ref $mi->{Ref};
3360 die "$mi->{Ref} ?" unless length $ref;
3361 $mi->{Commit} = $ref;
3364 $csuite = join ",", @csuites;
3366 my $previous = git_get_ref lrref;
3368 unshift @mergeinputs, {
3369 Commit => $previous,
3370 Info => "local combined tracking branch",
3372 "archive seems to have rewound: local tracking branch is ahead!",
3376 foreach my $ix (0..$#mergeinputs) {
3377 $mergeinputs[$ix]{Index} = $ix;
3380 @mergeinputs = sort {
3381 -version_compare(mergeinfo_version $a,
3382 mergeinfo_version $b) # highest version first
3384 $a->{Index} <=> $b->{Index}; # earliest in spec first
3390 foreach my $mi (@mergeinputs) {
3391 printdebug "multisuite merge check $mi->{Info}\n";
3392 foreach my $previous (@needed) {
3393 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3394 printdebug "multisuite merge un-needed $previous->{Info}\n";
3398 printdebug "multisuite merge this-needed\n";
3399 $mi->{Character} = '+';
3402 $needed[0]{Character} = '*';
3404 my $output = $needed[0]{Commit};
3407 printdebug "multisuite merge nontrivial\n";
3408 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3410 my $commit = "tree $tree\n";
3411 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3412 "Input branches:\n";
3414 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3415 printdebug "multisuite merge include $mi->{Info}\n";
3416 $mi->{Character} //= ' ';
3417 $commit .= "parent $mi->{Commit}\n";
3418 $msg .= sprintf " %s %-25s %s\n",
3420 (mergeinfo_version $mi),
3423 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3425 " * marks the highest version branch, which choose to use\n".
3426 " + marks each branch which was not already an ancestor\n\n".
3427 "[dgit multi-suite $csuite]\n";
3429 "author $authline\n".
3430 "committer $authline\n\n";
3431 $output = make_commit_text $commit.$msg;
3432 printdebug "multisuite merge generated $output\n";
3435 fetch_from_archive_record_1($output);
3436 fetch_from_archive_record_2($output);
3438 progress "calculated combined tracking suite $csuite";
3443 sub clone_set_head () {
3444 open H, "> .git/HEAD" or die $!;
3445 print H "ref: ".lref()."\n" or die $!;
3448 sub clone_finish ($) {
3450 runcmd @git, qw(reset --hard), lrref();
3451 runcmd qw(bash -ec), <<'END';
3453 git ls-tree -r --name-only -z HEAD | \
3454 xargs -0r touch -h -r . --
3456 printdone "ready for work in $dstdir";
3461 badusage "dry run makes no sense with clone" unless act_local();
3463 my $multi_fetched = fork_for_multisuite(sub {
3464 printdebug "multi clone before fetch merge\n";
3467 if ($multi_fetched) {
3468 printdebug "multi clone after fetch merge\n";
3470 clone_finish($dstdir);
3473 printdebug "clone main body\n";
3475 canonicalise_suite();
3476 my $hasgit = check_for_git();
3477 mkdir $dstdir or fail "create \`$dstdir': $!";
3479 runcmd @git, qw(init -q);
3481 my $giturl = access_giturl(1);
3482 if (defined $giturl) {
3483 runcmd @git, qw(remote add), 'origin', $giturl;
3486 progress "fetching existing git history";
3488 runcmd_ordryrun_local @git, qw(fetch origin);
3490 progress "starting new git history";
3492 fetch_from_archive() or no_such_package;
3493 my $vcsgiturl = $dsc->{'Vcs-Git'};
3494 if (length $vcsgiturl) {
3495 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3496 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3499 clone_finish($dstdir);
3503 canonicalise_suite();
3504 if (check_for_git()) {
3507 fetch_from_archive() or no_such_package();
3508 printdone "fetched into ".lrref();
3512 my $multi_fetched = fork_for_multisuite(sub { });
3513 fetch() unless $multi_fetched; # parent
3514 return if $multi_fetched eq '0'; # child
3515 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3517 printdone "fetched to ".lrref()." and merged into HEAD";
3520 sub check_not_dirty () {
3521 foreach my $f (qw(local-options local-patch-header)) {
3522 if (stat_exists "debian/source/$f") {
3523 fail "git tree contains debian/source/$f";
3527 return if $ignoredirty;
3529 my @cmd = (@git, qw(diff --quiet HEAD));
3531 $!=0; $?=-1; system @cmd;
3534 fail "working tree is dirty (does not match HEAD)";
3540 sub commit_admin ($) {
3543 runcmd_ordryrun_local @git, qw(commit -m), $m;
3546 sub commit_quilty_patch () {
3547 my $output = cmdoutput @git, qw(status --porcelain);
3549 foreach my $l (split /\n/, $output) {
3550 next unless $l =~ m/\S/;
3551 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3555 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3557 progress "nothing quilty to commit, ok.";
3560 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3561 runcmd_ordryrun_local @git, qw(add -f), @adds;
3563 Commit Debian 3.0 (quilt) metadata
3565 [dgit ($our_version) quilt-fixup]
3569 sub get_source_format () {
3571 if (open F, "debian/source/options") {
3575 s/\s+$//; # ignore missing final newline
3577 my ($k, $v) = ($`, $'); #');
3578 $v =~ s/^"(.*)"$/$1/;
3584 F->error and die $!;
3587 die $! unless $!==&ENOENT;
3590 if (!open F, "debian/source/format") {
3591 die $! unless $!==&ENOENT;
3595 F->error and die $!;
3597 return ($_, \%options);
3600 sub madformat_wantfixup ($) {
3602 return 0 unless $format eq '3.0 (quilt)';
3603 our $quilt_mode_warned;
3604 if ($quilt_mode eq 'nocheck') {
3605 progress "Not doing any fixup of \`$format' due to".
3606 " ----no-quilt-fixup or --quilt=nocheck"
3607 unless $quilt_mode_warned++;
3610 progress "Format \`$format', need to check/update patch stack"
3611 unless $quilt_mode_warned++;
3615 sub maybe_split_brain_save ($$$) {
3616 my ($headref, $dgitview, $msg) = @_;
3617 # => message fragment "$saved" describing disposition of $dgitview
3618 return "commit id $dgitview" unless defined $split_brain_save;
3619 my @cmd = (shell_cmd "cd ../../../..",
3620 @git, qw(update-ref -m),
3621 "dgit --dgit-view-save $msg HEAD=$headref",
3622 $split_brain_save, $dgitview);
3624 return "and left in $split_brain_save";
3627 # An "infopair" is a tuple [ $thing, $what ]
3628 # (often $thing is a commit hash; $what is a description)
3630 sub infopair_cond_equal ($$) {
3632 $x->[0] eq $y->[0] or fail <<END;
3633 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3637 sub infopair_lrf_tag_lookup ($$) {
3638 my ($tagnames, $what) = @_;
3639 # $tagname may be an array ref
3640 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3641 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3642 foreach my $tagname (@tagnames) {
3643 my $lrefname = lrfetchrefs."/tags/$tagname";
3644 my $tagobj = $lrfetchrefs_f{$lrefname};
3645 next unless defined $tagobj;
3646 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3647 return [ git_rev_parse($tagobj), $what ];
3649 fail @tagnames==1 ? <<END : <<END;
3650 Wanted tag $what (@tagnames) on dgit server, but not found
3652 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3656 sub infopair_cond_ff ($$) {
3657 my ($anc,$desc) = @_;
3658 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3659 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3663 sub pseudomerge_version_check ($$) {
3664 my ($clogp, $archive_hash) = @_;
3666 my $arch_clogp = commit_getclogp $archive_hash;
3667 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3668 'version currently in archive' ];
3669 if (defined $overwrite_version) {
3670 if (length $overwrite_version) {
3671 infopair_cond_equal([ $overwrite_version,
3672 '--overwrite= version' ],
3675 my $v = $i_arch_v->[0];
3676 progress "Checking package changelog for archive version $v ...";
3678 my @xa = ("-f$v", "-t$v");
3679 my $vclogp = parsechangelog @xa;
3680 my $cv = [ (getfield $vclogp, 'Version'),
3681 "Version field from dpkg-parsechangelog @xa" ];
3682 infopair_cond_equal($i_arch_v, $cv);
3685 $@ =~ s/^dgit: //gm;
3687 "Perhaps debian/changelog does not mention $v ?";
3692 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3696 sub pseudomerge_make_commit ($$$$ $$) {
3697 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3698 $msg_cmd, $msg_msg) = @_;
3699 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3701 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3702 my $authline = clogp_authline $clogp;
3706 !defined $overwrite_version ? ""
3707 : !length $overwrite_version ? " --overwrite"
3708 : " --overwrite=".$overwrite_version;
3711 my $pmf = ".git/dgit/pseudomerge";
3712 open MC, ">", $pmf or die "$pmf $!";
3713 print MC <<END or die $!;
3716 parent $archive_hash
3726 return make_commit($pmf);
3729 sub splitbrain_pseudomerge ($$$$) {
3730 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3731 # => $merged_dgitview
3732 printdebug "splitbrain_pseudomerge...\n";
3734 # We: debian/PREVIOUS HEAD($maintview)
3735 # expect: o ----------------- o
3738 # a/d/PREVIOUS $dgitview
3741 # we do: `------------------ o
3745 return $dgitview unless defined $archive_hash;
3747 printdebug "splitbrain_pseudomerge...\n";
3749 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3751 if (!defined $overwrite_version) {
3752 progress "Checking that HEAD inciudes all changes in archive...";
3755 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3757 if (defined $overwrite_version) {
3759 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3760 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3761 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3762 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3763 my $i_archive = [ $archive_hash, "current archive contents" ];
3765 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3767 infopair_cond_equal($i_dgit, $i_archive);
3768 infopair_cond_ff($i_dep14, $i_dgit);
3769 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3773 $us: check failed (maybe --overwrite is needed, consult documentation)
3778 my $r = pseudomerge_make_commit
3779 $clogp, $dgitview, $archive_hash, $i_arch_v,
3780 "dgit --quilt=$quilt_mode",
3781 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3782 Declare fast forward from $i_arch_v->[0]
3784 Make fast forward from $i_arch_v->[0]
3787 maybe_split_brain_save $maintview, $r, "pseudomerge";
3789 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3793 sub plain_overwrite_pseudomerge ($$$) {
3794 my ($clogp, $head, $archive_hash) = @_;
3796 printdebug "plain_overwrite_pseudomerge...";
3798 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3800 return $head if is_fast_fwd $archive_hash, $head;
3802 my $m = "Declare fast forward from $i_arch_v->[0]";
3804 my $r = pseudomerge_make_commit
3805 $clogp, $head, $archive_hash, $i_arch_v,
3808 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3810 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3814 sub push_parse_changelog ($) {
3817 my $clogp = Dpkg::Control::Hash->new();
3818 $clogp->load($clogpfn) or die;
3820 my $clogpackage = getfield $clogp, 'Source';
3821 $package //= $clogpackage;
3822 fail "-p specified $package but changelog specified $clogpackage"
3823 unless $package eq $clogpackage;
3824 my $cversion = getfield $clogp, 'Version';
3826 if (!$we_are_initiator) {
3827 # rpush initiator can't do this because it doesn't have $isuite yet
3828 my $tag = debiantag($cversion, access_nomdistro);
3829 runcmd @git, qw(check-ref-format), $tag;
3832 my $dscfn = dscfn($cversion);
3834 return ($clogp, $cversion, $dscfn);
3837 sub push_parse_dsc ($$$) {
3838 my ($dscfn,$dscfnwhat, $cversion) = @_;
3839 $dsc = parsecontrol($dscfn,$dscfnwhat);
3840 my $dversion = getfield $dsc, 'Version';
3841 my $dscpackage = getfield $dsc, 'Source';
3842 ($dscpackage eq $package && $dversion eq $cversion) or
3843 fail "$dscfn is for $dscpackage $dversion".
3844 " but debian/changelog is for $package $cversion";
3847 sub push_tagwants ($$$$) {
3848 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3851 TagFn => \&debiantag,
3856 if (defined $maintviewhead) {
3858 TagFn => \&debiantag_maintview,
3859 Objid => $maintviewhead,
3860 TfSuffix => '-maintview',
3863 } elsif ($dodep14tag eq 'no' ? 0
3864 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3865 : $dodep14tag eq 'always'
3866 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3867 --dep14tag-always (or equivalent in config) means server must support
3868 both "new" and "maint" tag formats, but config says it doesn't.
3870 : die "$dodep14tag ?") {
3872 TagFn => \&debiantag_maintview,
3874 TfSuffix => '-dgit',
3878 foreach my $tw (@tagwants) {
3879 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3880 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3882 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3886 sub push_mktags ($$ $$ $) {
3888 $changesfile,$changesfilewhat,
3891 die unless $tagwants->[0]{View} eq 'dgit';
3893 my $declaredistro = access_nomdistro();
3894 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
3895 $dsc->{$ourdscfield[0]} = join " ",
3896 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
3898 $dsc->save("$dscfn.tmp") or die $!;
3900 my $changes = parsecontrol($changesfile,$changesfilewhat);
3901 foreach my $field (qw(Source Distribution Version)) {
3902 $changes->{$field} eq $clogp->{$field} or
3903 fail "changes field $field \`$changes->{$field}'".
3904 " does not match changelog \`$clogp->{$field}'";
3907 my $cversion = getfield $clogp, 'Version';
3908 my $clogsuite = getfield $clogp, 'Distribution';
3910 # We make the git tag by hand because (a) that makes it easier
3911 # to control the "tagger" (b) we can do remote signing
3912 my $authline = clogp_authline $clogp;
3913 my $delibs = join(" ", "",@deliberatelies);
3917 my $tfn = $tw->{Tfn};
3918 my $head = $tw->{Objid};
3919 my $tag = $tw->{Tag};
3921 open TO, '>', $tfn->('.tmp') or die $!;
3922 print TO <<END or die $!;
3929 if ($tw->{View} eq 'dgit') {
3930 print TO <<END or die $!;
3931 $package release $cversion for $clogsuite ($csuite) [dgit]
3932 [dgit distro=$declaredistro$delibs]
3934 foreach my $ref (sort keys %previously) {
3935 print TO <<END or die $!;
3936 [dgit previously:$ref=$previously{$ref}]
3939 } elsif ($tw->{View} eq 'maint') {
3940 print TO <<END or die $!;
3941 $package release $cversion for $clogsuite ($csuite)
3942 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3945 die Dumper($tw)."?";
3950 my $tagobjfn = $tfn->('.tmp');
3952 if (!defined $keyid) {
3953 $keyid = access_cfg('keyid','RETURN-UNDEF');
3955 if (!defined $keyid) {
3956 $keyid = getfield $clogp, 'Maintainer';
3958 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3959 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3960 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3961 push @sign_cmd, $tfn->('.tmp');
3962 runcmd_ordryrun @sign_cmd;
3964 $tagobjfn = $tfn->('.signed.tmp');
3965 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3966 $tfn->('.tmp'), $tfn->('.tmp.asc');
3972 my @r = map { $mktag->($_); } @$tagwants;
3976 sub sign_changes ($) {
3977 my ($changesfile) = @_;
3979 my @debsign_cmd = @debsign;
3980 push @debsign_cmd, "-k$keyid" if defined $keyid;
3981 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3982 push @debsign_cmd, $changesfile;
3983 runcmd_ordryrun @debsign_cmd;
3988 printdebug "actually entering push\n";
3990 supplementary_message(<<'END');
3991 Push failed, while checking state of the archive.
3992 You can retry the push, after fixing the problem, if you like.
3994 if (check_for_git()) {
3997 my $archive_hash = fetch_from_archive();
3998 if (!$archive_hash) {
4000 fail "package appears to be new in this suite;".
4001 " if this is intentional, use --new";
4004 supplementary_message(<<'END');
4005 Push failed, while preparing your push.
4006 You can retry the push, after fixing the problem, if you like.
4009 need_tagformat 'new', "quilt mode $quilt_mode"
4010 if quiltmode_splitbrain;
4014 access_giturl(); # check that success is vaguely likely
4015 rpush_handle_protovsn_bothends() if $we_are_initiator;
4018 my $clogpfn = ".git/dgit/changelog.822.tmp";
4019 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4021 responder_send_file('parsed-changelog', $clogpfn);
4023 my ($clogp, $cversion, $dscfn) =
4024 push_parse_changelog("$clogpfn");
4026 my $dscpath = "$buildproductsdir/$dscfn";
4027 stat_exists $dscpath or
4028 fail "looked for .dsc $dscpath, but $!;".
4029 " maybe you forgot to build";
4031 responder_send_file('dsc', $dscpath);
4033 push_parse_dsc($dscpath, $dscfn, $cversion);
4035 my $format = getfield $dsc, 'Format';
4036 printdebug "format $format\n";
4038 my $actualhead = git_rev_parse('HEAD');
4039 my $dgithead = $actualhead;
4040 my $maintviewhead = undef;
4042 my $upstreamversion = upstreamversion $clogp->{Version};
4044 if (madformat_wantfixup($format)) {
4045 # user might have not used dgit build, so maybe do this now:
4046 if (quiltmode_splitbrain()) {
4048 quilt_make_fake_dsc($upstreamversion);
4050 ($dgithead, $cachekey) =
4051 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4053 "--quilt=$quilt_mode but no cached dgit view:
4054 perhaps tree changed since dgit build[-source] ?";
4056 $dgithead = splitbrain_pseudomerge($clogp,
4057 $actualhead, $dgithead,
4059 $maintviewhead = $actualhead;
4060 changedir '../../../..';
4061 prep_ud(); # so _only_subdir() works, below
4063 commit_quilty_patch();
4067 if (defined $overwrite_version && !defined $maintviewhead) {
4068 $dgithead = plain_overwrite_pseudomerge($clogp,
4076 if ($archive_hash) {
4077 if (is_fast_fwd($archive_hash, $dgithead)) {
4079 } elsif (deliberately_not_fast_forward) {
4082 fail "dgit push: HEAD is not a descendant".
4083 " of the archive's version.\n".
4084 "To overwrite the archive's contents,".
4085 " pass --overwrite[=VERSION].\n".
4086 "To rewind history, if permitted by the archive,".
4087 " use --deliberately-not-fast-forward.";
4092 progress "checking that $dscfn corresponds to HEAD";
4093 runcmd qw(dpkg-source -x --),
4094 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4095 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4096 check_for_vendor_patches() if madformat($dsc->{format});
4097 changedir '../../../..';
4098 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4099 debugcmd "+",@diffcmd;
4101 my $r = system @diffcmd;
4104 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4106 HEAD specifies a different tree to $dscfn:
4108 Perhaps you forgot to build. Or perhaps there is a problem with your
4109 source tree (see dgit(7) for some hints). To see a full diff, run
4116 if (!$changesfile) {
4117 my $pat = changespat $cversion;
4118 my @cs = glob "$buildproductsdir/$pat";
4119 fail "failed to find unique changes file".
4120 " (looked for $pat in $buildproductsdir);".
4121 " perhaps you need to use dgit -C"
4123 ($changesfile) = @cs;
4125 $changesfile = "$buildproductsdir/$changesfile";
4128 # Check that changes and .dsc agree enough
4129 $changesfile =~ m{[^/]*$};
4130 my $changes = parsecontrol($changesfile,$&);
4131 files_compare_inputs($dsc, $changes)
4132 unless forceing [qw(dsc-changes-mismatch)];
4134 # Perhaps adjust .dsc to contain right set of origs
4135 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4137 unless forceing [qw(changes-origs-exactly)];
4139 # Checks complete, we're going to try and go ahead:
4141 responder_send_file('changes',$changesfile);
4142 responder_send_command("param head $dgithead");
4143 responder_send_command("param csuite $csuite");
4144 responder_send_command("param isuite $isuite");
4145 responder_send_command("param tagformat $tagformat");
4146 if (defined $maintviewhead) {
4147 die unless ($protovsn//4) >= 4;
4148 responder_send_command("param maint-view $maintviewhead");
4151 if (deliberately_not_fast_forward) {
4152 git_for_each_ref(lrfetchrefs, sub {
4153 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4154 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4155 responder_send_command("previously $rrefname=$objid");
4156 $previously{$rrefname} = $objid;
4160 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4164 supplementary_message(<<'END');
4165 Push failed, while signing the tag.
4166 You can retry the push, after fixing the problem, if you like.
4168 # If we manage to sign but fail to record it anywhere, it's fine.
4169 if ($we_are_responder) {
4170 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4171 responder_receive_files('signed-tag', @tagobjfns);
4173 @tagobjfns = push_mktags($clogp,$dscpath,
4174 $changesfile,$changesfile,
4177 supplementary_message(<<'END');
4178 Push failed, *after* signing the tag.
4179 If you want to try again, you should use a new version number.
4182 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4184 foreach my $tw (@tagwants) {
4185 my $tag = $tw->{Tag};
4186 my $tagobjfn = $tw->{TagObjFn};
4188 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4189 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4190 runcmd_ordryrun_local
4191 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4194 supplementary_message(<<'END');
4195 Push failed, while updating the remote git repository - see messages above.
4196 If you want to try again, you should use a new version number.
4198 if (!check_for_git()) {
4199 create_remote_git_repo();
4202 my @pushrefs = $forceflag.$dgithead.":".rrref();
4203 foreach my $tw (@tagwants) {
4204 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4207 runcmd_ordryrun @git,
4208 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4209 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4211 supplementary_message(<<'END');
4212 Push failed, while obtaining signatures on the .changes and .dsc.
4213 If it was just that the signature failed, you may try again by using
4214 debsign by hand to sign the changes
4216 and then dput to complete the upload.
4217 If you need to change the package, you must use a new version number.
4219 if ($we_are_responder) {
4220 my $dryrunsuffix = act_local() ? "" : ".tmp";
4221 responder_receive_files('signed-dsc-changes',
4222 "$dscpath$dryrunsuffix",
4223 "$changesfile$dryrunsuffix");
4226 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4228 progress "[new .dsc left in $dscpath.tmp]";
4230 sign_changes $changesfile;
4233 supplementary_message(<<END);
4234 Push failed, while uploading package(s) to the archive server.
4235 You can retry the upload of exactly these same files with dput of:
4237 If that .changes file is broken, you will need to use a new version
4238 number for your next attempt at the upload.
4240 my $host = access_cfg('upload-host','RETURN-UNDEF');
4241 my @hostarg = defined($host) ? ($host,) : ();
4242 runcmd_ordryrun @dput, @hostarg, $changesfile;
4243 printdone "pushed and uploaded $cversion";
4245 supplementary_message('');
4246 responder_send_command("complete");
4252 badusage "-p is not allowed with clone; specify as argument instead"
4253 if defined $package;
4256 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4257 ($package,$isuite) = @ARGV;
4258 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4259 ($package,$dstdir) = @ARGV;
4260 } elsif (@ARGV==3) {
4261 ($package,$isuite,$dstdir) = @ARGV;
4263 badusage "incorrect arguments to dgit clone";
4267 $dstdir ||= "$package";
4268 if (stat_exists $dstdir) {
4269 fail "$dstdir already exists";
4273 if ($rmonerror && !$dryrun_level) {
4274 $cwd_remove= getcwd();
4276 return unless defined $cwd_remove;
4277 if (!chdir "$cwd_remove") {
4278 return if $!==&ENOENT;
4279 die "chdir $cwd_remove: $!";
4281 printdebug "clone rmonerror removing $dstdir\n";
4283 rmtree($dstdir) or die "remove $dstdir: $!\n";
4284 } elsif (grep { $! == $_ }
4285 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4287 print STDERR "check whether to remove $dstdir: $!\n";
4293 $cwd_remove = undef;
4296 sub branchsuite () {
4297 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4298 if ($branch =~ m#$lbranch_re#o) {
4305 sub fetchpullargs () {
4306 if (!defined $package) {
4307 my $sourcep = parsecontrol('debian/control','debian/control');
4308 $package = getfield $sourcep, 'Source';
4311 $isuite = branchsuite();
4313 my $clogp = parsechangelog();
4314 my $clogsuite = getfield $clogp, 'Distribution';
4315 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4317 } elsif (@ARGV==1) {
4320 badusage "incorrect arguments to dgit fetch or dgit pull";
4328 my $multi_fetched = fork_for_multisuite(sub { });
4329 exit 0 if $multi_fetched;
4336 if (quiltmode_splitbrain()) {
4337 my ($format, $fopts) = get_source_format();
4338 madformat($format) and fail <<END
4339 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4347 badusage "-p is not allowed with dgit push" if defined $package;
4349 my $clogp = parsechangelog();
4350 $package = getfield $clogp, 'Source';
4353 } elsif (@ARGV==1) {
4354 ($specsuite) = (@ARGV);
4356 badusage "incorrect arguments to dgit push";
4358 $isuite = getfield $clogp, 'Distribution';
4361 local ($package) = $existing_package; # this is a hack
4362 canonicalise_suite();
4364 canonicalise_suite();
4366 if (defined $specsuite &&
4367 $specsuite ne $isuite &&
4368 $specsuite ne $csuite) {
4369 fail "dgit push: changelog specifies $isuite ($csuite)".
4370 " but command line specifies $specsuite";
4375 #---------- remote commands' implementation ----------
4377 sub cmd_remote_push_build_host {
4378 my ($nrargs) = shift @ARGV;
4379 my (@rargs) = @ARGV[0..$nrargs-1];
4380 @ARGV = @ARGV[$nrargs..$#ARGV];
4382 my ($dir,$vsnwant) = @rargs;
4383 # vsnwant is a comma-separated list; we report which we have
4384 # chosen in our ready response (so other end can tell if they
4387 $we_are_responder = 1;
4388 $us .= " (build host)";
4390 open PI, "<&STDIN" or die $!;
4391 open STDIN, "/dev/null" or die $!;
4392 open PO, ">&STDOUT" or die $!;
4394 open STDOUT, ">&STDERR" or die $!;
4398 ($protovsn) = grep {
4399 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4400 } @rpushprotovsn_support;
4402 fail "build host has dgit rpush protocol versions ".
4403 (join ",", @rpushprotovsn_support).
4404 " but invocation host has $vsnwant"
4405 unless defined $protovsn;
4407 responder_send_command("dgit-remote-push-ready $protovsn");
4412 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4413 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4414 # a good error message)
4416 sub rpush_handle_protovsn_bothends () {
4417 if ($protovsn < 4) {
4418 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4427 my $report = i_child_report();
4428 if (defined $report) {
4429 printdebug "($report)\n";
4430 } elsif ($i_child_pid) {
4431 printdebug "(killing build host child $i_child_pid)\n";
4432 kill 15, $i_child_pid;
4434 if (defined $i_tmp && !defined $initiator_tempdir) {
4436 eval { rmtree $i_tmp; };
4440 END { i_cleanup(); }
4443 my ($base,$selector,@args) = @_;
4444 $selector =~ s/\-/_/g;
4445 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4451 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4459 push @rargs, join ",", @rpushprotovsn_support;
4462 push @rdgit, @ropts;
4463 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4465 my @cmd = (@ssh, $host, shellquote @rdgit);
4468 $we_are_initiator=1;
4470 if (defined $initiator_tempdir) {
4471 rmtree $initiator_tempdir;
4472 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4473 $i_tmp = $initiator_tempdir;
4477 $i_child_pid = open2(\*RO, \*RI, @cmd);
4479 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4480 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4481 $supplementary_message = '' unless $protovsn >= 3;
4484 my ($icmd,$iargs) = initiator_expect {
4485 m/^(\S+)(?: (.*))?$/;
4488 i_method "i_resp", $icmd, $iargs;
4492 sub i_resp_progress ($) {
4494 my $msg = protocol_read_bytes \*RO, $rhs;
4498 sub i_resp_supplementary_message ($) {
4500 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4503 sub i_resp_complete {
4504 my $pid = $i_child_pid;
4505 $i_child_pid = undef; # prevents killing some other process with same pid
4506 printdebug "waiting for build host child $pid...\n";
4507 my $got = waitpid $pid, 0;
4508 die $! unless $got == $pid;
4509 die "build host child failed $?" if $?;
4512 printdebug "all done\n";
4516 sub i_resp_file ($) {
4518 my $localname = i_method "i_localname", $keyword;
4519 my $localpath = "$i_tmp/$localname";
4520 stat_exists $localpath and
4521 badproto \*RO, "file $keyword ($localpath) twice";
4522 protocol_receive_file \*RO, $localpath;
4523 i_method "i_file", $keyword;
4528 sub i_resp_param ($) {
4529 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4533 sub i_resp_previously ($) {
4534 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4535 or badproto \*RO, "bad previously spec";
4536 my $r = system qw(git check-ref-format), $1;
4537 die "bad previously ref spec ($r)" if $r;
4538 $previously{$1} = $2;
4543 sub i_resp_want ($) {
4545 die "$keyword ?" if $i_wanted{$keyword}++;
4547 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4548 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4549 die unless $isuite =~ m/^$suite_re$/;
4552 rpush_handle_protovsn_bothends();
4554 fail "rpush negotiated protocol version $protovsn".
4555 " which does not support quilt mode $quilt_mode"
4556 if quiltmode_splitbrain;
4558 my @localpaths = i_method "i_want", $keyword;
4559 printdebug "[[ $keyword @localpaths\n";
4560 foreach my $localpath (@localpaths) {
4561 protocol_send_file \*RI, $localpath;
4563 print RI "files-end\n" or die $!;
4566 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4568 sub i_localname_parsed_changelog {
4569 return "remote-changelog.822";
4571 sub i_file_parsed_changelog {
4572 ($i_clogp, $i_version, $i_dscfn) =
4573 push_parse_changelog "$i_tmp/remote-changelog.822";
4574 die if $i_dscfn =~ m#/|^\W#;
4577 sub i_localname_dsc {
4578 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4583 sub i_localname_changes {
4584 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4585 $i_changesfn = $i_dscfn;
4586 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4587 return $i_changesfn;
4589 sub i_file_changes { }
4591 sub i_want_signed_tag {
4592 printdebug Dumper(\%i_param, $i_dscfn);
4593 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4594 && defined $i_param{'csuite'}
4595 or badproto \*RO, "premature desire for signed-tag";
4596 my $head = $i_param{'head'};
4597 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4599 my $maintview = $i_param{'maint-view'};
4600 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4603 if ($protovsn >= 4) {
4604 my $p = $i_param{'tagformat'} // '<undef>';
4606 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4609 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4611 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4613 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4616 push_mktags $i_clogp, $i_dscfn,
4617 $i_changesfn, 'remote changes',
4621 sub i_want_signed_dsc_changes {
4622 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4623 sign_changes $i_changesfn;
4624 return ($i_dscfn, $i_changesfn);
4627 #---------- building etc. ----------
4633 #----- `3.0 (quilt)' handling -----
4635 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4637 sub quiltify_dpkg_commit ($$$;$) {
4638 my ($patchname,$author,$msg, $xinfo) = @_;
4642 my $descfn = ".git/dgit/quilt-description.tmp";
4643 open O, '>', $descfn or die "$descfn: $!";
4644 $msg =~ s/\n+/\n\n/;
4645 print O <<END or die $!;
4647 ${xinfo}Subject: $msg
4654 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4655 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4656 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4657 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4661 sub quiltify_trees_differ ($$;$$$) {
4662 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4663 # returns true iff the two tree objects differ other than in debian/
4664 # with $finegrained,
4665 # returns bitmask 01 - differ in upstream files except .gitignore
4666 # 02 - differ in .gitignore
4667 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4668 # is set for each modified .gitignore filename $fn
4669 # if $unrepres is defined, array ref to which is appeneded
4670 # a list of unrepresentable changes (removals of upstream files
4673 my @cmd = (@git, qw(diff-tree -z));
4674 push @cmd, qw(--name-only) unless $unrepres;
4675 push @cmd, qw(-r) if $finegrained || $unrepres;
4677 my $diffs= cmdoutput @cmd;
4680 foreach my $f (split /\0/, $diffs) {
4681 if ($unrepres && !@lmodes) {
4682 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4685 my ($oldmode,$newmode) = @lmodes;
4688 next if $f =~ m#^debian(?:/.*)?$#s;
4692 die "not a plain file\n"
4693 unless $newmode =~ m/^10\d{4}$/ ||
4694 $oldmode =~ m/^10\d{4}$/;
4695 if ($oldmode =~ m/[^0]/ &&
4696 $newmode =~ m/[^0]/) {
4697 die "mode changed\n" if $oldmode ne $newmode;
4699 die "non-default mode\n"
4700 unless $newmode =~ m/^100644$/ ||
4701 $oldmode =~ m/^100644$/;
4705 local $/="\n"; chomp $@;
4706 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4710 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4711 $r |= $isignore ? 02 : 01;
4712 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4714 printdebug "quiltify_trees_differ $x $y => $r\n";
4718 sub quiltify_tree_sentinelfiles ($) {
4719 # lists the `sentinel' files present in the tree
4721 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4722 qw(-- debian/rules debian/control);
4727 sub quiltify_splitbrain_needed () {
4728 if (!$split_brain) {
4729 progress "dgit view: changes are required...";
4730 runcmd @git, qw(checkout -q -b dgit-view);
4735 sub quiltify_splitbrain ($$$$$$) {
4736 my ($clogp, $unapplied, $headref, $diffbits,
4737 $editedignores, $cachekey) = @_;
4738 if ($quilt_mode !~ m/gbp|dpm/) {
4739 # treat .gitignore just like any other upstream file
4740 $diffbits = { %$diffbits };
4741 $_ = !!$_ foreach values %$diffbits;
4743 # We would like any commits we generate to be reproducible
4744 my @authline = clogp_authline($clogp);
4745 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4746 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4747 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4748 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4749 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4750 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4752 if ($quilt_mode =~ m/gbp|unapplied/ &&
4753 ($diffbits->{O2H} & 01)) {
4755 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4756 " but git tree differs from orig in upstream files.";
4757 if (!stat_exists "debian/patches") {
4759 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4763 if ($quilt_mode =~ m/dpm/ &&
4764 ($diffbits->{H2A} & 01)) {
4766 --quilt=$quilt_mode specified, implying patches-applied git tree
4767 but git tree differs from result of applying debian/patches to upstream
4770 if ($quilt_mode =~ m/gbp|unapplied/ &&
4771 ($diffbits->{O2A} & 01)) { # some patches
4772 quiltify_splitbrain_needed();
4773 progress "dgit view: creating patches-applied version using gbp pq";
4774 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4775 # gbp pq import creates a fresh branch; push back to dgit-view
4776 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4777 runcmd @git, qw(checkout -q dgit-view);
4779 if ($quilt_mode =~ m/gbp|dpm/ &&
4780 ($diffbits->{O2A} & 02)) {
4782 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4783 tool which does not create patches for changes to upstream
4784 .gitignores: but, such patches exist in debian/patches.
4787 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4788 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4789 quiltify_splitbrain_needed();
4790 progress "dgit view: creating patch to represent .gitignore changes";
4791 ensuredir "debian/patches";
4792 my $gipatch = "debian/patches/auto-gitignore";
4793 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4794 stat GIPATCH or die "$gipatch: $!";
4795 fail "$gipatch already exists; but want to create it".
4796 " to record .gitignore changes" if (stat _)[7];
4797 print GIPATCH <<END or die "$gipatch: $!";
4798 Subject: Update .gitignore from Debian packaging branch
4800 The Debian packaging git branch contains these updates to the upstream
4801 .gitignore file(s). This patch is autogenerated, to provide these
4802 updates to users of the official Debian archive view of the package.
4804 [dgit ($our_version) update-gitignore]
4807 close GIPATCH or die "$gipatch: $!";
4808 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4809 $unapplied, $headref, "--", sort keys %$editedignores;
4810 open SERIES, "+>>", "debian/patches/series" or die $!;
4811 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4813 defined read SERIES, $newline, 1 or die $!;
4814 print SERIES "\n" or die $! unless $newline eq "\n";
4815 print SERIES "auto-gitignore\n" or die $!;
4816 close SERIES or die $!;
4817 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4819 Commit patch to update .gitignore
4821 [dgit ($our_version) update-gitignore-quilt-fixup]
4825 my $dgitview = git_rev_parse 'HEAD';
4827 changedir '../../../..';
4828 # When we no longer need to support squeeze, use --create-reflog
4830 ensuredir ".git/logs/refs/dgit-intern";
4831 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4834 my $oldcache = git_get_ref "refs/$splitbraincache";
4835 if ($oldcache eq $dgitview) {
4836 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4837 # git update-ref doesn't always update, in this case. *sigh*
4838 my $dummy = make_commit_text <<END;
4841 author Dgit <dgit\@example.com> 1000000000 +0000
4842 committer Dgit <dgit\@example.com> 1000000000 +0000
4844 Dummy commit - do not use
4846 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4847 "refs/$splitbraincache", $dummy;
4849 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4852 changedir '.git/dgit/unpack/work';
4854 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4855 progress "dgit view: created ($saved)";
4858 sub quiltify ($$$$) {
4859 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4861 # Quilt patchification algorithm
4863 # We search backwards through the history of the main tree's HEAD
4864 # (T) looking for a start commit S whose tree object is identical
4865 # to to the patch tip tree (ie the tree corresponding to the
4866 # current dpkg-committed patch series). For these purposes
4867 # `identical' disregards anything in debian/ - this wrinkle is
4868 # necessary because dpkg-source treates debian/ specially.
4870 # We can only traverse edges where at most one of the ancestors'
4871 # trees differs (in changes outside in debian/). And we cannot
4872 # handle edges which change .pc/ or debian/patches. To avoid
4873 # going down a rathole we avoid traversing edges which introduce
4874 # debian/rules or debian/control. And we set a limit on the
4875 # number of edges we are willing to look at.
4877 # If we succeed, we walk forwards again. For each traversed edge
4878 # PC (with P parent, C child) (starting with P=S and ending with
4879 # C=T) to we do this:
4881 # - dpkg-source --commit with a patch name and message derived from C
4882 # After traversing PT, we git commit the changes which
4883 # should be contained within debian/patches.
4885 # The search for the path S..T is breadth-first. We maintain a
4886 # todo list containing search nodes. A search node identifies a
4887 # commit, and looks something like this:
4889 # Commit => $git_commit_id,
4890 # Child => $c, # or undef if P=T
4891 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4892 # Nontrivial => true iff $p..$c has relevant changes
4899 my %considered; # saves being exponential on some weird graphs
4901 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4904 my ($search,$whynot) = @_;
4905 printdebug " search NOT $search->{Commit} $whynot\n";
4906 $search->{Whynot} = $whynot;
4907 push @nots, $search;
4908 no warnings qw(exiting);
4917 my $c = shift @todo;
4918 next if $considered{$c->{Commit}}++;
4920 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4922 printdebug "quiltify investigate $c->{Commit}\n";
4925 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4926 printdebug " search finished hooray!\n";
4931 if ($quilt_mode eq 'nofix') {
4932 fail "quilt fixup required but quilt mode is \`nofix'\n".
4933 "HEAD commit $c->{Commit} differs from tree implied by ".
4934 " debian/patches (tree object $oldtiptree)";
4936 if ($quilt_mode eq 'smash') {
4937 printdebug " search quitting smash\n";
4941 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4942 $not->($c, "has $c_sentinels not $t_sentinels")
4943 if $c_sentinels ne $t_sentinels;
4945 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4946 $commitdata =~ m/\n\n/;
4948 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4949 @parents = map { { Commit => $_, Child => $c } } @parents;
4951 $not->($c, "root commit") if !@parents;
4953 foreach my $p (@parents) {
4954 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4956 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4957 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4959 foreach my $p (@parents) {
4960 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4962 my @cmd= (@git, qw(diff-tree -r --name-only),
4963 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4964 my $patchstackchange = cmdoutput @cmd;
4965 if (length $patchstackchange) {
4966 $patchstackchange =~ s/\n/,/g;
4967 $not->($p, "changed $patchstackchange");
4970 printdebug " search queue P=$p->{Commit} ",
4971 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4977 printdebug "quiltify want to smash\n";
4980 my $x = $_[0]{Commit};
4981 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4984 my $reportnot = sub {
4986 my $s = $abbrev->($notp);
4987 my $c = $notp->{Child};
4988 $s .= "..".$abbrev->($c) if $c;
4989 $s .= ": ".$notp->{Whynot};
4992 if ($quilt_mode eq 'linear') {
4993 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4994 foreach my $notp (@nots) {
4995 print STDERR "$us: ", $reportnot->($notp), "\n";
4997 print STDERR "$us: $_\n" foreach @$failsuggestion;
4998 fail "quilt fixup naive history linearisation failed.\n".
4999 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5000 } elsif ($quilt_mode eq 'smash') {
5001 } elsif ($quilt_mode eq 'auto') {
5002 progress "quilt fixup cannot be linear, smashing...";
5004 die "$quilt_mode ?";
5007 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5008 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5010 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5012 quiltify_dpkg_commit "auto-$version-$target-$time",
5013 (getfield $clogp, 'Maintainer'),
5014 "Automatically generated patch ($clogp->{Version})\n".
5015 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5019 progress "quiltify linearisation planning successful, executing...";
5021 for (my $p = $sref_S;
5022 my $c = $p->{Child};
5024 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5025 next unless $p->{Nontrivial};
5027 my $cc = $c->{Commit};
5029 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5030 $commitdata =~ m/\n\n/ or die "$c ?";
5033 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5036 my $commitdate = cmdoutput
5037 @git, qw(log -n1 --pretty=format:%aD), $cc;
5039 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5041 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5048 my $gbp_check_suitable = sub {
5053 die "contains unexpected slashes\n" if m{//} || m{/$};
5054 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5055 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5056 die "too long" if length > 200;
5058 return $_ unless $@;
5059 print STDERR "quiltifying commit $cc:".
5060 " ignoring/dropping Gbp-Pq $what: $@";
5064 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5066 (\S+) \s* \n //ixm) {
5067 $patchname = $gbp_check_suitable->($1, 'Name');
5069 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5071 (\S+) \s* \n //ixm) {
5072 $patchdir = $gbp_check_suitable->($1, 'Topic');
5077 if (!defined $patchname) {
5078 $patchname = $title;
5079 $patchname =~ s/[.:]$//;
5082 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5083 my $translitname = $converter->convert($patchname);
5084 die unless defined $translitname;
5085 $patchname = $translitname;
5088 "dgit: patch title transliteration error: $@"
5090 $patchname =~ y/ A-Z/-a-z/;
5091 $patchname =~ y/-a-z0-9_.+=~//cd;
5092 $patchname =~ s/^\W/x-$&/;
5093 $patchname = substr($patchname,0,40);
5095 if (!defined $patchdir) {
5098 if (length $patchdir) {
5099 $patchname = "$patchdir/$patchname";
5101 if ($patchname =~ m{^(.*)/}) {
5102 mkpath "debian/patches/$1";
5107 stat "debian/patches/$patchname$index";
5109 $!==ENOENT or die "$patchname$index $!";
5111 runcmd @git, qw(checkout -q), $cc;
5113 # We use the tip's changelog so that dpkg-source doesn't
5114 # produce complaining messages from dpkg-parsechangelog. None
5115 # of the information dpkg-source gets from the changelog is
5116 # actually relevant - it gets put into the original message
5117 # which dpkg-source provides our stunt editor, and then
5119 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5121 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5122 "Date: $commitdate\n".
5123 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5125 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5128 runcmd @git, qw(checkout -q master);
5131 sub build_maybe_quilt_fixup () {
5132 my ($format,$fopts) = get_source_format;
5133 return unless madformat_wantfixup $format;
5136 check_for_vendor_patches();
5138 if (quiltmode_splitbrain) {
5139 fail <<END unless access_cfg_tagformats_can_splitbrain;
5140 quilt mode $quilt_mode requires split view so server needs to support
5141 both "new" and "maint" tag formats, but config says it doesn't.
5145 my $clogp = parsechangelog();
5146 my $headref = git_rev_parse('HEAD');
5151 my $upstreamversion = upstreamversion $version;
5153 if ($fopts->{'single-debian-patch'}) {
5154 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5156 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5159 die 'bug' if $split_brain && !$need_split_build_invocation;
5161 changedir '../../../..';
5162 runcmd_ordryrun_local
5163 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5166 sub quilt_fixup_mkwork ($) {
5169 mkdir "work" or die $!;
5171 mktree_in_ud_here();
5172 runcmd @git, qw(reset -q --hard), $headref;
5175 sub quilt_fixup_linkorigs ($$) {
5176 my ($upstreamversion, $fn) = @_;
5177 # calls $fn->($leafname);
5179 foreach my $f (<../../../../*>) { #/){
5180 my $b=$f; $b =~ s{.*/}{};
5182 local ($debuglevel) = $debuglevel-1;
5183 printdebug "QF linkorigs $b, $f ?\n";
5185 next unless is_orig_file_of_vsn $b, $upstreamversion;
5186 printdebug "QF linkorigs $b, $f Y\n";
5187 link_ltarget $f, $b or die "$b $!";
5192 sub quilt_fixup_delete_pc () {
5193 runcmd @git, qw(rm -rqf .pc);
5195 Commit removal of .pc (quilt series tracking data)
5197 [dgit ($our_version) upgrade quilt-remove-pc]
5201 sub quilt_fixup_singlepatch ($$$) {
5202 my ($clogp, $headref, $upstreamversion) = @_;
5204 progress "starting quiltify (single-debian-patch)";
5206 # dpkg-source --commit generates new patches even if
5207 # single-debian-patch is in debian/source/options. In order to
5208 # get it to generate debian/patches/debian-changes, it is
5209 # necessary to build the source package.
5211 quilt_fixup_linkorigs($upstreamversion, sub { });
5212 quilt_fixup_mkwork($headref);
5214 rmtree("debian/patches");
5216 runcmd @dpkgsource, qw(-b .);
5218 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5219 rename srcfn("$upstreamversion", "/debian/patches"),
5220 "work/debian/patches";
5223 commit_quilty_patch();
5226 sub quilt_make_fake_dsc ($) {
5227 my ($upstreamversion) = @_;
5229 my $fakeversion="$upstreamversion-~~DGITFAKE";
5231 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5232 print $fakedsc <<END or die $!;
5235 Version: $fakeversion
5239 my $dscaddfile=sub {
5242 my $md = new Digest::MD5;
5244 my $fh = new IO::File $b, '<' or die "$b $!";
5249 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5252 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5254 my @files=qw(debian/source/format debian/rules
5255 debian/control debian/changelog);
5256 foreach my $maybe (qw(debian/patches debian/source/options
5257 debian/tests/control)) {
5258 next unless stat_exists "../../../$maybe";
5259 push @files, $maybe;
5262 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5263 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5265 $dscaddfile->($debtar);
5266 close $fakedsc or die $!;
5269 sub quilt_check_splitbrain_cache ($$) {
5270 my ($headref, $upstreamversion) = @_;
5271 # Called only if we are in (potentially) split brain mode.
5273 # Computes the cache key and looks in the cache.
5274 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5276 my $splitbrain_cachekey;
5279 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5280 # we look in the reflog of dgit-intern/quilt-cache
5281 # we look for an entry whose message is the key for the cache lookup
5282 my @cachekey = (qw(dgit), $our_version);
5283 push @cachekey, $upstreamversion;
5284 push @cachekey, $quilt_mode;
5285 push @cachekey, $headref;
5287 push @cachekey, hashfile('fake.dsc');
5289 my $srcshash = Digest::SHA->new(256);
5290 my %sfs = ( %INC, '$0(dgit)' => $0 );
5291 foreach my $sfk (sort keys %sfs) {
5292 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5293 $srcshash->add($sfk," ");
5294 $srcshash->add(hashfile($sfs{$sfk}));
5295 $srcshash->add("\n");
5297 push @cachekey, $srcshash->hexdigest();
5298 $splitbrain_cachekey = "@cachekey";
5300 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5302 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5303 debugcmd "|(probably)",@cmd;
5304 my $child = open GC, "-|"; defined $child or die $!;
5306 chdir '../../..' or die $!;
5307 if (!stat ".git/logs/refs/$splitbraincache") {
5308 $! == ENOENT or die $!;
5309 printdebug ">(no reflog)\n";
5316 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5317 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5320 quilt_fixup_mkwork($headref);
5321 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5322 if ($cachehit ne $headref) {
5323 progress "dgit view: found cached ($saved)";
5324 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5326 return ($cachehit, $splitbrain_cachekey);
5328 progress "dgit view: found cached, no changes required";
5329 return ($headref, $splitbrain_cachekey);
5331 die $! if GC->error;
5332 failedcmd unless close GC;
5334 printdebug "splitbrain cache miss\n";
5335 return (undef, $splitbrain_cachekey);
5338 sub quilt_fixup_multipatch ($$$) {
5339 my ($clogp, $headref, $upstreamversion) = @_;
5341 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5344 # - honour any existing .pc in case it has any strangeness
5345 # - determine the git commit corresponding to the tip of
5346 # the patch stack (if there is one)
5347 # - if there is such a git commit, convert each subsequent
5348 # git commit into a quilt patch with dpkg-source --commit
5349 # - otherwise convert all the differences in the tree into
5350 # a single git commit
5354 # Our git tree doesn't necessarily contain .pc. (Some versions of
5355 # dgit would include the .pc in the git tree.) If there isn't
5356 # one, we need to generate one by unpacking the patches that we
5359 # We first look for a .pc in the git tree. If there is one, we
5360 # will use it. (This is not the normal case.)
5362 # Otherwise need to regenerate .pc so that dpkg-source --commit
5363 # can work. We do this as follows:
5364 # 1. Collect all relevant .orig from parent directory
5365 # 2. Generate a debian.tar.gz out of
5366 # debian/{patches,rules,source/format,source/options}
5367 # 3. Generate a fake .dsc containing just these fields:
5368 # Format Source Version Files
5369 # 4. Extract the fake .dsc
5370 # Now the fake .dsc has a .pc directory.
5371 # (In fact we do this in every case, because in future we will
5372 # want to search for a good base commit for generating patches.)
5374 # Then we can actually do the dpkg-source --commit
5375 # 1. Make a new working tree with the same object
5376 # store as our main tree and check out the main
5378 # 2. Copy .pc from the fake's extraction, if necessary
5379 # 3. Run dpkg-source --commit
5380 # 4. If the result has changes to debian/, then
5381 # - git add them them
5382 # - git add .pc if we had a .pc in-tree
5384 # 5. If we had a .pc in-tree, delete it, and git commit
5385 # 6. Back in the main tree, fast forward to the new HEAD
5387 # Another situation we may have to cope with is gbp-style
5388 # patches-unapplied trees.
5390 # We would want to detect these, so we know to escape into
5391 # quilt_fixup_gbp. However, this is in general not possible.
5392 # Consider a package with a one patch which the dgit user reverts
5393 # (with git revert or the moral equivalent).
5395 # That is indistinguishable in contents from a patches-unapplied
5396 # tree. And looking at the history to distinguish them is not
5397 # useful because the user might have made a confusing-looking git
5398 # history structure (which ought to produce an error if dgit can't
5399 # cope, not a silent reintroduction of an unwanted patch).
5401 # So gbp users will have to pass an option. But we can usually
5402 # detect their failure to do so: if the tree is not a clean
5403 # patches-applied tree, quilt linearisation fails, but the tree
5404 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5405 # they want --quilt=unapplied.
5407 # To help detect this, when we are extracting the fake dsc, we
5408 # first extract it with --skip-patches, and then apply the patches
5409 # afterwards with dpkg-source --before-build. That lets us save a
5410 # tree object corresponding to .origs.
5412 my $splitbrain_cachekey;
5414 quilt_make_fake_dsc($upstreamversion);
5416 if (quiltmode_splitbrain()) {
5418 ($cachehit, $splitbrain_cachekey) =
5419 quilt_check_splitbrain_cache($headref, $upstreamversion);
5420 return if $cachehit;
5424 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5426 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5427 rename $fakexdir, "fake" or die "$fakexdir $!";
5431 remove_stray_gits("source package");
5432 mktree_in_ud_here();
5436 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5437 my $unapplied=git_add_write_tree();
5438 printdebug "fake orig tree object $unapplied\n";
5442 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5444 if (system @bbcmd) {
5445 failedcmd @bbcmd if $? < 0;
5447 failed to apply your git tree's patch stack (from debian/patches/) to
5448 the corresponding upstream tarball(s). Your source tree and .orig
5449 are probably too inconsistent. dgit can only fix up certain kinds of
5450 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5456 quilt_fixup_mkwork($headref);
5459 if (stat_exists ".pc") {
5461 progress "Tree already contains .pc - will use it then delete it.";
5464 rename '../fake/.pc','.pc' or die $!;
5467 changedir '../fake';
5469 my $oldtiptree=git_add_write_tree();
5470 printdebug "fake o+d/p tree object $unapplied\n";
5471 changedir '../work';
5474 # We calculate some guesswork now about what kind of tree this might
5475 # be. This is mostly for error reporting.
5481 # O = orig, without patches applied
5482 # A = "applied", ie orig with H's debian/patches applied
5483 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5484 \%editedignores, \@unrepres),
5485 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5486 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5490 foreach my $b (qw(01 02)) {
5491 foreach my $v (qw(O2H O2A H2A)) {
5492 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5495 printdebug "differences \@dl @dl.\n";
5498 "$us: base trees orig=%.20s o+d/p=%.20s",
5499 $unapplied, $oldtiptree;
5501 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5502 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5503 $dl[0], $dl[1], $dl[3], $dl[4],
5507 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5509 forceable_fail [qw(unrepresentable)], <<END;
5510 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5515 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5516 push @failsuggestion, "This might be a patches-unapplied branch.";
5517 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5518 push @failsuggestion, "This might be a patches-applied branch.";
5520 push @failsuggestion, "Maybe you need to specify one of".
5521 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5523 if (quiltmode_splitbrain()) {
5524 quiltify_splitbrain($clogp, $unapplied, $headref,
5525 $diffbits, \%editedignores,
5526 $splitbrain_cachekey);
5530 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5531 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5533 if (!open P, '>>', ".pc/applied-patches") {
5534 $!==&ENOENT or die $!;
5539 commit_quilty_patch();
5541 if ($mustdeletepc) {
5542 quilt_fixup_delete_pc();
5546 sub quilt_fixup_editor () {
5547 my $descfn = $ENV{$fakeeditorenv};
5548 my $editing = $ARGV[$#ARGV];
5549 open I1, '<', $descfn or die "$descfn: $!";
5550 open I2, '<', $editing or die "$editing: $!";
5551 unlink $editing or die "$editing: $!";
5552 open O, '>', $editing or die "$editing: $!";
5553 while (<I1>) { print O or die $!; } I1->error and die $!;
5556 $copying ||= m/^\-\-\- /;
5557 next unless $copying;
5560 I2->error and die $!;
5565 sub maybe_apply_patches_dirtily () {
5566 return unless $quilt_mode =~ m/gbp|unapplied/;
5567 print STDERR <<END or die $!;
5569 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5570 dgit: Have to apply the patches - making the tree dirty.
5571 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5574 $patches_applied_dirtily = 01;
5575 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5576 runcmd qw(dpkg-source --before-build .);
5579 sub maybe_unapply_patches_again () {
5580 progress "dgit: Unapplying patches again to tidy up the tree."
5581 if $patches_applied_dirtily;
5582 runcmd qw(dpkg-source --after-build .)
5583 if $patches_applied_dirtily & 01;
5585 if $patches_applied_dirtily & 02;
5586 $patches_applied_dirtily = 0;
5589 #----- other building -----
5591 our $clean_using_builder;
5592 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5593 # clean the tree before building (perhaps invoked indirectly by
5594 # whatever we are using to run the build), rather than separately
5595 # and explicitly by us.
5598 return if $clean_using_builder;
5599 if ($cleanmode eq 'dpkg-source') {
5600 maybe_apply_patches_dirtily();
5601 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5602 } elsif ($cleanmode eq 'dpkg-source-d') {
5603 maybe_apply_patches_dirtily();
5604 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5605 } elsif ($cleanmode eq 'git') {
5606 runcmd_ordryrun_local @git, qw(clean -xdf);
5607 } elsif ($cleanmode eq 'git-ff') {
5608 runcmd_ordryrun_local @git, qw(clean -xdff);
5609 } elsif ($cleanmode eq 'check') {
5610 my $leftovers = cmdoutput @git, qw(clean -xdn);
5611 if (length $leftovers) {
5612 print STDERR $leftovers, "\n" or die $!;
5613 fail "tree contains uncommitted files and --clean=check specified";
5615 } elsif ($cleanmode eq 'none') {
5622 badusage "clean takes no additional arguments" if @ARGV;
5625 maybe_unapply_patches_again();
5628 sub build_prep_early () {
5629 our $build_prep_early_done //= 0;
5630 return if $build_prep_early_done++;
5632 badusage "-p is not allowed when building" if defined $package;
5633 my $clogp = parsechangelog();
5634 $isuite = getfield $clogp, 'Distribution';
5635 $package = getfield $clogp, 'Source';
5636 $version = getfield $clogp, 'Version';
5643 build_maybe_quilt_fixup();
5645 my $pat = changespat $version;
5646 foreach my $f (glob "$buildproductsdir/$pat") {
5648 unlink $f or fail "remove old changes file $f: $!";
5650 progress "would remove $f";
5656 sub changesopts_initial () {
5657 my @opts =@changesopts[1..$#changesopts];
5660 sub changesopts_version () {
5661 if (!defined $changes_since_version) {
5662 my @vsns = archive_query('archive_query');
5663 my @quirk = access_quirk();
5664 if ($quirk[0] eq 'backports') {
5665 local $isuite = $quirk[2];
5667 canonicalise_suite();
5668 push @vsns, archive_query('archive_query');
5671 @vsns = map { $_->[0] } @vsns;
5672 @vsns = sort { -version_compare($a, $b) } @vsns;
5673 $changes_since_version = $vsns[0];
5674 progress "changelog will contain changes since $vsns[0]";
5676 $changes_since_version = '_';
5677 progress "package seems new, not specifying -v<version>";
5680 if ($changes_since_version ne '_') {
5681 return ("-v$changes_since_version");
5687 sub changesopts () {
5688 return (changesopts_initial(), changesopts_version());
5691 sub massage_dbp_args ($;$) {
5692 my ($cmd,$xargs) = @_;
5695 # - if we're going to split the source build out so we can
5696 # do strange things to it, massage the arguments to dpkg-buildpackage
5697 # so that the main build doessn't build source (or add an argument
5698 # to stop it building source by default).
5700 # - add -nc to stop dpkg-source cleaning the source tree,
5701 # unless we're not doing a split build and want dpkg-source
5702 # as cleanmode, in which case we can do nothing
5705 # 0 - source will NOT need to be built separately by caller
5706 # +1 - source will need to be built separately by caller
5707 # +2 - source will need to be built separately by caller AND
5708 # dpkg-buildpackage should not in fact be run at all!
5709 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5710 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5711 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5712 $clean_using_builder = 1;
5715 # -nc has the side effect of specifying -b if nothing else specified
5716 # and some combinations of -S, -b, et al, are errors, rather than
5717 # later simply overriding earlie. So we need to:
5718 # - search the command line for these options
5719 # - pick the last one
5720 # - perhaps add our own as a default
5721 # - perhaps adjust it to the corresponding non-source-building version
5723 foreach my $l ($cmd, $xargs) {
5725 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5728 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5730 if ($need_split_build_invocation) {
5731 printdebug "massage split $dmode.\n";
5732 $r = $dmode =~ m/[S]/ ? +2 :
5733 $dmode =~ y/gGF/ABb/ ? +1 :
5734 $dmode =~ m/[ABb]/ ? 0 :
5737 printdebug "massage done $r $dmode.\n";
5739 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5745 my $wasdir = must_getcwd();
5751 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5752 my ($msg_if_onlyone) = @_;
5753 # If there is only one .changes file, fail with $msg_if_onlyone,
5754 # or if that is undef, be a no-op.
5755 # Returns the changes file to report to the user.
5756 my $pat = changespat $version;
5757 my @changesfiles = glob $pat;
5758 @changesfiles = sort {
5759 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5763 if (@changesfiles==1) {
5764 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5765 only one changes file from build (@changesfiles)
5767 $result = $changesfiles[0];
5768 } elsif (@changesfiles==2) {
5769 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5770 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5771 fail "$l found in binaries changes file $binchanges"
5774 runcmd_ordryrun_local @mergechanges, @changesfiles;
5775 my $multichanges = changespat $version,'multi';
5777 stat_exists $multichanges or fail "$multichanges: $!";
5778 foreach my $cf (glob $pat) {
5779 next if $cf eq $multichanges;
5780 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5783 $result = $multichanges;
5785 fail "wrong number of different changes files (@changesfiles)";
5787 printdone "build successful, results in $result\n" or die $!;
5790 sub midbuild_checkchanges () {
5791 my $pat = changespat $version;
5792 return if $rmchanges;
5793 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5794 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5796 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5797 Suggest you delete @unwanted.
5802 sub midbuild_checkchanges_vanilla ($) {
5804 midbuild_checkchanges() if $wantsrc == 1;
5807 sub postbuild_mergechanges_vanilla ($) {
5809 if ($wantsrc == 1) {
5811 postbuild_mergechanges(undef);
5814 printdone "build successful\n";
5820 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5821 my $wantsrc = massage_dbp_args \@dbp;
5824 midbuild_checkchanges_vanilla $wantsrc;
5829 push @dbp, changesopts_version();
5830 maybe_apply_patches_dirtily();
5831 runcmd_ordryrun_local @dbp;
5833 maybe_unapply_patches_again();
5834 postbuild_mergechanges_vanilla $wantsrc;
5838 $quilt_mode //= 'gbp';
5844 # gbp can make .origs out of thin air. In my tests it does this
5845 # even for a 1.0 format package, with no origs present. So I
5846 # guess it keys off just the version number. We don't know
5847 # exactly what .origs ought to exist, but let's assume that we
5848 # should run gbp if: the version has an upstream part and the main
5850 my $upstreamversion = upstreamversion $version;
5851 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5852 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5854 if ($gbp_make_orig) {
5856 $cleanmode = 'none'; # don't do it again
5857 $need_split_build_invocation = 1;
5860 my @dbp = @dpkgbuildpackage;
5862 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5864 if (!length $gbp_build[0]) {
5865 if (length executable_on_path('git-buildpackage')) {
5866 $gbp_build[0] = qw(git-buildpackage);
5868 $gbp_build[0] = 'gbp buildpackage';
5871 my @cmd = opts_opt_multi_cmd @gbp_build;
5873 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5875 if ($gbp_make_orig) {
5876 ensuredir '.git/dgit';
5877 my $ok = '.git/dgit/origs-gen-ok';
5878 unlink $ok or $!==&ENOENT or die $!;
5879 my @origs_cmd = @cmd;
5880 push @origs_cmd, qw(--git-cleaner=true);
5881 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5882 push @origs_cmd, @ARGV;
5884 debugcmd @origs_cmd;
5886 do { local $!; stat_exists $ok; }
5887 or failedcmd @origs_cmd;
5889 dryrun_report @origs_cmd;
5895 midbuild_checkchanges_vanilla $wantsrc;
5897 if (!$clean_using_builder) {
5898 push @cmd, '--git-cleaner=true';
5902 maybe_unapply_patches_again();
5904 push @cmd, changesopts();
5905 runcmd_ordryrun_local @cmd, @ARGV;
5907 postbuild_mergechanges_vanilla $wantsrc;
5909 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5913 my $our_cleanmode = $cleanmode;
5914 if ($need_split_build_invocation) {
5915 # Pretend that clean is being done some other way. This
5916 # forces us not to try to use dpkg-buildpackage to clean and
5917 # build source all in one go; and instead we run dpkg-source
5918 # (and build_prep() will do the clean since $clean_using_builder
5920 $our_cleanmode = 'ELSEWHERE';
5922 if ($our_cleanmode =~ m/^dpkg-source/) {
5923 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5924 $clean_using_builder = 1;
5927 $sourcechanges = changespat $version,'source';
5929 unlink "../$sourcechanges" or $!==ENOENT
5930 or fail "remove $sourcechanges: $!";
5932 $dscfn = dscfn($version);
5933 if ($our_cleanmode eq 'dpkg-source') {
5934 maybe_apply_patches_dirtily();
5935 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5937 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5938 maybe_apply_patches_dirtily();
5939 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5942 my @cmd = (@dpkgsource, qw(-b --));
5945 runcmd_ordryrun_local @cmd, "work";
5946 my @udfiles = <${package}_*>;
5947 changedir "../../..";
5948 foreach my $f (@udfiles) {
5949 printdebug "source copy, found $f\n";
5952 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5953 $f eq srcfn($version, $&));
5954 printdebug "source copy, found $f - renaming\n";
5955 rename "$ud/$f", "../$f" or $!==ENOENT
5956 or fail "put in place new source file ($f): $!";
5959 my $pwd = must_getcwd();
5960 my $leafdir = basename $pwd;
5962 runcmd_ordryrun_local @cmd, $leafdir;
5965 runcmd_ordryrun_local qw(sh -ec),
5966 'exec >$1; shift; exec "$@"','x',
5967 "../$sourcechanges",
5968 @dpkggenchanges, qw(-S), changesopts();
5972 sub cmd_build_source {
5974 badusage "build-source takes no additional arguments" if @ARGV;
5976 maybe_unapply_patches_again();
5977 printdone "source built, results in $dscfn and $sourcechanges";
5982 midbuild_checkchanges();
5985 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5986 stat_exists $sourcechanges
5987 or fail "$sourcechanges (in parent directory): $!";
5989 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5991 maybe_unapply_patches_again();
5993 postbuild_mergechanges(<<END);
5994 perhaps you need to pass -A ? (sbuild's default is to build only
5995 arch-specific binaries; dgit 1.4 used to override that.)
6000 sub cmd_quilt_fixup {
6001 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6004 build_maybe_quilt_fixup();
6007 sub cmd_import_dsc {
6011 last unless $ARGV[0] =~ m/^-/;
6014 if (m/^--require-valid-signature$/) {
6017 badusage "unknown dgit import-dsc sub-option \`$_'";
6021 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6022 my ($dscfn, $dstbranch) = @ARGV;
6024 badusage "dry run makes no sense with import-dsc" unless act_local();
6026 my $force = $dstbranch =~ s/^\+// ? +1 :
6027 $dstbranch =~ s/^\.\.// ? -1 :
6029 my $info = $force ? " $&" : '';
6030 $info = "$dscfn$info";
6032 my $specbranch = $dstbranch;
6033 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6034 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6036 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6037 my $chead = cmdoutput_errok @symcmd;
6038 defined $chead or $?==256 or failedcmd @symcmd;
6040 fail "$dstbranch is checked out - will not update it"
6041 if defined $chead and $chead eq $dstbranch;
6043 my $oldhash = git_get_ref $dstbranch;
6045 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6046 $dscdata = do { local $/ = undef; <D>; };
6047 D->error and fail "read $dscfn: $!";
6050 # we don't normally need this so import it here
6051 use Dpkg::Source::Package;
6052 my $dp = new Dpkg::Source::Package filename => $dscfn,
6053 require_valid_signature => $needsig;
6055 local $SIG{__WARN__} = sub {
6057 return unless $needsig;
6058 fail "import-dsc signature check failed";
6060 if (!$dp->is_signed()) {
6061 warn "$us: warning: importing unsigned .dsc\n";
6063 my $r = $dp->check_signature();
6064 die "->check_signature => $r" if $needsig && $r;
6070 $package = getfield $dsc, 'Source';
6072 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6073 unless forceing [qw(import-dsc-with-dgit-field)];
6075 if (defined $dsc_hash) {
6076 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6077 resolve_dsc_field_commit undef, undef;
6079 if (defined $dsc_hash) {
6080 my @cmd = (qw(sh -ec),
6081 "echo $dsc_hash | git cat-file --batch-check");
6082 my $objgot = cmdoutput @cmd;
6083 if ($objgot =~ m#^\w+ missing\b#) {
6085 .dsc contains Dgit field referring to object $dsc_hash
6086 Your git tree does not have that object. Try `git fetch' from a
6087 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6090 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6092 progress "Not fast forward, forced update.";
6094 fail "Not fast forward to $dsc_hash";
6097 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
6098 $dstbranch, $dsc_hash);
6100 progress "dgit: import-dsc updated git ref $dstbranch";
6105 Branch $dstbranch already exists
6106 Specify ..$specbranch for a pseudo-merge, binding in existing history
6107 Specify +$specbranch to overwrite, discarding existing history
6109 if $oldhash && !$force;
6113 my @dfi = dsc_files_info();
6114 foreach my $fi (@dfi) {
6115 my $f = $fi->{Filename};
6117 next if lstat $here;
6118 fail "stat $here: $!" unless $! == ENOENT;
6120 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6122 } elsif ($dscfn =~ m#^/#) {
6125 fail "cannot import $dscfn which seems to be inside working tree!";
6127 $there =~ s#/+[^/]+$## or
6128 fail "cannot import $dscfn which seems to not have a basename";
6130 symlink $there, $here or fail "symlink $there to $here: $!";
6131 progress "made symlink $here -> $there";
6132 # print STDERR Dumper($fi);
6134 my @mergeinputs = generate_commits_from_dsc();
6135 die unless @mergeinputs == 1;
6137 my $newhash = $mergeinputs[0]{Commit};
6141 progress "Import, forced update - synthetic orphan git history.";
6142 } elsif ($force < 0) {
6143 progress "Import, merging.";
6144 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6145 my $version = getfield $dsc, 'Version';
6146 my $clogp = commit_getclogp $newhash;
6147 my $authline = clogp_authline $clogp;
6148 $newhash = make_commit_text <<END;
6155 Merge $package ($version) import into $dstbranch
6158 die; # caught earlier
6162 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
6163 $dstbranch, $newhash);
6165 progress "dgit: import-dsc results are in in git ref $dstbranch";
6168 sub cmd_archive_api_query {
6169 badusage "need only 1 subpath argument" unless @ARGV==1;
6170 my ($subpath) = @ARGV;
6171 my @cmd = archive_api_query_cmd($subpath);
6174 exec @cmd or fail "exec curl: $!\n";
6177 sub cmd_clone_dgit_repos_server {
6178 badusage "need destination argument" unless @ARGV==1;
6179 my ($destdir) = @ARGV;
6180 $package = '_dgit-repos-server';
6181 local $access_forpush = 0;
6182 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6184 exec @cmd or fail "exec git clone: $!\n";
6187 sub cmd_print_dgit_repos_server_source_url {
6188 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6190 $package = '_dgit-repos-server';
6191 local $access_forpush = 0;
6192 my $url = access_giturl();
6193 print $url, "\n" or die $!;
6196 sub cmd_setup_mergechangelogs {
6197 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6198 setup_mergechangelogs(1);
6201 sub cmd_setup_useremail {
6202 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6206 sub cmd_setup_new_tree {
6207 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6211 #---------- argument parsing and main program ----------
6214 print "dgit version $our_version\n" or die $!;
6218 our (%valopts_long, %valopts_short);
6221 sub defvalopt ($$$$) {
6222 my ($long,$short,$val_re,$how) = @_;
6223 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6224 $valopts_long{$long} = $oi;
6225 $valopts_short{$short} = $oi;
6226 # $how subref should:
6227 # do whatever assignemnt or thing it likes with $_[0]
6228 # if the option should not be passed on to remote, @rvalopts=()
6229 # or $how can be a scalar ref, meaning simply assign the value
6232 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6233 defvalopt '--distro', '-d', '.+', \$idistro;
6234 defvalopt '', '-k', '.+', \$keyid;
6235 defvalopt '--existing-package','', '.*', \$existing_package;
6236 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6237 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6238 defvalopt '--package', '-p', $package_re, \$package;
6239 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6241 defvalopt '', '-C', '.+', sub {
6242 ($changesfile) = (@_);
6243 if ($changesfile =~ s#^(.*)/##) {
6244 $buildproductsdir = $1;
6248 defvalopt '--initiator-tempdir','','.*', sub {
6249 ($initiator_tempdir) = (@_);
6250 $initiator_tempdir =~ m#^/# or
6251 badusage "--initiator-tempdir must be used specify an".
6252 " absolute, not relative, directory."
6258 if (defined $ENV{'DGIT_SSH'}) {
6259 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6260 } elsif (defined $ENV{'GIT_SSH'}) {
6261 @ssh = ($ENV{'GIT_SSH'});
6269 if (!defined $val) {
6270 badusage "$what needs a value" unless @ARGV;
6272 push @rvalopts, $val;
6274 badusage "bad value \`$val' for $what" unless
6275 $val =~ m/^$oi->{Re}$(?!\n)/s;
6276 my $how = $oi->{How};
6277 if (ref($how) eq 'SCALAR') {
6282 push @ropts, @rvalopts;
6286 last unless $ARGV[0] =~ m/^-/;
6290 if (m/^--dry-run$/) {
6293 } elsif (m/^--damp-run$/) {
6296 } elsif (m/^--no-sign$/) {
6299 } elsif (m/^--help$/) {
6301 } elsif (m/^--version$/) {
6303 } elsif (m/^--new$/) {
6306 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6307 ($om = $opts_opt_map{$1}) &&
6311 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6312 !$opts_opt_cmdonly{$1} &&
6313 ($om = $opts_opt_map{$1})) {
6316 } elsif (m/^--(gbp|dpm)$/s) {
6317 push @ropts, "--quilt=$1";
6319 } elsif (m/^--ignore-dirty$/s) {
6322 } elsif (m/^--no-quilt-fixup$/s) {
6324 $quilt_mode = 'nocheck';
6325 } elsif (m/^--no-rm-on-error$/s) {
6328 } elsif (m/^--no-chase-dsc-distro$/s) {
6330 $chase_dsc_distro = 0;
6331 } elsif (m/^--overwrite$/s) {
6333 $overwrite_version = '';
6334 } elsif (m/^--overwrite=(.+)$/s) {
6336 $overwrite_version = $1;
6337 } elsif (m/^--dep14tag$/s) {
6339 $dodep14tag= 'want';
6340 } elsif (m/^--no-dep14tag$/s) {
6343 } elsif (m/^--always-dep14tag$/s) {
6345 $dodep14tag= 'always';
6346 } elsif (m/^--delayed=(\d+)$/s) {
6349 } elsif (m/^--dgit-view-save=(.+)$/s) {
6351 $split_brain_save = $1;
6352 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6353 } elsif (m/^--(no-)?rm-old-changes$/s) {
6356 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6358 push @deliberatelies, $&;
6359 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6363 } elsif (m/^--force-/) {
6365 "$us: warning: ignoring unknown force option $_\n";
6367 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6368 # undocumented, for testing
6370 $tagformat_want = [ $1, 'command line', 1 ];
6371 # 1 menas overrides distro configuration
6372 } elsif (m/^--always-split-source-build$/s) {
6373 # undocumented, for testing
6375 $need_split_build_invocation = 1;
6376 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6377 # undocumented, for testing
6379 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6380 # ^ it's supposed to be an array ref
6381 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6382 $val = $2 ? $' : undef; #';
6383 $valopt->($oi->{Long});
6385 badusage "unknown long option \`$_'";
6392 } elsif (s/^-L/-/) {
6395 } elsif (s/^-h/-/) {
6397 } elsif (s/^-D/-/) {
6401 } elsif (s/^-N/-/) {
6406 push @changesopts, $_;
6408 } elsif (s/^-wn$//s) {
6410 $cleanmode = 'none';
6411 } elsif (s/^-wg$//s) {
6414 } elsif (s/^-wgf$//s) {
6416 $cleanmode = 'git-ff';
6417 } elsif (s/^-wd$//s) {
6419 $cleanmode = 'dpkg-source';
6420 } elsif (s/^-wdd$//s) {
6422 $cleanmode = 'dpkg-source-d';
6423 } elsif (s/^-wc$//s) {
6425 $cleanmode = 'check';
6426 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6427 push @git, '-c', $&;
6428 $gitcfgs{cmdline}{$1} = [ $2 ];
6429 } elsif (s/^-c([^=]+)$//s) {
6430 push @git, '-c', $&;
6431 $gitcfgs{cmdline}{$1} = [ 'true' ];
6432 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6434 $val = undef unless length $val;
6435 $valopt->($oi->{Short});
6438 badusage "unknown short option \`$_'";
6445 sub check_env_sanity () {
6446 my $blocked = new POSIX::SigSet;
6447 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6450 foreach my $name (qw(PIPE CHLD)) {
6451 my $signame = "SIG$name";
6452 my $signum = eval "POSIX::$signame" // die;
6453 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6454 die "$signame is set to something other than SIG_DFL\n";
6455 $blocked->ismember($signum) and
6456 die "$signame is blocked\n";
6462 On entry to dgit, $@
6463 This is a bug produced by something in in your execution environment.
6469 sub parseopts_late_defaults () {
6470 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6471 if defined $idistro;
6472 $isuite //= cfg('dgit.default.default-suite');
6474 foreach my $k (keys %opts_opt_map) {
6475 my $om = $opts_opt_map{$k};
6477 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6479 badcfg "cannot set command for $k"
6480 unless length $om->[0];
6484 foreach my $c (access_cfg_cfgs("opts-$k")) {
6486 map { $_ ? @$_ : () }
6487 map { $gitcfgs{$_}{$c} }
6488 reverse @gitcfgsources;
6489 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6490 "\n" if $debuglevel >= 4;
6492 badcfg "cannot configure options for $k"
6493 if $opts_opt_cmdonly{$k};
6494 my $insertpos = $opts_cfg_insertpos{$k};
6495 @$om = ( @$om[0..$insertpos-1],
6497 @$om[$insertpos..$#$om] );
6501 if (!defined $rmchanges) {
6502 local $access_forpush;
6503 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6506 if (!defined $quilt_mode) {
6507 local $access_forpush;
6508 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6509 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6511 $quilt_mode =~ m/^($quilt_modes_re)$/
6512 or badcfg "unknown quilt-mode \`$quilt_mode'";
6516 if (!defined $dodep14tag) {
6517 local $access_forpush;
6518 $dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
6519 $dodep14tag =~ m/^($dodep14tag_re)$/
6520 or badcfg "unknown dep14tag setting \`$dodep14tag'";
6524 $need_split_build_invocation ||= quiltmode_splitbrain();
6526 if (!defined $cleanmode) {
6527 local $access_forpush;
6528 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6529 $cleanmode //= 'dpkg-source';
6531 badcfg "unknown clean-mode \`$cleanmode'" unless
6532 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6536 if ($ENV{$fakeeditorenv}) {
6538 quilt_fixup_editor();
6545 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6546 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6547 if $dryrun_level == 1;
6549 print STDERR $helpmsg or die $!;
6552 my $cmd = shift @ARGV;
6555 my $pre_fn = ${*::}{"pre_$cmd"};
6556 $pre_fn->() if $pre_fn;
6558 my $fn = ${*::}{"cmd_$cmd"};
6559 $fn or badusage "unknown operation $cmd";