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 if (stat_exists $tf) {
2469 progress "using existing $f";
2471 printdebug "$tf does not exist, need to fetch\n";
2473 $furl =~ s{/[^/]+$}{};
2475 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2476 die "$f ?" if $f =~ m#/#;
2477 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2478 return 0 if !act_local();
2482 open F, "<", "$tf" or die "$tf: $!";
2483 $fi->{Digester}->reset();
2484 $fi->{Digester}->addfile(*F);
2485 F->error and die $!;
2486 my $got = $fi->{Digester}->hexdigest();
2487 $got eq $fi->{Hash} or
2488 fail "file $f has hash $got but .dsc".
2489 " demands hash $fi->{Hash} ".
2490 ($downloaded ? "(got wrong file from archive!)"
2491 : "(perhaps you should delete this file?)");
2496 sub ensure_we_have_orig () {
2497 my @dfi = dsc_files_info();
2498 foreach my $fi (@dfi) {
2499 my $f = $fi->{Filename};
2500 next unless is_orig_file_in_dsc($f, \@dfi);
2501 complete_file_from_dsc('..', $fi)
2506 #---------- git fetch ----------
2508 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2509 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2511 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2512 # locally fetched refs because they have unhelpful names and clutter
2513 # up gitk etc. So we track whether we have "used up" head ref (ie,
2514 # whether we have made another local ref which refers to this object).
2516 # (If we deleted them unconditionally, then we might end up
2517 # re-fetching the same git objects each time dgit fetch was run.)
2519 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
2520 # in git_fetch_us to fetch the refs in question, and possibly a call
2521 # to lrfetchref_used.
2523 our (%lrfetchrefs_f, %lrfetchrefs_d);
2524 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2526 sub lrfetchref_used ($) {
2527 my ($fullrefname) = @_;
2528 my $objid = $lrfetchrefs_f{$fullrefname};
2529 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2532 sub git_lrfetch_sane {
2533 my ($supplementary, @specs) = @_;
2534 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2535 # at least as regards @specs. Also leave the results in
2536 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2537 # able to clean these up.
2539 # With $supplementary==1, @specs must not contain wildcards
2540 # and we add to our previous fetches (non-atomically).
2542 # This is rather miserable:
2543 # When git fetch --prune is passed a fetchspec ending with a *,
2544 # it does a plausible thing. If there is no * then:
2545 # - it matches subpaths too, even if the supplied refspec
2546 # starts refs, and behaves completely madly if the source
2547 # has refs/refs/something. (See, for example, Debian #NNNN.)
2548 # - if there is no matching remote ref, it bombs out the whole
2550 # We want to fetch a fixed ref, and we don't know in advance
2551 # if it exists, so this is not suitable.
2553 # Our workaround is to use git ls-remote. git ls-remote has its
2554 # own qairks. Notably, it has the absurd multi-tail-matching
2555 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2556 # refs/refs/foo etc.
2558 # Also, we want an idempotent snapshot, but we have to make two
2559 # calls to the remote: one to git ls-remote and to git fetch. The
2560 # solution is use git ls-remote to obtain a target state, and
2561 # git fetch to try to generate it. If we don't manage to generate
2562 # the target state, we try again.
2564 my $url = access_giturl();
2566 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2568 my $specre = join '|', map {
2571 my $wildcard = $x =~ s/\\\*$/.*/;
2572 die if $wildcard && $supplementary;
2575 printdebug "git_lrfetch_sane specre=$specre\n";
2576 my $wanted_rref = sub {
2578 return m/^(?:$specre)$/;
2581 my $fetch_iteration = 0;
2584 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2585 if (++$fetch_iteration > 10) {
2586 fail "too many iterations trying to get sane fetch!";
2589 my @look = map { "refs/$_" } @specs;
2590 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2594 open GITLS, "-|", @lcmd or die $!;
2596 printdebug "=> ", $_;
2597 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2598 my ($objid,$rrefname) = ($1,$2);
2599 if (!$wanted_rref->($rrefname)) {
2601 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2605 $wantr{$rrefname} = $objid;
2608 close GITLS or failedcmd @lcmd;
2610 # OK, now %want is exactly what we want for refs in @specs
2612 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2613 "+refs/$_:".lrfetchrefs."/$_";
2616 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2618 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2619 runcmd_ordryrun_local @fcmd if @fspecs;
2621 if (!$supplementary) {
2622 %lrfetchrefs_f = ();
2626 git_for_each_ref(lrfetchrefs, sub {
2627 my ($objid,$objtype,$lrefname,$reftail) = @_;
2628 $lrfetchrefs_f{$lrefname} = $objid;
2629 $objgot{$objid} = 1;
2632 if ($supplementary) {
2636 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2637 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2638 if (!exists $wantr{$rrefname}) {
2639 if ($wanted_rref->($rrefname)) {
2641 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2645 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2648 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2649 delete $lrfetchrefs_f{$lrefname};
2653 foreach my $rrefname (sort keys %wantr) {
2654 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2655 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2656 my $want = $wantr{$rrefname};
2657 next if $got eq $want;
2658 if (!defined $objgot{$want}) {
2660 warning: git ls-remote suggests we want $lrefname
2661 warning: and it should refer to $want
2662 warning: but git fetch didn't fetch that object to any relevant ref.
2663 warning: This may be due to a race with someone updating the server.
2664 warning: Will try again...
2666 next FETCH_ITERATION;
2669 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2671 runcmd_ordryrun_local @git, qw(update-ref -m),
2672 "dgit fetch git fetch fixup", $lrefname, $want;
2673 $lrfetchrefs_f{$lrefname} = $want;
2678 if (defined $csuite) {
2679 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2680 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2681 my ($objid,$objtype,$lrefname,$reftail) = @_;
2682 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2683 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2687 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2688 Dumper(\%lrfetchrefs_f);
2691 sub git_fetch_us () {
2692 # Want to fetch only what we are going to use, unless
2693 # deliberately-not-ff, in which case we must fetch everything.
2695 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2697 (quiltmode_splitbrain
2698 ? (map { $_->('*',access_nomdistro) }
2699 \&debiantag_new, \&debiantag_maintview)
2700 : debiantags('*',access_nomdistro));
2701 push @specs, server_branch($csuite);
2702 push @specs, $rewritemap;
2703 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2705 git_lrfetch_sane 0, @specs;
2708 my @tagpats = debiantags('*',access_nomdistro);
2710 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2711 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2712 printdebug "currently $fullrefname=$objid\n";
2713 $here{$fullrefname} = $objid;
2715 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2716 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2717 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2718 printdebug "offered $lref=$objid\n";
2719 if (!defined $here{$lref}) {
2720 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2721 runcmd_ordryrun_local @upd;
2722 lrfetchref_used $fullrefname;
2723 } elsif ($here{$lref} eq $objid) {
2724 lrfetchref_used $fullrefname;
2727 "Not updateting $lref from $here{$lref} to $objid.\n";
2732 #---------- dsc and archive handling ----------
2734 sub mergeinfo_getclogp ($) {
2735 # Ensures thit $mi->{Clogp} exists and returns it
2737 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2740 sub mergeinfo_version ($) {
2741 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2744 sub fetch_from_archive_record_1 ($) {
2746 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2747 'DGIT_ARCHIVE', $hash;
2748 cmdoutput @git, qw(log -n2), $hash;
2749 # ... gives git a chance to complain if our commit is malformed
2752 sub fetch_from_archive_record_2 ($) {
2754 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2758 dryrun_report @upd_cmd;
2762 sub parse_dsc_field ($$) {
2763 my ($dsc, $what) = @_;
2765 foreach my $field (@ourdscfield) {
2766 $f = $dsc->{$field};
2770 progress "$what: NO git hash";
2771 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2772 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2773 progress "$what: specified git info ($dsc_distro)";
2774 $dsc_hint_tag = [ $dsc_hint_tag ];
2775 } elsif ($f =~ m/^\w+\s*$/) {
2777 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2778 dgit.default.distro);
2779 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2781 progress "$what: specified git hash";
2783 fail "$what: invalid Dgit info";
2787 sub resolve_dsc_field_commit ($$) {
2788 my ($already_distro, $already_mapref) = @_;
2790 return unless defined $dsc_hash;
2793 defined $already_mapref &&
2794 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2795 ? $already_mapref : undef;
2799 my ($what, @fetch) = @_;
2801 local $idistro = $dsc_distro;
2802 my $lrf = lrfetchrefs;
2804 if (!$chase_dsc_distro) {
2806 "not chasing .dsc distro $dsc_distro: not fetching $what";
2811 ".dsc names distro $dsc_distro: fetching $what";
2813 my $url = access_giturl();
2814 if (!defined $url) {
2815 defined $dsc_hint_url or fail <<END;
2816 .dsc Dgit metadata is in context of distro $dsc_distro
2817 for which we have no configured url and .dsc provides no hint
2820 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2821 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2822 parse_cfg_bool "dsc-url-proto-ok", 'false',
2823 cfg("dgit.dsc-url-proto-ok.$proto",
2824 "dgit.default.dsc-url-proto-ok")
2826 .dsc Dgit metadata is in context of distro $dsc_distro
2827 for which we have no configured url;
2828 .dsc provices hinted url with protocol $proto which is unsafe.
2829 (can be overridden by config - consult documentation)
2831 $url = $dsc_hint_url;
2834 git_lrfetch_sane 1, @fetch;
2839 my $rewrite_enable = do {
2840 local $idistro = $dsc_distro;
2841 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2844 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2845 if (!defined $mapref) {
2846 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2847 $mapref = $lrf.'/'.$rewritemap;
2849 my $rewritemapdata = git_cat_file $mapref.':map';
2850 if (defined $rewritemapdata
2851 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2853 "server's git history rewrite map contains a relevant entry!";
2856 if (defined $dsc_hash) {
2857 progress "using rewritten git hash in place of .dsc value";
2859 progress "server data says .dsc hash is to be disregarded";
2864 if (!defined git_cat_file $dsc_hash) {
2865 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2866 my $lrf = $do_fetch->("additional commits", @tags) &&
2867 defined git_cat_file $dsc_hash
2869 .dsc Dgit metadata requires commit $dsc_hash
2870 but we could not obtain that object anywhere.
2872 foreach my $t (@tags) {
2873 my $fullrefname = $lrf.'/'.$t;
2874 print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2875 next unless $lrfetchrefs_f{$fullrefname};
2876 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2877 lrfetchref_used $fullrefname;
2882 sub fetch_from_archive () {
2883 ensure_setup_existing_tree();
2885 # Ensures that lrref() is what is actually in the archive, one way
2886 # or another, according to us - ie this client's
2887 # appropritaely-updated archive view. Also returns the commit id.
2888 # If there is nothing in the archive, leaves lrref alone and
2889 # returns undef. git_fetch_us must have already been called.
2893 parse_dsc_field($dsc, 'last upload to archive');
2894 resolve_dsc_field_commit access_basedistro,
2895 lrfetchrefs."/".$rewritemap
2897 progress "no version available from the archive";
2900 # If the archive's .dsc has a Dgit field, there are three
2901 # relevant git commitids we need to choose between and/or merge
2903 # 1. $dsc_hash: the Dgit field from the archive
2904 # 2. $lastpush_hash: the suite branch on the dgit git server
2905 # 3. $lastfetch_hash: our local tracking brach for the suite
2907 # These may all be distinct and need not be in any fast forward
2910 # If the dsc was pushed to this suite, then the server suite
2911 # branch will have been updated; but it might have been pushed to
2912 # a different suite and copied by the archive. Conversely a more
2913 # recent version may have been pushed with dgit but not appeared
2914 # in the archive (yet).
2916 # $lastfetch_hash may be awkward because archive imports
2917 # (particularly, imports of Dgit-less .dscs) are performed only as
2918 # needed on individual clients, so different clients may perform a
2919 # different subset of them - and these imports are only made
2920 # public during push. So $lastfetch_hash may represent a set of
2921 # imports different to a subsequent upload by a different dgit
2924 # Our approach is as follows:
2926 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2927 # descendant of $dsc_hash, then it was pushed by a dgit user who
2928 # had based their work on $dsc_hash, so we should prefer it.
2929 # Otherwise, $dsc_hash was installed into this suite in the
2930 # archive other than by a dgit push, and (necessarily) after the
2931 # last dgit push into that suite (since a dgit push would have
2932 # been descended from the dgit server git branch); thus, in that
2933 # case, we prefer the archive's version (and produce a
2934 # pseudo-merge to overwrite the dgit server git branch).
2936 # (If there is no Dgit field in the archive's .dsc then
2937 # generate_commit_from_dsc uses the version numbers to decide
2938 # whether the suite branch or the archive is newer. If the suite
2939 # branch is newer it ignores the archive's .dsc; otherwise it
2940 # generates an import of the .dsc, and produces a pseudo-merge to
2941 # overwrite the suite branch with the archive contents.)
2943 # The outcome of that part of the algorithm is the `public view',
2944 # and is same for all dgit clients: it does not depend on any
2945 # unpublished history in the local tracking branch.
2947 # As between the public view and the local tracking branch: The
2948 # local tracking branch is only updated by dgit fetch, and
2949 # whenever dgit fetch runs it includes the public view in the
2950 # local tracking branch. Therefore if the public view is not
2951 # descended from the local tracking branch, the local tracking
2952 # branch must contain history which was imported from the archive
2953 # but never pushed; and, its tip is now out of date. So, we make
2954 # a pseudo-merge to overwrite the old imports and stitch the old
2957 # Finally: we do not necessarily reify the public view (as
2958 # described above). This is so that we do not end up stacking two
2959 # pseudo-merges. So what we actually do is figure out the inputs
2960 # to any public view pseudo-merge and put them in @mergeinputs.
2963 # $mergeinputs[]{Commit}
2964 # $mergeinputs[]{Info}
2965 # $mergeinputs[0] is the one whose tree we use
2966 # @mergeinputs is in the order we use in the actual commit)
2969 # $mergeinputs[]{Message} is a commit message to use
2970 # $mergeinputs[]{ReverseParents} if def specifies that parent
2971 # list should be in opposite order
2972 # Such an entry has no Commit or Info. It applies only when found
2973 # in the last entry. (This ugliness is to support making
2974 # identical imports to previous dgit versions.)
2976 my $lastpush_hash = git_get_ref(lrfetchref());
2977 printdebug "previous reference hash=$lastpush_hash\n";
2978 $lastpush_mergeinput = $lastpush_hash && {
2979 Commit => $lastpush_hash,
2980 Info => "dgit suite branch on dgit git server",
2983 my $lastfetch_hash = git_get_ref(lrref());
2984 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2985 my $lastfetch_mergeinput = $lastfetch_hash && {
2986 Commit => $lastfetch_hash,
2987 Info => "dgit client's archive history view",
2990 my $dsc_mergeinput = $dsc_hash && {
2991 Commit => $dsc_hash,
2992 Info => "Dgit field in .dsc from archive",
2996 my $del_lrfetchrefs = sub {
2999 printdebug "del_lrfetchrefs...\n";
3000 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3001 my $objid = $lrfetchrefs_d{$fullrefname};
3002 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3004 $gur ||= new IO::Handle;
3005 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3007 printf $gur "delete %s %s\n", $fullrefname, $objid;
3010 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3014 if (defined $dsc_hash) {
3015 ensure_we_have_orig();
3016 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3017 @mergeinputs = $dsc_mergeinput
3018 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3019 print STDERR <<END or die $!;
3021 Git commit in archive is behind the last version allegedly pushed/uploaded.
3022 Commit referred to by archive: $dsc_hash
3023 Last version pushed with dgit: $lastpush_hash
3026 @mergeinputs = ($lastpush_mergeinput);
3028 # Archive has .dsc which is not a descendant of the last dgit
3029 # push. This can happen if the archive moves .dscs about.
3030 # Just follow its lead.
3031 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3032 progress "archive .dsc names newer git commit";
3033 @mergeinputs = ($dsc_mergeinput);
3035 progress "archive .dsc names other git commit, fixing up";
3036 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3040 @mergeinputs = generate_commits_from_dsc();
3041 # We have just done an import. Now, our import algorithm might
3042 # have been improved. But even so we do not want to generate
3043 # a new different import of the same package. So if the
3044 # version numbers are the same, just use our existing version.
3045 # If the version numbers are different, the archive has changed
3046 # (perhaps, rewound).
3047 if ($lastfetch_mergeinput &&
3048 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3049 (mergeinfo_version $mergeinputs[0]) )) {
3050 @mergeinputs = ($lastfetch_mergeinput);
3052 } elsif ($lastpush_hash) {
3053 # only in git, not in the archive yet
3054 @mergeinputs = ($lastpush_mergeinput);
3055 print STDERR <<END or die $!;
3057 Package not found in the archive, but has allegedly been pushed using dgit.
3061 printdebug "nothing found!\n";
3062 if (defined $skew_warning_vsn) {
3063 print STDERR <<END or die $!;
3065 Warning: relevant archive skew detected.
3066 Archive allegedly contains $skew_warning_vsn
3067 But we were not able to obtain any version from the archive or git.
3071 unshift @end, $del_lrfetchrefs;
3075 if ($lastfetch_hash &&
3077 my $h = $_->{Commit};
3078 $h and is_fast_fwd($lastfetch_hash, $h);
3079 # If true, one of the existing parents of this commit
3080 # is a descendant of the $lastfetch_hash, so we'll
3081 # be ff from that automatically.
3085 push @mergeinputs, $lastfetch_mergeinput;
3088 printdebug "fetch mergeinfos:\n";
3089 foreach my $mi (@mergeinputs) {
3091 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3093 printdebug sprintf " ReverseParents=%d Message=%s",
3094 $mi->{ReverseParents}, $mi->{Message};
3098 my $compat_info= pop @mergeinputs
3099 if $mergeinputs[$#mergeinputs]{Message};
3101 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3104 if (@mergeinputs > 1) {
3106 my $tree_commit = $mergeinputs[0]{Commit};
3108 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3109 $tree =~ m/\n\n/; $tree = $`;
3110 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3113 # We use the changelog author of the package in question the
3114 # author of this pseudo-merge. This is (roughly) correct if
3115 # this commit is simply representing aa non-dgit upload.
3116 # (Roughly because it does not record sponsorship - but we
3117 # don't have sponsorship info because that's in the .changes,
3118 # which isn't in the archivw.)
3120 # But, it might be that we are representing archive history
3121 # updates (including in-archive copies). These are not really
3122 # the responsibility of the person who created the .dsc, but
3123 # there is no-one whose name we should better use. (The
3124 # author of the .dsc-named commit is clearly worse.)
3126 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3127 my $author = clogp_authline $useclogp;
3128 my $cversion = getfield $useclogp, 'Version';
3130 my $mcf = ".git/dgit/mergecommit";
3131 open MC, ">", $mcf or die "$mcf $!";
3132 print MC <<END or die $!;
3136 my @parents = grep { $_->{Commit} } @mergeinputs;
3137 @parents = reverse @parents if $compat_info->{ReverseParents};
3138 print MC <<END or die $! foreach @parents;
3142 print MC <<END or die $!;
3148 if (defined $compat_info->{Message}) {
3149 print MC $compat_info->{Message} or die $!;
3151 print MC <<END or die $!;
3152 Record $package ($cversion) in archive suite $csuite
3156 my $message_add_info = sub {
3158 my $mversion = mergeinfo_version $mi;
3159 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3163 $message_add_info->($mergeinputs[0]);
3164 print MC <<END or die $!;
3165 should be treated as descended from
3167 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3171 $hash = make_commit $mcf;
3173 $hash = $mergeinputs[0]{Commit};
3175 printdebug "fetch hash=$hash\n";
3178 my ($lasth, $what) = @_;
3179 return unless $lasth;
3180 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3183 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3185 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3187 fetch_from_archive_record_1($hash);
3189 if (defined $skew_warning_vsn) {
3191 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3192 my $gotclogp = commit_getclogp($hash);
3193 my $got_vsn = getfield $gotclogp, 'Version';
3194 printdebug "SKEW CHECK GOT $got_vsn\n";
3195 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3196 print STDERR <<END or die $!;
3198 Warning: archive skew detected. Using the available version:
3199 Archive allegedly contains $skew_warning_vsn
3200 We were able to obtain only $got_vsn
3206 if ($lastfetch_hash ne $hash) {
3207 fetch_from_archive_record_2($hash);
3210 lrfetchref_used lrfetchref();
3212 unshift @end, $del_lrfetchrefs;
3216 sub set_local_git_config ($$) {
3218 runcmd @git, qw(config), $k, $v;
3221 sub setup_mergechangelogs (;$) {
3223 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3225 my $driver = 'dpkg-mergechangelogs';
3226 my $cb = "merge.$driver";
3227 my $attrs = '.git/info/attributes';
3228 ensuredir '.git/info';
3230 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3231 if (!open ATTRS, "<", $attrs) {
3232 $!==ENOENT or die "$attrs: $!";
3236 next if m{^debian/changelog\s};
3237 print NATTRS $_, "\n" or die $!;
3239 ATTRS->error and die $!;
3242 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3245 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3246 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3248 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3251 sub setup_useremail (;$) {
3253 return unless $always || access_cfg_bool(1, 'setup-useremail');
3256 my ($k, $envvar) = @_;
3257 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3258 return unless defined $v;
3259 set_local_git_config "user.$k", $v;
3262 $setup->('email', 'DEBEMAIL');
3263 $setup->('name', 'DEBFULLNAME');
3266 sub ensure_setup_existing_tree () {
3267 my $k = "remote.$remotename.skipdefaultupdate";
3268 my $c = git_get_config $k;
3269 return if defined $c;
3270 set_local_git_config $k, 'true';
3273 sub setup_new_tree () {
3274 setup_mergechangelogs();
3278 sub multisuite_suite_child ($$$) {
3279 my ($tsuite, $merginputs, $fn) = @_;
3280 # in child, sets things up, calls $fn->(), and returns undef
3281 # in parent, returns canonical suite name for $tsuite
3282 my $canonsuitefh = IO::File::new_tmpfile;
3283 my $pid = fork // die $!;
3286 $us .= " [$isuite]";
3287 $debugprefix .= " ";
3288 progress "fetching $tsuite...";
3289 canonicalise_suite();
3290 print $canonsuitefh $csuite, "\n" or die $!;
3291 close $canonsuitefh or die $!;
3295 waitpid $pid,0 == $pid or die $!;
3296 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3297 seek $canonsuitefh,0,0 or die $!;
3298 local $csuite = <$canonsuitefh>;
3299 die $! unless defined $csuite && chomp $csuite;
3301 printdebug "multisuite $tsuite missing\n";
3304 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3305 push @$merginputs, {
3312 sub fork_for_multisuite ($) {
3313 my ($before_fetch_merge) = @_;
3314 # if nothing unusual, just returns ''
3317 # returns 0 to caller in child, to do first of the specified suites
3318 # in child, $csuite is not yet set
3320 # returns 1 to caller in parent, to finish up anything needed after
3321 # in parent, $csuite is set to canonicalised portmanteau
3323 my $org_isuite = $isuite;
3324 my @suites = split /\,/, $isuite;
3325 return '' unless @suites > 1;
3326 printdebug "fork_for_multisuite: @suites\n";
3330 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3332 return 0 unless defined $cbasesuite;
3334 fail "package $package missing in (base suite) $cbasesuite"
3335 unless @mergeinputs;
3337 my @csuites = ($cbasesuite);
3339 $before_fetch_merge->();
3341 foreach my $tsuite (@suites[1..$#suites]) {
3342 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3348 # xxx collecte the ref here
3350 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3351 push @csuites, $csubsuite;
3354 foreach my $mi (@mergeinputs) {
3355 my $ref = git_get_ref $mi->{Ref};
3356 die "$mi->{Ref} ?" unless length $ref;
3357 $mi->{Commit} = $ref;
3360 $csuite = join ",", @csuites;
3362 my $previous = git_get_ref lrref;
3364 unshift @mergeinputs, {
3365 Commit => $previous,
3366 Info => "local combined tracking branch",
3368 "archive seems to have rewound: local tracking branch is ahead!",
3372 foreach my $ix (0..$#mergeinputs) {
3373 $mergeinputs[$ix]{Index} = $ix;
3376 @mergeinputs = sort {
3377 -version_compare(mergeinfo_version $a,
3378 mergeinfo_version $b) # highest version first
3380 $a->{Index} <=> $b->{Index}; # earliest in spec first
3386 foreach my $mi (@mergeinputs) {
3387 printdebug "multisuite merge check $mi->{Info}\n";
3388 foreach my $previous (@needed) {
3389 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3390 printdebug "multisuite merge un-needed $previous->{Info}\n";
3394 printdebug "multisuite merge this-needed\n";
3395 $mi->{Character} = '+';
3398 $needed[0]{Character} = '*';
3400 my $output = $needed[0]{Commit};
3403 printdebug "multisuite merge nontrivial\n";
3404 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3406 my $commit = "tree $tree\n";
3407 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3408 "Input branches:\n";
3410 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3411 printdebug "multisuite merge include $mi->{Info}\n";
3412 $mi->{Character} //= ' ';
3413 $commit .= "parent $mi->{Commit}\n";
3414 $msg .= sprintf " %s %-25s %s\n",
3416 (mergeinfo_version $mi),
3419 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3421 " * marks the highest version branch, which choose to use\n".
3422 " + marks each branch which was not already an ancestor\n\n".
3423 "[dgit multi-suite $csuite]\n";
3425 "author $authline\n".
3426 "committer $authline\n\n";
3427 $output = make_commit_text $commit.$msg;
3428 printdebug "multisuite merge generated $output\n";
3431 fetch_from_archive_record_1($output);
3432 fetch_from_archive_record_2($output);
3434 progress "calculated combined tracking suite $csuite";
3439 sub clone_set_head () {
3440 open H, "> .git/HEAD" or die $!;
3441 print H "ref: ".lref()."\n" or die $!;
3444 sub clone_finish ($) {
3446 runcmd @git, qw(reset --hard), lrref();
3447 runcmd qw(bash -ec), <<'END';
3449 git ls-tree -r --name-only -z HEAD | \
3450 xargs -0r touch -h -r . --
3452 printdone "ready for work in $dstdir";
3457 badusage "dry run makes no sense with clone" unless act_local();
3459 my $multi_fetched = fork_for_multisuite(sub {
3460 printdebug "multi clone before fetch merge\n";
3463 if ($multi_fetched) {
3464 printdebug "multi clone after fetch merge\n";
3466 clone_finish($dstdir);
3469 printdebug "clone main body\n";
3471 canonicalise_suite();
3472 my $hasgit = check_for_git();
3473 mkdir $dstdir or fail "create \`$dstdir': $!";
3475 runcmd @git, qw(init -q);
3477 my $giturl = access_giturl(1);
3478 if (defined $giturl) {
3479 runcmd @git, qw(remote add), 'origin', $giturl;
3482 progress "fetching existing git history";
3484 runcmd_ordryrun_local @git, qw(fetch origin);
3486 progress "starting new git history";
3488 fetch_from_archive() or no_such_package;
3489 my $vcsgiturl = $dsc->{'Vcs-Git'};
3490 if (length $vcsgiturl) {
3491 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3492 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3495 clone_finish($dstdir);
3499 canonicalise_suite();
3500 if (check_for_git()) {
3503 fetch_from_archive() or no_such_package();
3504 printdone "fetched into ".lrref();
3508 my $multi_fetched = fork_for_multisuite(sub { });
3509 fetch() unless $multi_fetched; # parent
3510 return if $multi_fetched eq '0'; # child
3511 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3513 printdone "fetched to ".lrref()." and merged into HEAD";
3516 sub check_not_dirty () {
3517 foreach my $f (qw(local-options local-patch-header)) {
3518 if (stat_exists "debian/source/$f") {
3519 fail "git tree contains debian/source/$f";
3523 return if $ignoredirty;
3525 my @cmd = (@git, qw(diff --quiet HEAD));
3527 $!=0; $?=-1; system @cmd;
3530 fail "working tree is dirty (does not match HEAD)";
3536 sub commit_admin ($) {
3539 runcmd_ordryrun_local @git, qw(commit -m), $m;
3542 sub commit_quilty_patch () {
3543 my $output = cmdoutput @git, qw(status --porcelain);
3545 foreach my $l (split /\n/, $output) {
3546 next unless $l =~ m/\S/;
3547 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3551 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3553 progress "nothing quilty to commit, ok.";
3556 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3557 runcmd_ordryrun_local @git, qw(add -f), @adds;
3559 Commit Debian 3.0 (quilt) metadata
3561 [dgit ($our_version) quilt-fixup]
3565 sub get_source_format () {
3567 if (open F, "debian/source/options") {
3571 s/\s+$//; # ignore missing final newline
3573 my ($k, $v) = ($`, $'); #');
3574 $v =~ s/^"(.*)"$/$1/;
3580 F->error and die $!;
3583 die $! unless $!==&ENOENT;
3586 if (!open F, "debian/source/format") {
3587 die $! unless $!==&ENOENT;
3591 F->error and die $!;
3593 return ($_, \%options);
3596 sub madformat_wantfixup ($) {
3598 return 0 unless $format eq '3.0 (quilt)';
3599 our $quilt_mode_warned;
3600 if ($quilt_mode eq 'nocheck') {
3601 progress "Not doing any fixup of \`$format' due to".
3602 " ----no-quilt-fixup or --quilt=nocheck"
3603 unless $quilt_mode_warned++;
3606 progress "Format \`$format', need to check/update patch stack"
3607 unless $quilt_mode_warned++;
3611 sub maybe_split_brain_save ($$$) {
3612 my ($headref, $dgitview, $msg) = @_;
3613 # => message fragment "$saved" describing disposition of $dgitview
3614 return "commit id $dgitview" unless defined $split_brain_save;
3615 my @cmd = (shell_cmd "cd ../../../..",
3616 @git, qw(update-ref -m),
3617 "dgit --dgit-view-save $msg HEAD=$headref",
3618 $split_brain_save, $dgitview);
3620 return "and left in $split_brain_save";
3623 # An "infopair" is a tuple [ $thing, $what ]
3624 # (often $thing is a commit hash; $what is a description)
3626 sub infopair_cond_equal ($$) {
3628 $x->[0] eq $y->[0] or fail <<END;
3629 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3633 sub infopair_lrf_tag_lookup ($$) {
3634 my ($tagnames, $what) = @_;
3635 # $tagname may be an array ref
3636 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3637 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3638 foreach my $tagname (@tagnames) {
3639 my $lrefname = lrfetchrefs."/tags/$tagname";
3640 my $tagobj = $lrfetchrefs_f{$lrefname};
3641 next unless defined $tagobj;
3642 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3643 return [ git_rev_parse($tagobj), $what ];
3645 fail @tagnames==1 ? <<END : <<END;
3646 Wanted tag $what (@tagnames) on dgit server, but not found
3648 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3652 sub infopair_cond_ff ($$) {
3653 my ($anc,$desc) = @_;
3654 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3655 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3659 sub pseudomerge_version_check ($$) {
3660 my ($clogp, $archive_hash) = @_;
3662 my $arch_clogp = commit_getclogp $archive_hash;
3663 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3664 'version currently in archive' ];
3665 if (defined $overwrite_version) {
3666 if (length $overwrite_version) {
3667 infopair_cond_equal([ $overwrite_version,
3668 '--overwrite= version' ],
3671 my $v = $i_arch_v->[0];
3672 progress "Checking package changelog for archive version $v ...";
3674 my @xa = ("-f$v", "-t$v");
3675 my $vclogp = parsechangelog @xa;
3676 my $cv = [ (getfield $vclogp, 'Version'),
3677 "Version field from dpkg-parsechangelog @xa" ];
3678 infopair_cond_equal($i_arch_v, $cv);
3681 $@ =~ s/^dgit: //gm;
3683 "Perhaps debian/changelog does not mention $v ?";
3688 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3692 sub pseudomerge_make_commit ($$$$ $$) {
3693 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3694 $msg_cmd, $msg_msg) = @_;
3695 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3697 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3698 my $authline = clogp_authline $clogp;
3702 !defined $overwrite_version ? ""
3703 : !length $overwrite_version ? " --overwrite"
3704 : " --overwrite=".$overwrite_version;
3707 my $pmf = ".git/dgit/pseudomerge";
3708 open MC, ">", $pmf or die "$pmf $!";
3709 print MC <<END or die $!;
3712 parent $archive_hash
3722 return make_commit($pmf);
3725 sub splitbrain_pseudomerge ($$$$) {
3726 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3727 # => $merged_dgitview
3728 printdebug "splitbrain_pseudomerge...\n";
3730 # We: debian/PREVIOUS HEAD($maintview)
3731 # expect: o ----------------- o
3734 # a/d/PREVIOUS $dgitview
3737 # we do: `------------------ o
3741 return $dgitview unless defined $archive_hash;
3743 printdebug "splitbrain_pseudomerge...\n";
3745 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3747 if (!defined $overwrite_version) {
3748 progress "Checking that HEAD inciudes all changes in archive...";
3751 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3753 if (defined $overwrite_version) {
3755 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3756 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3757 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3758 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3759 my $i_archive = [ $archive_hash, "current archive contents" ];
3761 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3763 infopair_cond_equal($i_dgit, $i_archive);
3764 infopair_cond_ff($i_dep14, $i_dgit);
3765 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3769 $us: check failed (maybe --overwrite is needed, consult documentation)
3774 my $r = pseudomerge_make_commit
3775 $clogp, $dgitview, $archive_hash, $i_arch_v,
3776 "dgit --quilt=$quilt_mode",
3777 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3778 Declare fast forward from $i_arch_v->[0]
3780 Make fast forward from $i_arch_v->[0]
3783 maybe_split_brain_save $maintview, $r, "pseudomerge";
3785 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3789 sub plain_overwrite_pseudomerge ($$$) {
3790 my ($clogp, $head, $archive_hash) = @_;
3792 printdebug "plain_overwrite_pseudomerge...";
3794 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3796 return $head if is_fast_fwd $archive_hash, $head;
3798 my $m = "Declare fast forward from $i_arch_v->[0]";
3800 my $r = pseudomerge_make_commit
3801 $clogp, $head, $archive_hash, $i_arch_v,
3804 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3806 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3810 sub push_parse_changelog ($) {
3813 my $clogp = Dpkg::Control::Hash->new();
3814 $clogp->load($clogpfn) or die;
3816 my $clogpackage = getfield $clogp, 'Source';
3817 $package //= $clogpackage;
3818 fail "-p specified $package but changelog specified $clogpackage"
3819 unless $package eq $clogpackage;
3820 my $cversion = getfield $clogp, 'Version';
3822 if (!$we_are_initiator) {
3823 # rpush initiator can't do this because it doesn't have $isuite yet
3824 my $tag = debiantag($cversion, access_nomdistro);
3825 runcmd @git, qw(check-ref-format), $tag;
3828 my $dscfn = dscfn($cversion);
3830 return ($clogp, $cversion, $dscfn);
3833 sub push_parse_dsc ($$$) {
3834 my ($dscfn,$dscfnwhat, $cversion) = @_;
3835 $dsc = parsecontrol($dscfn,$dscfnwhat);
3836 my $dversion = getfield $dsc, 'Version';
3837 my $dscpackage = getfield $dsc, 'Source';
3838 ($dscpackage eq $package && $dversion eq $cversion) or
3839 fail "$dscfn is for $dscpackage $dversion".
3840 " but debian/changelog is for $package $cversion";
3843 sub push_tagwants ($$$$) {
3844 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3847 TagFn => \&debiantag,
3852 if (defined $maintviewhead) {
3854 TagFn => \&debiantag_maintview,
3855 Objid => $maintviewhead,
3856 TfSuffix => '-maintview',
3859 } elsif ($dodep14tag eq 'no' ? 0
3860 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3861 : $dodep14tag eq 'always'
3862 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3863 --dep14tag-always (or equivalent in config) means server must support
3864 both "new" and "maint" tag formats, but config says it doesn't.
3866 : die "$dodep14tag ?") {
3868 TagFn => \&debiantag_maintview,
3870 TfSuffix => '-dgit',
3874 foreach my $tw (@tagwants) {
3875 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3876 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3878 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3882 sub push_mktags ($$ $$ $) {
3884 $changesfile,$changesfilewhat,
3887 die unless $tagwants->[0]{View} eq 'dgit';
3889 my $declaredistro = access_nomdistro();
3890 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
3891 $dsc->{$ourdscfield[0]} = join " ",
3892 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
3894 $dsc->save("$dscfn.tmp") or die $!;
3896 my $changes = parsecontrol($changesfile,$changesfilewhat);
3897 foreach my $field (qw(Source Distribution Version)) {
3898 $changes->{$field} eq $clogp->{$field} or
3899 fail "changes field $field \`$changes->{$field}'".
3900 " does not match changelog \`$clogp->{$field}'";
3903 my $cversion = getfield $clogp, 'Version';
3904 my $clogsuite = getfield $clogp, 'Distribution';
3906 # We make the git tag by hand because (a) that makes it easier
3907 # to control the "tagger" (b) we can do remote signing
3908 my $authline = clogp_authline $clogp;
3909 my $delibs = join(" ", "",@deliberatelies);
3913 my $tfn = $tw->{Tfn};
3914 my $head = $tw->{Objid};
3915 my $tag = $tw->{Tag};
3917 open TO, '>', $tfn->('.tmp') or die $!;
3918 print TO <<END or die $!;
3925 if ($tw->{View} eq 'dgit') {
3926 print TO <<END or die $!;
3927 $package release $cversion for $clogsuite ($csuite) [dgit]
3928 [dgit distro=$declaredistro$delibs]
3930 foreach my $ref (sort keys %previously) {
3931 print TO <<END or die $!;
3932 [dgit previously:$ref=$previously{$ref}]
3935 } elsif ($tw->{View} eq 'maint') {
3936 print TO <<END or die $!;
3937 $package release $cversion for $clogsuite ($csuite)
3938 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3941 die Dumper($tw)."?";
3946 my $tagobjfn = $tfn->('.tmp');
3948 if (!defined $keyid) {
3949 $keyid = access_cfg('keyid','RETURN-UNDEF');
3951 if (!defined $keyid) {
3952 $keyid = getfield $clogp, 'Maintainer';
3954 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3955 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3956 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3957 push @sign_cmd, $tfn->('.tmp');
3958 runcmd_ordryrun @sign_cmd;
3960 $tagobjfn = $tfn->('.signed.tmp');
3961 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3962 $tfn->('.tmp'), $tfn->('.tmp.asc');
3968 my @r = map { $mktag->($_); } @$tagwants;
3972 sub sign_changes ($) {
3973 my ($changesfile) = @_;
3975 my @debsign_cmd = @debsign;
3976 push @debsign_cmd, "-k$keyid" if defined $keyid;
3977 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3978 push @debsign_cmd, $changesfile;
3979 runcmd_ordryrun @debsign_cmd;
3984 printdebug "actually entering push\n";
3986 supplementary_message(<<'END');
3987 Push failed, while checking state of the archive.
3988 You can retry the push, after fixing the problem, if you like.
3990 if (check_for_git()) {
3993 my $archive_hash = fetch_from_archive();
3994 if (!$archive_hash) {
3996 fail "package appears to be new in this suite;".
3997 " if this is intentional, use --new";
4000 supplementary_message(<<'END');
4001 Push failed, while preparing your push.
4002 You can retry the push, after fixing the problem, if you like.
4005 need_tagformat 'new', "quilt mode $quilt_mode"
4006 if quiltmode_splitbrain;
4010 access_giturl(); # check that success is vaguely likely
4011 rpush_handle_protovsn_bothends() if $we_are_initiator;
4014 my $clogpfn = ".git/dgit/changelog.822.tmp";
4015 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4017 responder_send_file('parsed-changelog', $clogpfn);
4019 my ($clogp, $cversion, $dscfn) =
4020 push_parse_changelog("$clogpfn");
4022 my $dscpath = "$buildproductsdir/$dscfn";
4023 stat_exists $dscpath or
4024 fail "looked for .dsc $dscpath, but $!;".
4025 " maybe you forgot to build";
4027 responder_send_file('dsc', $dscpath);
4029 push_parse_dsc($dscpath, $dscfn, $cversion);
4031 my $format = getfield $dsc, 'Format';
4032 printdebug "format $format\n";
4034 my $actualhead = git_rev_parse('HEAD');
4035 my $dgithead = $actualhead;
4036 my $maintviewhead = undef;
4038 my $upstreamversion = upstreamversion $clogp->{Version};
4040 if (madformat_wantfixup($format)) {
4041 # user might have not used dgit build, so maybe do this now:
4042 if (quiltmode_splitbrain()) {
4044 quilt_make_fake_dsc($upstreamversion);
4046 ($dgithead, $cachekey) =
4047 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4049 "--quilt=$quilt_mode but no cached dgit view:
4050 perhaps tree changed since dgit build[-source] ?";
4052 $dgithead = splitbrain_pseudomerge($clogp,
4053 $actualhead, $dgithead,
4055 $maintviewhead = $actualhead;
4056 changedir '../../../..';
4057 prep_ud(); # so _only_subdir() works, below
4059 commit_quilty_patch();
4063 if (defined $overwrite_version && !defined $maintviewhead) {
4064 $dgithead = plain_overwrite_pseudomerge($clogp,
4072 if ($archive_hash) {
4073 if (is_fast_fwd($archive_hash, $dgithead)) {
4075 } elsif (deliberately_not_fast_forward) {
4078 fail "dgit push: HEAD is not a descendant".
4079 " of the archive's version.\n".
4080 "To overwrite the archive's contents,".
4081 " pass --overwrite[=VERSION].\n".
4082 "To rewind history, if permitted by the archive,".
4083 " use --deliberately-not-fast-forward.";
4088 progress "checking that $dscfn corresponds to HEAD";
4089 runcmd qw(dpkg-source -x --),
4090 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4091 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4092 check_for_vendor_patches() if madformat($dsc->{format});
4093 changedir '../../../..';
4094 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4095 debugcmd "+",@diffcmd;
4097 my $r = system @diffcmd;
4100 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4102 HEAD specifies a different tree to $dscfn:
4104 Perhaps you forgot to build. Or perhaps there is a problem with your
4105 source tree (see dgit(7) for some hints). To see a full diff, run
4112 if (!$changesfile) {
4113 my $pat = changespat $cversion;
4114 my @cs = glob "$buildproductsdir/$pat";
4115 fail "failed to find unique changes file".
4116 " (looked for $pat in $buildproductsdir);".
4117 " perhaps you need to use dgit -C"
4119 ($changesfile) = @cs;
4121 $changesfile = "$buildproductsdir/$changesfile";
4124 # Check that changes and .dsc agree enough
4125 $changesfile =~ m{[^/]*$};
4126 my $changes = parsecontrol($changesfile,$&);
4127 files_compare_inputs($dsc, $changes)
4128 unless forceing [qw(dsc-changes-mismatch)];
4130 # Perhaps adjust .dsc to contain right set of origs
4131 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4133 unless forceing [qw(changes-origs-exactly)];
4135 # Checks complete, we're going to try and go ahead:
4137 responder_send_file('changes',$changesfile);
4138 responder_send_command("param head $dgithead");
4139 responder_send_command("param csuite $csuite");
4140 responder_send_command("param isuite $isuite");
4141 responder_send_command("param tagformat $tagformat");
4142 if (defined $maintviewhead) {
4143 die unless ($protovsn//4) >= 4;
4144 responder_send_command("param maint-view $maintviewhead");
4147 if (deliberately_not_fast_forward) {
4148 git_for_each_ref(lrfetchrefs, sub {
4149 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4150 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4151 responder_send_command("previously $rrefname=$objid");
4152 $previously{$rrefname} = $objid;
4156 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4160 supplementary_message(<<'END');
4161 Push failed, while signing the tag.
4162 You can retry the push, after fixing the problem, if you like.
4164 # If we manage to sign but fail to record it anywhere, it's fine.
4165 if ($we_are_responder) {
4166 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4167 responder_receive_files('signed-tag', @tagobjfns);
4169 @tagobjfns = push_mktags($clogp,$dscpath,
4170 $changesfile,$changesfile,
4173 supplementary_message(<<'END');
4174 Push failed, *after* signing the tag.
4175 If you want to try again, you should use a new version number.
4178 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4180 foreach my $tw (@tagwants) {
4181 my $tag = $tw->{Tag};
4182 my $tagobjfn = $tw->{TagObjFn};
4184 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4185 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4186 runcmd_ordryrun_local
4187 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4190 supplementary_message(<<'END');
4191 Push failed, while updating the remote git repository - see messages above.
4192 If you want to try again, you should use a new version number.
4194 if (!check_for_git()) {
4195 create_remote_git_repo();
4198 my @pushrefs = $forceflag.$dgithead.":".rrref();
4199 foreach my $tw (@tagwants) {
4200 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4203 runcmd_ordryrun @git,
4204 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4205 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4207 supplementary_message(<<'END');
4208 Push failed, while obtaining signatures on the .changes and .dsc.
4209 If it was just that the signature failed, you may try again by using
4210 debsign by hand to sign the changes
4212 and then dput to complete the upload.
4213 If you need to change the package, you must use a new version number.
4215 if ($we_are_responder) {
4216 my $dryrunsuffix = act_local() ? "" : ".tmp";
4217 responder_receive_files('signed-dsc-changes',
4218 "$dscpath$dryrunsuffix",
4219 "$changesfile$dryrunsuffix");
4222 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4224 progress "[new .dsc left in $dscpath.tmp]";
4226 sign_changes $changesfile;
4229 supplementary_message(<<END);
4230 Push failed, while uploading package(s) to the archive server.
4231 You can retry the upload of exactly these same files with dput of:
4233 If that .changes file is broken, you will need to use a new version
4234 number for your next attempt at the upload.
4236 my $host = access_cfg('upload-host','RETURN-UNDEF');
4237 my @hostarg = defined($host) ? ($host,) : ();
4238 runcmd_ordryrun @dput, @hostarg, $changesfile;
4239 printdone "pushed and uploaded $cversion";
4241 supplementary_message('');
4242 responder_send_command("complete");
4248 badusage "-p is not allowed with clone; specify as argument instead"
4249 if defined $package;
4252 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4253 ($package,$isuite) = @ARGV;
4254 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4255 ($package,$dstdir) = @ARGV;
4256 } elsif (@ARGV==3) {
4257 ($package,$isuite,$dstdir) = @ARGV;
4259 badusage "incorrect arguments to dgit clone";
4263 $dstdir ||= "$package";
4264 if (stat_exists $dstdir) {
4265 fail "$dstdir already exists";
4269 if ($rmonerror && !$dryrun_level) {
4270 $cwd_remove= getcwd();
4272 return unless defined $cwd_remove;
4273 if (!chdir "$cwd_remove") {
4274 return if $!==&ENOENT;
4275 die "chdir $cwd_remove: $!";
4277 printdebug "clone rmonerror removing $dstdir\n";
4279 rmtree($dstdir) or die "remove $dstdir: $!\n";
4280 } elsif (grep { $! == $_ }
4281 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4283 print STDERR "check whether to remove $dstdir: $!\n";
4289 $cwd_remove = undef;
4292 sub branchsuite () {
4293 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4294 if ($branch =~ m#$lbranch_re#o) {
4301 sub fetchpullargs () {
4302 if (!defined $package) {
4303 my $sourcep = parsecontrol('debian/control','debian/control');
4304 $package = getfield $sourcep, 'Source';
4307 $isuite = branchsuite();
4309 my $clogp = parsechangelog();
4310 my $clogsuite = getfield $clogp, 'Distribution';
4311 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4313 } elsif (@ARGV==1) {
4316 badusage "incorrect arguments to dgit fetch or dgit pull";
4324 my $multi_fetched = fork_for_multisuite(sub { });
4325 exit 0 if $multi_fetched;
4332 if (quiltmode_splitbrain()) {
4333 my ($format, $fopts) = get_source_format();
4334 madformat($format) and fail <<END
4335 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4343 badusage "-p is not allowed with dgit push" if defined $package;
4345 my $clogp = parsechangelog();
4346 $package = getfield $clogp, 'Source';
4349 } elsif (@ARGV==1) {
4350 ($specsuite) = (@ARGV);
4352 badusage "incorrect arguments to dgit push";
4354 $isuite = getfield $clogp, 'Distribution';
4357 local ($package) = $existing_package; # this is a hack
4358 canonicalise_suite();
4360 canonicalise_suite();
4362 if (defined $specsuite &&
4363 $specsuite ne $isuite &&
4364 $specsuite ne $csuite) {
4365 fail "dgit push: changelog specifies $isuite ($csuite)".
4366 " but command line specifies $specsuite";
4371 #---------- remote commands' implementation ----------
4373 sub cmd_remote_push_build_host {
4374 my ($nrargs) = shift @ARGV;
4375 my (@rargs) = @ARGV[0..$nrargs-1];
4376 @ARGV = @ARGV[$nrargs..$#ARGV];
4378 my ($dir,$vsnwant) = @rargs;
4379 # vsnwant is a comma-separated list; we report which we have
4380 # chosen in our ready response (so other end can tell if they
4383 $we_are_responder = 1;
4384 $us .= " (build host)";
4386 open PI, "<&STDIN" or die $!;
4387 open STDIN, "/dev/null" or die $!;
4388 open PO, ">&STDOUT" or die $!;
4390 open STDOUT, ">&STDERR" or die $!;
4394 ($protovsn) = grep {
4395 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4396 } @rpushprotovsn_support;
4398 fail "build host has dgit rpush protocol versions ".
4399 (join ",", @rpushprotovsn_support).
4400 " but invocation host has $vsnwant"
4401 unless defined $protovsn;
4403 responder_send_command("dgit-remote-push-ready $protovsn");
4408 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4409 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4410 # a good error message)
4412 sub rpush_handle_protovsn_bothends () {
4413 if ($protovsn < 4) {
4414 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4423 my $report = i_child_report();
4424 if (defined $report) {
4425 printdebug "($report)\n";
4426 } elsif ($i_child_pid) {
4427 printdebug "(killing build host child $i_child_pid)\n";
4428 kill 15, $i_child_pid;
4430 if (defined $i_tmp && !defined $initiator_tempdir) {
4432 eval { rmtree $i_tmp; };
4436 END { i_cleanup(); }
4439 my ($base,$selector,@args) = @_;
4440 $selector =~ s/\-/_/g;
4441 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4447 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4455 push @rargs, join ",", @rpushprotovsn_support;
4458 push @rdgit, @ropts;
4459 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4461 my @cmd = (@ssh, $host, shellquote @rdgit);
4464 $we_are_initiator=1;
4466 if (defined $initiator_tempdir) {
4467 rmtree $initiator_tempdir;
4468 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4469 $i_tmp = $initiator_tempdir;
4473 $i_child_pid = open2(\*RO, \*RI, @cmd);
4475 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4476 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4477 $supplementary_message = '' unless $protovsn >= 3;
4480 my ($icmd,$iargs) = initiator_expect {
4481 m/^(\S+)(?: (.*))?$/;
4484 i_method "i_resp", $icmd, $iargs;
4488 sub i_resp_progress ($) {
4490 my $msg = protocol_read_bytes \*RO, $rhs;
4494 sub i_resp_supplementary_message ($) {
4496 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4499 sub i_resp_complete {
4500 my $pid = $i_child_pid;
4501 $i_child_pid = undef; # prevents killing some other process with same pid
4502 printdebug "waiting for build host child $pid...\n";
4503 my $got = waitpid $pid, 0;
4504 die $! unless $got == $pid;
4505 die "build host child failed $?" if $?;
4508 printdebug "all done\n";
4512 sub i_resp_file ($) {
4514 my $localname = i_method "i_localname", $keyword;
4515 my $localpath = "$i_tmp/$localname";
4516 stat_exists $localpath and
4517 badproto \*RO, "file $keyword ($localpath) twice";
4518 protocol_receive_file \*RO, $localpath;
4519 i_method "i_file", $keyword;
4524 sub i_resp_param ($) {
4525 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4529 sub i_resp_previously ($) {
4530 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4531 or badproto \*RO, "bad previously spec";
4532 my $r = system qw(git check-ref-format), $1;
4533 die "bad previously ref spec ($r)" if $r;
4534 $previously{$1} = $2;
4539 sub i_resp_want ($) {
4541 die "$keyword ?" if $i_wanted{$keyword}++;
4543 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4544 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4545 die unless $isuite =~ m/^$suite_re$/;
4548 rpush_handle_protovsn_bothends();
4550 fail "rpush negotiated protocol version $protovsn".
4551 " which does not support quilt mode $quilt_mode"
4552 if quiltmode_splitbrain;
4554 my @localpaths = i_method "i_want", $keyword;
4555 printdebug "[[ $keyword @localpaths\n";
4556 foreach my $localpath (@localpaths) {
4557 protocol_send_file \*RI, $localpath;
4559 print RI "files-end\n" or die $!;
4562 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4564 sub i_localname_parsed_changelog {
4565 return "remote-changelog.822";
4567 sub i_file_parsed_changelog {
4568 ($i_clogp, $i_version, $i_dscfn) =
4569 push_parse_changelog "$i_tmp/remote-changelog.822";
4570 die if $i_dscfn =~ m#/|^\W#;
4573 sub i_localname_dsc {
4574 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4579 sub i_localname_changes {
4580 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4581 $i_changesfn = $i_dscfn;
4582 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4583 return $i_changesfn;
4585 sub i_file_changes { }
4587 sub i_want_signed_tag {
4588 printdebug Dumper(\%i_param, $i_dscfn);
4589 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4590 && defined $i_param{'csuite'}
4591 or badproto \*RO, "premature desire for signed-tag";
4592 my $head = $i_param{'head'};
4593 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4595 my $maintview = $i_param{'maint-view'};
4596 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4599 if ($protovsn >= 4) {
4600 my $p = $i_param{'tagformat'} // '<undef>';
4602 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4605 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4607 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4609 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4612 push_mktags $i_clogp, $i_dscfn,
4613 $i_changesfn, 'remote changes',
4617 sub i_want_signed_dsc_changes {
4618 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4619 sign_changes $i_changesfn;
4620 return ($i_dscfn, $i_changesfn);
4623 #---------- building etc. ----------
4629 #----- `3.0 (quilt)' handling -----
4631 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4633 sub quiltify_dpkg_commit ($$$;$) {
4634 my ($patchname,$author,$msg, $xinfo) = @_;
4638 my $descfn = ".git/dgit/quilt-description.tmp";
4639 open O, '>', $descfn or die "$descfn: $!";
4640 $msg =~ s/\n+/\n\n/;
4641 print O <<END or die $!;
4643 ${xinfo}Subject: $msg
4650 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4651 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4652 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4653 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4657 sub quiltify_trees_differ ($$;$$$) {
4658 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4659 # returns true iff the two tree objects differ other than in debian/
4660 # with $finegrained,
4661 # returns bitmask 01 - differ in upstream files except .gitignore
4662 # 02 - differ in .gitignore
4663 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4664 # is set for each modified .gitignore filename $fn
4665 # if $unrepres is defined, array ref to which is appeneded
4666 # a list of unrepresentable changes (removals of upstream files
4669 my @cmd = (@git, qw(diff-tree -z));
4670 push @cmd, qw(--name-only) unless $unrepres;
4671 push @cmd, qw(-r) if $finegrained || $unrepres;
4673 my $diffs= cmdoutput @cmd;
4676 foreach my $f (split /\0/, $diffs) {
4677 if ($unrepres && !@lmodes) {
4678 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4681 my ($oldmode,$newmode) = @lmodes;
4684 next if $f =~ m#^debian(?:/.*)?$#s;
4688 die "not a plain file\n"
4689 unless $newmode =~ m/^10\d{4}$/ ||
4690 $oldmode =~ m/^10\d{4}$/;
4691 if ($oldmode =~ m/[^0]/ &&
4692 $newmode =~ m/[^0]/) {
4693 die "mode changed\n" if $oldmode ne $newmode;
4695 die "non-default mode\n"
4696 unless $newmode =~ m/^100644$/ ||
4697 $oldmode =~ m/^100644$/;
4701 local $/="\n"; chomp $@;
4702 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4706 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4707 $r |= $isignore ? 02 : 01;
4708 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4710 printdebug "quiltify_trees_differ $x $y => $r\n";
4714 sub quiltify_tree_sentinelfiles ($) {
4715 # lists the `sentinel' files present in the tree
4717 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4718 qw(-- debian/rules debian/control);
4723 sub quiltify_splitbrain_needed () {
4724 if (!$split_brain) {
4725 progress "dgit view: changes are required...";
4726 runcmd @git, qw(checkout -q -b dgit-view);
4731 sub quiltify_splitbrain ($$$$$$) {
4732 my ($clogp, $unapplied, $headref, $diffbits,
4733 $editedignores, $cachekey) = @_;
4734 if ($quilt_mode !~ m/gbp|dpm/) {
4735 # treat .gitignore just like any other upstream file
4736 $diffbits = { %$diffbits };
4737 $_ = !!$_ foreach values %$diffbits;
4739 # We would like any commits we generate to be reproducible
4740 my @authline = clogp_authline($clogp);
4741 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4742 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4743 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4744 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4745 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4746 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4748 if ($quilt_mode =~ m/gbp|unapplied/ &&
4749 ($diffbits->{O2H} & 01)) {
4751 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4752 " but git tree differs from orig in upstream files.";
4753 if (!stat_exists "debian/patches") {
4755 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4759 if ($quilt_mode =~ m/dpm/ &&
4760 ($diffbits->{H2A} & 01)) {
4762 --quilt=$quilt_mode specified, implying patches-applied git tree
4763 but git tree differs from result of applying debian/patches to upstream
4766 if ($quilt_mode =~ m/gbp|unapplied/ &&
4767 ($diffbits->{O2A} & 01)) { # some patches
4768 quiltify_splitbrain_needed();
4769 progress "dgit view: creating patches-applied version using gbp pq";
4770 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4771 # gbp pq import creates a fresh branch; push back to dgit-view
4772 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4773 runcmd @git, qw(checkout -q dgit-view);
4775 if ($quilt_mode =~ m/gbp|dpm/ &&
4776 ($diffbits->{O2A} & 02)) {
4778 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4779 tool which does not create patches for changes to upstream
4780 .gitignores: but, such patches exist in debian/patches.
4783 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4784 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4785 quiltify_splitbrain_needed();
4786 progress "dgit view: creating patch to represent .gitignore changes";
4787 ensuredir "debian/patches";
4788 my $gipatch = "debian/patches/auto-gitignore";
4789 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4790 stat GIPATCH or die "$gipatch: $!";
4791 fail "$gipatch already exists; but want to create it".
4792 " to record .gitignore changes" if (stat _)[7];
4793 print GIPATCH <<END or die "$gipatch: $!";
4794 Subject: Update .gitignore from Debian packaging branch
4796 The Debian packaging git branch contains these updates to the upstream
4797 .gitignore file(s). This patch is autogenerated, to provide these
4798 updates to users of the official Debian archive view of the package.
4800 [dgit ($our_version) update-gitignore]
4803 close GIPATCH or die "$gipatch: $!";
4804 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4805 $unapplied, $headref, "--", sort keys %$editedignores;
4806 open SERIES, "+>>", "debian/patches/series" or die $!;
4807 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4809 defined read SERIES, $newline, 1 or die $!;
4810 print SERIES "\n" or die $! unless $newline eq "\n";
4811 print SERIES "auto-gitignore\n" or die $!;
4812 close SERIES or die $!;
4813 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4815 Commit patch to update .gitignore
4817 [dgit ($our_version) update-gitignore-quilt-fixup]
4821 my $dgitview = git_rev_parse 'HEAD';
4823 changedir '../../../..';
4824 # When we no longer need to support squeeze, use --create-reflog
4826 ensuredir ".git/logs/refs/dgit-intern";
4827 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4830 my $oldcache = git_get_ref "refs/$splitbraincache";
4831 if ($oldcache eq $dgitview) {
4832 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4833 # git update-ref doesn't always update, in this case. *sigh*
4834 my $dummy = make_commit_text <<END;
4837 author Dgit <dgit\@example.com> 1000000000 +0000
4838 committer Dgit <dgit\@example.com> 1000000000 +0000
4840 Dummy commit - do not use
4842 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4843 "refs/$splitbraincache", $dummy;
4845 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4848 changedir '.git/dgit/unpack/work';
4850 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4851 progress "dgit view: created ($saved)";
4854 sub quiltify ($$$$) {
4855 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4857 # Quilt patchification algorithm
4859 # We search backwards through the history of the main tree's HEAD
4860 # (T) looking for a start commit S whose tree object is identical
4861 # to to the patch tip tree (ie the tree corresponding to the
4862 # current dpkg-committed patch series). For these purposes
4863 # `identical' disregards anything in debian/ - this wrinkle is
4864 # necessary because dpkg-source treates debian/ specially.
4866 # We can only traverse edges where at most one of the ancestors'
4867 # trees differs (in changes outside in debian/). And we cannot
4868 # handle edges which change .pc/ or debian/patches. To avoid
4869 # going down a rathole we avoid traversing edges which introduce
4870 # debian/rules or debian/control. And we set a limit on the
4871 # number of edges we are willing to look at.
4873 # If we succeed, we walk forwards again. For each traversed edge
4874 # PC (with P parent, C child) (starting with P=S and ending with
4875 # C=T) to we do this:
4877 # - dpkg-source --commit with a patch name and message derived from C
4878 # After traversing PT, we git commit the changes which
4879 # should be contained within debian/patches.
4881 # The search for the path S..T is breadth-first. We maintain a
4882 # todo list containing search nodes. A search node identifies a
4883 # commit, and looks something like this:
4885 # Commit => $git_commit_id,
4886 # Child => $c, # or undef if P=T
4887 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4888 # Nontrivial => true iff $p..$c has relevant changes
4895 my %considered; # saves being exponential on some weird graphs
4897 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4900 my ($search,$whynot) = @_;
4901 printdebug " search NOT $search->{Commit} $whynot\n";
4902 $search->{Whynot} = $whynot;
4903 push @nots, $search;
4904 no warnings qw(exiting);
4913 my $c = shift @todo;
4914 next if $considered{$c->{Commit}}++;
4916 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4918 printdebug "quiltify investigate $c->{Commit}\n";
4921 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4922 printdebug " search finished hooray!\n";
4927 if ($quilt_mode eq 'nofix') {
4928 fail "quilt fixup required but quilt mode is \`nofix'\n".
4929 "HEAD commit $c->{Commit} differs from tree implied by ".
4930 " debian/patches (tree object $oldtiptree)";
4932 if ($quilt_mode eq 'smash') {
4933 printdebug " search quitting smash\n";
4937 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4938 $not->($c, "has $c_sentinels not $t_sentinels")
4939 if $c_sentinels ne $t_sentinels;
4941 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4942 $commitdata =~ m/\n\n/;
4944 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4945 @parents = map { { Commit => $_, Child => $c } } @parents;
4947 $not->($c, "root commit") if !@parents;
4949 foreach my $p (@parents) {
4950 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4952 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4953 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4955 foreach my $p (@parents) {
4956 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4958 my @cmd= (@git, qw(diff-tree -r --name-only),
4959 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4960 my $patchstackchange = cmdoutput @cmd;
4961 if (length $patchstackchange) {
4962 $patchstackchange =~ s/\n/,/g;
4963 $not->($p, "changed $patchstackchange");
4966 printdebug " search queue P=$p->{Commit} ",
4967 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4973 printdebug "quiltify want to smash\n";
4976 my $x = $_[0]{Commit};
4977 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4980 my $reportnot = sub {
4982 my $s = $abbrev->($notp);
4983 my $c = $notp->{Child};
4984 $s .= "..".$abbrev->($c) if $c;
4985 $s .= ": ".$notp->{Whynot};
4988 if ($quilt_mode eq 'linear') {
4989 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4990 foreach my $notp (@nots) {
4991 print STDERR "$us: ", $reportnot->($notp), "\n";
4993 print STDERR "$us: $_\n" foreach @$failsuggestion;
4994 fail "quilt fixup naive history linearisation failed.\n".
4995 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4996 } elsif ($quilt_mode eq 'smash') {
4997 } elsif ($quilt_mode eq 'auto') {
4998 progress "quilt fixup cannot be linear, smashing...";
5000 die "$quilt_mode ?";
5003 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5004 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5006 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5008 quiltify_dpkg_commit "auto-$version-$target-$time",
5009 (getfield $clogp, 'Maintainer'),
5010 "Automatically generated patch ($clogp->{Version})\n".
5011 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5015 progress "quiltify linearisation planning successful, executing...";
5017 for (my $p = $sref_S;
5018 my $c = $p->{Child};
5020 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5021 next unless $p->{Nontrivial};
5023 my $cc = $c->{Commit};
5025 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5026 $commitdata =~ m/\n\n/ or die "$c ?";
5029 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5032 my $commitdate = cmdoutput
5033 @git, qw(log -n1 --pretty=format:%aD), $cc;
5035 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5037 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5044 my $gbp_check_suitable = sub {
5049 die "contains unexpected slashes\n" if m{//} || m{/$};
5050 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5051 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5052 die "too long" if length > 200;
5054 return $_ unless $@;
5055 print STDERR "quiltifying commit $cc:".
5056 " ignoring/dropping Gbp-Pq $what: $@";
5060 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5062 (\S+) \s* \n //ixm) {
5063 $patchname = $gbp_check_suitable->($1, 'Name');
5065 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5067 (\S+) \s* \n //ixm) {
5068 $patchdir = $gbp_check_suitable->($1, 'Topic');
5073 if (!defined $patchname) {
5074 $patchname = $title;
5075 $patchname =~ s/[.:]$//;
5078 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5079 my $translitname = $converter->convert($patchname);
5080 die unless defined $translitname;
5081 $patchname = $translitname;
5084 "dgit: patch title transliteration error: $@"
5086 $patchname =~ y/ A-Z/-a-z/;
5087 $patchname =~ y/-a-z0-9_.+=~//cd;
5088 $patchname =~ s/^\W/x-$&/;
5089 $patchname = substr($patchname,0,40);
5091 if (!defined $patchdir) {
5094 if (length $patchdir) {
5095 $patchname = "$patchdir/$patchname";
5097 if ($patchname =~ m{^(.*)/}) {
5098 mkpath "debian/patches/$1";
5103 stat "debian/patches/$patchname$index";
5105 $!==ENOENT or die "$patchname$index $!";
5107 runcmd @git, qw(checkout -q), $cc;
5109 # We use the tip's changelog so that dpkg-source doesn't
5110 # produce complaining messages from dpkg-parsechangelog. None
5111 # of the information dpkg-source gets from the changelog is
5112 # actually relevant - it gets put into the original message
5113 # which dpkg-source provides our stunt editor, and then
5115 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5117 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5118 "Date: $commitdate\n".
5119 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5121 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5124 runcmd @git, qw(checkout -q master);
5127 sub build_maybe_quilt_fixup () {
5128 my ($format,$fopts) = get_source_format;
5129 return unless madformat_wantfixup $format;
5132 check_for_vendor_patches();
5134 if (quiltmode_splitbrain) {
5135 fail <<END unless access_cfg_tagformats_can_splitbrain;
5136 quilt mode $quilt_mode requires split view so server needs to support
5137 both "new" and "maint" tag formats, but config says it doesn't.
5141 my $clogp = parsechangelog();
5142 my $headref = git_rev_parse('HEAD');
5147 my $upstreamversion = upstreamversion $version;
5149 if ($fopts->{'single-debian-patch'}) {
5150 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5152 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5155 die 'bug' if $split_brain && !$need_split_build_invocation;
5157 changedir '../../../..';
5158 runcmd_ordryrun_local
5159 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5162 sub quilt_fixup_mkwork ($) {
5165 mkdir "work" or die $!;
5167 mktree_in_ud_here();
5168 runcmd @git, qw(reset -q --hard), $headref;
5171 sub quilt_fixup_linkorigs ($$) {
5172 my ($upstreamversion, $fn) = @_;
5173 # calls $fn->($leafname);
5175 foreach my $f (<../../../../*>) { #/){
5176 my $b=$f; $b =~ s{.*/}{};
5178 local ($debuglevel) = $debuglevel-1;
5179 printdebug "QF linkorigs $b, $f ?\n";
5181 next unless is_orig_file_of_vsn $b, $upstreamversion;
5182 printdebug "QF linkorigs $b, $f Y\n";
5183 link_ltarget $f, $b or die "$b $!";
5188 sub quilt_fixup_delete_pc () {
5189 runcmd @git, qw(rm -rqf .pc);
5191 Commit removal of .pc (quilt series tracking data)
5193 [dgit ($our_version) upgrade quilt-remove-pc]
5197 sub quilt_fixup_singlepatch ($$$) {
5198 my ($clogp, $headref, $upstreamversion) = @_;
5200 progress "starting quiltify (single-debian-patch)";
5202 # dpkg-source --commit generates new patches even if
5203 # single-debian-patch is in debian/source/options. In order to
5204 # get it to generate debian/patches/debian-changes, it is
5205 # necessary to build the source package.
5207 quilt_fixup_linkorigs($upstreamversion, sub { });
5208 quilt_fixup_mkwork($headref);
5210 rmtree("debian/patches");
5212 runcmd @dpkgsource, qw(-b .);
5214 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5215 rename srcfn("$upstreamversion", "/debian/patches"),
5216 "work/debian/patches";
5219 commit_quilty_patch();
5222 sub quilt_make_fake_dsc ($) {
5223 my ($upstreamversion) = @_;
5225 my $fakeversion="$upstreamversion-~~DGITFAKE";
5227 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5228 print $fakedsc <<END or die $!;
5231 Version: $fakeversion
5235 my $dscaddfile=sub {
5238 my $md = new Digest::MD5;
5240 my $fh = new IO::File $b, '<' or die "$b $!";
5245 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5248 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5250 my @files=qw(debian/source/format debian/rules
5251 debian/control debian/changelog);
5252 foreach my $maybe (qw(debian/patches debian/source/options
5253 debian/tests/control)) {
5254 next unless stat_exists "../../../$maybe";
5255 push @files, $maybe;
5258 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5259 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5261 $dscaddfile->($debtar);
5262 close $fakedsc or die $!;
5265 sub quilt_check_splitbrain_cache ($$) {
5266 my ($headref, $upstreamversion) = @_;
5267 # Called only if we are in (potentially) split brain mode.
5269 # Computes the cache key and looks in the cache.
5270 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5272 my $splitbrain_cachekey;
5275 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5276 # we look in the reflog of dgit-intern/quilt-cache
5277 # we look for an entry whose message is the key for the cache lookup
5278 my @cachekey = (qw(dgit), $our_version);
5279 push @cachekey, $upstreamversion;
5280 push @cachekey, $quilt_mode;
5281 push @cachekey, $headref;
5283 push @cachekey, hashfile('fake.dsc');
5285 my $srcshash = Digest::SHA->new(256);
5286 my %sfs = ( %INC, '$0(dgit)' => $0 );
5287 foreach my $sfk (sort keys %sfs) {
5288 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5289 $srcshash->add($sfk," ");
5290 $srcshash->add(hashfile($sfs{$sfk}));
5291 $srcshash->add("\n");
5293 push @cachekey, $srcshash->hexdigest();
5294 $splitbrain_cachekey = "@cachekey";
5296 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5298 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5299 debugcmd "|(probably)",@cmd;
5300 my $child = open GC, "-|"; defined $child or die $!;
5302 chdir '../../..' or die $!;
5303 if (!stat ".git/logs/refs/$splitbraincache") {
5304 $! == ENOENT or die $!;
5305 printdebug ">(no reflog)\n";
5312 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5313 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5316 quilt_fixup_mkwork($headref);
5317 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5318 if ($cachehit ne $headref) {
5319 progress "dgit view: found cached ($saved)";
5320 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5322 return ($cachehit, $splitbrain_cachekey);
5324 progress "dgit view: found cached, no changes required";
5325 return ($headref, $splitbrain_cachekey);
5327 die $! if GC->error;
5328 failedcmd unless close GC;
5330 printdebug "splitbrain cache miss\n";
5331 return (undef, $splitbrain_cachekey);
5334 sub quilt_fixup_multipatch ($$$) {
5335 my ($clogp, $headref, $upstreamversion) = @_;
5337 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5340 # - honour any existing .pc in case it has any strangeness
5341 # - determine the git commit corresponding to the tip of
5342 # the patch stack (if there is one)
5343 # - if there is such a git commit, convert each subsequent
5344 # git commit into a quilt patch with dpkg-source --commit
5345 # - otherwise convert all the differences in the tree into
5346 # a single git commit
5350 # Our git tree doesn't necessarily contain .pc. (Some versions of
5351 # dgit would include the .pc in the git tree.) If there isn't
5352 # one, we need to generate one by unpacking the patches that we
5355 # We first look for a .pc in the git tree. If there is one, we
5356 # will use it. (This is not the normal case.)
5358 # Otherwise need to regenerate .pc so that dpkg-source --commit
5359 # can work. We do this as follows:
5360 # 1. Collect all relevant .orig from parent directory
5361 # 2. Generate a debian.tar.gz out of
5362 # debian/{patches,rules,source/format,source/options}
5363 # 3. Generate a fake .dsc containing just these fields:
5364 # Format Source Version Files
5365 # 4. Extract the fake .dsc
5366 # Now the fake .dsc has a .pc directory.
5367 # (In fact we do this in every case, because in future we will
5368 # want to search for a good base commit for generating patches.)
5370 # Then we can actually do the dpkg-source --commit
5371 # 1. Make a new working tree with the same object
5372 # store as our main tree and check out the main
5374 # 2. Copy .pc from the fake's extraction, if necessary
5375 # 3. Run dpkg-source --commit
5376 # 4. If the result has changes to debian/, then
5377 # - git add them them
5378 # - git add .pc if we had a .pc in-tree
5380 # 5. If we had a .pc in-tree, delete it, and git commit
5381 # 6. Back in the main tree, fast forward to the new HEAD
5383 # Another situation we may have to cope with is gbp-style
5384 # patches-unapplied trees.
5386 # We would want to detect these, so we know to escape into
5387 # quilt_fixup_gbp. However, this is in general not possible.
5388 # Consider a package with a one patch which the dgit user reverts
5389 # (with git revert or the moral equivalent).
5391 # That is indistinguishable in contents from a patches-unapplied
5392 # tree. And looking at the history to distinguish them is not
5393 # useful because the user might have made a confusing-looking git
5394 # history structure (which ought to produce an error if dgit can't
5395 # cope, not a silent reintroduction of an unwanted patch).
5397 # So gbp users will have to pass an option. But we can usually
5398 # detect their failure to do so: if the tree is not a clean
5399 # patches-applied tree, quilt linearisation fails, but the tree
5400 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5401 # they want --quilt=unapplied.
5403 # To help detect this, when we are extracting the fake dsc, we
5404 # first extract it with --skip-patches, and then apply the patches
5405 # afterwards with dpkg-source --before-build. That lets us save a
5406 # tree object corresponding to .origs.
5408 my $splitbrain_cachekey;
5410 quilt_make_fake_dsc($upstreamversion);
5412 if (quiltmode_splitbrain()) {
5414 ($cachehit, $splitbrain_cachekey) =
5415 quilt_check_splitbrain_cache($headref, $upstreamversion);
5416 return if $cachehit;
5420 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5422 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5423 rename $fakexdir, "fake" or die "$fakexdir $!";
5427 remove_stray_gits("source package");
5428 mktree_in_ud_here();
5432 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5433 my $unapplied=git_add_write_tree();
5434 printdebug "fake orig tree object $unapplied\n";
5438 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5440 if (system @bbcmd) {
5441 failedcmd @bbcmd if $? < 0;
5443 failed to apply your git tree's patch stack (from debian/patches/) to
5444 the corresponding upstream tarball(s). Your source tree and .orig
5445 are probably too inconsistent. dgit can only fix up certain kinds of
5446 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5452 quilt_fixup_mkwork($headref);
5455 if (stat_exists ".pc") {
5457 progress "Tree already contains .pc - will use it then delete it.";
5460 rename '../fake/.pc','.pc' or die $!;
5463 changedir '../fake';
5465 my $oldtiptree=git_add_write_tree();
5466 printdebug "fake o+d/p tree object $unapplied\n";
5467 changedir '../work';
5470 # We calculate some guesswork now about what kind of tree this might
5471 # be. This is mostly for error reporting.
5477 # O = orig, without patches applied
5478 # A = "applied", ie orig with H's debian/patches applied
5479 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5480 \%editedignores, \@unrepres),
5481 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5482 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5486 foreach my $b (qw(01 02)) {
5487 foreach my $v (qw(O2H O2A H2A)) {
5488 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5491 printdebug "differences \@dl @dl.\n";
5494 "$us: base trees orig=%.20s o+d/p=%.20s",
5495 $unapplied, $oldtiptree;
5497 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5498 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5499 $dl[0], $dl[1], $dl[3], $dl[4],
5503 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5505 forceable_fail [qw(unrepresentable)], <<END;
5506 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5511 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5512 push @failsuggestion, "This might be a patches-unapplied branch.";
5513 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5514 push @failsuggestion, "This might be a patches-applied branch.";
5516 push @failsuggestion, "Maybe you need to specify one of".
5517 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5519 if (quiltmode_splitbrain()) {
5520 quiltify_splitbrain($clogp, $unapplied, $headref,
5521 $diffbits, \%editedignores,
5522 $splitbrain_cachekey);
5526 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5527 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5529 if (!open P, '>>', ".pc/applied-patches") {
5530 $!==&ENOENT or die $!;
5535 commit_quilty_patch();
5537 if ($mustdeletepc) {
5538 quilt_fixup_delete_pc();
5542 sub quilt_fixup_editor () {
5543 my $descfn = $ENV{$fakeeditorenv};
5544 my $editing = $ARGV[$#ARGV];
5545 open I1, '<', $descfn or die "$descfn: $!";
5546 open I2, '<', $editing or die "$editing: $!";
5547 unlink $editing or die "$editing: $!";
5548 open O, '>', $editing or die "$editing: $!";
5549 while (<I1>) { print O or die $!; } I1->error and die $!;
5552 $copying ||= m/^\-\-\- /;
5553 next unless $copying;
5556 I2->error and die $!;
5561 sub maybe_apply_patches_dirtily () {
5562 return unless $quilt_mode =~ m/gbp|unapplied/;
5563 print STDERR <<END or die $!;
5565 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5566 dgit: Have to apply the patches - making the tree dirty.
5567 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5570 $patches_applied_dirtily = 01;
5571 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5572 runcmd qw(dpkg-source --before-build .);
5575 sub maybe_unapply_patches_again () {
5576 progress "dgit: Unapplying patches again to tidy up the tree."
5577 if $patches_applied_dirtily;
5578 runcmd qw(dpkg-source --after-build .)
5579 if $patches_applied_dirtily & 01;
5581 if $patches_applied_dirtily & 02;
5582 $patches_applied_dirtily = 0;
5585 #----- other building -----
5587 our $clean_using_builder;
5588 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5589 # clean the tree before building (perhaps invoked indirectly by
5590 # whatever we are using to run the build), rather than separately
5591 # and explicitly by us.
5594 return if $clean_using_builder;
5595 if ($cleanmode eq 'dpkg-source') {
5596 maybe_apply_patches_dirtily();
5597 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5598 } elsif ($cleanmode eq 'dpkg-source-d') {
5599 maybe_apply_patches_dirtily();
5600 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5601 } elsif ($cleanmode eq 'git') {
5602 runcmd_ordryrun_local @git, qw(clean -xdf);
5603 } elsif ($cleanmode eq 'git-ff') {
5604 runcmd_ordryrun_local @git, qw(clean -xdff);
5605 } elsif ($cleanmode eq 'check') {
5606 my $leftovers = cmdoutput @git, qw(clean -xdn);
5607 if (length $leftovers) {
5608 print STDERR $leftovers, "\n" or die $!;
5609 fail "tree contains uncommitted files and --clean=check specified";
5611 } elsif ($cleanmode eq 'none') {
5618 badusage "clean takes no additional arguments" if @ARGV;
5621 maybe_unapply_patches_again();
5624 sub build_prep_early () {
5625 our $build_prep_early_done //= 0;
5626 return if $build_prep_early_done++;
5628 badusage "-p is not allowed when building" if defined $package;
5629 my $clogp = parsechangelog();
5630 $isuite = getfield $clogp, 'Distribution';
5631 $package = getfield $clogp, 'Source';
5632 $version = getfield $clogp, 'Version';
5639 build_maybe_quilt_fixup();
5641 my $pat = changespat $version;
5642 foreach my $f (glob "$buildproductsdir/$pat") {
5644 unlink $f or fail "remove old changes file $f: $!";
5646 progress "would remove $f";
5652 sub changesopts_initial () {
5653 my @opts =@changesopts[1..$#changesopts];
5656 sub changesopts_version () {
5657 if (!defined $changes_since_version) {
5658 my @vsns = archive_query('archive_query');
5659 my @quirk = access_quirk();
5660 if ($quirk[0] eq 'backports') {
5661 local $isuite = $quirk[2];
5663 canonicalise_suite();
5664 push @vsns, archive_query('archive_query');
5667 @vsns = map { $_->[0] } @vsns;
5668 @vsns = sort { -version_compare($a, $b) } @vsns;
5669 $changes_since_version = $vsns[0];
5670 progress "changelog will contain changes since $vsns[0]";
5672 $changes_since_version = '_';
5673 progress "package seems new, not specifying -v<version>";
5676 if ($changes_since_version ne '_') {
5677 return ("-v$changes_since_version");
5683 sub changesopts () {
5684 return (changesopts_initial(), changesopts_version());
5687 sub massage_dbp_args ($;$) {
5688 my ($cmd,$xargs) = @_;
5691 # - if we're going to split the source build out so we can
5692 # do strange things to it, massage the arguments to dpkg-buildpackage
5693 # so that the main build doessn't build source (or add an argument
5694 # to stop it building source by default).
5696 # - add -nc to stop dpkg-source cleaning the source tree,
5697 # unless we're not doing a split build and want dpkg-source
5698 # as cleanmode, in which case we can do nothing
5701 # 0 - source will NOT need to be built separately by caller
5702 # +1 - source will need to be built separately by caller
5703 # +2 - source will need to be built separately by caller AND
5704 # dpkg-buildpackage should not in fact be run at all!
5705 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5706 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5707 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5708 $clean_using_builder = 1;
5711 # -nc has the side effect of specifying -b if nothing else specified
5712 # and some combinations of -S, -b, et al, are errors, rather than
5713 # later simply overriding earlie. So we need to:
5714 # - search the command line for these options
5715 # - pick the last one
5716 # - perhaps add our own as a default
5717 # - perhaps adjust it to the corresponding non-source-building version
5719 foreach my $l ($cmd, $xargs) {
5721 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5724 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5726 if ($need_split_build_invocation) {
5727 printdebug "massage split $dmode.\n";
5728 $r = $dmode =~ m/[S]/ ? +2 :
5729 $dmode =~ y/gGF/ABb/ ? +1 :
5730 $dmode =~ m/[ABb]/ ? 0 :
5733 printdebug "massage done $r $dmode.\n";
5735 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5741 my $wasdir = must_getcwd();
5747 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5748 my ($msg_if_onlyone) = @_;
5749 # If there is only one .changes file, fail with $msg_if_onlyone,
5750 # or if that is undef, be a no-op.
5751 # Returns the changes file to report to the user.
5752 my $pat = changespat $version;
5753 my @changesfiles = glob $pat;
5754 @changesfiles = sort {
5755 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5759 if (@changesfiles==1) {
5760 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5761 only one changes file from build (@changesfiles)
5763 $result = $changesfiles[0];
5764 } elsif (@changesfiles==2) {
5765 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5766 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5767 fail "$l found in binaries changes file $binchanges"
5770 runcmd_ordryrun_local @mergechanges, @changesfiles;
5771 my $multichanges = changespat $version,'multi';
5773 stat_exists $multichanges or fail "$multichanges: $!";
5774 foreach my $cf (glob $pat) {
5775 next if $cf eq $multichanges;
5776 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5779 $result = $multichanges;
5781 fail "wrong number of different changes files (@changesfiles)";
5783 printdone "build successful, results in $result\n" or die $!;
5786 sub midbuild_checkchanges () {
5787 my $pat = changespat $version;
5788 return if $rmchanges;
5789 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5790 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5792 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5793 Suggest you delete @unwanted.
5798 sub midbuild_checkchanges_vanilla ($) {
5800 midbuild_checkchanges() if $wantsrc == 1;
5803 sub postbuild_mergechanges_vanilla ($) {
5805 if ($wantsrc == 1) {
5807 postbuild_mergechanges(undef);
5810 printdone "build successful\n";
5816 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5817 my $wantsrc = massage_dbp_args \@dbp;
5820 midbuild_checkchanges_vanilla $wantsrc;
5825 push @dbp, changesopts_version();
5826 maybe_apply_patches_dirtily();
5827 runcmd_ordryrun_local @dbp;
5829 maybe_unapply_patches_again();
5830 postbuild_mergechanges_vanilla $wantsrc;
5834 $quilt_mode //= 'gbp';
5840 # gbp can make .origs out of thin air. In my tests it does this
5841 # even for a 1.0 format package, with no origs present. So I
5842 # guess it keys off just the version number. We don't know
5843 # exactly what .origs ought to exist, but let's assume that we
5844 # should run gbp if: the version has an upstream part and the main
5846 my $upstreamversion = upstreamversion $version;
5847 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5848 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5850 if ($gbp_make_orig) {
5852 $cleanmode = 'none'; # don't do it again
5853 $need_split_build_invocation = 1;
5856 my @dbp = @dpkgbuildpackage;
5858 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5860 if (!length $gbp_build[0]) {
5861 if (length executable_on_path('git-buildpackage')) {
5862 $gbp_build[0] = qw(git-buildpackage);
5864 $gbp_build[0] = 'gbp buildpackage';
5867 my @cmd = opts_opt_multi_cmd @gbp_build;
5869 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5871 if ($gbp_make_orig) {
5872 ensuredir '.git/dgit';
5873 my $ok = '.git/dgit/origs-gen-ok';
5874 unlink $ok or $!==&ENOENT or die $!;
5875 my @origs_cmd = @cmd;
5876 push @origs_cmd, qw(--git-cleaner=true);
5877 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5878 push @origs_cmd, @ARGV;
5880 debugcmd @origs_cmd;
5882 do { local $!; stat_exists $ok; }
5883 or failedcmd @origs_cmd;
5885 dryrun_report @origs_cmd;
5891 midbuild_checkchanges_vanilla $wantsrc;
5893 if (!$clean_using_builder) {
5894 push @cmd, '--git-cleaner=true';
5898 maybe_unapply_patches_again();
5900 push @cmd, changesopts();
5901 runcmd_ordryrun_local @cmd, @ARGV;
5903 postbuild_mergechanges_vanilla $wantsrc;
5905 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5909 my $our_cleanmode = $cleanmode;
5910 if ($need_split_build_invocation) {
5911 # Pretend that clean is being done some other way. This
5912 # forces us not to try to use dpkg-buildpackage to clean and
5913 # build source all in one go; and instead we run dpkg-source
5914 # (and build_prep() will do the clean since $clean_using_builder
5916 $our_cleanmode = 'ELSEWHERE';
5918 if ($our_cleanmode =~ m/^dpkg-source/) {
5919 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5920 $clean_using_builder = 1;
5923 $sourcechanges = changespat $version,'source';
5925 unlink "../$sourcechanges" or $!==ENOENT
5926 or fail "remove $sourcechanges: $!";
5928 $dscfn = dscfn($version);
5929 if ($our_cleanmode eq 'dpkg-source') {
5930 maybe_apply_patches_dirtily();
5931 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5933 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5934 maybe_apply_patches_dirtily();
5935 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5938 my @cmd = (@dpkgsource, qw(-b --));
5941 runcmd_ordryrun_local @cmd, "work";
5942 my @udfiles = <${package}_*>;
5943 changedir "../../..";
5944 foreach my $f (@udfiles) {
5945 printdebug "source copy, found $f\n";
5948 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5949 $f eq srcfn($version, $&));
5950 printdebug "source copy, found $f - renaming\n";
5951 rename "$ud/$f", "../$f" or $!==ENOENT
5952 or fail "put in place new source file ($f): $!";
5955 my $pwd = must_getcwd();
5956 my $leafdir = basename $pwd;
5958 runcmd_ordryrun_local @cmd, $leafdir;
5961 runcmd_ordryrun_local qw(sh -ec),
5962 'exec >$1; shift; exec "$@"','x',
5963 "../$sourcechanges",
5964 @dpkggenchanges, qw(-S), changesopts();
5968 sub cmd_build_source {
5970 badusage "build-source takes no additional arguments" if @ARGV;
5972 maybe_unapply_patches_again();
5973 printdone "source built, results in $dscfn and $sourcechanges";
5978 midbuild_checkchanges();
5981 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5982 stat_exists $sourcechanges
5983 or fail "$sourcechanges (in parent directory): $!";
5985 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5987 maybe_unapply_patches_again();
5989 postbuild_mergechanges(<<END);
5990 perhaps you need to pass -A ? (sbuild's default is to build only
5991 arch-specific binaries; dgit 1.4 used to override that.)
5996 sub cmd_quilt_fixup {
5997 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6000 build_maybe_quilt_fixup();
6003 sub cmd_import_dsc {
6007 last unless $ARGV[0] =~ m/^-/;
6010 if (m/^--require-valid-signature$/) {
6013 badusage "unknown dgit import-dsc sub-option \`$_'";
6017 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6018 my ($dscfn, $dstbranch) = @ARGV;
6020 badusage "dry run makes no sense with import-dsc" unless act_local();
6022 my $force = $dstbranch =~ s/^\+// ? +1 :
6023 $dstbranch =~ s/^\.\.// ? -1 :
6025 my $info = $force ? " $&" : '';
6026 $info = "$dscfn$info";
6028 my $specbranch = $dstbranch;
6029 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6030 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6032 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6033 my $chead = cmdoutput_errok @symcmd;
6034 defined $chead or $?==256 or failedcmd @symcmd;
6036 fail "$dstbranch is checked out - will not update it"
6037 if defined $chead and $chead eq $dstbranch;
6039 my $oldhash = git_get_ref $dstbranch;
6041 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6042 $dscdata = do { local $/ = undef; <D>; };
6043 D->error and fail "read $dscfn: $!";
6046 # we don't normally need this so import it here
6047 use Dpkg::Source::Package;
6048 my $dp = new Dpkg::Source::Package filename => $dscfn,
6049 require_valid_signature => $needsig;
6051 local $SIG{__WARN__} = sub {
6053 return unless $needsig;
6054 fail "import-dsc signature check failed";
6056 if (!$dp->is_signed()) {
6057 warn "$us: warning: importing unsigned .dsc\n";
6059 my $r = $dp->check_signature();
6060 die "->check_signature => $r" if $needsig && $r;
6066 $package = getfield $dsc, 'Source';
6068 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6069 unless forceing [qw(import-dsc-with-dgit-field)];
6071 if (defined $dsc_hash) {
6072 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6073 resolve_dsc_field_commit undef, undef;
6075 if (defined $dsc_hash) {
6076 my @cmd = (qw(sh -ec),
6077 "echo $dsc_hash | git cat-file --batch-check");
6078 my $objgot = cmdoutput @cmd;
6079 if ($objgot =~ m#^\w+ missing\b#) {
6081 .dsc contains Dgit field referring to object $dsc_hash
6082 Your git tree does not have that object. Try `git fetch' from a
6083 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6086 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6088 progress "Not fast forward, forced update.";
6090 fail "Not fast forward to $dsc_hash";
6093 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
6094 $dstbranch, $dsc_hash);
6096 progress "dgit: import-dsc updated git ref $dstbranch";
6101 Branch $dstbranch already exists
6102 Specify ..$specbranch for a pseudo-merge, binding in existing history
6103 Specify +$specbranch to overwrite, discarding existing history
6105 if $oldhash && !$force;
6109 my @dfi = dsc_files_info();
6110 foreach my $fi (@dfi) {
6111 my $f = $fi->{Filename};
6113 next if lstat $here;
6114 fail "stat $here: $!" unless $! == ENOENT;
6116 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6118 } elsif ($dscfn =~ m#^/#) {
6121 fail "cannot import $dscfn which seems to be inside working tree!";
6123 $there =~ s#/+[^/]+$## or
6124 fail "cannot import $dscfn which seems to not have a basename";
6126 symlink $there, $here or fail "symlink $there to $here: $!";
6127 progress "made symlink $here -> $there";
6128 # print STDERR Dumper($fi);
6130 my @mergeinputs = generate_commits_from_dsc();
6131 die unless @mergeinputs == 1;
6133 my $newhash = $mergeinputs[0]{Commit};
6137 progress "Import, forced update - synthetic orphan git history.";
6138 } elsif ($force < 0) {
6139 progress "Import, merging.";
6140 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6141 my $version = getfield $dsc, 'Version';
6142 my $clogp = commit_getclogp $newhash;
6143 my $authline = clogp_authline $clogp;
6144 $newhash = make_commit_text <<END;
6151 Merge $package ($version) import into $dstbranch
6154 die; # caught earlier
6158 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
6159 $dstbranch, $newhash);
6161 progress "dgit: import-dsc results are in in git ref $dstbranch";
6164 sub cmd_archive_api_query {
6165 badusage "need only 1 subpath argument" unless @ARGV==1;
6166 my ($subpath) = @ARGV;
6167 my @cmd = archive_api_query_cmd($subpath);
6170 exec @cmd or fail "exec curl: $!\n";
6173 sub cmd_clone_dgit_repos_server {
6174 badusage "need destination argument" unless @ARGV==1;
6175 my ($destdir) = @ARGV;
6176 $package = '_dgit-repos-server';
6177 local $access_forpush = 0;
6178 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6180 exec @cmd or fail "exec git clone: $!\n";
6183 sub cmd_print_dgit_repos_server_source_url {
6184 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6186 $package = '_dgit-repos-server';
6187 local $access_forpush = 0;
6188 my $url = access_giturl();
6189 print $url, "\n" or die $!;
6192 sub cmd_setup_mergechangelogs {
6193 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6194 setup_mergechangelogs(1);
6197 sub cmd_setup_useremail {
6198 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6202 sub cmd_setup_new_tree {
6203 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6207 #---------- argument parsing and main program ----------
6210 print "dgit version $our_version\n" or die $!;
6214 our (%valopts_long, %valopts_short);
6217 sub defvalopt ($$$$) {
6218 my ($long,$short,$val_re,$how) = @_;
6219 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6220 $valopts_long{$long} = $oi;
6221 $valopts_short{$short} = $oi;
6222 # $how subref should:
6223 # do whatever assignemnt or thing it likes with $_[0]
6224 # if the option should not be passed on to remote, @rvalopts=()
6225 # or $how can be a scalar ref, meaning simply assign the value
6228 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6229 defvalopt '--distro', '-d', '.+', \$idistro;
6230 defvalopt '', '-k', '.+', \$keyid;
6231 defvalopt '--existing-package','', '.*', \$existing_package;
6232 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6233 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6234 defvalopt '--package', '-p', $package_re, \$package;
6235 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6237 defvalopt '', '-C', '.+', sub {
6238 ($changesfile) = (@_);
6239 if ($changesfile =~ s#^(.*)/##) {
6240 $buildproductsdir = $1;
6244 defvalopt '--initiator-tempdir','','.*', sub {
6245 ($initiator_tempdir) = (@_);
6246 $initiator_tempdir =~ m#^/# or
6247 badusage "--initiator-tempdir must be used specify an".
6248 " absolute, not relative, directory."
6254 if (defined $ENV{'DGIT_SSH'}) {
6255 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6256 } elsif (defined $ENV{'GIT_SSH'}) {
6257 @ssh = ($ENV{'GIT_SSH'});
6265 if (!defined $val) {
6266 badusage "$what needs a value" unless @ARGV;
6268 push @rvalopts, $val;
6270 badusage "bad value \`$val' for $what" unless
6271 $val =~ m/^$oi->{Re}$(?!\n)/s;
6272 my $how = $oi->{How};
6273 if (ref($how) eq 'SCALAR') {
6278 push @ropts, @rvalopts;
6282 last unless $ARGV[0] =~ m/^-/;
6286 if (m/^--dry-run$/) {
6289 } elsif (m/^--damp-run$/) {
6292 } elsif (m/^--no-sign$/) {
6295 } elsif (m/^--help$/) {
6297 } elsif (m/^--version$/) {
6299 } elsif (m/^--new$/) {
6302 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6303 ($om = $opts_opt_map{$1}) &&
6307 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6308 !$opts_opt_cmdonly{$1} &&
6309 ($om = $opts_opt_map{$1})) {
6312 } elsif (m/^--(gbp|dpm)$/s) {
6313 push @ropts, "--quilt=$1";
6315 } elsif (m/^--ignore-dirty$/s) {
6318 } elsif (m/^--no-quilt-fixup$/s) {
6320 $quilt_mode = 'nocheck';
6321 } elsif (m/^--no-rm-on-error$/s) {
6324 } elsif (m/^--no-chase-dsc-distro$/s) {
6326 $chase_dsc_distro = 0;
6327 } elsif (m/^--overwrite$/s) {
6329 $overwrite_version = '';
6330 } elsif (m/^--overwrite=(.+)$/s) {
6332 $overwrite_version = $1;
6333 } elsif (m/^--dep14tag$/s) {
6335 $dodep14tag= 'want';
6336 } elsif (m/^--no-dep14tag$/s) {
6339 } elsif (m/^--always-dep14tag$/s) {
6341 $dodep14tag= 'always';
6342 } elsif (m/^--delayed=(\d+)$/s) {
6345 } elsif (m/^--dgit-view-save=(.+)$/s) {
6347 $split_brain_save = $1;
6348 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6349 } elsif (m/^--(no-)?rm-old-changes$/s) {
6352 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6354 push @deliberatelies, $&;
6355 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6359 } elsif (m/^--force-/) {
6361 "$us: warning: ignoring unknown force option $_\n";
6363 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6364 # undocumented, for testing
6366 $tagformat_want = [ $1, 'command line', 1 ];
6367 # 1 menas overrides distro configuration
6368 } elsif (m/^--always-split-source-build$/s) {
6369 # undocumented, for testing
6371 $need_split_build_invocation = 1;
6372 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6373 # undocumented, for testing
6375 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6376 # ^ it's supposed to be an array ref
6377 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6378 $val = $2 ? $' : undef; #';
6379 $valopt->($oi->{Long});
6381 badusage "unknown long option \`$_'";
6388 } elsif (s/^-L/-/) {
6391 } elsif (s/^-h/-/) {
6393 } elsif (s/^-D/-/) {
6397 } elsif (s/^-N/-/) {
6402 push @changesopts, $_;
6404 } elsif (s/^-wn$//s) {
6406 $cleanmode = 'none';
6407 } elsif (s/^-wg$//s) {
6410 } elsif (s/^-wgf$//s) {
6412 $cleanmode = 'git-ff';
6413 } elsif (s/^-wd$//s) {
6415 $cleanmode = 'dpkg-source';
6416 } elsif (s/^-wdd$//s) {
6418 $cleanmode = 'dpkg-source-d';
6419 } elsif (s/^-wc$//s) {
6421 $cleanmode = 'check';
6422 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6423 push @git, '-c', $&;
6424 $gitcfgs{cmdline}{$1} = [ $2 ];
6425 } elsif (s/^-c([^=]+)$//s) {
6426 push @git, '-c', $&;
6427 $gitcfgs{cmdline}{$1} = [ 'true' ];
6428 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6430 $val = undef unless length $val;
6431 $valopt->($oi->{Short});
6434 badusage "unknown short option \`$_'";
6441 sub check_env_sanity () {
6442 my $blocked = new POSIX::SigSet;
6443 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6446 foreach my $name (qw(PIPE CHLD)) {
6447 my $signame = "SIG$name";
6448 my $signum = eval "POSIX::$signame" // die;
6449 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6450 die "$signame is set to something other than SIG_DFL\n";
6451 $blocked->ismember($signum) and
6452 die "$signame is blocked\n";
6458 On entry to dgit, $@
6459 This is a bug produced by something in in your execution environment.
6465 sub parseopts_late_defaults () {
6466 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6467 if defined $idistro;
6468 $isuite //= cfg('dgit.default.default-suite');
6470 foreach my $k (keys %opts_opt_map) {
6471 my $om = $opts_opt_map{$k};
6473 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6475 badcfg "cannot set command for $k"
6476 unless length $om->[0];
6480 foreach my $c (access_cfg_cfgs("opts-$k")) {
6482 map { $_ ? @$_ : () }
6483 map { $gitcfgs{$_}{$c} }
6484 reverse @gitcfgsources;
6485 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6486 "\n" if $debuglevel >= 4;
6488 badcfg "cannot configure options for $k"
6489 if $opts_opt_cmdonly{$k};
6490 my $insertpos = $opts_cfg_insertpos{$k};
6491 @$om = ( @$om[0..$insertpos-1],
6493 @$om[$insertpos..$#$om] );
6497 if (!defined $rmchanges) {
6498 local $access_forpush;
6499 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6502 if (!defined $quilt_mode) {
6503 local $access_forpush;
6504 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6505 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6507 $quilt_mode =~ m/^($quilt_modes_re)$/
6508 or badcfg "unknown quilt-mode \`$quilt_mode'";
6512 if (!defined $dodep14tag) {
6513 local $access_forpush;
6514 $dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
6515 $dodep14tag =~ m/^($dodep14tag_re)$/
6516 or badcfg "unknown dep14tag setting \`$dodep14tag'";
6520 $need_split_build_invocation ||= quiltmode_splitbrain();
6522 if (!defined $cleanmode) {
6523 local $access_forpush;
6524 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6525 $cleanmode //= 'dpkg-source';
6527 badcfg "unknown clean-mode \`$cleanmode'" unless
6528 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6532 if ($ENV{$fakeeditorenv}) {
6534 quilt_fixup_editor();
6541 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6542 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6543 if $dryrun_level == 1;
6545 print STDERR $helpmsg or die $!;
6548 my $cmd = shift @ARGV;
6551 my $pre_fn = ${*::}{"pre_$cmd"};
6552 $pre_fn->() if $pre_fn;
6554 my $fn = ${*::}{"cmd_$cmd"};
6555 $fn or badusage "unknown operation $cmd";