3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::Util qw(any);
38 use List::MoreUtils qw(pairwise);
39 use Text::Glob qw(match_glob);
40 use Fcntl qw(:DEFAULT :flock);
45 our $our_version = 'UNRELEASED'; ###substituted###
46 our $absurdity = undef; ###substituted###
48 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
51 our $isuite = 'unstable';
57 our $dryrun_level = 0;
59 our $buildproductsdir = '..';
65 our $existing_package = 'dpkg';
67 our $changes_since_version;
69 our $overwrite_version; # undef: not specified; '': check changelog
71 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
73 our $dodep14tag_re = 'want|no|always';
74 our $split_brain_save;
75 our $we_are_responder;
76 our $initiator_tempdir;
77 our $patches_applied_dirtily = 00;
81 our $chase_dsc_distro=1;
83 our %forceopts = map { $_=>0 }
84 qw(unrepresentable unsupported-source-format
85 dsc-changes-mismatch changes-origs-exactly
86 import-gitapply-absurd
87 import-gitapply-no-absurd
88 import-dsc-with-dgit-field);
90 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
92 our $suite_re = '[-+.0-9a-z]+';
93 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
94 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
95 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
96 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
98 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
99 our $splitbraincache = 'dgit-intern/quilt-cache';
100 our $rewritemap = 'dgit-rewrite/map';
102 our (@git) = qw(git);
103 our (@dget) = qw(dget);
104 our (@curl) = qw(curl);
105 our (@dput) = qw(dput);
106 our (@debsign) = qw(debsign);
107 our (@gpg) = qw(gpg);
108 our (@sbuild) = qw(sbuild);
110 our (@dgit) = qw(dgit);
111 our (@aptget) = qw(apt-get);
112 our (@aptcache) = qw(apt-cache);
113 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
114 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
115 our (@dpkggenchanges) = qw(dpkg-genchanges);
116 our (@mergechanges) = qw(mergechanges -f);
117 our (@gbp_build) = ('');
118 our (@gbp_pq) = ('gbp pq');
119 our (@changesopts) = ('');
121 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
124 'debsign' => \@debsign,
126 'sbuild' => \@sbuild,
130 'apt-get' => \@aptget,
131 'apt-cache' => \@aptcache,
132 'dpkg-source' => \@dpkgsource,
133 'dpkg-buildpackage' => \@dpkgbuildpackage,
134 'dpkg-genchanges' => \@dpkggenchanges,
135 'gbp-build' => \@gbp_build,
136 'gbp-pq' => \@gbp_pq,
137 'ch' => \@changesopts,
138 'mergechanges' => \@mergechanges);
140 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
141 our %opts_cfg_insertpos = map {
143 scalar @{ $opts_opt_map{$_} }
144 } keys %opts_opt_map;
146 sub parseopts_late_defaults();
152 our $supplementary_message = '';
153 our $need_split_build_invocation = 0;
154 our $split_brain = 0;
158 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
161 our $remotename = 'dgit';
162 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
166 if (!defined $absurdity) {
168 $absurdity =~ s{/[^/]+$}{/absurd} or die;
172 my ($v,$distro) = @_;
173 return $tagformatfn->($v, $distro);
176 sub debiantag_maintview ($$) {
177 my ($v,$distro) = @_;
178 return "$distro/".dep14_version_mangle $v;
181 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
183 sub lbranch () { return "$branchprefix/$csuite"; }
184 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
185 sub lref () { return "refs/heads/".lbranch(); }
186 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
187 sub rrref () { return server_ref($csuite); }
197 return "${package}_".(stripepoch $vsn).$sfx
202 return srcfn($vsn,".dsc");
205 sub changespat ($;$) {
206 my ($vsn, $arch) = @_;
207 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
210 sub upstreamversion ($) {
222 foreach my $f (@end) {
224 print STDERR "$us: cleanup: $@" if length $@;
228 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
230 sub forceable_fail ($$) {
231 my ($forceoptsl, $msg) = @_;
232 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
233 print STDERR "warning: overriding problem due to --force:\n". $msg;
237 my ($forceoptsl) = @_;
238 my @got = grep { $forceopts{$_} } @$forceoptsl;
239 return 0 unless @got;
241 "warning: skipping checks or functionality due to --force-$got[0]\n";
244 sub no_such_package () {
245 print STDERR "$us: package $package does not exist in suite $isuite\n";
251 printdebug "CD $newdir\n";
252 chdir $newdir or confess "chdir: $newdir: $!";
255 sub deliberately ($) {
257 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
260 sub deliberately_not_fast_forward () {
261 foreach (qw(not-fast-forward fresh-repo)) {
262 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
266 sub quiltmode_splitbrain () {
267 $quilt_mode =~ m/gbp|dpm|unapplied/;
270 sub opts_opt_multi_cmd {
272 push @cmd, split /\s+/, shift @_;
278 return opts_opt_multi_cmd @gbp_pq;
281 #---------- remote protocol support, common ----------
283 # remote push initiator/responder protocol:
284 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
285 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
286 # < dgit-remote-push-ready <actual-proto-vsn>
293 # > supplementary-message NBYTES # $protovsn >= 3
298 # > file parsed-changelog
299 # [indicates that output of dpkg-parsechangelog follows]
300 # > data-block NBYTES
301 # > [NBYTES bytes of data (no newline)]
302 # [maybe some more blocks]
311 # > param head DGIT-VIEW-HEAD
312 # > param csuite SUITE
313 # > param tagformat old|new
314 # > param maint-view MAINT-VIEW-HEAD
316 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
317 # # goes into tag, for replay prevention
320 # [indicates that signed tag is wanted]
321 # < data-block NBYTES
322 # < [NBYTES bytes of data (no newline)]
323 # [maybe some more blocks]
327 # > want signed-dsc-changes
328 # < data-block NBYTES [transfer of signed dsc]
330 # < data-block NBYTES [transfer of signed changes]
338 sub i_child_report () {
339 # Sees if our child has died, and reap it if so. Returns a string
340 # describing how it died if it failed, or undef otherwise.
341 return undef unless $i_child_pid;
342 my $got = waitpid $i_child_pid, WNOHANG;
343 return undef if $got <= 0;
344 die unless $got == $i_child_pid;
345 $i_child_pid = undef;
346 return undef unless $?;
347 return "build host child ".waitstatusmsg();
352 fail "connection lost: $!" if $fh->error;
353 fail "protocol violation; $m not expected";
356 sub badproto_badread ($$) {
358 fail "connection lost: $!" if $!;
359 my $report = i_child_report();
360 fail $report if defined $report;
361 badproto $fh, "eof (reading $wh)";
364 sub protocol_expect (&$) {
365 my ($match, $fh) = @_;
368 defined && chomp or badproto_badread $fh, "protocol message";
376 badproto $fh, "\`$_'";
379 sub protocol_send_file ($$) {
380 my ($fh, $ourfn) = @_;
381 open PF, "<", $ourfn or die "$ourfn: $!";
384 my $got = read PF, $d, 65536;
385 die "$ourfn: $!" unless defined $got;
387 print $fh "data-block ".length($d)."\n" or die $!;
388 print $fh $d or die $!;
390 PF->error and die "$ourfn $!";
391 print $fh "data-end\n" or die $!;
395 sub protocol_read_bytes ($$) {
396 my ($fh, $nbytes) = @_;
397 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
399 my $got = read $fh, $d, $nbytes;
400 $got==$nbytes or badproto_badread $fh, "data block";
404 sub protocol_receive_file ($$) {
405 my ($fh, $ourfn) = @_;
406 printdebug "() $ourfn\n";
407 open PF, ">", $ourfn or die "$ourfn: $!";
409 my ($y,$l) = protocol_expect {
410 m/^data-block (.*)$/ ? (1,$1) :
411 m/^data-end$/ ? (0,) :
415 my $d = protocol_read_bytes $fh, $l;
416 print PF $d or die $!;
421 #---------- remote protocol support, responder ----------
423 sub responder_send_command ($) {
425 return unless $we_are_responder;
426 # called even without $we_are_responder
427 printdebug ">> $command\n";
428 print PO $command, "\n" or die $!;
431 sub responder_send_file ($$) {
432 my ($keyword, $ourfn) = @_;
433 return unless $we_are_responder;
434 printdebug "]] $keyword $ourfn\n";
435 responder_send_command "file $keyword";
436 protocol_send_file \*PO, $ourfn;
439 sub responder_receive_files ($@) {
440 my ($keyword, @ourfns) = @_;
441 die unless $we_are_responder;
442 printdebug "[[ $keyword @ourfns\n";
443 responder_send_command "want $keyword";
444 foreach my $fn (@ourfns) {
445 protocol_receive_file \*PI, $fn;
448 protocol_expect { m/^files-end$/ } \*PI;
451 #---------- remote protocol support, initiator ----------
453 sub initiator_expect (&) {
455 protocol_expect { &$match } \*RO;
458 #---------- end remote code ----------
461 if ($we_are_responder) {
463 responder_send_command "progress ".length($m) or die $!;
464 print PO $m or die $!;
474 $ua = LWP::UserAgent->new();
478 progress "downloading $what...";
479 my $r = $ua->get(@_) or die $!;
480 return undef if $r->code == 404;
481 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
482 return $r->decoded_content(charset => 'none');
485 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
490 failedcmd @_ if system @_;
493 sub act_local () { return $dryrun_level <= 1; }
494 sub act_scary () { return !$dryrun_level; }
497 if (!$dryrun_level) {
498 progress "$us ok: @_";
500 progress "would be ok: @_ (but dry run only)";
505 printcmd(\*STDERR,$debugprefix."#",@_);
508 sub runcmd_ordryrun {
516 sub runcmd_ordryrun_local {
525 my ($first_shell, @cmd) = @_;
526 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
529 our $helpmsg = <<END;
531 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
532 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
533 dgit [dgit-opts] build [dpkg-buildpackage-opts]
534 dgit [dgit-opts] sbuild [sbuild-opts]
535 dgit [dgit-opts] push [dgit-opts] [suite]
536 dgit [dgit-opts] rpush build-host:build-dir ...
537 important dgit options:
538 -k<keyid> sign tag and package with <keyid> instead of default
539 --dry-run -n do not change anything, but go through the motions
540 --damp-run -L like --dry-run but make local changes, without signing
541 --new -N allow introducing a new package
542 --debug -D increase debug level
543 -c<name>=<value> set git config option (used directly by dgit too)
546 our $later_warning_msg = <<END;
547 Perhaps the upload is stuck in incoming. Using the version from git.
551 print STDERR "$us: @_\n", $helpmsg or die $!;
556 @ARGV or badusage "too few arguments";
557 return scalar shift @ARGV;
561 print $helpmsg or die $!;
565 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
567 our %defcfg = ('dgit.default.distro' => 'debian',
568 'dgit.default.old-dsc-distro' => 'debian',
569 'dgit-suite.*-security.distro' => 'debian-security',
570 'dgit.default.username' => '',
571 'dgit.default.archive-query-default-component' => 'main',
572 'dgit.default.ssh' => 'ssh',
573 'dgit.default.archive-query' => 'madison:',
574 'dgit.default.sshpsql-dbname' => 'service=projectb',
575 'dgit.default.aptget-components' => 'main',
576 'dgit.default.dgit-tag-format' => 'new,old,maint',
577 'dgit.dsc-url-proto-ok.http' => 'true',
578 'dgit.dsc-url-proto-ok.https' => 'true',
579 'dgit.dsc-url-proto-ok.git' => 'true',
580 'dgit.default.dsc-url-proto-ok' => 'false',
581 # old means "repo server accepts pushes with old dgit tags"
582 # new means "repo server accepts pushes with new dgit tags"
583 # maint means "repo server accepts split brain pushes"
584 # hist means "repo server may have old pushes without new tag"
585 # ("hist" is implied by "old")
586 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
587 'dgit-distro.debian.git-check' => 'url',
588 'dgit-distro.debian.git-check-suffix' => '/info/refs',
589 'dgit-distro.debian.new-private-pushers' => 't',
590 'dgit-distro.debian/push.git-url' => '',
591 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
592 'dgit-distro.debian/push.git-user-force' => 'dgit',
593 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
594 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
595 'dgit-distro.debian/push.git-create' => 'true',
596 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
597 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
598 # 'dgit-distro.debian.archive-query-tls-key',
599 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
600 # ^ this does not work because curl is broken nowadays
601 # Fixing #790093 properly will involve providing providing the key
602 # in some pacagke and maybe updating these paths.
604 # 'dgit-distro.debian.archive-query-tls-curl-args',
605 # '--ca-path=/etc/ssl/ca-debian',
606 # ^ this is a workaround but works (only) on DSA-administered machines
607 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
608 'dgit-distro.debian.git-url-suffix' => '',
609 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
610 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
611 'dgit-distro.debian-security.archive-query' => 'aptget:',
612 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
613 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
614 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
615 'dgit-distro.debian-security.nominal-distro' => 'debian',
616 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
617 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
618 'dgit-distro.ubuntu.git-check' => 'false',
619 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
620 'dgit-distro.test-dummy.ssh' => "$td/ssh",
621 'dgit-distro.test-dummy.username' => "alice",
622 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
623 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
624 'dgit-distro.test-dummy.git-url' => "$td/git",
625 'dgit-distro.test-dummy.git-host' => "git",
626 'dgit-distro.test-dummy.git-path' => "$td/git",
627 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
628 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
629 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
630 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
634 our @gitcfgsources = qw(cmdline local global system);
636 sub git_slurp_config () {
637 local ($debuglevel) = $debuglevel-2;
640 # This algoritm is a bit subtle, but this is needed so that for
641 # options which we want to be single-valued, we allow the
642 # different config sources to override properly. See #835858.
643 foreach my $src (@gitcfgsources) {
644 next if $src eq 'cmdline';
645 # we do this ourselves since git doesn't handle it
647 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
650 open GITS, "-|", @cmd or die $!;
653 printdebug "=> ", (messagequote $_), "\n";
655 push @{ $gitcfgs{$src}{$`} }, $'; #';
659 or ($!==0 && $?==256)
664 sub git_get_config ($) {
666 foreach my $src (@gitcfgsources) {
667 my $l = $gitcfgs{$src}{$c};
668 croak "$l $c" if $l && !ref $l;
669 printdebug"C $c ".(defined $l ?
670 join " ", map { messagequote "'$_'" } @$l :
674 @$l==1 or badcfg "multiple values for $c".
675 " (in $src git config)" if @$l > 1;
683 return undef if $c =~ /RETURN-UNDEF/;
684 printdebug "C? $c\n" if $debuglevel >= 5;
685 my $v = git_get_config($c);
686 return $v if defined $v;
687 my $dv = $defcfg{$c};
689 printdebug "CD $c $dv\n" if $debuglevel >= 4;
693 badcfg "need value for one of: @_\n".
694 "$us: distro or suite appears not to be (properly) supported";
697 sub access_basedistro__noalias () {
698 if (defined $idistro) {
701 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
702 return $def if defined $def;
703 foreach my $src (@gitcfgsources, 'internal') {
704 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
706 foreach my $k (keys %$kl) {
707 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
709 next unless match_glob $dpat, $isuite;
713 return cfg("dgit.default.distro");
717 sub access_basedistro () {
718 my $noalias = access_basedistro__noalias();
719 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
720 return $canon // $noalias;
723 sub access_nomdistro () {
724 my $base = access_basedistro();
725 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
726 $r =~ m/^$distro_re$/ or badcfg
727 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
731 sub access_quirk () {
732 # returns (quirk name, distro to use instead or undef, quirk-specific info)
733 my $basedistro = access_basedistro();
734 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
736 if (defined $backports_quirk) {
737 my $re = $backports_quirk;
738 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
740 $re =~ s/\%/([-0-9a-z_]+)/
741 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
742 if ($isuite =~ m/^$re$/) {
743 return ('backports',"$basedistro-backports",$1);
746 return ('none',undef);
751 sub parse_cfg_bool ($$$) {
752 my ($what,$def,$v) = @_;
755 $v =~ m/^[ty1]/ ? 1 :
756 $v =~ m/^[fn0]/ ? 0 :
757 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
760 sub access_forpush_config () {
761 my $d = access_basedistro();
765 parse_cfg_bool('new-private-pushers', 0,
766 cfg("dgit-distro.$d.new-private-pushers",
769 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
772 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
773 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
774 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
775 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
778 sub access_forpush () {
779 $access_forpush //= access_forpush_config();
780 return $access_forpush;
784 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
785 badcfg "pushing but distro is configured readonly"
786 if access_forpush_config() eq '0';
788 $supplementary_message = <<'END' unless $we_are_responder;
789 Push failed, before we got started.
790 You can retry the push, after fixing the problem, if you like.
792 parseopts_late_defaults();
796 parseopts_late_defaults();
799 sub supplementary_message ($) {
801 if (!$we_are_responder) {
802 $supplementary_message = $msg;
804 } elsif ($protovsn >= 3) {
805 responder_send_command "supplementary-message ".length($msg)
807 print PO $msg or die $!;
811 sub access_distros () {
812 # Returns list of distros to try, in order
815 # 0. `instead of' distro name(s) we have been pointed to
816 # 1. the access_quirk distro, if any
817 # 2a. the user's specified distro, or failing that } basedistro
818 # 2b. the distro calculated from the suite }
819 my @l = access_basedistro();
821 my (undef,$quirkdistro) = access_quirk();
822 unshift @l, $quirkdistro;
823 unshift @l, $instead_distro;
824 @l = grep { defined } @l;
826 push @l, access_nomdistro();
828 if (access_forpush()) {
829 @l = map { ("$_/push", $_) } @l;
834 sub access_cfg_cfgs (@) {
837 # The nesting of these loops determines the search order. We put
838 # the key loop on the outside so that we search all the distros
839 # for each key, before going on to the next key. That means that
840 # if access_cfg is called with a more specific, and then a less
841 # specific, key, an earlier distro can override the less specific
842 # without necessarily overriding any more specific keys. (If the
843 # distro wants to override the more specific keys it can simply do
844 # so; whereas if we did the loop the other way around, it would be
845 # impossible to for an earlier distro to override a less specific
846 # key but not the more specific ones without restating the unknown
847 # values of the more specific keys.
850 # We have to deal with RETURN-UNDEF specially, so that we don't
851 # terminate the search prematurely.
853 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
856 foreach my $d (access_distros()) {
857 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
859 push @cfgs, map { "dgit.default.$_" } @realkeys;
866 my (@cfgs) = access_cfg_cfgs(@keys);
867 my $value = cfg(@cfgs);
871 sub access_cfg_bool ($$) {
872 my ($def, @keys) = @_;
873 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
876 sub string_to_ssh ($) {
878 if ($spec =~ m/\s/) {
879 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
885 sub access_cfg_ssh () {
886 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
887 if (!defined $gitssh) {
890 return string_to_ssh $gitssh;
894 sub access_runeinfo ($) {
896 return ": dgit ".access_basedistro()." $info ;";
899 sub access_someuserhost ($) {
901 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
902 defined($user) && length($user) or
903 $user = access_cfg("$some-user",'username');
904 my $host = access_cfg("$some-host");
905 return length($user) ? "$user\@$host" : $host;
908 sub access_gituserhost () {
909 return access_someuserhost('git');
912 sub access_giturl (;$) {
914 my $url = access_cfg('git-url','RETURN-UNDEF');
917 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
918 return undef unless defined $proto;
921 access_gituserhost().
922 access_cfg('git-path');
924 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
927 return "$url/$package$suffix";
930 sub parsecontrolfh ($$;$) {
931 my ($fh, $desc, $allowsigned) = @_;
932 our $dpkgcontrolhash_noissigned;
935 my %opts = ('name' => $desc);
936 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
937 $c = Dpkg::Control::Hash->new(%opts);
938 $c->parse($fh,$desc) or die "parsing of $desc failed";
939 last if $allowsigned;
940 last if $dpkgcontrolhash_noissigned;
941 my $issigned= $c->get_option('is_pgp_signed');
942 if (!defined $issigned) {
943 $dpkgcontrolhash_noissigned= 1;
944 seek $fh, 0,0 or die "seek $desc: $!";
945 } elsif ($issigned) {
946 fail "control file $desc is (already) PGP-signed. ".
947 " Note that dgit push needs to modify the .dsc and then".
948 " do the signature itself";
957 my ($file, $desc, $allowsigned) = @_;
958 my $fh = new IO::Handle;
959 open $fh, '<', $file or die "$file: $!";
960 my $c = parsecontrolfh($fh,$desc,$allowsigned);
961 $fh->error and die $!;
967 my ($dctrl,$field) = @_;
968 my $v = $dctrl->{$field};
969 return $v if defined $v;
970 fail "missing field $field in ".$dctrl->get_option('name');
974 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
975 my $p = new IO::Handle;
976 my @cmd = (qw(dpkg-parsechangelog), @_);
977 open $p, '-|', @cmd or die $!;
979 $?=0; $!=0; close $p or failedcmd @cmd;
983 sub commit_getclogp ($) {
984 # Returns the parsed changelog hashref for a particular commit
986 our %commit_getclogp_memo;
987 my $memo = $commit_getclogp_memo{$objid};
988 return $memo if $memo;
990 my $mclog = ".git/dgit/clog-$objid";
991 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
992 "$objid:debian/changelog";
993 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
998 defined $d or fail "getcwd failed: $!";
1002 sub parse_dscdata () {
1003 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1004 printdebug Dumper($dscdata) if $debuglevel>1;
1005 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1006 printdebug Dumper($dsc) if $debuglevel>1;
1011 sub archive_query ($;@) {
1012 my ($method) = shift @_;
1013 fail "this operation does not support multiple comma-separated suites"
1015 my $query = access_cfg('archive-query','RETURN-UNDEF');
1016 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1019 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1022 sub archive_query_prepend_mirror {
1023 my $m = access_cfg('mirror');
1024 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1027 sub pool_dsc_subpath ($$) {
1028 my ($vsn,$component) = @_; # $package is implict arg
1029 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1030 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1033 sub cfg_apply_map ($$$) {
1034 my ($varref, $what, $mapspec) = @_;
1035 return unless $mapspec;
1037 printdebug "config $what EVAL{ $mapspec; }\n";
1039 eval "package Dgit::Config; $mapspec;";
1044 #---------- `ftpmasterapi' archive query method (nascent) ----------
1046 sub archive_api_query_cmd ($) {
1048 my @cmd = (@curl, qw(-sS));
1049 my $url = access_cfg('archive-query-url');
1050 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1052 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1053 foreach my $key (split /\:/, $keys) {
1054 $key =~ s/\%HOST\%/$host/g;
1056 fail "for $url: stat $key: $!" unless $!==ENOENT;
1059 fail "config requested specific TLS key but do not know".
1060 " how to get curl to use exactly that EE key ($key)";
1061 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1062 # # Sadly the above line does not work because of changes
1063 # # to gnutls. The real fix for #790093 may involve
1064 # # new curl options.
1067 # Fixing #790093 properly will involve providing a value
1068 # for this on clients.
1069 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1070 push @cmd, split / /, $kargs if defined $kargs;
1072 push @cmd, $url.$subpath;
1076 sub api_query ($$;$) {
1078 my ($data, $subpath, $ok404) = @_;
1079 badcfg "ftpmasterapi archive query method takes no data part"
1081 my @cmd = archive_api_query_cmd($subpath);
1082 my $url = $cmd[$#cmd];
1083 push @cmd, qw(-w %{http_code});
1084 my $json = cmdoutput @cmd;
1085 unless ($json =~ s/\d+\d+\d$//) {
1086 failedcmd_report_cmd undef, @cmd;
1087 fail "curl failed to print 3-digit HTTP code";
1090 return undef if $code eq '404' && $ok404;
1091 fail "fetch of $url gave HTTP code $code"
1092 unless $url =~ m#^file://# or $code =~ m/^2/;
1093 return decode_json($json);
1096 sub canonicalise_suite_ftpmasterapi {
1097 my ($proto,$data) = @_;
1098 my $suites = api_query($data, 'suites');
1100 foreach my $entry (@$suites) {
1102 my $v = $entry->{$_};
1103 defined $v && $v eq $isuite;
1104 } qw(codename name);
1105 push @matched, $entry;
1107 fail "unknown suite $isuite" unless @matched;
1110 @matched==1 or die "multiple matches for suite $isuite\n";
1111 $cn = "$matched[0]{codename}";
1112 defined $cn or die "suite $isuite info has no codename\n";
1113 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1115 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1120 sub archive_query_ftpmasterapi {
1121 my ($proto,$data) = @_;
1122 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1124 my $digester = Digest::SHA->new(256);
1125 foreach my $entry (@$info) {
1127 my $vsn = "$entry->{version}";
1128 my ($ok,$msg) = version_check $vsn;
1129 die "bad version: $msg\n" unless $ok;
1130 my $component = "$entry->{component}";
1131 $component =~ m/^$component_re$/ or die "bad component";
1132 my $filename = "$entry->{filename}";
1133 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1134 or die "bad filename";
1135 my $sha256sum = "$entry->{sha256sum}";
1136 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1137 push @rows, [ $vsn, "/pool/$component/$filename",
1138 $digester, $sha256sum ];
1140 die "bad ftpmaster api response: $@\n".Dumper($entry)
1143 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1144 return archive_query_prepend_mirror @rows;
1147 sub file_in_archive_ftpmasterapi {
1148 my ($proto,$data,$filename) = @_;
1149 my $pat = $filename;
1152 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1153 my $info = api_query($data, "file_in_archive/$pat", 1);
1156 #---------- `aptget' archive query method ----------
1159 our $aptget_releasefile;
1160 our $aptget_configpath;
1162 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1163 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1165 sub aptget_cache_clean {
1166 runcmd_ordryrun_local qw(sh -ec),
1167 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1171 sub aptget_lock_acquire () {
1172 my $lockfile = "$aptget_base/lock";
1173 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1174 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1177 sub aptget_prep ($) {
1179 return if defined $aptget_base;
1181 badcfg "aptget archive query method takes no data part"
1184 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1187 ensuredir "$cache/dgit";
1189 access_cfg('aptget-cachekey','RETURN-UNDEF')
1190 // access_nomdistro();
1192 $aptget_base = "$cache/dgit/aptget";
1193 ensuredir $aptget_base;
1195 my $quoted_base = $aptget_base;
1196 die "$quoted_base contains bad chars, cannot continue"
1197 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1199 ensuredir $aptget_base;
1201 aptget_lock_acquire();
1203 aptget_cache_clean();
1205 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1206 my $sourceslist = "source.list#$cachekey";
1208 my $aptsuites = $isuite;
1209 cfg_apply_map(\$aptsuites, 'suite map',
1210 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1212 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1213 printf SRCS "deb-src %s %s %s\n",
1214 access_cfg('mirror'),
1216 access_cfg('aptget-components')
1219 ensuredir "$aptget_base/cache";
1220 ensuredir "$aptget_base/lists";
1222 open CONF, ">", $aptget_configpath or die $!;
1224 Debug::NoLocking "true";
1225 APT::Get::List-Cleanup "false";
1226 #clear APT::Update::Post-Invoke-Success;
1227 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1228 Dir::State::Lists "$quoted_base/lists";
1229 Dir::Etc::preferences "$quoted_base/preferences";
1230 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1231 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1234 foreach my $key (qw(
1237 Dir::Cache::Archives
1238 Dir::Etc::SourceParts
1239 Dir::Etc::preferencesparts
1241 ensuredir "$aptget_base/$key";
1242 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1245 my $oldatime = (time // die $!) - 1;
1246 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1247 next unless stat_exists $oldlist;
1248 my ($mtime) = (stat _)[9];
1249 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1252 runcmd_ordryrun_local aptget_aptget(), qw(update);
1255 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1256 next unless stat_exists $oldlist;
1257 my ($atime) = (stat _)[8];
1258 next if $atime == $oldatime;
1259 push @releasefiles, $oldlist;
1261 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1262 @releasefiles = @inreleasefiles if @inreleasefiles;
1263 die "apt updated wrong number of Release files (@releasefiles), erk"
1264 unless @releasefiles == 1;
1266 ($aptget_releasefile) = @releasefiles;
1269 sub canonicalise_suite_aptget {
1270 my ($proto,$data) = @_;
1273 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1275 foreach my $name (qw(Codename Suite)) {
1276 my $val = $release->{$name};
1278 printdebug "release file $name: $val\n";
1279 $val =~ m/^$suite_re$/o or fail
1280 "Release file ($aptget_releasefile) specifies intolerable $name";
1281 cfg_apply_map(\$val, 'suite rmap',
1282 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1289 sub archive_query_aptget {
1290 my ($proto,$data) = @_;
1293 ensuredir "$aptget_base/source";
1294 foreach my $old (<$aptget_base/source/*.dsc>) {
1295 unlink $old or die "$old: $!";
1298 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1299 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1300 # avoids apt-get source failing with ambiguous error code
1302 runcmd_ordryrun_local
1303 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1304 aptget_aptget(), qw(--download-only --only-source source), $package;
1306 my @dscs = <$aptget_base/source/*.dsc>;
1307 fail "apt-get source did not produce a .dsc" unless @dscs;
1308 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1310 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1313 my $uri = "file://". uri_escape $dscs[0];
1314 $uri =~ s{\%2f}{/}gi;
1315 return [ (getfield $pre_dsc, 'Version'), $uri ];
1318 #---------- `dummyapicat' archive query method ----------
1320 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1321 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1323 sub file_in_archive_dummycatapi ($$$) {
1324 my ($proto,$data,$filename) = @_;
1325 my $mirror = access_cfg('mirror');
1326 $mirror =~ s#^file://#/# or die "$mirror ?";
1328 my @cmd = (qw(sh -ec), '
1330 find -name "$2" -print0 |
1332 ', qw(x), $mirror, $filename);
1333 debugcmd "-|", @cmd;
1334 open FIA, "-|", @cmd or die $!;
1337 printdebug "| $_\n";
1338 m/^(\w+) (\S+)$/ or die "$_ ?";
1339 push @out, { sha256sum => $1, filename => $2 };
1341 close FIA or die failedcmd @cmd;
1345 #---------- `madison' archive query method ----------
1347 sub archive_query_madison {
1348 return archive_query_prepend_mirror
1349 map { [ @$_[0..1] ] } madison_get_parse(@_);
1352 sub madison_get_parse {
1353 my ($proto,$data) = @_;
1354 die unless $proto eq 'madison';
1355 if (!length $data) {
1356 $data= access_cfg('madison-distro','RETURN-UNDEF');
1357 $data //= access_basedistro();
1359 $rmad{$proto,$data,$package} ||= cmdoutput
1360 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1361 my $rmad = $rmad{$proto,$data,$package};
1364 foreach my $l (split /\n/, $rmad) {
1365 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1366 \s*( [^ \t|]+ )\s* \|
1367 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1368 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1369 $1 eq $package or die "$rmad $package ?";
1376 $component = access_cfg('archive-query-default-component');
1378 $5 eq 'source' or die "$rmad ?";
1379 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1381 return sort { -version_compare($a->[0],$b->[0]); } @out;
1384 sub canonicalise_suite_madison {
1385 # madison canonicalises for us
1386 my @r = madison_get_parse(@_);
1388 "unable to canonicalise suite using package $package".
1389 " which does not appear to exist in suite $isuite;".
1390 " --existing-package may help";
1394 sub file_in_archive_madison { return undef; }
1396 #---------- `sshpsql' archive query method ----------
1399 my ($data,$runeinfo,$sql) = @_;
1400 if (!length $data) {
1401 $data= access_someuserhost('sshpsql').':'.
1402 access_cfg('sshpsql-dbname');
1404 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1405 my ($userhost,$dbname) = ($`,$'); #';
1407 my @cmd = (access_cfg_ssh, $userhost,
1408 access_runeinfo("ssh-psql $runeinfo").
1409 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1410 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1412 open P, "-|", @cmd or die $!;
1415 printdebug(">|$_|\n");
1418 $!=0; $?=0; close P or failedcmd @cmd;
1420 my $nrows = pop @rows;
1421 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1422 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1423 @rows = map { [ split /\|/, $_ ] } @rows;
1424 my $ncols = scalar @{ shift @rows };
1425 die if grep { scalar @$_ != $ncols } @rows;
1429 sub sql_injection_check {
1430 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1433 sub archive_query_sshpsql ($$) {
1434 my ($proto,$data) = @_;
1435 sql_injection_check $isuite, $package;
1436 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1437 SELECT source.version, component.name, files.filename, files.sha256sum
1439 JOIN src_associations ON source.id = src_associations.source
1440 JOIN suite ON suite.id = src_associations.suite
1441 JOIN dsc_files ON dsc_files.source = source.id
1442 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1443 JOIN component ON component.id = files_archive_map.component_id
1444 JOIN files ON files.id = dsc_files.file
1445 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1446 AND source.source='$package'
1447 AND files.filename LIKE '%.dsc';
1449 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1450 my $digester = Digest::SHA->new(256);
1452 my ($vsn,$component,$filename,$sha256sum) = @$_;
1453 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1455 return archive_query_prepend_mirror @rows;
1458 sub canonicalise_suite_sshpsql ($$) {
1459 my ($proto,$data) = @_;
1460 sql_injection_check $isuite;
1461 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1462 SELECT suite.codename
1463 FROM suite where suite_name='$isuite' or codename='$isuite';
1465 @rows = map { $_->[0] } @rows;
1466 fail "unknown suite $isuite" unless @rows;
1467 die "ambiguous $isuite: @rows ?" if @rows>1;
1471 sub file_in_archive_sshpsql ($$$) { return undef; }
1473 #---------- `dummycat' archive query method ----------
1475 sub canonicalise_suite_dummycat ($$) {
1476 my ($proto,$data) = @_;
1477 my $dpath = "$data/suite.$isuite";
1478 if (!open C, "<", $dpath) {
1479 $!==ENOENT or die "$dpath: $!";
1480 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1484 chomp or die "$dpath: $!";
1486 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1490 sub archive_query_dummycat ($$) {
1491 my ($proto,$data) = @_;
1492 canonicalise_suite();
1493 my $dpath = "$data/package.$csuite.$package";
1494 if (!open C, "<", $dpath) {
1495 $!==ENOENT or die "$dpath: $!";
1496 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1504 printdebug "dummycat query $csuite $package $dpath | $_\n";
1505 my @row = split /\s+/, $_;
1506 @row==2 or die "$dpath: $_ ?";
1509 C->error and die "$dpath: $!";
1511 return archive_query_prepend_mirror
1512 sort { -version_compare($a->[0],$b->[0]); } @rows;
1515 sub file_in_archive_dummycat () { return undef; }
1517 #---------- tag format handling ----------
1519 sub access_cfg_tagformats () {
1520 split /\,/, access_cfg('dgit-tag-format');
1523 sub access_cfg_tagformats_can_splitbrain () {
1524 my %y = map { $_ => 1 } access_cfg_tagformats;
1525 foreach my $needtf (qw(new maint)) {
1526 next if $y{$needtf};
1532 sub need_tagformat ($$) {
1533 my ($fmt, $why) = @_;
1534 fail "need to use tag format $fmt ($why) but also need".
1535 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1536 " - no way to proceed"
1537 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1538 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1541 sub select_tagformat () {
1543 return if $tagformatfn && !$tagformat_want;
1544 die 'bug' if $tagformatfn && $tagformat_want;
1545 # ... $tagformat_want assigned after previous select_tagformat
1547 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1548 printdebug "select_tagformat supported @supported\n";
1550 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1551 printdebug "select_tagformat specified @$tagformat_want\n";
1553 my ($fmt,$why,$override) = @$tagformat_want;
1555 fail "target distro supports tag formats @supported".
1556 " but have to use $fmt ($why)"
1558 or grep { $_ eq $fmt } @supported;
1560 $tagformat_want = undef;
1562 $tagformatfn = ${*::}{"debiantag_$fmt"};
1564 fail "trying to use unknown tag format \`$fmt' ($why) !"
1565 unless $tagformatfn;
1568 #---------- archive query entrypoints and rest of program ----------
1570 sub canonicalise_suite () {
1571 return if defined $csuite;
1572 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1573 $csuite = archive_query('canonicalise_suite');
1574 if ($isuite ne $csuite) {
1575 progress "canonical suite name for $isuite is $csuite";
1577 progress "canonical suite name is $csuite";
1581 sub get_archive_dsc () {
1582 canonicalise_suite();
1583 my @vsns = archive_query('archive_query');
1584 foreach my $vinfo (@vsns) {
1585 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1586 $dscurl = $vsn_dscurl;
1587 $dscdata = url_get($dscurl);
1589 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1594 $digester->add($dscdata);
1595 my $got = $digester->hexdigest();
1597 fail "$dscurl has hash $got but".
1598 " archive told us to expect $digest";
1601 my $fmt = getfield $dsc, 'Format';
1602 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1603 "unsupported source format $fmt, sorry";
1605 $dsc_checked = !!$digester;
1606 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1610 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1613 sub check_for_git ();
1614 sub check_for_git () {
1616 my $how = access_cfg('git-check');
1617 if ($how eq 'ssh-cmd') {
1619 (access_cfg_ssh, access_gituserhost(),
1620 access_runeinfo("git-check $package").
1621 " set -e; cd ".access_cfg('git-path').";".
1622 " if test -d $package.git; then echo 1; else echo 0; fi");
1623 my $r= cmdoutput @cmd;
1624 if (defined $r and $r =~ m/^divert (\w+)$/) {
1626 my ($usedistro,) = access_distros();
1627 # NB that if we are pushing, $usedistro will be $distro/push
1628 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1629 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1630 progress "diverting to $divert (using config for $instead_distro)";
1631 return check_for_git();
1633 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1635 } elsif ($how eq 'url') {
1636 my $prefix = access_cfg('git-check-url','git-url');
1637 my $suffix = access_cfg('git-check-suffix','git-suffix',
1638 'RETURN-UNDEF') // '.git';
1639 my $url = "$prefix/$package$suffix";
1640 my @cmd = (@curl, qw(-sS -I), $url);
1641 my $result = cmdoutput @cmd;
1642 $result =~ s/^\S+ 200 .*\n\r?\n//;
1643 # curl -sS -I with https_proxy prints
1644 # HTTP/1.0 200 Connection established
1645 $result =~ m/^\S+ (404|200) /s or
1646 fail "unexpected results from git check query - ".
1647 Dumper($prefix, $result);
1649 if ($code eq '404') {
1651 } elsif ($code eq '200') {
1656 } elsif ($how eq 'true') {
1658 } elsif ($how eq 'false') {
1661 badcfg "unknown git-check \`$how'";
1665 sub create_remote_git_repo () {
1666 my $how = access_cfg('git-create');
1667 if ($how eq 'ssh-cmd') {
1669 (access_cfg_ssh, access_gituserhost(),
1670 access_runeinfo("git-create $package").
1671 "set -e; cd ".access_cfg('git-path').";".
1672 " cp -a _template $package.git");
1673 } elsif ($how eq 'true') {
1676 badcfg "unknown git-create \`$how'";
1680 our ($dsc_hash,$lastpush_mergeinput);
1681 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1683 our $ud = '.git/dgit/unpack';
1693 sub mktree_in_ud_here () {
1694 runcmd qw(git init -q);
1695 runcmd qw(git config gc.auto 0);
1696 rmtree('.git/objects');
1697 symlink '../../../../objects','.git/objects' or die $!;
1700 sub git_write_tree () {
1701 my $tree = cmdoutput @git, qw(write-tree);
1702 $tree =~ m/^\w+$/ or die "$tree ?";
1706 sub git_add_write_tree () {
1707 runcmd @git, qw(add -Af .);
1708 return git_write_tree();
1711 sub remove_stray_gits ($) {
1713 my @gitscmd = qw(find -name .git -prune -print0);
1714 debugcmd "|",@gitscmd;
1715 open GITS, "-|", @gitscmd or die $!;
1720 print STDERR "$us: warning: removing from $what: ",
1721 (messagequote $_), "\n";
1725 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1728 sub mktree_in_ud_from_only_subdir ($;$) {
1729 my ($what,$raw) = @_;
1731 # changes into the subdir
1733 die "expected one subdir but found @dirs ?" unless @dirs==1;
1734 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1738 remove_stray_gits($what);
1739 mktree_in_ud_here();
1741 my ($format, $fopts) = get_source_format();
1742 if (madformat($format)) {
1747 my $tree=git_add_write_tree();
1748 return ($tree,$dir);
1751 our @files_csum_info_fields =
1752 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1753 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1754 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1756 sub dsc_files_info () {
1757 foreach my $csumi (@files_csum_info_fields) {
1758 my ($fname, $module, $method) = @$csumi;
1759 my $field = $dsc->{$fname};
1760 next unless defined $field;
1761 eval "use $module; 1;" or die $@;
1763 foreach (split /\n/, $field) {
1765 m/^(\w+) (\d+) (\S+)$/ or
1766 fail "could not parse .dsc $fname line \`$_'";
1767 my $digester = eval "$module"."->$method;" or die $@;
1772 Digester => $digester,
1777 fail "missing any supported Checksums-* or Files field in ".
1778 $dsc->get_option('name');
1782 map { $_->{Filename} } dsc_files_info();
1785 sub files_compare_inputs (@) {
1790 my $showinputs = sub {
1791 return join "; ", map { $_->get_option('name') } @$inputs;
1794 foreach my $in (@$inputs) {
1796 my $in_name = $in->get_option('name');
1798 printdebug "files_compare_inputs $in_name\n";
1800 foreach my $csumi (@files_csum_info_fields) {
1801 my ($fname) = @$csumi;
1802 printdebug "files_compare_inputs $in_name $fname\n";
1804 my $field = $in->{$fname};
1805 next unless defined $field;
1808 foreach (split /\n/, $field) {
1811 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1812 fail "could not parse $in_name $fname line \`$_'";
1814 printdebug "files_compare_inputs $in_name $fname $f\n";
1818 my $re = \ $record{$f}{$fname};
1820 $fchecked{$f}{$in_name} = 1;
1822 fail "hash or size of $f varies in $fname fields".
1823 " (between: ".$showinputs->().")";
1828 @files = sort @files;
1829 $expected_files //= \@files;
1830 "@$expected_files" eq "@files" or
1831 fail "file list in $in_name varies between hash fields!";
1834 fail "$in_name has no files list field(s)";
1836 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1839 grep { keys %$_ == @$inputs-1 } values %fchecked
1840 or fail "no file appears in all file lists".
1841 " (looked in: ".$showinputs->().")";
1844 sub is_orig_file_in_dsc ($$) {
1845 my ($f, $dsc_files_info) = @_;
1846 return 0 if @$dsc_files_info <= 1;
1847 # One file means no origs, and the filename doesn't have a "what
1848 # part of dsc" component. (Consider versions ending `.orig'.)
1849 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1853 sub is_orig_file_of_vsn ($$) {
1854 my ($f, $upstreamvsn) = @_;
1855 my $base = srcfn $upstreamvsn, '';
1856 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1860 sub changes_update_origs_from_dsc ($$$$) {
1861 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1863 printdebug "checking origs needed ($upstreamvsn)...\n";
1864 $_ = getfield $changes, 'Files';
1865 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1866 fail "cannot find section/priority from .changes Files field";
1867 my $placementinfo = $1;
1869 printdebug "checking origs needed placement '$placementinfo'...\n";
1870 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1871 $l =~ m/\S+$/ or next;
1873 printdebug "origs $file | $l\n";
1874 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1875 printdebug "origs $file is_orig\n";
1876 my $have = archive_query('file_in_archive', $file);
1877 if (!defined $have) {
1879 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1885 printdebug "origs $file \$#\$have=$#$have\n";
1886 foreach my $h (@$have) {
1889 foreach my $csumi (@files_csum_info_fields) {
1890 my ($fname, $module, $method, $archivefield) = @$csumi;
1891 next unless defined $h->{$archivefield};
1892 $_ = $dsc->{$fname};
1893 next unless defined;
1894 m/^(\w+) .* \Q$file\E$/m or
1895 fail ".dsc $fname missing entry for $file";
1896 if ($h->{$archivefield} eq $1) {
1900 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1903 die "$file ".Dumper($h)." ?!" if $same && @differ;
1906 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1909 printdebug "origs $file f.same=$found_same".
1910 " #f._differ=$#found_differ\n";
1911 if (@found_differ && !$found_same) {
1913 "archive contains $file with different checksum",
1916 # Now we edit the changes file to add or remove it
1917 foreach my $csumi (@files_csum_info_fields) {
1918 my ($fname, $module, $method, $archivefield) = @$csumi;
1919 next unless defined $changes->{$fname};
1921 # in archive, delete from .changes if it's there
1922 $changed{$file} = "removed" if
1923 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1924 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1925 # not in archive, but it's here in the .changes
1927 my $dsc_data = getfield $dsc, $fname;
1928 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1930 $extra =~ s/ \d+ /$&$placementinfo /
1931 or die "$fname $extra >$dsc_data< ?"
1932 if $fname eq 'Files';
1933 $changes->{$fname} .= "\n". $extra;
1934 $changed{$file} = "added";
1939 foreach my $file (keys %changed) {
1941 "edited .changes for archive .orig contents: %s %s",
1942 $changed{$file}, $file;
1944 my $chtmp = "$changesfile.tmp";
1945 $changes->save($chtmp);
1947 rename $chtmp,$changesfile or die "$changesfile $!";
1949 progress "[new .changes left in $changesfile]";
1952 progress "$changesfile already has appropriate .orig(s) (if any)";
1956 sub make_commit ($) {
1958 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1961 sub make_commit_text ($) {
1964 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1966 print Dumper($text) if $debuglevel > 1;
1967 my $child = open2($out, $in, @cmd) or die $!;
1970 print $in $text or die $!;
1971 close $in or die $!;
1973 $h =~ m/^\w+$/ or die;
1975 printdebug "=> $h\n";
1978 waitpid $child, 0 == $child or die "$child $!";
1979 $? and failedcmd @cmd;
1983 sub clogp_authline ($) {
1985 my $author = getfield $clogp, 'Maintainer';
1986 $author =~ s#,.*##ms;
1987 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1988 my $authline = "$author $date";
1989 $authline =~ m/$git_authline_re/o or
1990 fail "unexpected commit author line format \`$authline'".
1991 " (was generated from changelog Maintainer field)";
1992 return ($1,$2,$3) if wantarray;
1996 sub vendor_patches_distro ($$) {
1997 my ($checkdistro, $what) = @_;
1998 return unless defined $checkdistro;
2000 my $series = "debian/patches/\L$checkdistro\E.series";
2001 printdebug "checking for vendor-specific $series ($what)\n";
2003 if (!open SERIES, "<", $series) {
2004 die "$series $!" unless $!==ENOENT;
2013 Unfortunately, this source package uses a feature of dpkg-source where
2014 the same source package unpacks to different source code on different
2015 distros. dgit cannot safely operate on such packages on affected
2016 distros, because the meaning of source packages is not stable.
2018 Please ask the distro/maintainer to remove the distro-specific series
2019 files and use a different technique (if necessary, uploading actually
2020 different packages, if different distros are supposed to have
2024 fail "Found active distro-specific series file for".
2025 " $checkdistro ($what): $series, cannot continue";
2027 die "$series $!" if SERIES->error;
2031 sub check_for_vendor_patches () {
2032 # This dpkg-source feature doesn't seem to be documented anywhere!
2033 # But it can be found in the changelog (reformatted):
2035 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2036 # Author: Raphael Hertzog <hertzog@debian.org>
2037 # Date: Sun Oct 3 09:36:48 2010 +0200
2039 # dpkg-source: correctly create .pc/.quilt_series with alternate
2042 # If you have debian/patches/ubuntu.series and you were
2043 # unpacking the source package on ubuntu, quilt was still
2044 # directed to debian/patches/series instead of
2045 # debian/patches/ubuntu.series.
2047 # debian/changelog | 3 +++
2048 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2049 # 2 files changed, 6 insertions(+), 1 deletion(-)
2052 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2053 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2054 "Dpkg::Vendor \`current vendor'");
2055 vendor_patches_distro(access_basedistro(),
2056 "(base) distro being accessed");
2057 vendor_patches_distro(access_nomdistro(),
2058 "(nominal) distro being accessed");
2061 sub generate_commits_from_dsc () {
2062 # See big comment in fetch_from_archive, below.
2063 # See also README.dsc-import.
2067 my @dfi = dsc_files_info();
2068 foreach my $fi (@dfi) {
2069 my $f = $fi->{Filename};
2070 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2072 printdebug "considering linking $f: ";
2074 link_ltarget "../../../../$f", $f
2075 or ((printdebug "($!) "), 0)
2079 printdebug "linked.\n";
2081 complete_file_from_dsc('.', $fi)
2084 if (is_orig_file_in_dsc($f, \@dfi)) {
2085 link $f, "../../../../$f"
2091 # We unpack and record the orig tarballs first, so that we only
2092 # need disk space for one private copy of the unpacked source.
2093 # But we can't make them into commits until we have the metadata
2094 # from the debian/changelog, so we record the tree objects now and
2095 # make them into commits later.
2097 my $upstreamv = upstreamversion $dsc->{version};
2098 my $orig_f_base = srcfn $upstreamv, '';
2100 foreach my $fi (@dfi) {
2101 # We actually import, and record as a commit, every tarball
2102 # (unless there is only one file, in which case there seems
2105 my $f = $fi->{Filename};
2106 printdebug "import considering $f ";
2107 (printdebug "only one dfi\n"), next if @dfi == 1;
2108 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2109 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2113 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2115 printdebug "Y ", (join ' ', map { $_//"(none)" }
2116 $compr_ext, $orig_f_part
2119 my $input = new IO::File $f, '<' or die "$f $!";
2123 if (defined $compr_ext) {
2125 Dpkg::Compression::compression_guess_from_filename $f;
2126 fail "Dpkg::Compression cannot handle file $f in source package"
2127 if defined $compr_ext && !defined $cname;
2129 new Dpkg::Compression::Process compression => $cname;
2130 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2131 my $compr_fh = new IO::Handle;
2132 my $compr_pid = open $compr_fh, "-|" // die $!;
2134 open STDIN, "<&", $input or die $!;
2136 die "dgit (child): exec $compr_cmd[0]: $!\n";
2141 rmtree "_unpack-tar";
2142 mkdir "_unpack-tar" or die $!;
2143 my @tarcmd = qw(tar -x -f -
2144 --no-same-owner --no-same-permissions
2145 --no-acls --no-xattrs --no-selinux);
2146 my $tar_pid = fork // die $!;
2148 chdir "_unpack-tar" or die $!;
2149 open STDIN, "<&", $input or die $!;
2151 die "dgit (child): exec $tarcmd[0]: $!";
2153 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2154 !$? or failedcmd @tarcmd;
2157 (@compr_cmd ? failedcmd @compr_cmd
2159 # finally, we have the results in "tarball", but maybe
2160 # with the wrong permissions
2162 runcmd qw(chmod -R +rwX _unpack-tar);
2163 changedir "_unpack-tar";
2164 remove_stray_gits($f);
2165 mktree_in_ud_here();
2167 my ($tree) = git_add_write_tree();
2168 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2169 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2171 printdebug "one subtree $1\n";
2173 printdebug "multiple subtrees\n";
2176 rmtree "_unpack-tar";
2178 my $ent = [ $f, $tree ];
2180 Orig => !!$orig_f_part,
2181 Sort => (!$orig_f_part ? 2 :
2182 $orig_f_part =~ m/-/g ? 1 :
2190 # put any without "_" first (spec is not clear whether files
2191 # are always in the usual order). Tarballs without "_" are
2192 # the main orig or the debian tarball.
2193 $a->{Sort} <=> $b->{Sort} or
2197 my $any_orig = grep { $_->{Orig} } @tartrees;
2199 my $dscfn = "$package.dsc";
2201 my $treeimporthow = 'package';
2203 open D, ">", $dscfn or die "$dscfn: $!";
2204 print D $dscdata or die "$dscfn: $!";
2205 close D or die "$dscfn: $!";
2206 my @cmd = qw(dpkg-source);
2207 push @cmd, '--no-check' if $dsc_checked;
2208 if (madformat $dsc->{format}) {
2209 push @cmd, '--skip-patches';
2210 $treeimporthow = 'unpatched';
2212 push @cmd, qw(-x --), $dscfn;
2215 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2216 if (madformat $dsc->{format}) {
2217 check_for_vendor_patches();
2221 if (madformat $dsc->{format}) {
2222 my @pcmd = qw(dpkg-source --before-build .);
2223 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2225 $dappliedtree = git_add_write_tree();
2228 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2229 debugcmd "|",@clogcmd;
2230 open CLOGS, "-|", @clogcmd or die $!;
2235 printdebug "import clog search...\n";
2238 my $stanzatext = do { local $/=""; <CLOGS>; };
2239 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2240 last if !defined $stanzatext;
2242 my $desc = "package changelog, entry no.$.";
2243 open my $stanzafh, "<", \$stanzatext or die;
2244 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2245 $clogp //= $thisstanza;
2247 printdebug "import clog $thisstanza->{version} $desc...\n";
2249 last if !$any_orig; # we don't need $r1clogp
2251 # We look for the first (most recent) changelog entry whose
2252 # version number is lower than the upstream version of this
2253 # package. Then the last (least recent) previous changelog
2254 # entry is treated as the one which introduced this upstream
2255 # version and used for the synthetic commits for the upstream
2258 # One might think that a more sophisticated algorithm would be
2259 # necessary. But: we do not want to scan the whole changelog
2260 # file. Stopping when we see an earlier version, which
2261 # necessarily then is an earlier upstream version, is the only
2262 # realistic way to do that. Then, either the earliest
2263 # changelog entry we have seen so far is indeed the earliest
2264 # upload of this upstream version; or there are only changelog
2265 # entries relating to later upstream versions (which is not
2266 # possible unless the changelog and .dsc disagree about the
2267 # version). Then it remains to choose between the physically
2268 # last entry in the file, and the one with the lowest version
2269 # number. If these are not the same, we guess that the
2270 # versions were created in a non-monotic order rather than
2271 # that the changelog entries have been misordered.
2273 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2275 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2276 $r1clogp = $thisstanza;
2278 printdebug "import clog $r1clogp->{version} becomes r1\n";
2280 die $! if CLOGS->error;
2281 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2283 $clogp or fail "package changelog has no entries!";
2285 my $authline = clogp_authline $clogp;
2286 my $changes = getfield $clogp, 'Changes';
2287 my $cversion = getfield $clogp, 'Version';
2290 $r1clogp //= $clogp; # maybe there's only one entry;
2291 my $r1authline = clogp_authline $r1clogp;
2292 # Strictly, r1authline might now be wrong if it's going to be
2293 # unused because !$any_orig. Whatever.
2295 printdebug "import tartrees authline $authline\n";
2296 printdebug "import tartrees r1authline $r1authline\n";
2298 foreach my $tt (@tartrees) {
2299 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2301 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2304 committer $r1authline
2308 [dgit import orig $tt->{F}]
2316 [dgit import tarball $package $cversion $tt->{F}]
2321 printdebug "import main commit\n";
2323 open C, ">../commit.tmp" or die $!;
2324 print C <<END or die $!;
2327 print C <<END or die $! foreach @tartrees;
2330 print C <<END or die $!;
2336 [dgit import $treeimporthow $package $cversion]
2340 my $rawimport_hash = make_commit qw(../commit.tmp);
2342 if (madformat $dsc->{format}) {
2343 printdebug "import apply patches...\n";
2345 # regularise the state of the working tree so that
2346 # the checkout of $rawimport_hash works nicely.
2347 my $dappliedcommit = make_commit_text(<<END);
2354 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2356 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2358 # We need the answers to be reproducible
2359 my @authline = clogp_authline($clogp);
2360 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2361 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2362 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2363 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2364 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2365 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2367 my $path = $ENV{PATH} or die;
2369 foreach my $use_absurd (qw(0 1)) {
2370 runcmd @git, qw(checkout -q unpa);
2371 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2372 local $ENV{PATH} = $path;
2375 progress "warning: $@";
2376 $path = "$absurdity:$path";
2377 progress "$us: trying slow absurd-git-apply...";
2378 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2383 die "forbid absurd git-apply\n" if $use_absurd
2384 && forceing [qw(import-gitapply-no-absurd)];
2385 die "only absurd git-apply!\n" if !$use_absurd
2386 && forceing [qw(import-gitapply-absurd)];
2388 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2389 local $ENV{PATH} = $path if $use_absurd;
2391 my @showcmd = (gbp_pq, qw(import));
2392 my @realcmd = shell_cmd
2393 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2394 debugcmd "+",@realcmd;
2395 if (system @realcmd) {
2396 die +(shellquote @showcmd).
2398 failedcmd_waitstatus()."\n";
2401 my $gapplied = git_rev_parse('HEAD');
2402 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2403 $gappliedtree eq $dappliedtree or
2405 gbp-pq import and dpkg-source disagree!
2406 gbp-pq import gave commit $gapplied
2407 gbp-pq import gave tree $gappliedtree
2408 dpkg-source --before-build gave tree $dappliedtree
2410 $rawimport_hash = $gapplied;
2415 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2420 progress "synthesised git commit from .dsc $cversion";
2422 my $rawimport_mergeinput = {
2423 Commit => $rawimport_hash,
2424 Info => "Import of source package",
2426 my @output = ($rawimport_mergeinput);
2428 if ($lastpush_mergeinput) {
2429 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2430 my $oversion = getfield $oldclogp, 'Version';
2432 version_compare($oversion, $cversion);
2434 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2435 { Message => <<END, ReverseParents => 1 });
2436 Record $package ($cversion) in archive suite $csuite
2438 } elsif ($vcmp > 0) {
2439 print STDERR <<END or die $!;
2441 Version actually in archive: $cversion (older)
2442 Last version pushed with dgit: $oversion (newer or same)
2445 @output = $lastpush_mergeinput;
2447 # Same version. Use what's in the server git branch,
2448 # discarding our own import. (This could happen if the
2449 # server automatically imports all packages into git.)
2450 @output = $lastpush_mergeinput;
2453 changedir '../../../..';
2458 sub complete_file_from_dsc ($$) {
2459 our ($dstdir, $fi) = @_;
2460 # Ensures that we have, in $dir, the file $fi, with the correct
2461 # contents. (Downloading it from alongside $dscurl if necessary.)
2463 my $f = $fi->{Filename};
2464 my $tf = "$dstdir/$f";
2467 if (stat_exists $tf) {
2468 progress "using existing $f";
2470 printdebug "$tf does not exist, need to fetch\n";
2472 $furl =~ s{/[^/]+$}{};
2474 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2475 die "$f ?" if $f =~ m#/#;
2476 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2477 return 0 if !act_local();
2481 open F, "<", "$tf" or die "$tf: $!";
2482 $fi->{Digester}->reset();
2483 $fi->{Digester}->addfile(*F);
2484 F->error and die $!;
2485 my $got = $fi->{Digester}->hexdigest();
2486 $got eq $fi->{Hash} or
2487 fail "file $f has hash $got but .dsc".
2488 " demands hash $fi->{Hash} ".
2489 ($downloaded ? "(got wrong file from archive!)"
2490 : "(perhaps you should delete this file?)");
2495 sub ensure_we_have_orig () {
2496 my @dfi = dsc_files_info();
2497 foreach my $fi (@dfi) {
2498 my $f = $fi->{Filename};
2499 next unless is_orig_file_in_dsc($f, \@dfi);
2500 complete_file_from_dsc('..', $fi)
2505 #---------- git fetch ----------
2507 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2508 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2510 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2511 # locally fetched refs because they have unhelpful names and clutter
2512 # up gitk etc. So we track whether we have "used up" head ref (ie,
2513 # whether we have made another local ref which refers to this object).
2515 # (If we deleted them unconditionally, then we might end up
2516 # re-fetching the same git objects each time dgit fetch was run.)
2518 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
2519 # in git_fetch_us to fetch the refs in question, and possibly a call
2520 # to lrfetchref_used.
2522 our (%lrfetchrefs_f, %lrfetchrefs_d);
2523 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2525 sub lrfetchref_used ($) {
2526 my ($fullrefname) = @_;
2527 my $objid = $lrfetchrefs_f{$fullrefname};
2528 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2531 sub git_lrfetch_sane {
2532 my ($supplementary, @specs) = @_;
2533 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2534 # at least as regards @specs. Also leave the results in
2535 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2536 # able to clean these up.
2538 # With $supplementary==1, @specs must not contain wildcards
2539 # and we add to our previous fetches (non-atomically).
2541 # This is rather miserable:
2542 # When git fetch --prune is passed a fetchspec ending with a *,
2543 # it does a plausible thing. If there is no * then:
2544 # - it matches subpaths too, even if the supplied refspec
2545 # starts refs, and behaves completely madly if the source
2546 # has refs/refs/something. (See, for example, Debian #NNNN.)
2547 # - if there is no matching remote ref, it bombs out the whole
2549 # We want to fetch a fixed ref, and we don't know in advance
2550 # if it exists, so this is not suitable.
2552 # Our workaround is to use git ls-remote. git ls-remote has its
2553 # own qairks. Notably, it has the absurd multi-tail-matching
2554 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2555 # refs/refs/foo etc.
2557 # Also, we want an idempotent snapshot, but we have to make two
2558 # calls to the remote: one to git ls-remote and to git fetch. The
2559 # solution is use git ls-remote to obtain a target state, and
2560 # git fetch to try to generate it. If we don't manage to generate
2561 # the target state, we try again.
2563 my $url = access_giturl();
2565 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2567 my $specre = join '|', map {
2570 my $wildcard = $x =~ s/\\\*$/.*/;
2571 die if $wildcard && $supplementary;
2574 printdebug "git_lrfetch_sane specre=$specre\n";
2575 my $wanted_rref = sub {
2577 return m/^(?:$specre)$/;
2580 my $fetch_iteration = 0;
2583 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2584 if (++$fetch_iteration > 10) {
2585 fail "too many iterations trying to get sane fetch!";
2588 my @look = map { "refs/$_" } @specs;
2589 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2593 open GITLS, "-|", @lcmd or die $!;
2595 printdebug "=> ", $_;
2596 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2597 my ($objid,$rrefname) = ($1,$2);
2598 if (!$wanted_rref->($rrefname)) {
2600 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2604 $wantr{$rrefname} = $objid;
2607 close GITLS or failedcmd @lcmd;
2609 # OK, now %want is exactly what we want for refs in @specs
2611 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2612 "+refs/$_:".lrfetchrefs."/$_";
2615 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2617 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2618 runcmd_ordryrun_local @fcmd if @fspecs;
2620 if (!$supplementary) {
2621 %lrfetchrefs_f = ();
2625 git_for_each_ref(lrfetchrefs, sub {
2626 my ($objid,$objtype,$lrefname,$reftail) = @_;
2627 $lrfetchrefs_f{$lrefname} = $objid;
2628 $objgot{$objid} = 1;
2631 if ($supplementary) {
2635 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2636 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2637 if (!exists $wantr{$rrefname}) {
2638 if ($wanted_rref->($rrefname)) {
2640 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2644 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2647 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2648 delete $lrfetchrefs_f{$lrefname};
2652 foreach my $rrefname (sort keys %wantr) {
2653 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2654 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2655 my $want = $wantr{$rrefname};
2656 next if $got eq $want;
2657 if (!defined $objgot{$want}) {
2659 warning: git ls-remote suggests we want $lrefname
2660 warning: and it should refer to $want
2661 warning: but git fetch didn't fetch that object to any relevant ref.
2662 warning: This may be due to a race with someone updating the server.
2663 warning: Will try again...
2665 next FETCH_ITERATION;
2668 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2670 runcmd_ordryrun_local @git, qw(update-ref -m),
2671 "dgit fetch git fetch fixup", $lrefname, $want;
2672 $lrfetchrefs_f{$lrefname} = $want;
2677 if (defined $csuite) {
2678 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2679 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2680 my ($objid,$objtype,$lrefname,$reftail) = @_;
2681 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2682 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2686 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2687 Dumper(\%lrfetchrefs_f);
2690 sub git_fetch_us () {
2691 # Want to fetch only what we are going to use, unless
2692 # deliberately-not-ff, in which case we must fetch everything.
2694 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2696 (quiltmode_splitbrain
2697 ? (map { $_->('*',access_nomdistro) }
2698 \&debiantag_new, \&debiantag_maintview)
2699 : debiantags('*',access_nomdistro));
2700 push @specs, server_branch($csuite);
2701 push @specs, $rewritemap;
2702 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2704 git_lrfetch_sane 0, @specs;
2707 my @tagpats = debiantags('*',access_nomdistro);
2709 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2710 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2711 printdebug "currently $fullrefname=$objid\n";
2712 $here{$fullrefname} = $objid;
2714 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2715 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2716 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2717 printdebug "offered $lref=$objid\n";
2718 if (!defined $here{$lref}) {
2719 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2720 runcmd_ordryrun_local @upd;
2721 lrfetchref_used $fullrefname;
2722 } elsif ($here{$lref} eq $objid) {
2723 lrfetchref_used $fullrefname;
2726 "Not updateting $lref from $here{$lref} to $objid.\n";
2731 #---------- dsc and archive handling ----------
2733 sub mergeinfo_getclogp ($) {
2734 # Ensures thit $mi->{Clogp} exists and returns it
2736 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2739 sub mergeinfo_version ($) {
2740 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2743 sub fetch_from_archive_record_1 ($) {
2745 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2746 'DGIT_ARCHIVE', $hash;
2747 cmdoutput @git, qw(log -n2), $hash;
2748 # ... gives git a chance to complain if our commit is malformed
2751 sub fetch_from_archive_record_2 ($) {
2753 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2757 dryrun_report @upd_cmd;
2761 sub parse_dsc_field ($$) {
2762 my ($dsc, $what) = @_;
2764 foreach my $field (@ourdscfield) {
2765 $f = $dsc->{$field};
2769 progress "$what: NO git hash";
2770 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2771 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2772 progress "$what: specified git info ($dsc_distro)";
2773 $dsc_hint_tag = [ $dsc_hint_tag ];
2774 } elsif ($f =~ m/^\w+\s*$/) {
2776 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2777 dgit.default.distro);
2778 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2780 progress "$what: specified git hash";
2782 fail "$what: invalid Dgit info";
2786 sub resolve_dsc_field_commit ($$) {
2787 my ($already_distro, $already_mapref) = @_;
2789 return unless defined $dsc_hash;
2792 defined $already_mapref &&
2793 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2794 ? $already_mapref : undef;
2798 my ($what, @fetch) = @_;
2800 local $idistro = $dsc_distro;
2801 my $lrf = lrfetchrefs;
2803 if (!$chase_dsc_distro) {
2805 "not chasing .dsc distro $dsc_distro: not fetching $what";
2810 ".dsc names distro $dsc_distro: fetching $what";
2812 my $url = access_giturl();
2813 if (!defined $url) {
2814 defined $dsc_hint_url or fail <<END;
2815 .dsc Dgit metadata is in context of distro $dsc_distro
2816 for which we have no configured url and .dsc provides no hint
2819 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2820 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2821 parse_cfg_bool "dsc-url-proto-ok", 'false',
2822 cfg("dgit.dsc-url-proto-ok.$proto",
2823 "dgit.default.dsc-url-proto-ok")
2825 .dsc Dgit metadata is in context of distro $dsc_distro
2826 for which we have no configured url;
2827 .dsc provices hinted url with protocol $proto which is unsafe.
2828 (can be overridden by config - consult documentation)
2830 $url = $dsc_hint_url;
2833 git_lrfetch_sane 1, @fetch;
2838 my $rewrite_enable = do {
2839 local $idistro = $dsc_distro;
2840 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2843 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2844 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2845 $mapref = $lrf.'/'.$rewritemap;
2846 my $rewritemapdata = git_cat_file $mapref.':map';
2847 if (defined $rewritemapdata
2848 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2850 "server's git history rewrite map contains a relevant entry!";
2853 if (defined $dsc_hash) {
2854 progress "using rewritten git hash in place of .dsc value";
2856 progress "server data says .dsc hash is to be disregarded";
2861 if (!defined git_cat_file $dsc_hash) {
2862 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2863 my $lrf = $do_fetch->("additional commits", @tags) &&
2864 defined git_cat_file $dsc_hash
2866 .dsc Dgit metadata requires commit $dsc_hash
2867 but we could not obtain that object anywhere.
2869 foreach my $t (@tags) {
2870 my $fullrefname = $lrf.'/'.$t;
2871 print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2872 next unless $lrfetchrefs_f{$fullrefname};
2873 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2874 lrfetchref_used $fullrefname;
2879 sub fetch_from_archive () {
2880 ensure_setup_existing_tree();
2882 # Ensures that lrref() is what is actually in the archive, one way
2883 # or another, according to us - ie this client's
2884 # appropritaely-updated archive view. Also returns the commit id.
2885 # If there is nothing in the archive, leaves lrref alone and
2886 # returns undef. git_fetch_us must have already been called.
2890 parse_dsc_field($dsc, 'last upload to archive');
2891 resolve_dsc_field_commit access_basedistro,
2892 lrfetchrefs."/".$rewritemap
2894 progress "no version available from the archive";
2897 # If the archive's .dsc has a Dgit field, there are three
2898 # relevant git commitids we need to choose between and/or merge
2900 # 1. $dsc_hash: the Dgit field from the archive
2901 # 2. $lastpush_hash: the suite branch on the dgit git server
2902 # 3. $lastfetch_hash: our local tracking brach for the suite
2904 # These may all be distinct and need not be in any fast forward
2907 # If the dsc was pushed to this suite, then the server suite
2908 # branch will have been updated; but it might have been pushed to
2909 # a different suite and copied by the archive. Conversely a more
2910 # recent version may have been pushed with dgit but not appeared
2911 # in the archive (yet).
2913 # $lastfetch_hash may be awkward because archive imports
2914 # (particularly, imports of Dgit-less .dscs) are performed only as
2915 # needed on individual clients, so different clients may perform a
2916 # different subset of them - and these imports are only made
2917 # public during push. So $lastfetch_hash may represent a set of
2918 # imports different to a subsequent upload by a different dgit
2921 # Our approach is as follows:
2923 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2924 # descendant of $dsc_hash, then it was pushed by a dgit user who
2925 # had based their work on $dsc_hash, so we should prefer it.
2926 # Otherwise, $dsc_hash was installed into this suite in the
2927 # archive other than by a dgit push, and (necessarily) after the
2928 # last dgit push into that suite (since a dgit push would have
2929 # been descended from the dgit server git branch); thus, in that
2930 # case, we prefer the archive's version (and produce a
2931 # pseudo-merge to overwrite the dgit server git branch).
2933 # (If there is no Dgit field in the archive's .dsc then
2934 # generate_commit_from_dsc uses the version numbers to decide
2935 # whether the suite branch or the archive is newer. If the suite
2936 # branch is newer it ignores the archive's .dsc; otherwise it
2937 # generates an import of the .dsc, and produces a pseudo-merge to
2938 # overwrite the suite branch with the archive contents.)
2940 # The outcome of that part of the algorithm is the `public view',
2941 # and is same for all dgit clients: it does not depend on any
2942 # unpublished history in the local tracking branch.
2944 # As between the public view and the local tracking branch: The
2945 # local tracking branch is only updated by dgit fetch, and
2946 # whenever dgit fetch runs it includes the public view in the
2947 # local tracking branch. Therefore if the public view is not
2948 # descended from the local tracking branch, the local tracking
2949 # branch must contain history which was imported from the archive
2950 # but never pushed; and, its tip is now out of date. So, we make
2951 # a pseudo-merge to overwrite the old imports and stitch the old
2954 # Finally: we do not necessarily reify the public view (as
2955 # described above). This is so that we do not end up stacking two
2956 # pseudo-merges. So what we actually do is figure out the inputs
2957 # to any public view pseudo-merge and put them in @mergeinputs.
2960 # $mergeinputs[]{Commit}
2961 # $mergeinputs[]{Info}
2962 # $mergeinputs[0] is the one whose tree we use
2963 # @mergeinputs is in the order we use in the actual commit)
2966 # $mergeinputs[]{Message} is a commit message to use
2967 # $mergeinputs[]{ReverseParents} if def specifies that parent
2968 # list should be in opposite order
2969 # Such an entry has no Commit or Info. It applies only when found
2970 # in the last entry. (This ugliness is to support making
2971 # identical imports to previous dgit versions.)
2973 my $lastpush_hash = git_get_ref(lrfetchref());
2974 printdebug "previous reference hash=$lastpush_hash\n";
2975 $lastpush_mergeinput = $lastpush_hash && {
2976 Commit => $lastpush_hash,
2977 Info => "dgit suite branch on dgit git server",
2980 my $lastfetch_hash = git_get_ref(lrref());
2981 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2982 my $lastfetch_mergeinput = $lastfetch_hash && {
2983 Commit => $lastfetch_hash,
2984 Info => "dgit client's archive history view",
2987 my $dsc_mergeinput = $dsc_hash && {
2988 Commit => $dsc_hash,
2989 Info => "Dgit field in .dsc from archive",
2993 my $del_lrfetchrefs = sub {
2996 printdebug "del_lrfetchrefs...\n";
2997 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2998 my $objid = $lrfetchrefs_d{$fullrefname};
2999 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3001 $gur ||= new IO::Handle;
3002 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3004 printf $gur "delete %s %s\n", $fullrefname, $objid;
3007 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3011 if (defined $dsc_hash) {
3012 ensure_we_have_orig();
3013 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3014 @mergeinputs = $dsc_mergeinput
3015 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3016 print STDERR <<END or die $!;
3018 Git commit in archive is behind the last version allegedly pushed/uploaded.
3019 Commit referred to by archive: $dsc_hash
3020 Last version pushed with dgit: $lastpush_hash
3023 @mergeinputs = ($lastpush_mergeinput);
3025 # Archive has .dsc which is not a descendant of the last dgit
3026 # push. This can happen if the archive moves .dscs about.
3027 # Just follow its lead.
3028 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3029 progress "archive .dsc names newer git commit";
3030 @mergeinputs = ($dsc_mergeinput);
3032 progress "archive .dsc names other git commit, fixing up";
3033 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3037 @mergeinputs = generate_commits_from_dsc();
3038 # We have just done an import. Now, our import algorithm might
3039 # have been improved. But even so we do not want to generate
3040 # a new different import of the same package. So if the
3041 # version numbers are the same, just use our existing version.
3042 # If the version numbers are different, the archive has changed
3043 # (perhaps, rewound).
3044 if ($lastfetch_mergeinput &&
3045 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3046 (mergeinfo_version $mergeinputs[0]) )) {
3047 @mergeinputs = ($lastfetch_mergeinput);
3049 } elsif ($lastpush_hash) {
3050 # only in git, not in the archive yet
3051 @mergeinputs = ($lastpush_mergeinput);
3052 print STDERR <<END or die $!;
3054 Package not found in the archive, but has allegedly been pushed using dgit.
3058 printdebug "nothing found!\n";
3059 if (defined $skew_warning_vsn) {
3060 print STDERR <<END or die $!;
3062 Warning: relevant archive skew detected.
3063 Archive allegedly contains $skew_warning_vsn
3064 But we were not able to obtain any version from the archive or git.
3068 unshift @end, $del_lrfetchrefs;
3072 if ($lastfetch_hash &&
3074 my $h = $_->{Commit};
3075 $h and is_fast_fwd($lastfetch_hash, $h);
3076 # If true, one of the existing parents of this commit
3077 # is a descendant of the $lastfetch_hash, so we'll
3078 # be ff from that automatically.
3082 push @mergeinputs, $lastfetch_mergeinput;
3085 printdebug "fetch mergeinfos:\n";
3086 foreach my $mi (@mergeinputs) {
3088 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3090 printdebug sprintf " ReverseParents=%d Message=%s",
3091 $mi->{ReverseParents}, $mi->{Message};
3095 my $compat_info= pop @mergeinputs
3096 if $mergeinputs[$#mergeinputs]{Message};
3098 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3101 if (@mergeinputs > 1) {
3103 my $tree_commit = $mergeinputs[0]{Commit};
3105 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3106 $tree =~ m/\n\n/; $tree = $`;
3107 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3110 # We use the changelog author of the package in question the
3111 # author of this pseudo-merge. This is (roughly) correct if
3112 # this commit is simply representing aa non-dgit upload.
3113 # (Roughly because it does not record sponsorship - but we
3114 # don't have sponsorship info because that's in the .changes,
3115 # which isn't in the archivw.)
3117 # But, it might be that we are representing archive history
3118 # updates (including in-archive copies). These are not really
3119 # the responsibility of the person who created the .dsc, but
3120 # there is no-one whose name we should better use. (The
3121 # author of the .dsc-named commit is clearly worse.)
3123 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3124 my $author = clogp_authline $useclogp;
3125 my $cversion = getfield $useclogp, 'Version';
3127 my $mcf = ".git/dgit/mergecommit";
3128 open MC, ">", $mcf or die "$mcf $!";
3129 print MC <<END or die $!;
3133 my @parents = grep { $_->{Commit} } @mergeinputs;
3134 @parents = reverse @parents if $compat_info->{ReverseParents};
3135 print MC <<END or die $! foreach @parents;
3139 print MC <<END or die $!;
3145 if (defined $compat_info->{Message}) {
3146 print MC $compat_info->{Message} or die $!;
3148 print MC <<END or die $!;
3149 Record $package ($cversion) in archive suite $csuite
3153 my $message_add_info = sub {
3155 my $mversion = mergeinfo_version $mi;
3156 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3160 $message_add_info->($mergeinputs[0]);
3161 print MC <<END or die $!;
3162 should be treated as descended from
3164 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3168 $hash = make_commit $mcf;
3170 $hash = $mergeinputs[0]{Commit};
3172 printdebug "fetch hash=$hash\n";
3175 my ($lasth, $what) = @_;
3176 return unless $lasth;
3177 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3180 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3182 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3184 fetch_from_archive_record_1($hash);
3186 if (defined $skew_warning_vsn) {
3188 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3189 my $gotclogp = commit_getclogp($hash);
3190 my $got_vsn = getfield $gotclogp, 'Version';
3191 printdebug "SKEW CHECK GOT $got_vsn\n";
3192 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3193 print STDERR <<END or die $!;
3195 Warning: archive skew detected. Using the available version:
3196 Archive allegedly contains $skew_warning_vsn
3197 We were able to obtain only $got_vsn
3203 if ($lastfetch_hash ne $hash) {
3204 fetch_from_archive_record_2($hash);
3207 lrfetchref_used lrfetchref();
3209 unshift @end, $del_lrfetchrefs;
3213 sub set_local_git_config ($$) {
3215 runcmd @git, qw(config), $k, $v;
3218 sub setup_mergechangelogs (;$) {
3220 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3222 my $driver = 'dpkg-mergechangelogs';
3223 my $cb = "merge.$driver";
3224 my $attrs = '.git/info/attributes';
3225 ensuredir '.git/info';
3227 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3228 if (!open ATTRS, "<", $attrs) {
3229 $!==ENOENT or die "$attrs: $!";
3233 next if m{^debian/changelog\s};
3234 print NATTRS $_, "\n" or die $!;
3236 ATTRS->error and die $!;
3239 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3242 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3243 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3245 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3248 sub setup_useremail (;$) {
3250 return unless $always || access_cfg_bool(1, 'setup-useremail');
3253 my ($k, $envvar) = @_;
3254 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3255 return unless defined $v;
3256 set_local_git_config "user.$k", $v;
3259 $setup->('email', 'DEBEMAIL');
3260 $setup->('name', 'DEBFULLNAME');
3263 sub ensure_setup_existing_tree () {
3264 my $k = "remote.$remotename.skipdefaultupdate";
3265 my $c = git_get_config $k;
3266 return if defined $c;
3267 set_local_git_config $k, 'true';
3270 sub setup_new_tree () {
3271 setup_mergechangelogs();
3275 sub multisuite_suite_child ($$$) {
3276 my ($tsuite, $merginputs, $fn) = @_;
3277 # in child, sets things up, calls $fn->(), and returns undef
3278 # in parent, returns canonical suite name for $tsuite
3279 my $canonsuitefh = IO::File::new_tmpfile;
3280 my $pid = fork // die $!;
3283 $us .= " [$isuite]";
3284 $debugprefix .= " ";
3285 progress "fetching $tsuite...";
3286 canonicalise_suite();
3287 print $canonsuitefh $csuite, "\n" or die $!;
3288 close $canonsuitefh or die $!;
3292 waitpid $pid,0 == $pid or die $!;
3293 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3294 seek $canonsuitefh,0,0 or die $!;
3295 local $csuite = <$canonsuitefh>;
3296 die $! unless defined $csuite && chomp $csuite;
3298 printdebug "multisuite $tsuite missing\n";
3301 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3302 push @$merginputs, {
3309 sub fork_for_multisuite ($) {
3310 my ($before_fetch_merge) = @_;
3311 # if nothing unusual, just returns ''
3314 # returns 0 to caller in child, to do first of the specified suites
3315 # in child, $csuite is not yet set
3317 # returns 1 to caller in parent, to finish up anything needed after
3318 # in parent, $csuite is set to canonicalised portmanteau
3320 my $org_isuite = $isuite;
3321 my @suites = split /\,/, $isuite;
3322 return '' unless @suites > 1;
3323 printdebug "fork_for_multisuite: @suites\n";
3327 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3329 return 0 unless defined $cbasesuite;
3331 fail "package $package missing in (base suite) $cbasesuite"
3332 unless @mergeinputs;
3334 my @csuites = ($cbasesuite);
3336 $before_fetch_merge->();
3338 foreach my $tsuite (@suites[1..$#suites]) {
3339 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3345 # xxx collecte the ref here
3347 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3348 push @csuites, $csubsuite;
3351 foreach my $mi (@mergeinputs) {
3352 my $ref = git_get_ref $mi->{Ref};
3353 die "$mi->{Ref} ?" unless length $ref;
3354 $mi->{Commit} = $ref;
3357 $csuite = join ",", @csuites;
3359 my $previous = git_get_ref lrref;
3361 unshift @mergeinputs, {
3362 Commit => $previous,
3363 Info => "local combined tracking branch",
3365 "archive seems to have rewound: local tracking branch is ahead!",
3369 foreach my $ix (0..$#mergeinputs) {
3370 $mergeinputs[$ix]{Index} = $ix;
3373 @mergeinputs = sort {
3374 -version_compare(mergeinfo_version $a,
3375 mergeinfo_version $b) # highest version first
3377 $a->{Index} <=> $b->{Index}; # earliest in spec first
3383 foreach my $mi (@mergeinputs) {
3384 printdebug "multisuite merge check $mi->{Info}\n";
3385 foreach my $previous (@needed) {
3386 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3387 printdebug "multisuite merge un-needed $previous->{Info}\n";
3391 printdebug "multisuite merge this-needed\n";
3392 $mi->{Character} = '+';
3395 $needed[0]{Character} = '*';
3397 my $output = $needed[0]{Commit};
3400 printdebug "multisuite merge nontrivial\n";
3401 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3403 my $commit = "tree $tree\n";
3404 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3405 "Input branches:\n";
3407 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3408 printdebug "multisuite merge include $mi->{Info}\n";
3409 $mi->{Character} //= ' ';
3410 $commit .= "parent $mi->{Commit}\n";
3411 $msg .= sprintf " %s %-25s %s\n",
3413 (mergeinfo_version $mi),
3416 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3418 " * marks the highest version branch, which choose to use\n".
3419 " + marks each branch which was not already an ancestor\n\n".
3420 "[dgit multi-suite $csuite]\n";
3422 "author $authline\n".
3423 "committer $authline\n\n";
3424 $output = make_commit_text $commit.$msg;
3425 printdebug "multisuite merge generated $output\n";
3428 fetch_from_archive_record_1($output);
3429 fetch_from_archive_record_2($output);
3431 progress "calculated combined tracking suite $csuite";
3436 sub clone_set_head () {
3437 open H, "> .git/HEAD" or die $!;
3438 print H "ref: ".lref()."\n" or die $!;
3441 sub clone_finish ($) {
3443 runcmd @git, qw(reset --hard), lrref();
3444 runcmd qw(bash -ec), <<'END';
3446 git ls-tree -r --name-only -z HEAD | \
3447 xargs -0r touch -h -r . --
3449 printdone "ready for work in $dstdir";
3454 badusage "dry run makes no sense with clone" unless act_local();
3456 my $multi_fetched = fork_for_multisuite(sub {
3457 printdebug "multi clone before fetch merge\n";
3460 if ($multi_fetched) {
3461 printdebug "multi clone after fetch merge\n";
3463 clone_finish($dstdir);
3466 printdebug "clone main body\n";
3468 canonicalise_suite();
3469 my $hasgit = check_for_git();
3470 mkdir $dstdir or fail "create \`$dstdir': $!";
3472 runcmd @git, qw(init -q);
3474 my $giturl = access_giturl(1);
3475 if (defined $giturl) {
3476 runcmd @git, qw(remote add), 'origin', $giturl;
3479 progress "fetching existing git history";
3481 runcmd_ordryrun_local @git, qw(fetch origin);
3483 progress "starting new git history";
3485 fetch_from_archive() or no_such_package;
3486 my $vcsgiturl = $dsc->{'Vcs-Git'};
3487 if (length $vcsgiturl) {
3488 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3489 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3492 clone_finish($dstdir);
3496 canonicalise_suite();
3497 if (check_for_git()) {
3500 fetch_from_archive() or no_such_package();
3501 printdone "fetched into ".lrref();
3505 my $multi_fetched = fork_for_multisuite(sub { });
3506 fetch() unless $multi_fetched; # parent
3507 return if $multi_fetched eq '0'; # child
3508 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3510 printdone "fetched to ".lrref()." and merged into HEAD";
3513 sub check_not_dirty () {
3514 foreach my $f (qw(local-options local-patch-header)) {
3515 if (stat_exists "debian/source/$f") {
3516 fail "git tree contains debian/source/$f";
3520 return if $ignoredirty;
3522 my @cmd = (@git, qw(diff --quiet HEAD));
3524 $!=0; $?=-1; system @cmd;
3527 fail "working tree is dirty (does not match HEAD)";
3533 sub commit_admin ($) {
3536 runcmd_ordryrun_local @git, qw(commit -m), $m;
3539 sub commit_quilty_patch () {
3540 my $output = cmdoutput @git, qw(status --porcelain);
3542 foreach my $l (split /\n/, $output) {
3543 next unless $l =~ m/\S/;
3544 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3548 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3550 progress "nothing quilty to commit, ok.";
3553 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3554 runcmd_ordryrun_local @git, qw(add -f), @adds;
3556 Commit Debian 3.0 (quilt) metadata
3558 [dgit ($our_version) quilt-fixup]
3562 sub get_source_format () {
3564 if (open F, "debian/source/options") {
3568 s/\s+$//; # ignore missing final newline
3570 my ($k, $v) = ($`, $'); #');
3571 $v =~ s/^"(.*)"$/$1/;
3577 F->error and die $!;
3580 die $! unless $!==&ENOENT;
3583 if (!open F, "debian/source/format") {
3584 die $! unless $!==&ENOENT;
3588 F->error and die $!;
3590 return ($_, \%options);
3593 sub madformat_wantfixup ($) {
3595 return 0 unless $format eq '3.0 (quilt)';
3596 our $quilt_mode_warned;
3597 if ($quilt_mode eq 'nocheck') {
3598 progress "Not doing any fixup of \`$format' due to".
3599 " ----no-quilt-fixup or --quilt=nocheck"
3600 unless $quilt_mode_warned++;
3603 progress "Format \`$format', need to check/update patch stack"
3604 unless $quilt_mode_warned++;
3608 sub maybe_split_brain_save ($$$) {
3609 my ($headref, $dgitview, $msg) = @_;
3610 # => message fragment "$saved" describing disposition of $dgitview
3611 return "commit id $dgitview" unless defined $split_brain_save;
3612 my @cmd = (shell_cmd "cd ../../../..",
3613 @git, qw(update-ref -m),
3614 "dgit --dgit-view-save $msg HEAD=$headref",
3615 $split_brain_save, $dgitview);
3617 return "and left in $split_brain_save";
3620 # An "infopair" is a tuple [ $thing, $what ]
3621 # (often $thing is a commit hash; $what is a description)
3623 sub infopair_cond_equal ($$) {
3625 $x->[0] eq $y->[0] or fail <<END;
3626 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3630 sub infopair_lrf_tag_lookup ($$) {
3631 my ($tagnames, $what) = @_;
3632 # $tagname may be an array ref
3633 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3634 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3635 foreach my $tagname (@tagnames) {
3636 my $lrefname = lrfetchrefs."/tags/$tagname";
3637 my $tagobj = $lrfetchrefs_f{$lrefname};
3638 next unless defined $tagobj;
3639 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3640 return [ git_rev_parse($tagobj), $what ];
3642 fail @tagnames==1 ? <<END : <<END;
3643 Wanted tag $what (@tagnames) on dgit server, but not found
3645 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3649 sub infopair_cond_ff ($$) {
3650 my ($anc,$desc) = @_;
3651 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3652 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3656 sub pseudomerge_version_check ($$) {
3657 my ($clogp, $archive_hash) = @_;
3659 my $arch_clogp = commit_getclogp $archive_hash;
3660 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3661 'version currently in archive' ];
3662 if (defined $overwrite_version) {
3663 if (length $overwrite_version) {
3664 infopair_cond_equal([ $overwrite_version,
3665 '--overwrite= version' ],
3668 my $v = $i_arch_v->[0];
3669 progress "Checking package changelog for archive version $v ...";
3671 my @xa = ("-f$v", "-t$v");
3672 my $vclogp = parsechangelog @xa;
3673 my $cv = [ (getfield $vclogp, 'Version'),
3674 "Version field from dpkg-parsechangelog @xa" ];
3675 infopair_cond_equal($i_arch_v, $cv);
3678 $@ =~ s/^dgit: //gm;
3680 "Perhaps debian/changelog does not mention $v ?";
3685 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3689 sub pseudomerge_make_commit ($$$$ $$) {
3690 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3691 $msg_cmd, $msg_msg) = @_;
3692 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3694 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3695 my $authline = clogp_authline $clogp;
3699 !defined $overwrite_version ? ""
3700 : !length $overwrite_version ? " --overwrite"
3701 : " --overwrite=".$overwrite_version;
3704 my $pmf = ".git/dgit/pseudomerge";
3705 open MC, ">", $pmf or die "$pmf $!";
3706 print MC <<END or die $!;
3709 parent $archive_hash
3719 return make_commit($pmf);
3722 sub splitbrain_pseudomerge ($$$$) {
3723 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3724 # => $merged_dgitview
3725 printdebug "splitbrain_pseudomerge...\n";
3727 # We: debian/PREVIOUS HEAD($maintview)
3728 # expect: o ----------------- o
3731 # a/d/PREVIOUS $dgitview
3734 # we do: `------------------ o
3738 return $dgitview unless defined $archive_hash;
3740 printdebug "splitbrain_pseudomerge...\n";
3742 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3744 if (!defined $overwrite_version) {
3745 progress "Checking that HEAD inciudes all changes in archive...";
3748 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3750 if (defined $overwrite_version) {
3752 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3753 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3754 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3755 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3756 my $i_archive = [ $archive_hash, "current archive contents" ];
3758 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3760 infopair_cond_equal($i_dgit, $i_archive);
3761 infopair_cond_ff($i_dep14, $i_dgit);
3762 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3766 $us: check failed (maybe --overwrite is needed, consult documentation)
3771 my $r = pseudomerge_make_commit
3772 $clogp, $dgitview, $archive_hash, $i_arch_v,
3773 "dgit --quilt=$quilt_mode",
3774 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3775 Declare fast forward from $i_arch_v->[0]
3777 Make fast forward from $i_arch_v->[0]
3780 maybe_split_brain_save $maintview, $r, "pseudomerge";
3782 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3786 sub plain_overwrite_pseudomerge ($$$) {
3787 my ($clogp, $head, $archive_hash) = @_;
3789 printdebug "plain_overwrite_pseudomerge...";
3791 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3793 return $head if is_fast_fwd $archive_hash, $head;
3795 my $m = "Declare fast forward from $i_arch_v->[0]";
3797 my $r = pseudomerge_make_commit
3798 $clogp, $head, $archive_hash, $i_arch_v,
3801 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3803 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3807 sub push_parse_changelog ($) {
3810 my $clogp = Dpkg::Control::Hash->new();
3811 $clogp->load($clogpfn) or die;
3813 my $clogpackage = getfield $clogp, 'Source';
3814 $package //= $clogpackage;
3815 fail "-p specified $package but changelog specified $clogpackage"
3816 unless $package eq $clogpackage;
3817 my $cversion = getfield $clogp, 'Version';
3818 my $tag = debiantag($cversion, access_nomdistro);
3819 runcmd @git, qw(check-ref-format), $tag;
3821 my $dscfn = dscfn($cversion);
3823 return ($clogp, $cversion, $dscfn);
3826 sub push_parse_dsc ($$$) {
3827 my ($dscfn,$dscfnwhat, $cversion) = @_;
3828 $dsc = parsecontrol($dscfn,$dscfnwhat);
3829 my $dversion = getfield $dsc, 'Version';
3830 my $dscpackage = getfield $dsc, 'Source';
3831 ($dscpackage eq $package && $dversion eq $cversion) or
3832 fail "$dscfn is for $dscpackage $dversion".
3833 " but debian/changelog is for $package $cversion";
3836 sub push_tagwants ($$$$) {
3837 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3840 TagFn => \&debiantag,
3845 if (defined $maintviewhead) {
3847 TagFn => \&debiantag_maintview,
3848 Objid => $maintviewhead,
3849 TfSuffix => '-maintview',
3852 } elsif ($dodep14tag eq 'no' ? 0
3853 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3854 : $dodep14tag eq 'always'
3855 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3856 --dep14tag-always (or equivalent in config) means server must support
3857 both "new" and "maint" tag formats, but config says it doesn't.
3859 : die "$dodep14tag ?") {
3861 TagFn => \&debiantag_maintview,
3863 TfSuffix => '-dgit',
3867 foreach my $tw (@tagwants) {
3868 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3869 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3871 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3875 sub push_mktags ($$ $$ $) {
3877 $changesfile,$changesfilewhat,
3880 die unless $tagwants->[0]{View} eq 'dgit';
3882 my $declaredistro = access_nomdistro();
3883 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
3884 $dsc->{$ourdscfield[0]} = join " ",
3885 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
3887 $dsc->save("$dscfn.tmp") or die $!;
3889 my $changes = parsecontrol($changesfile,$changesfilewhat);
3890 foreach my $field (qw(Source Distribution Version)) {
3891 $changes->{$field} eq $clogp->{$field} or
3892 fail "changes field $field \`$changes->{$field}'".
3893 " does not match changelog \`$clogp->{$field}'";
3896 my $cversion = getfield $clogp, 'Version';
3897 my $clogsuite = getfield $clogp, 'Distribution';
3899 # We make the git tag by hand because (a) that makes it easier
3900 # to control the "tagger" (b) we can do remote signing
3901 my $authline = clogp_authline $clogp;
3902 my $delibs = join(" ", "",@deliberatelies);
3906 my $tfn = $tw->{Tfn};
3907 my $head = $tw->{Objid};
3908 my $tag = $tw->{Tag};
3910 open TO, '>', $tfn->('.tmp') or die $!;
3911 print TO <<END or die $!;
3918 if ($tw->{View} eq 'dgit') {
3919 print TO <<END or die $!;
3920 $package release $cversion for $clogsuite ($csuite) [dgit]
3921 [dgit distro=$declaredistro$delibs]
3923 foreach my $ref (sort keys %previously) {
3924 print TO <<END or die $!;
3925 [dgit previously:$ref=$previously{$ref}]
3928 } elsif ($tw->{View} eq 'maint') {
3929 print TO <<END or die $!;
3930 $package release $cversion for $clogsuite ($csuite)
3931 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3934 die Dumper($tw)."?";
3939 my $tagobjfn = $tfn->('.tmp');
3941 if (!defined $keyid) {
3942 $keyid = access_cfg('keyid','RETURN-UNDEF');
3944 if (!defined $keyid) {
3945 $keyid = getfield $clogp, 'Maintainer';
3947 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3948 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3949 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3950 push @sign_cmd, $tfn->('.tmp');
3951 runcmd_ordryrun @sign_cmd;
3953 $tagobjfn = $tfn->('.signed.tmp');
3954 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3955 $tfn->('.tmp'), $tfn->('.tmp.asc');
3961 my @r = map { $mktag->($_); } @$tagwants;
3965 sub sign_changes ($) {
3966 my ($changesfile) = @_;
3968 my @debsign_cmd = @debsign;
3969 push @debsign_cmd, "-k$keyid" if defined $keyid;
3970 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3971 push @debsign_cmd, $changesfile;
3972 runcmd_ordryrun @debsign_cmd;
3977 printdebug "actually entering push\n";
3979 supplementary_message(<<'END');
3980 Push failed, while checking state of the archive.
3981 You can retry the push, after fixing the problem, if you like.
3983 if (check_for_git()) {
3986 my $archive_hash = fetch_from_archive();
3987 if (!$archive_hash) {
3989 fail "package appears to be new in this suite;".
3990 " if this is intentional, use --new";
3993 supplementary_message(<<'END');
3994 Push failed, while preparing your push.
3995 You can retry the push, after fixing the problem, if you like.
3998 need_tagformat 'new', "quilt mode $quilt_mode"
3999 if quiltmode_splitbrain;
4003 access_giturl(); # check that success is vaguely likely
4006 my $clogpfn = ".git/dgit/changelog.822.tmp";
4007 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4009 responder_send_file('parsed-changelog', $clogpfn);
4011 my ($clogp, $cversion, $dscfn) =
4012 push_parse_changelog("$clogpfn");
4014 my $dscpath = "$buildproductsdir/$dscfn";
4015 stat_exists $dscpath or
4016 fail "looked for .dsc $dscpath, but $!;".
4017 " maybe you forgot to build";
4019 responder_send_file('dsc', $dscpath);
4021 push_parse_dsc($dscpath, $dscfn, $cversion);
4023 my $format = getfield $dsc, 'Format';
4024 printdebug "format $format\n";
4026 my $actualhead = git_rev_parse('HEAD');
4027 my $dgithead = $actualhead;
4028 my $maintviewhead = undef;
4030 my $upstreamversion = upstreamversion $clogp->{Version};
4032 if (madformat_wantfixup($format)) {
4033 # user might have not used dgit build, so maybe do this now:
4034 if (quiltmode_splitbrain()) {
4036 quilt_make_fake_dsc($upstreamversion);
4038 ($dgithead, $cachekey) =
4039 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4041 "--quilt=$quilt_mode but no cached dgit view:
4042 perhaps tree changed since dgit build[-source] ?";
4044 $dgithead = splitbrain_pseudomerge($clogp,
4045 $actualhead, $dgithead,
4047 $maintviewhead = $actualhead;
4048 changedir '../../../..';
4049 prep_ud(); # so _only_subdir() works, below
4051 commit_quilty_patch();
4055 if (defined $overwrite_version && !defined $maintviewhead) {
4056 $dgithead = plain_overwrite_pseudomerge($clogp,
4064 if ($archive_hash) {
4065 if (is_fast_fwd($archive_hash, $dgithead)) {
4067 } elsif (deliberately_not_fast_forward) {
4070 fail "dgit push: HEAD is not a descendant".
4071 " of the archive's version.\n".
4072 "To overwrite the archive's contents,".
4073 " pass --overwrite[=VERSION].\n".
4074 "To rewind history, if permitted by the archive,".
4075 " use --deliberately-not-fast-forward.";
4080 progress "checking that $dscfn corresponds to HEAD";
4081 runcmd qw(dpkg-source -x --),
4082 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4083 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4084 check_for_vendor_patches() if madformat($dsc->{format});
4085 changedir '../../../..';
4086 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4087 debugcmd "+",@diffcmd;
4089 my $r = system @diffcmd;
4092 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4094 HEAD specifies a different tree to $dscfn:
4096 Perhaps you forgot to build. Or perhaps there is a problem with your
4097 source tree (see dgit(7) for some hints). To see a full diff, run
4104 if (!$changesfile) {
4105 my $pat = changespat $cversion;
4106 my @cs = glob "$buildproductsdir/$pat";
4107 fail "failed to find unique changes file".
4108 " (looked for $pat in $buildproductsdir);".
4109 " perhaps you need to use dgit -C"
4111 ($changesfile) = @cs;
4113 $changesfile = "$buildproductsdir/$changesfile";
4116 # Check that changes and .dsc agree enough
4117 $changesfile =~ m{[^/]*$};
4118 my $changes = parsecontrol($changesfile,$&);
4119 files_compare_inputs($dsc, $changes)
4120 unless forceing [qw(dsc-changes-mismatch)];
4122 # Perhaps adjust .dsc to contain right set of origs
4123 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4125 unless forceing [qw(changes-origs-exactly)];
4127 # Checks complete, we're going to try and go ahead:
4129 responder_send_file('changes',$changesfile);
4130 responder_send_command("param head $dgithead");
4131 responder_send_command("param csuite $csuite");
4132 responder_send_command("param tagformat $tagformat");
4133 if (defined $maintviewhead) {
4134 die unless ($protovsn//4) >= 4;
4135 responder_send_command("param maint-view $maintviewhead");
4138 if (deliberately_not_fast_forward) {
4139 git_for_each_ref(lrfetchrefs, sub {
4140 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4141 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4142 responder_send_command("previously $rrefname=$objid");
4143 $previously{$rrefname} = $objid;
4147 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4151 supplementary_message(<<'END');
4152 Push failed, while signing the tag.
4153 You can retry the push, after fixing the problem, if you like.
4155 # If we manage to sign but fail to record it anywhere, it's fine.
4156 if ($we_are_responder) {
4157 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4158 responder_receive_files('signed-tag', @tagobjfns);
4160 @tagobjfns = push_mktags($clogp,$dscpath,
4161 $changesfile,$changesfile,
4164 supplementary_message(<<'END');
4165 Push failed, *after* signing the tag.
4166 If you want to try again, you should use a new version number.
4169 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4171 foreach my $tw (@tagwants) {
4172 my $tag = $tw->{Tag};
4173 my $tagobjfn = $tw->{TagObjFn};
4175 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4176 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4177 runcmd_ordryrun_local
4178 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4181 supplementary_message(<<'END');
4182 Push failed, while updating the remote git repository - see messages above.
4183 If you want to try again, you should use a new version number.
4185 if (!check_for_git()) {
4186 create_remote_git_repo();
4189 my @pushrefs = $forceflag.$dgithead.":".rrref();
4190 foreach my $tw (@tagwants) {
4191 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4194 runcmd_ordryrun @git,
4195 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4196 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4198 supplementary_message(<<'END');
4199 Push failed, while obtaining signatures on the .changes and .dsc.
4200 If it was just that the signature failed, you may try again by using
4201 debsign by hand to sign the changes
4203 and then dput to complete the upload.
4204 If you need to change the package, you must use a new version number.
4206 if ($we_are_responder) {
4207 my $dryrunsuffix = act_local() ? "" : ".tmp";
4208 responder_receive_files('signed-dsc-changes',
4209 "$dscpath$dryrunsuffix",
4210 "$changesfile$dryrunsuffix");
4213 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4215 progress "[new .dsc left in $dscpath.tmp]";
4217 sign_changes $changesfile;
4220 supplementary_message(<<END);
4221 Push failed, while uploading package(s) to the archive server.
4222 You can retry the upload of exactly these same files with dput of:
4224 If that .changes file is broken, you will need to use a new version
4225 number for your next attempt at the upload.
4227 my $host = access_cfg('upload-host','RETURN-UNDEF');
4228 my @hostarg = defined($host) ? ($host,) : ();
4229 runcmd_ordryrun @dput, @hostarg, $changesfile;
4230 printdone "pushed and uploaded $cversion";
4232 supplementary_message('');
4233 responder_send_command("complete");
4239 badusage "-p is not allowed with clone; specify as argument instead"
4240 if defined $package;
4243 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4244 ($package,$isuite) = @ARGV;
4245 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4246 ($package,$dstdir) = @ARGV;
4247 } elsif (@ARGV==3) {
4248 ($package,$isuite,$dstdir) = @ARGV;
4250 badusage "incorrect arguments to dgit clone";
4254 $dstdir ||= "$package";
4255 if (stat_exists $dstdir) {
4256 fail "$dstdir already exists";
4260 if ($rmonerror && !$dryrun_level) {
4261 $cwd_remove= getcwd();
4263 return unless defined $cwd_remove;
4264 if (!chdir "$cwd_remove") {
4265 return if $!==&ENOENT;
4266 die "chdir $cwd_remove: $!";
4268 printdebug "clone rmonerror removing $dstdir\n";
4270 rmtree($dstdir) or die "remove $dstdir: $!\n";
4271 } elsif (grep { $! == $_ }
4272 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4274 print STDERR "check whether to remove $dstdir: $!\n";
4280 $cwd_remove = undef;
4283 sub branchsuite () {
4284 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4285 if ($branch =~ m#$lbranch_re#o) {
4292 sub fetchpullargs () {
4293 if (!defined $package) {
4294 my $sourcep = parsecontrol('debian/control','debian/control');
4295 $package = getfield $sourcep, 'Source';
4298 $isuite = branchsuite();
4300 my $clogp = parsechangelog();
4301 $isuite = getfield $clogp, 'Distribution';
4303 } elsif (@ARGV==1) {
4306 badusage "incorrect arguments to dgit fetch or dgit pull";
4314 my $multi_fetched = fork_for_multisuite(sub { });
4315 exit 0 if $multi_fetched;
4322 if (quiltmode_splitbrain()) {
4323 my ($format, $fopts) = get_source_format();
4324 madformat($format) and fail <<END
4325 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4334 badusage "-p is not allowed with dgit push" if defined $package;
4336 my $clogp = parsechangelog();
4337 $package = getfield $clogp, 'Source';
4340 } elsif (@ARGV==1) {
4341 ($specsuite) = (@ARGV);
4343 badusage "incorrect arguments to dgit push";
4345 $isuite = getfield $clogp, 'Distribution';
4347 local ($package) = $existing_package; # this is a hack
4348 canonicalise_suite();
4350 canonicalise_suite();
4352 if (defined $specsuite &&
4353 $specsuite ne $isuite &&
4354 $specsuite ne $csuite) {
4355 fail "dgit push: changelog specifies $isuite ($csuite)".
4356 " but command line specifies $specsuite";
4361 #---------- remote commands' implementation ----------
4363 sub cmd_remote_push_build_host {
4364 my ($nrargs) = shift @ARGV;
4365 my (@rargs) = @ARGV[0..$nrargs-1];
4366 @ARGV = @ARGV[$nrargs..$#ARGV];
4368 my ($dir,$vsnwant) = @rargs;
4369 # vsnwant is a comma-separated list; we report which we have
4370 # chosen in our ready response (so other end can tell if they
4373 $we_are_responder = 1;
4374 $us .= " (build host)";
4378 open PI, "<&STDIN" or die $!;
4379 open STDIN, "/dev/null" or die $!;
4380 open PO, ">&STDOUT" or die $!;
4382 open STDOUT, ">&STDERR" or die $!;
4386 ($protovsn) = grep {
4387 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4388 } @rpushprotovsn_support;
4390 fail "build host has dgit rpush protocol versions ".
4391 (join ",", @rpushprotovsn_support).
4392 " but invocation host has $vsnwant"
4393 unless defined $protovsn;
4395 responder_send_command("dgit-remote-push-ready $protovsn");
4396 rpush_handle_protovsn_bothends();
4401 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4402 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4403 # a good error message)
4405 sub rpush_handle_protovsn_bothends () {
4406 if ($protovsn < 4) {
4407 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4416 my $report = i_child_report();
4417 if (defined $report) {
4418 printdebug "($report)\n";
4419 } elsif ($i_child_pid) {
4420 printdebug "(killing build host child $i_child_pid)\n";
4421 kill 15, $i_child_pid;
4423 if (defined $i_tmp && !defined $initiator_tempdir) {
4425 eval { rmtree $i_tmp; };
4429 END { i_cleanup(); }
4432 my ($base,$selector,@args) = @_;
4433 $selector =~ s/\-/_/g;
4434 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4441 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4449 push @rargs, join ",", @rpushprotovsn_support;
4452 push @rdgit, @ropts;
4453 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4455 my @cmd = (@ssh, $host, shellquote @rdgit);
4458 if (defined $initiator_tempdir) {
4459 rmtree $initiator_tempdir;
4460 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4461 $i_tmp = $initiator_tempdir;
4465 $i_child_pid = open2(\*RO, \*RI, @cmd);
4467 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4468 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4469 $supplementary_message = '' unless $protovsn >= 3;
4471 fail "rpush negotiated protocol version $protovsn".
4472 " which does not support quilt mode $quilt_mode"
4473 if quiltmode_splitbrain;
4475 rpush_handle_protovsn_bothends();
4477 my ($icmd,$iargs) = initiator_expect {
4478 m/^(\S+)(?: (.*))?$/;
4481 i_method "i_resp", $icmd, $iargs;
4485 sub i_resp_progress ($) {
4487 my $msg = protocol_read_bytes \*RO, $rhs;
4491 sub i_resp_supplementary_message ($) {
4493 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4496 sub i_resp_complete {
4497 my $pid = $i_child_pid;
4498 $i_child_pid = undef; # prevents killing some other process with same pid
4499 printdebug "waiting for build host child $pid...\n";
4500 my $got = waitpid $pid, 0;
4501 die $! unless $got == $pid;
4502 die "build host child failed $?" if $?;
4505 printdebug "all done\n";
4509 sub i_resp_file ($) {
4511 my $localname = i_method "i_localname", $keyword;
4512 my $localpath = "$i_tmp/$localname";
4513 stat_exists $localpath and
4514 badproto \*RO, "file $keyword ($localpath) twice";
4515 protocol_receive_file \*RO, $localpath;
4516 i_method "i_file", $keyword;
4521 sub i_resp_param ($) {
4522 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4526 sub i_resp_previously ($) {
4527 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4528 or badproto \*RO, "bad previously spec";
4529 my $r = system qw(git check-ref-format), $1;
4530 die "bad previously ref spec ($r)" if $r;
4531 $previously{$1} = $2;
4536 sub i_resp_want ($) {
4538 die "$keyword ?" if $i_wanted{$keyword}++;
4539 my @localpaths = i_method "i_want", $keyword;
4540 printdebug "[[ $keyword @localpaths\n";
4541 foreach my $localpath (@localpaths) {
4542 protocol_send_file \*RI, $localpath;
4544 print RI "files-end\n" or die $!;
4547 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4549 sub i_localname_parsed_changelog {
4550 return "remote-changelog.822";
4552 sub i_file_parsed_changelog {
4553 ($i_clogp, $i_version, $i_dscfn) =
4554 push_parse_changelog "$i_tmp/remote-changelog.822";
4555 die if $i_dscfn =~ m#/|^\W#;
4558 sub i_localname_dsc {
4559 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4564 sub i_localname_changes {
4565 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4566 $i_changesfn = $i_dscfn;
4567 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4568 return $i_changesfn;
4570 sub i_file_changes { }
4572 sub i_want_signed_tag {
4573 printdebug Dumper(\%i_param, $i_dscfn);
4574 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4575 && defined $i_param{'csuite'}
4576 or badproto \*RO, "premature desire for signed-tag";
4577 my $head = $i_param{'head'};
4578 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4580 my $maintview = $i_param{'maint-view'};
4581 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4584 if ($protovsn >= 4) {
4585 my $p = $i_param{'tagformat'} // '<undef>';
4587 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4590 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4592 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4594 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4597 push_mktags $i_clogp, $i_dscfn,
4598 $i_changesfn, 'remote changes',
4602 sub i_want_signed_dsc_changes {
4603 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4604 sign_changes $i_changesfn;
4605 return ($i_dscfn, $i_changesfn);
4608 #---------- building etc. ----------
4614 #----- `3.0 (quilt)' handling -----
4616 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4618 sub quiltify_dpkg_commit ($$$;$) {
4619 my ($patchname,$author,$msg, $xinfo) = @_;
4623 my $descfn = ".git/dgit/quilt-description.tmp";
4624 open O, '>', $descfn or die "$descfn: $!";
4625 $msg =~ s/\n+/\n\n/;
4626 print O <<END or die $!;
4628 ${xinfo}Subject: $msg
4635 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4636 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4637 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4638 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4642 sub quiltify_trees_differ ($$;$$$) {
4643 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4644 # returns true iff the two tree objects differ other than in debian/
4645 # with $finegrained,
4646 # returns bitmask 01 - differ in upstream files except .gitignore
4647 # 02 - differ in .gitignore
4648 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4649 # is set for each modified .gitignore filename $fn
4650 # if $unrepres is defined, array ref to which is appeneded
4651 # a list of unrepresentable changes (removals of upstream files
4654 my @cmd = (@git, qw(diff-tree -z));
4655 push @cmd, qw(--name-only) unless $unrepres;
4656 push @cmd, qw(-r) if $finegrained || $unrepres;
4658 my $diffs= cmdoutput @cmd;
4661 foreach my $f (split /\0/, $diffs) {
4662 if ($unrepres && !@lmodes) {
4663 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4666 my ($oldmode,$newmode) = @lmodes;
4669 next if $f =~ m#^debian(?:/.*)?$#s;
4673 die "not a plain file\n"
4674 unless $newmode =~ m/^10\d{4}$/ ||
4675 $oldmode =~ m/^10\d{4}$/;
4676 if ($oldmode =~ m/[^0]/ &&
4677 $newmode =~ m/[^0]/) {
4678 die "mode changed\n" if $oldmode ne $newmode;
4680 die "non-default mode\n"
4681 unless $newmode =~ m/^100644$/ ||
4682 $oldmode =~ m/^100644$/;
4686 local $/="\n"; chomp $@;
4687 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4691 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4692 $r |= $isignore ? 02 : 01;
4693 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4695 printdebug "quiltify_trees_differ $x $y => $r\n";
4699 sub quiltify_tree_sentinelfiles ($) {
4700 # lists the `sentinel' files present in the tree
4702 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4703 qw(-- debian/rules debian/control);
4708 sub quiltify_splitbrain_needed () {
4709 if (!$split_brain) {
4710 progress "dgit view: changes are required...";
4711 runcmd @git, qw(checkout -q -b dgit-view);
4716 sub quiltify_splitbrain ($$$$$$) {
4717 my ($clogp, $unapplied, $headref, $diffbits,
4718 $editedignores, $cachekey) = @_;
4719 if ($quilt_mode !~ m/gbp|dpm/) {
4720 # treat .gitignore just like any other upstream file
4721 $diffbits = { %$diffbits };
4722 $_ = !!$_ foreach values %$diffbits;
4724 # We would like any commits we generate to be reproducible
4725 my @authline = clogp_authline($clogp);
4726 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4727 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4728 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4729 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4730 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4731 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4733 if ($quilt_mode =~ m/gbp|unapplied/ &&
4734 ($diffbits->{O2H} & 01)) {
4736 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4737 " but git tree differs from orig in upstream files.";
4738 if (!stat_exists "debian/patches") {
4740 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4744 if ($quilt_mode =~ m/dpm/ &&
4745 ($diffbits->{H2A} & 01)) {
4747 --quilt=$quilt_mode specified, implying patches-applied git tree
4748 but git tree differs from result of applying debian/patches to upstream
4751 if ($quilt_mode =~ m/gbp|unapplied/ &&
4752 ($diffbits->{O2A} & 01)) { # some patches
4753 quiltify_splitbrain_needed();
4754 progress "dgit view: creating patches-applied version using gbp pq";
4755 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4756 # gbp pq import creates a fresh branch; push back to dgit-view
4757 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4758 runcmd @git, qw(checkout -q dgit-view);
4760 if ($quilt_mode =~ m/gbp|dpm/ &&
4761 ($diffbits->{O2A} & 02)) {
4763 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4764 tool which does not create patches for changes to upstream
4765 .gitignores: but, such patches exist in debian/patches.
4768 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4769 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4770 quiltify_splitbrain_needed();
4771 progress "dgit view: creating patch to represent .gitignore changes";
4772 ensuredir "debian/patches";
4773 my $gipatch = "debian/patches/auto-gitignore";
4774 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4775 stat GIPATCH or die "$gipatch: $!";
4776 fail "$gipatch already exists; but want to create it".
4777 " to record .gitignore changes" if (stat _)[7];
4778 print GIPATCH <<END or die "$gipatch: $!";
4779 Subject: Update .gitignore from Debian packaging branch
4781 The Debian packaging git branch contains these updates to the upstream
4782 .gitignore file(s). This patch is autogenerated, to provide these
4783 updates to users of the official Debian archive view of the package.
4785 [dgit ($our_version) update-gitignore]
4788 close GIPATCH or die "$gipatch: $!";
4789 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4790 $unapplied, $headref, "--", sort keys %$editedignores;
4791 open SERIES, "+>>", "debian/patches/series" or die $!;
4792 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4794 defined read SERIES, $newline, 1 or die $!;
4795 print SERIES "\n" or die $! unless $newline eq "\n";
4796 print SERIES "auto-gitignore\n" or die $!;
4797 close SERIES or die $!;
4798 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4800 Commit patch to update .gitignore
4802 [dgit ($our_version) update-gitignore-quilt-fixup]
4806 my $dgitview = git_rev_parse 'HEAD';
4808 changedir '../../../..';
4809 # When we no longer need to support squeeze, use --create-reflog
4811 ensuredir ".git/logs/refs/dgit-intern";
4812 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4815 my $oldcache = git_get_ref "refs/$splitbraincache";
4816 if ($oldcache eq $dgitview) {
4817 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4818 # git update-ref doesn't always update, in this case. *sigh*
4819 my $dummy = make_commit_text <<END;
4822 author Dgit <dgit\@example.com> 1000000000 +0000
4823 committer Dgit <dgit\@example.com> 1000000000 +0000
4825 Dummy commit - do not use
4827 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4828 "refs/$splitbraincache", $dummy;
4830 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4833 changedir '.git/dgit/unpack/work';
4835 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4836 progress "dgit view: created ($saved)";
4839 sub quiltify ($$$$) {
4840 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4842 # Quilt patchification algorithm
4844 # We search backwards through the history of the main tree's HEAD
4845 # (T) looking for a start commit S whose tree object is identical
4846 # to to the patch tip tree (ie the tree corresponding to the
4847 # current dpkg-committed patch series). For these purposes
4848 # `identical' disregards anything in debian/ - this wrinkle is
4849 # necessary because dpkg-source treates debian/ specially.
4851 # We can only traverse edges where at most one of the ancestors'
4852 # trees differs (in changes outside in debian/). And we cannot
4853 # handle edges which change .pc/ or debian/patches. To avoid
4854 # going down a rathole we avoid traversing edges which introduce
4855 # debian/rules or debian/control. And we set a limit on the
4856 # number of edges we are willing to look at.
4858 # If we succeed, we walk forwards again. For each traversed edge
4859 # PC (with P parent, C child) (starting with P=S and ending with
4860 # C=T) to we do this:
4862 # - dpkg-source --commit with a patch name and message derived from C
4863 # After traversing PT, we git commit the changes which
4864 # should be contained within debian/patches.
4866 # The search for the path S..T is breadth-first. We maintain a
4867 # todo list containing search nodes. A search node identifies a
4868 # commit, and looks something like this:
4870 # Commit => $git_commit_id,
4871 # Child => $c, # or undef if P=T
4872 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4873 # Nontrivial => true iff $p..$c has relevant changes
4880 my %considered; # saves being exponential on some weird graphs
4882 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4885 my ($search,$whynot) = @_;
4886 printdebug " search NOT $search->{Commit} $whynot\n";
4887 $search->{Whynot} = $whynot;
4888 push @nots, $search;
4889 no warnings qw(exiting);
4898 my $c = shift @todo;
4899 next if $considered{$c->{Commit}}++;
4901 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4903 printdebug "quiltify investigate $c->{Commit}\n";
4906 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4907 printdebug " search finished hooray!\n";
4912 if ($quilt_mode eq 'nofix') {
4913 fail "quilt fixup required but quilt mode is \`nofix'\n".
4914 "HEAD commit $c->{Commit} differs from tree implied by ".
4915 " debian/patches (tree object $oldtiptree)";
4917 if ($quilt_mode eq 'smash') {
4918 printdebug " search quitting smash\n";
4922 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4923 $not->($c, "has $c_sentinels not $t_sentinels")
4924 if $c_sentinels ne $t_sentinels;
4926 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4927 $commitdata =~ m/\n\n/;
4929 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4930 @parents = map { { Commit => $_, Child => $c } } @parents;
4932 $not->($c, "root commit") if !@parents;
4934 foreach my $p (@parents) {
4935 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4937 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4938 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4940 foreach my $p (@parents) {
4941 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4943 my @cmd= (@git, qw(diff-tree -r --name-only),
4944 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4945 my $patchstackchange = cmdoutput @cmd;
4946 if (length $patchstackchange) {
4947 $patchstackchange =~ s/\n/,/g;
4948 $not->($p, "changed $patchstackchange");
4951 printdebug " search queue P=$p->{Commit} ",
4952 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4958 printdebug "quiltify want to smash\n";
4961 my $x = $_[0]{Commit};
4962 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4965 my $reportnot = sub {
4967 my $s = $abbrev->($notp);
4968 my $c = $notp->{Child};
4969 $s .= "..".$abbrev->($c) if $c;
4970 $s .= ": ".$notp->{Whynot};
4973 if ($quilt_mode eq 'linear') {
4974 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4975 foreach my $notp (@nots) {
4976 print STDERR "$us: ", $reportnot->($notp), "\n";
4978 print STDERR "$us: $_\n" foreach @$failsuggestion;
4979 fail "quilt fixup naive history linearisation failed.\n".
4980 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4981 } elsif ($quilt_mode eq 'smash') {
4982 } elsif ($quilt_mode eq 'auto') {
4983 progress "quilt fixup cannot be linear, smashing...";
4985 die "$quilt_mode ?";
4988 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4989 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4991 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4993 quiltify_dpkg_commit "auto-$version-$target-$time",
4994 (getfield $clogp, 'Maintainer'),
4995 "Automatically generated patch ($clogp->{Version})\n".
4996 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5000 progress "quiltify linearisation planning successful, executing...";
5002 for (my $p = $sref_S;
5003 my $c = $p->{Child};
5005 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5006 next unless $p->{Nontrivial};
5008 my $cc = $c->{Commit};
5010 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5011 $commitdata =~ m/\n\n/ or die "$c ?";
5014 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5017 my $commitdate = cmdoutput
5018 @git, qw(log -n1 --pretty=format:%aD), $cc;
5020 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5022 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5029 my $gbp_check_suitable = sub {
5034 die "contains unexpected slashes\n" if m{//} || m{/$};
5035 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5036 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5037 die "too long" if length > 200;
5039 return $_ unless $@;
5040 print STDERR "quiltifying commit $cc:".
5041 " ignoring/dropping Gbp-Pq $what: $@";
5045 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5047 (\S+) \s* \n //ixm) {
5048 $patchname = $gbp_check_suitable->($1, 'Name');
5050 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5052 (\S+) \s* \n //ixm) {
5053 $patchdir = $gbp_check_suitable->($1, 'Topic');
5058 if (!defined $patchname) {
5059 $patchname = $title;
5060 $patchname =~ s/[.:]$//;
5063 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5064 my $translitname = $converter->convert($patchname);
5065 die unless defined $translitname;
5066 $patchname = $translitname;
5069 "dgit: patch title transliteration error: $@"
5071 $patchname =~ y/ A-Z/-a-z/;
5072 $patchname =~ y/-a-z0-9_.+=~//cd;
5073 $patchname =~ s/^\W/x-$&/;
5074 $patchname = substr($patchname,0,40);
5076 if (!defined $patchdir) {
5079 if (length $patchdir) {
5080 $patchname = "$patchdir/$patchname";
5082 if ($patchname =~ m{^(.*)/}) {
5083 mkpath "debian/patches/$1";
5088 stat "debian/patches/$patchname$index";
5090 $!==ENOENT or die "$patchname$index $!";
5092 runcmd @git, qw(checkout -q), $cc;
5094 # We use the tip's changelog so that dpkg-source doesn't
5095 # produce complaining messages from dpkg-parsechangelog. None
5096 # of the information dpkg-source gets from the changelog is
5097 # actually relevant - it gets put into the original message
5098 # which dpkg-source provides our stunt editor, and then
5100 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5102 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5103 "Date: $commitdate\n".
5104 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5106 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5109 runcmd @git, qw(checkout -q master);
5112 sub build_maybe_quilt_fixup () {
5113 my ($format,$fopts) = get_source_format;
5114 return unless madformat_wantfixup $format;
5117 check_for_vendor_patches();
5119 if (quiltmode_splitbrain) {
5120 fail <<END unless access_cfg_tagformats_can_splitbrain;
5121 quilt mode $quilt_mode requires split view so server needs to support
5122 both "new" and "maint" tag formats, but config says it doesn't.
5126 my $clogp = parsechangelog();
5127 my $headref = git_rev_parse('HEAD');
5132 my $upstreamversion = upstreamversion $version;
5134 if ($fopts->{'single-debian-patch'}) {
5135 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5137 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5140 die 'bug' if $split_brain && !$need_split_build_invocation;
5142 changedir '../../../..';
5143 runcmd_ordryrun_local
5144 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5147 sub quilt_fixup_mkwork ($) {
5150 mkdir "work" or die $!;
5152 mktree_in_ud_here();
5153 runcmd @git, qw(reset -q --hard), $headref;
5156 sub quilt_fixup_linkorigs ($$) {
5157 my ($upstreamversion, $fn) = @_;
5158 # calls $fn->($leafname);
5160 foreach my $f (<../../../../*>) { #/){
5161 my $b=$f; $b =~ s{.*/}{};
5163 local ($debuglevel) = $debuglevel-1;
5164 printdebug "QF linkorigs $b, $f ?\n";
5166 next unless is_orig_file_of_vsn $b, $upstreamversion;
5167 printdebug "QF linkorigs $b, $f Y\n";
5168 link_ltarget $f, $b or die "$b $!";
5173 sub quilt_fixup_delete_pc () {
5174 runcmd @git, qw(rm -rqf .pc);
5176 Commit removal of .pc (quilt series tracking data)
5178 [dgit ($our_version) upgrade quilt-remove-pc]
5182 sub quilt_fixup_singlepatch ($$$) {
5183 my ($clogp, $headref, $upstreamversion) = @_;
5185 progress "starting quiltify (single-debian-patch)";
5187 # dpkg-source --commit generates new patches even if
5188 # single-debian-patch is in debian/source/options. In order to
5189 # get it to generate debian/patches/debian-changes, it is
5190 # necessary to build the source package.
5192 quilt_fixup_linkorigs($upstreamversion, sub { });
5193 quilt_fixup_mkwork($headref);
5195 rmtree("debian/patches");
5197 runcmd @dpkgsource, qw(-b .);
5199 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5200 rename srcfn("$upstreamversion", "/debian/patches"),
5201 "work/debian/patches";
5204 commit_quilty_patch();
5207 sub quilt_make_fake_dsc ($) {
5208 my ($upstreamversion) = @_;
5210 my $fakeversion="$upstreamversion-~~DGITFAKE";
5212 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5213 print $fakedsc <<END or die $!;
5216 Version: $fakeversion
5220 my $dscaddfile=sub {
5223 my $md = new Digest::MD5;
5225 my $fh = new IO::File $b, '<' or die "$b $!";
5230 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5233 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5235 my @files=qw(debian/source/format debian/rules
5236 debian/control debian/changelog);
5237 foreach my $maybe (qw(debian/patches debian/source/options
5238 debian/tests/control)) {
5239 next unless stat_exists "../../../$maybe";
5240 push @files, $maybe;
5243 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5244 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5246 $dscaddfile->($debtar);
5247 close $fakedsc or die $!;
5250 sub quilt_check_splitbrain_cache ($$) {
5251 my ($headref, $upstreamversion) = @_;
5252 # Called only if we are in (potentially) split brain mode.
5254 # Computes the cache key and looks in the cache.
5255 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5257 my $splitbrain_cachekey;
5260 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5261 # we look in the reflog of dgit-intern/quilt-cache
5262 # we look for an entry whose message is the key for the cache lookup
5263 my @cachekey = (qw(dgit), $our_version);
5264 push @cachekey, $upstreamversion;
5265 push @cachekey, $quilt_mode;
5266 push @cachekey, $headref;
5268 push @cachekey, hashfile('fake.dsc');
5270 my $srcshash = Digest::SHA->new(256);
5271 my %sfs = ( %INC, '$0(dgit)' => $0 );
5272 foreach my $sfk (sort keys %sfs) {
5273 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5274 $srcshash->add($sfk," ");
5275 $srcshash->add(hashfile($sfs{$sfk}));
5276 $srcshash->add("\n");
5278 push @cachekey, $srcshash->hexdigest();
5279 $splitbrain_cachekey = "@cachekey";
5281 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5283 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5284 debugcmd "|(probably)",@cmd;
5285 my $child = open GC, "-|"; defined $child or die $!;
5287 chdir '../../..' or die $!;
5288 if (!stat ".git/logs/refs/$splitbraincache") {
5289 $! == ENOENT or die $!;
5290 printdebug ">(no reflog)\n";
5297 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5298 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5301 quilt_fixup_mkwork($headref);
5302 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5303 if ($cachehit ne $headref) {
5304 progress "dgit view: found cached ($saved)";
5305 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5307 return ($cachehit, $splitbrain_cachekey);
5309 progress "dgit view: found cached, no changes required";
5310 return ($headref, $splitbrain_cachekey);
5312 die $! if GC->error;
5313 failedcmd unless close GC;
5315 printdebug "splitbrain cache miss\n";
5316 return (undef, $splitbrain_cachekey);
5319 sub quilt_fixup_multipatch ($$$) {
5320 my ($clogp, $headref, $upstreamversion) = @_;
5322 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5325 # - honour any existing .pc in case it has any strangeness
5326 # - determine the git commit corresponding to the tip of
5327 # the patch stack (if there is one)
5328 # - if there is such a git commit, convert each subsequent
5329 # git commit into a quilt patch with dpkg-source --commit
5330 # - otherwise convert all the differences in the tree into
5331 # a single git commit
5335 # Our git tree doesn't necessarily contain .pc. (Some versions of
5336 # dgit would include the .pc in the git tree.) If there isn't
5337 # one, we need to generate one by unpacking the patches that we
5340 # We first look for a .pc in the git tree. If there is one, we
5341 # will use it. (This is not the normal case.)
5343 # Otherwise need to regenerate .pc so that dpkg-source --commit
5344 # can work. We do this as follows:
5345 # 1. Collect all relevant .orig from parent directory
5346 # 2. Generate a debian.tar.gz out of
5347 # debian/{patches,rules,source/format,source/options}
5348 # 3. Generate a fake .dsc containing just these fields:
5349 # Format Source Version Files
5350 # 4. Extract the fake .dsc
5351 # Now the fake .dsc has a .pc directory.
5352 # (In fact we do this in every case, because in future we will
5353 # want to search for a good base commit for generating patches.)
5355 # Then we can actually do the dpkg-source --commit
5356 # 1. Make a new working tree with the same object
5357 # store as our main tree and check out the main
5359 # 2. Copy .pc from the fake's extraction, if necessary
5360 # 3. Run dpkg-source --commit
5361 # 4. If the result has changes to debian/, then
5362 # - git add them them
5363 # - git add .pc if we had a .pc in-tree
5365 # 5. If we had a .pc in-tree, delete it, and git commit
5366 # 6. Back in the main tree, fast forward to the new HEAD
5368 # Another situation we may have to cope with is gbp-style
5369 # patches-unapplied trees.
5371 # We would want to detect these, so we know to escape into
5372 # quilt_fixup_gbp. However, this is in general not possible.
5373 # Consider a package with a one patch which the dgit user reverts
5374 # (with git revert or the moral equivalent).
5376 # That is indistinguishable in contents from a patches-unapplied
5377 # tree. And looking at the history to distinguish them is not
5378 # useful because the user might have made a confusing-looking git
5379 # history structure (which ought to produce an error if dgit can't
5380 # cope, not a silent reintroduction of an unwanted patch).
5382 # So gbp users will have to pass an option. But we can usually
5383 # detect their failure to do so: if the tree is not a clean
5384 # patches-applied tree, quilt linearisation fails, but the tree
5385 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5386 # they want --quilt=unapplied.
5388 # To help detect this, when we are extracting the fake dsc, we
5389 # first extract it with --skip-patches, and then apply the patches
5390 # afterwards with dpkg-source --before-build. That lets us save a
5391 # tree object corresponding to .origs.
5393 my $splitbrain_cachekey;
5395 quilt_make_fake_dsc($upstreamversion);
5397 if (quiltmode_splitbrain()) {
5399 ($cachehit, $splitbrain_cachekey) =
5400 quilt_check_splitbrain_cache($headref, $upstreamversion);
5401 return if $cachehit;
5405 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5407 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5408 rename $fakexdir, "fake" or die "$fakexdir $!";
5412 remove_stray_gits("source package");
5413 mktree_in_ud_here();
5417 my $unapplied=git_add_write_tree();
5418 printdebug "fake orig tree object $unapplied\n";
5422 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5424 if (system @bbcmd) {
5425 failedcmd @bbcmd if $? < 0;
5427 failed to apply your git tree's patch stack (from debian/patches/) to
5428 the corresponding upstream tarball(s). Your source tree and .orig
5429 are probably too inconsistent. dgit can only fix up certain kinds of
5430 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5436 quilt_fixup_mkwork($headref);
5439 if (stat_exists ".pc") {
5441 progress "Tree already contains .pc - will use it then delete it.";
5444 rename '../fake/.pc','.pc' or die $!;
5447 changedir '../fake';
5449 my $oldtiptree=git_add_write_tree();
5450 printdebug "fake o+d/p tree object $unapplied\n";
5451 changedir '../work';
5454 # We calculate some guesswork now about what kind of tree this might
5455 # be. This is mostly for error reporting.
5461 # O = orig, without patches applied
5462 # A = "applied", ie orig with H's debian/patches applied
5463 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5464 \%editedignores, \@unrepres),
5465 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5466 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5470 foreach my $b (qw(01 02)) {
5471 foreach my $v (qw(O2H O2A H2A)) {
5472 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5475 printdebug "differences \@dl @dl.\n";
5478 "$us: base trees orig=%.20s o+d/p=%.20s",
5479 $unapplied, $oldtiptree;
5481 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5482 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5483 $dl[0], $dl[1], $dl[3], $dl[4],
5487 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5489 forceable_fail [qw(unrepresentable)], <<END;
5490 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5495 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5496 push @failsuggestion, "This might be a patches-unapplied branch.";
5497 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5498 push @failsuggestion, "This might be a patches-applied branch.";
5500 push @failsuggestion, "Maybe you need to specify one of".
5501 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5503 if (quiltmode_splitbrain()) {
5504 quiltify_splitbrain($clogp, $unapplied, $headref,
5505 $diffbits, \%editedignores,
5506 $splitbrain_cachekey);
5510 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5511 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5513 if (!open P, '>>', ".pc/applied-patches") {
5514 $!==&ENOENT or die $!;
5519 commit_quilty_patch();
5521 if ($mustdeletepc) {
5522 quilt_fixup_delete_pc();
5526 sub quilt_fixup_editor () {
5527 my $descfn = $ENV{$fakeeditorenv};
5528 my $editing = $ARGV[$#ARGV];
5529 open I1, '<', $descfn or die "$descfn: $!";
5530 open I2, '<', $editing or die "$editing: $!";
5531 unlink $editing or die "$editing: $!";
5532 open O, '>', $editing or die "$editing: $!";
5533 while (<I1>) { print O or die $!; } I1->error and die $!;
5536 $copying ||= m/^\-\-\- /;
5537 next unless $copying;
5540 I2->error and die $!;
5545 sub maybe_apply_patches_dirtily () {
5546 return unless $quilt_mode =~ m/gbp|unapplied/;
5547 print STDERR <<END or die $!;
5549 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5550 dgit: Have to apply the patches - making the tree dirty.
5551 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5554 $patches_applied_dirtily = 01;
5555 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5556 runcmd qw(dpkg-source --before-build .);
5559 sub maybe_unapply_patches_again () {
5560 progress "dgit: Unapplying patches again to tidy up the tree."
5561 if $patches_applied_dirtily;
5562 runcmd qw(dpkg-source --after-build .)
5563 if $patches_applied_dirtily & 01;
5565 if $patches_applied_dirtily & 02;
5566 $patches_applied_dirtily = 0;
5569 #----- other building -----
5571 our $clean_using_builder;
5572 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5573 # clean the tree before building (perhaps invoked indirectly by
5574 # whatever we are using to run the build), rather than separately
5575 # and explicitly by us.
5578 return if $clean_using_builder;
5579 if ($cleanmode eq 'dpkg-source') {
5580 maybe_apply_patches_dirtily();
5581 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5582 } elsif ($cleanmode eq 'dpkg-source-d') {
5583 maybe_apply_patches_dirtily();
5584 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5585 } elsif ($cleanmode eq 'git') {
5586 runcmd_ordryrun_local @git, qw(clean -xdf);
5587 } elsif ($cleanmode eq 'git-ff') {
5588 runcmd_ordryrun_local @git, qw(clean -xdff);
5589 } elsif ($cleanmode eq 'check') {
5590 my $leftovers = cmdoutput @git, qw(clean -xdn);
5591 if (length $leftovers) {
5592 print STDERR $leftovers, "\n" or die $!;
5593 fail "tree contains uncommitted files and --clean=check specified";
5595 } elsif ($cleanmode eq 'none') {
5602 badusage "clean takes no additional arguments" if @ARGV;
5605 maybe_unapply_patches_again();
5608 sub build_prep_early () {
5609 our $build_prep_early_done //= 0;
5610 return if $build_prep_early_done++;
5612 badusage "-p is not allowed when building" if defined $package;
5613 my $clogp = parsechangelog();
5614 $isuite = getfield $clogp, 'Distribution';
5615 $package = getfield $clogp, 'Source';
5616 $version = getfield $clogp, 'Version';
5623 build_maybe_quilt_fixup();
5625 my $pat = changespat $version;
5626 foreach my $f (glob "$buildproductsdir/$pat") {
5628 unlink $f or fail "remove old changes file $f: $!";
5630 progress "would remove $f";
5636 sub changesopts_initial () {
5637 my @opts =@changesopts[1..$#changesopts];
5640 sub changesopts_version () {
5641 if (!defined $changes_since_version) {
5642 my @vsns = archive_query('archive_query');
5643 my @quirk = access_quirk();
5644 if ($quirk[0] eq 'backports') {
5645 local $isuite = $quirk[2];
5647 canonicalise_suite();
5648 push @vsns, archive_query('archive_query');
5651 @vsns = map { $_->[0] } @vsns;
5652 @vsns = sort { -version_compare($a, $b) } @vsns;
5653 $changes_since_version = $vsns[0];
5654 progress "changelog will contain changes since $vsns[0]";
5656 $changes_since_version = '_';
5657 progress "package seems new, not specifying -v<version>";
5660 if ($changes_since_version ne '_') {
5661 return ("-v$changes_since_version");
5667 sub changesopts () {
5668 return (changesopts_initial(), changesopts_version());
5671 sub massage_dbp_args ($;$) {
5672 my ($cmd,$xargs) = @_;
5675 # - if we're going to split the source build out so we can
5676 # do strange things to it, massage the arguments to dpkg-buildpackage
5677 # so that the main build doessn't build source (or add an argument
5678 # to stop it building source by default).
5680 # - add -nc to stop dpkg-source cleaning the source tree,
5681 # unless we're not doing a split build and want dpkg-source
5682 # as cleanmode, in which case we can do nothing
5685 # 0 - source will NOT need to be built separately by caller
5686 # +1 - source will need to be built separately by caller
5687 # +2 - source will need to be built separately by caller AND
5688 # dpkg-buildpackage should not in fact be run at all!
5689 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5690 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5691 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5692 $clean_using_builder = 1;
5695 # -nc has the side effect of specifying -b if nothing else specified
5696 # and some combinations of -S, -b, et al, are errors, rather than
5697 # later simply overriding earlie. So we need to:
5698 # - search the command line for these options
5699 # - pick the last one
5700 # - perhaps add our own as a default
5701 # - perhaps adjust it to the corresponding non-source-building version
5703 foreach my $l ($cmd, $xargs) {
5705 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5708 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5710 if ($need_split_build_invocation) {
5711 printdebug "massage split $dmode.\n";
5712 $r = $dmode =~ m/[S]/ ? +2 :
5713 $dmode =~ y/gGF/ABb/ ? +1 :
5714 $dmode =~ m/[ABb]/ ? 0 :
5717 printdebug "massage done $r $dmode.\n";
5719 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5725 my $wasdir = must_getcwd();
5731 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5732 my ($msg_if_onlyone) = @_;
5733 # If there is only one .changes file, fail with $msg_if_onlyone,
5734 # or if that is undef, be a no-op.
5735 # Returns the changes file to report to the user.
5736 my $pat = changespat $version;
5737 my @changesfiles = glob $pat;
5738 @changesfiles = sort {
5739 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5743 if (@changesfiles==1) {
5744 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5745 only one changes file from build (@changesfiles)
5747 $result = $changesfiles[0];
5748 } elsif (@changesfiles==2) {
5749 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5750 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5751 fail "$l found in binaries changes file $binchanges"
5754 runcmd_ordryrun_local @mergechanges, @changesfiles;
5755 my $multichanges = changespat $version,'multi';
5757 stat_exists $multichanges or fail "$multichanges: $!";
5758 foreach my $cf (glob $pat) {
5759 next if $cf eq $multichanges;
5760 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5763 $result = $multichanges;
5765 fail "wrong number of different changes files (@changesfiles)";
5767 printdone "build successful, results in $result\n" or die $!;
5770 sub midbuild_checkchanges () {
5771 my $pat = changespat $version;
5772 return if $rmchanges;
5773 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5774 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5776 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5777 Suggest you delete @unwanted.
5782 sub midbuild_checkchanges_vanilla ($) {
5784 midbuild_checkchanges() if $wantsrc == 1;
5787 sub postbuild_mergechanges_vanilla ($) {
5789 if ($wantsrc == 1) {
5791 postbuild_mergechanges(undef);
5794 printdone "build successful\n";
5800 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5801 my $wantsrc = massage_dbp_args \@dbp;
5804 midbuild_checkchanges_vanilla $wantsrc;
5809 push @dbp, changesopts_version();
5810 maybe_apply_patches_dirtily();
5811 runcmd_ordryrun_local @dbp;
5813 maybe_unapply_patches_again();
5814 postbuild_mergechanges_vanilla $wantsrc;
5818 $quilt_mode //= 'gbp';
5824 # gbp can make .origs out of thin air. In my tests it does this
5825 # even for a 1.0 format package, with no origs present. So I
5826 # guess it keys off just the version number. We don't know
5827 # exactly what .origs ought to exist, but let's assume that we
5828 # should run gbp if: the version has an upstream part and the main
5830 my $upstreamversion = upstreamversion $version;
5831 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5832 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5834 if ($gbp_make_orig) {
5836 $cleanmode = 'none'; # don't do it again
5837 $need_split_build_invocation = 1;
5840 my @dbp = @dpkgbuildpackage;
5842 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5844 if (!length $gbp_build[0]) {
5845 if (length executable_on_path('git-buildpackage')) {
5846 $gbp_build[0] = qw(git-buildpackage);
5848 $gbp_build[0] = 'gbp buildpackage';
5851 my @cmd = opts_opt_multi_cmd @gbp_build;
5853 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5855 if ($gbp_make_orig) {
5856 ensuredir '.git/dgit';
5857 my $ok = '.git/dgit/origs-gen-ok';
5858 unlink $ok or $!==&ENOENT or die $!;
5859 my @origs_cmd = @cmd;
5860 push @origs_cmd, qw(--git-cleaner=true);
5861 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5862 push @origs_cmd, @ARGV;
5864 debugcmd @origs_cmd;
5866 do { local $!; stat_exists $ok; }
5867 or failedcmd @origs_cmd;
5869 dryrun_report @origs_cmd;
5875 midbuild_checkchanges_vanilla $wantsrc;
5877 if (!$clean_using_builder) {
5878 push @cmd, '--git-cleaner=true';
5882 maybe_unapply_patches_again();
5884 push @cmd, changesopts();
5885 runcmd_ordryrun_local @cmd, @ARGV;
5887 postbuild_mergechanges_vanilla $wantsrc;
5889 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5893 my $our_cleanmode = $cleanmode;
5894 if ($need_split_build_invocation) {
5895 # Pretend that clean is being done some other way. This
5896 # forces us not to try to use dpkg-buildpackage to clean and
5897 # build source all in one go; and instead we run dpkg-source
5898 # (and build_prep() will do the clean since $clean_using_builder
5900 $our_cleanmode = 'ELSEWHERE';
5902 if ($our_cleanmode =~ m/^dpkg-source/) {
5903 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5904 $clean_using_builder = 1;
5907 $sourcechanges = changespat $version,'source';
5909 unlink "../$sourcechanges" or $!==ENOENT
5910 or fail "remove $sourcechanges: $!";
5912 $dscfn = dscfn($version);
5913 if ($our_cleanmode eq 'dpkg-source') {
5914 maybe_apply_patches_dirtily();
5915 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5917 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5918 maybe_apply_patches_dirtily();
5919 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5922 my @cmd = (@dpkgsource, qw(-b --));
5925 runcmd_ordryrun_local @cmd, "work";
5926 my @udfiles = <${package}_*>;
5927 changedir "../../..";
5928 foreach my $f (@udfiles) {
5929 printdebug "source copy, found $f\n";
5932 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5933 $f eq srcfn($version, $&));
5934 printdebug "source copy, found $f - renaming\n";
5935 rename "$ud/$f", "../$f" or $!==ENOENT
5936 or fail "put in place new source file ($f): $!";
5939 my $pwd = must_getcwd();
5940 my $leafdir = basename $pwd;
5942 runcmd_ordryrun_local @cmd, $leafdir;
5945 runcmd_ordryrun_local qw(sh -ec),
5946 'exec >$1; shift; exec "$@"','x',
5947 "../$sourcechanges",
5948 @dpkggenchanges, qw(-S), changesopts();
5952 sub cmd_build_source {
5954 badusage "build-source takes no additional arguments" if @ARGV;
5956 maybe_unapply_patches_again();
5957 printdone "source built, results in $dscfn and $sourcechanges";
5962 midbuild_checkchanges();
5965 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5966 stat_exists $sourcechanges
5967 or fail "$sourcechanges (in parent directory): $!";
5969 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5971 maybe_unapply_patches_again();
5973 postbuild_mergechanges(<<END);
5974 perhaps you need to pass -A ? (sbuild's default is to build only
5975 arch-specific binaries; dgit 1.4 used to override that.)
5980 sub cmd_quilt_fixup {
5981 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5984 build_maybe_quilt_fixup();
5987 sub cmd_import_dsc {
5991 last unless $ARGV[0] =~ m/^-/;
5994 if (m/^--require-valid-signature$/) {
5997 badusage "unknown dgit import-dsc sub-option \`$_'";
6001 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6002 my ($dscfn, $dstbranch) = @ARGV;
6004 badusage "dry run makes no sense with import-dsc" unless act_local();
6006 my $force = $dstbranch =~ s/^\+// ? +1 :
6007 $dstbranch =~ s/^\.\.// ? -1 :
6009 my $info = $force ? " $&" : '';
6010 $info = "$dscfn$info";
6012 my $specbranch = $dstbranch;
6013 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6014 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6016 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6017 my $chead = cmdoutput_errok @symcmd;
6018 defined $chead or $?==256 or failedcmd @symcmd;
6020 fail "$dstbranch is checked out - will not update it"
6021 if defined $chead and $chead eq $dstbranch;
6023 my $oldhash = git_get_ref $dstbranch;
6025 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6026 $dscdata = do { local $/ = undef; <D>; };
6027 D->error and fail "read $dscfn: $!";
6030 # we don't normally need this so import it here
6031 use Dpkg::Source::Package;
6032 my $dp = new Dpkg::Source::Package filename => $dscfn,
6033 require_valid_signature => $needsig;
6035 local $SIG{__WARN__} = sub {
6037 return unless $needsig;
6038 fail "import-dsc signature check failed";
6040 if (!$dp->is_signed()) {
6041 warn "$us: warning: importing unsigned .dsc\n";
6043 my $r = $dp->check_signature();
6044 die "->check_signature => $r" if $needsig && $r;
6050 $package = getfield $dsc, 'Source';
6052 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6053 unless forceing [qw(import-dsc-with-dgit-field)];
6055 if (defined $dsc_hash) {
6056 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6057 resolve_dsc_field_commit undef, undef;
6059 if (defined $dsc_hash) {
6060 my @cmd = (qw(sh -ec),
6061 "echo $dsc_hash | git cat-file --batch-check");
6062 my $objgot = cmdoutput @cmd;
6063 if ($objgot =~ m#^\w+ missing\b#) {
6065 .dsc contains Dgit field referring to object $dsc_hash
6066 Your git tree does not have that object. Try `git fetch' from a
6067 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6070 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6072 progress "Not fast forward, forced update.";
6074 fail "Not fast forward to $dsc_hash";
6077 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
6078 $dstbranch, $dsc_hash);
6080 progress "dgit: import-dsc updated git ref $dstbranch";
6085 Branch $dstbranch already exists
6086 Specify ..$specbranch for a pseudo-merge, binding in existing history
6087 Specify +$specbranch to overwrite, discarding existing history
6089 if $oldhash && !$force;
6091 my @dfi = dsc_files_info();
6092 foreach my $fi (@dfi) {
6093 my $f = $fi->{Filename};
6095 next if lstat $here;
6096 fail "stat $here: $!" unless $! == ENOENT;
6098 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6100 } elsif ($dscfn =~ m#^/#) {
6103 fail "cannot import $dscfn which seems to be inside working tree!";
6105 $there =~ s#/+[^/]+$## or
6106 fail "cannot import $dscfn which seems to not have a basename";
6108 symlink $there, $here or fail "symlink $there to $here: $!";
6109 progress "made symlink $here -> $there";
6110 # print STDERR Dumper($fi);
6112 my @mergeinputs = generate_commits_from_dsc();
6113 die unless @mergeinputs == 1;
6115 my $newhash = $mergeinputs[0]{Commit};
6119 progress "Import, forced update - synthetic orphan git history.";
6120 } elsif ($force < 0) {
6121 progress "Import, merging.";
6122 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6123 my $version = getfield $dsc, 'Version';
6124 my $clogp = commit_getclogp $newhash;
6125 my $authline = clogp_authline $clogp;
6126 $newhash = make_commit_text <<END;
6133 Merge $package ($version) import into $dstbranch
6136 die; # caught earlier
6140 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
6141 $dstbranch, $newhash);
6143 progress "dgit: import-dsc results are in in git ref $dstbranch";
6146 sub cmd_archive_api_query {
6147 badusage "need only 1 subpath argument" unless @ARGV==1;
6148 my ($subpath) = @ARGV;
6149 my @cmd = archive_api_query_cmd($subpath);
6152 exec @cmd or fail "exec curl: $!\n";
6155 sub cmd_clone_dgit_repos_server {
6156 badusage "need destination argument" unless @ARGV==1;
6157 my ($destdir) = @ARGV;
6158 $package = '_dgit-repos-server';
6159 local $access_forpush = 0;
6160 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6162 exec @cmd or fail "exec git clone: $!\n";
6165 sub cmd_print_dgit_repos_server_source_url {
6166 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6168 $package = '_dgit-repos-server';
6169 local $access_forpush = 0;
6170 my $url = access_giturl();
6171 print $url, "\n" or die $!;
6174 sub cmd_setup_mergechangelogs {
6175 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6176 setup_mergechangelogs(1);
6179 sub cmd_setup_useremail {
6180 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6184 sub cmd_setup_new_tree {
6185 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6189 #---------- argument parsing and main program ----------
6192 print "dgit version $our_version\n" or die $!;
6196 our (%valopts_long, %valopts_short);
6199 sub defvalopt ($$$$) {
6200 my ($long,$short,$val_re,$how) = @_;
6201 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6202 $valopts_long{$long} = $oi;
6203 $valopts_short{$short} = $oi;
6204 # $how subref should:
6205 # do whatever assignemnt or thing it likes with $_[0]
6206 # if the option should not be passed on to remote, @rvalopts=()
6207 # or $how can be a scalar ref, meaning simply assign the value
6210 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6211 defvalopt '--distro', '-d', '.+', \$idistro;
6212 defvalopt '', '-k', '.+', \$keyid;
6213 defvalopt '--existing-package','', '.*', \$existing_package;
6214 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6215 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6216 defvalopt '--package', '-p', $package_re, \$package;
6217 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6219 defvalopt '', '-C', '.+', sub {
6220 ($changesfile) = (@_);
6221 if ($changesfile =~ s#^(.*)/##) {
6222 $buildproductsdir = $1;
6226 defvalopt '--initiator-tempdir','','.*', sub {
6227 ($initiator_tempdir) = (@_);
6228 $initiator_tempdir =~ m#^/# or
6229 badusage "--initiator-tempdir must be used specify an".
6230 " absolute, not relative, directory."
6236 if (defined $ENV{'DGIT_SSH'}) {
6237 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6238 } elsif (defined $ENV{'GIT_SSH'}) {
6239 @ssh = ($ENV{'GIT_SSH'});
6247 if (!defined $val) {
6248 badusage "$what needs a value" unless @ARGV;
6250 push @rvalopts, $val;
6252 badusage "bad value \`$val' for $what" unless
6253 $val =~ m/^$oi->{Re}$(?!\n)/s;
6254 my $how = $oi->{How};
6255 if (ref($how) eq 'SCALAR') {
6260 push @ropts, @rvalopts;
6264 last unless $ARGV[0] =~ m/^-/;
6268 if (m/^--dry-run$/) {
6271 } elsif (m/^--damp-run$/) {
6274 } elsif (m/^--no-sign$/) {
6277 } elsif (m/^--help$/) {
6279 } elsif (m/^--version$/) {
6281 } elsif (m/^--new$/) {
6284 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6285 ($om = $opts_opt_map{$1}) &&
6289 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6290 !$opts_opt_cmdonly{$1} &&
6291 ($om = $opts_opt_map{$1})) {
6294 } elsif (m/^--(gbp|dpm)$/s) {
6295 push @ropts, "--quilt=$1";
6297 } elsif (m/^--ignore-dirty$/s) {
6300 } elsif (m/^--no-quilt-fixup$/s) {
6302 $quilt_mode = 'nocheck';
6303 } elsif (m/^--no-rm-on-error$/s) {
6306 } elsif (m/^--no-chase-dsc-distro$/s) {
6308 $chase_dsc_distro = 0;
6309 } elsif (m/^--overwrite$/s) {
6311 $overwrite_version = '';
6312 } elsif (m/^--overwrite=(.+)$/s) {
6314 $overwrite_version = $1;
6315 } elsif (m/^--dep14tag$/s) {
6317 $dodep14tag= 'want';
6318 } elsif (m/^--no-dep14tag$/s) {
6321 } elsif (m/^--always-dep14tag$/s) {
6323 $dodep14tag= 'always';
6324 } elsif (m/^--delayed=(\d+)$/s) {
6327 } elsif (m/^--dgit-view-save=(.+)$/s) {
6329 $split_brain_save = $1;
6330 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6331 } elsif (m/^--(no-)?rm-old-changes$/s) {
6334 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6336 push @deliberatelies, $&;
6337 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6341 } elsif (m/^--force-/) {
6343 "$us: warning: ignoring unknown force option $_\n";
6345 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6346 # undocumented, for testing
6348 $tagformat_want = [ $1, 'command line', 1 ];
6349 # 1 menas overrides distro configuration
6350 } elsif (m/^--always-split-source-build$/s) {
6351 # undocumented, for testing
6353 $need_split_build_invocation = 1;
6354 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6355 # undocumented, for testing
6357 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6358 # ^ it's supposed to be an array ref
6359 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6360 $val = $2 ? $' : undef; #';
6361 $valopt->($oi->{Long});
6363 badusage "unknown long option \`$_'";
6370 } elsif (s/^-L/-/) {
6373 } elsif (s/^-h/-/) {
6375 } elsif (s/^-D/-/) {
6379 } elsif (s/^-N/-/) {
6384 push @changesopts, $_;
6386 } elsif (s/^-wn$//s) {
6388 $cleanmode = 'none';
6389 } elsif (s/^-wg$//s) {
6392 } elsif (s/^-wgf$//s) {
6394 $cleanmode = 'git-ff';
6395 } elsif (s/^-wd$//s) {
6397 $cleanmode = 'dpkg-source';
6398 } elsif (s/^-wdd$//s) {
6400 $cleanmode = 'dpkg-source-d';
6401 } elsif (s/^-wc$//s) {
6403 $cleanmode = 'check';
6404 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6405 push @git, '-c', $&;
6406 $gitcfgs{cmdline}{$1} = [ $2 ];
6407 } elsif (s/^-c([^=]+)$//s) {
6408 push @git, '-c', $&;
6409 $gitcfgs{cmdline}{$1} = [ 'true' ];
6410 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6412 $val = undef unless length $val;
6413 $valopt->($oi->{Short});
6416 badusage "unknown short option \`$_'";
6423 sub check_env_sanity () {
6424 my $blocked = new POSIX::SigSet;
6425 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6428 foreach my $name (qw(PIPE CHLD)) {
6429 my $signame = "SIG$name";
6430 my $signum = eval "POSIX::$signame" // die;
6431 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6432 die "$signame is set to something other than SIG_DFL\n";
6433 $blocked->ismember($signum) and
6434 die "$signame is blocked\n";
6440 On entry to dgit, $@
6441 This is a bug produced by something in in your execution environment.
6447 sub parseopts_late_defaults () {
6448 foreach my $k (keys %opts_opt_map) {
6449 my $om = $opts_opt_map{$k};
6451 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6453 badcfg "cannot set command for $k"
6454 unless length $om->[0];
6458 foreach my $c (access_cfg_cfgs("opts-$k")) {
6460 map { $_ ? @$_ : () }
6461 map { $gitcfgs{$_}{$c} }
6462 reverse @gitcfgsources;
6463 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6464 "\n" if $debuglevel >= 4;
6466 badcfg "cannot configure options for $k"
6467 if $opts_opt_cmdonly{$k};
6468 my $insertpos = $opts_cfg_insertpos{$k};
6469 @$om = ( @$om[0..$insertpos-1],
6471 @$om[$insertpos..$#$om] );
6475 if (!defined $rmchanges) {
6476 local $access_forpush;
6477 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6480 if (!defined $quilt_mode) {
6481 local $access_forpush;
6482 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6483 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6485 $quilt_mode =~ m/^($quilt_modes_re)$/
6486 or badcfg "unknown quilt-mode \`$quilt_mode'";
6490 if (!defined $dodep14tag) {
6491 local $access_forpush;
6492 $dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
6493 $dodep14tag =~ m/^($dodep14tag_re)$/
6494 or badcfg "unknown dep14tag setting \`$dodep14tag'";
6498 $need_split_build_invocation ||= quiltmode_splitbrain();
6500 if (!defined $cleanmode) {
6501 local $access_forpush;
6502 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6503 $cleanmode //= 'dpkg-source';
6505 badcfg "unknown clean-mode \`$cleanmode'" unless
6506 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6510 if ($ENV{$fakeeditorenv}) {
6512 quilt_fixup_editor();
6519 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6520 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6521 if $dryrun_level == 1;
6523 print STDERR $helpmsg or die $!;
6526 my $cmd = shift @ARGV;
6529 my $pre_fn = ${*::}{"pre_$cmd"};
6530 $pre_fn->() if $pre_fn;
6532 my $fn = ${*::}{"cmd_$cmd"};
6533 $fn or badusage "unknown operation $cmd";