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;
82 our %forceopts = map { $_=>0 }
83 qw(unrepresentable unsupported-source-format
84 dsc-changes-mismatch changes-origs-exactly
85 import-gitapply-absurd
86 import-gitapply-no-absurd
87 import-dsc-with-dgit-field);
89 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
91 our $suite_re = '[-+.0-9a-z]+';
92 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
93 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
94 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
95 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
97 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
98 our $splitbraincache = 'dgit-intern/quilt-cache';
99 our $rewritemap = 'dgit-rewrite/map';
101 our (@git) = qw(git);
102 our (@dget) = qw(dget);
103 our (@curl) = qw(curl);
104 our (@dput) = qw(dput);
105 our (@debsign) = qw(debsign);
106 our (@gpg) = qw(gpg);
107 our (@sbuild) = qw(sbuild);
109 our (@dgit) = qw(dgit);
110 our (@aptget) = qw(apt-get);
111 our (@aptcache) = qw(apt-cache);
112 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
113 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
114 our (@dpkggenchanges) = qw(dpkg-genchanges);
115 our (@mergechanges) = qw(mergechanges -f);
116 our (@gbp_build) = ('');
117 our (@gbp_pq) = ('gbp pq');
118 our (@changesopts) = ('');
120 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
123 'debsign' => \@debsign,
125 'sbuild' => \@sbuild,
129 'apt-get' => \@aptget,
130 'apt-cache' => \@aptcache,
131 'dpkg-source' => \@dpkgsource,
132 'dpkg-buildpackage' => \@dpkgbuildpackage,
133 'dpkg-genchanges' => \@dpkggenchanges,
134 'gbp-build' => \@gbp_build,
135 'gbp-pq' => \@gbp_pq,
136 'ch' => \@changesopts,
137 'mergechanges' => \@mergechanges);
139 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
140 our %opts_cfg_insertpos = map {
142 scalar @{ $opts_opt_map{$_} }
143 } keys %opts_opt_map;
145 sub parseopts_late_defaults();
151 our $supplementary_message = '';
152 our $need_split_build_invocation = 0;
153 our $split_brain = 0;
157 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
160 our $remotename = 'dgit';
161 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
165 if (!defined $absurdity) {
167 $absurdity =~ s{/[^/]+$}{/absurd} or die;
171 my ($v,$distro) = @_;
172 return $tagformatfn->($v, $distro);
175 sub debiantag_maintview ($$) {
176 my ($v,$distro) = @_;
177 return "$distro/".dep14_version_mangle $v;
180 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
182 sub lbranch () { return "$branchprefix/$csuite"; }
183 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
184 sub lref () { return "refs/heads/".lbranch(); }
185 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
186 sub rrref () { return server_ref($csuite); }
196 return "${package}_".(stripepoch $vsn).$sfx
201 return srcfn($vsn,".dsc");
204 sub changespat ($;$) {
205 my ($vsn, $arch) = @_;
206 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
209 sub upstreamversion ($) {
221 foreach my $f (@end) {
223 print STDERR "$us: cleanup: $@" if length $@;
227 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
229 sub forceable_fail ($$) {
230 my ($forceoptsl, $msg) = @_;
231 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
232 print STDERR "warning: overriding problem due to --force:\n". $msg;
236 my ($forceoptsl) = @_;
237 my @got = grep { $forceopts{$_} } @$forceoptsl;
238 return 0 unless @got;
240 "warning: skipping checks or functionality due to --force-$got[0]\n";
243 sub no_such_package () {
244 print STDERR "$us: package $package does not exist in suite $isuite\n";
250 printdebug "CD $newdir\n";
251 chdir $newdir or confess "chdir: $newdir: $!";
254 sub deliberately ($) {
256 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
259 sub deliberately_not_fast_forward () {
260 foreach (qw(not-fast-forward fresh-repo)) {
261 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
265 sub quiltmode_splitbrain () {
266 $quilt_mode =~ m/gbp|dpm|unapplied/;
269 sub opts_opt_multi_cmd {
271 push @cmd, split /\s+/, shift @_;
277 return opts_opt_multi_cmd @gbp_pq;
280 #---------- remote protocol support, common ----------
282 # remote push initiator/responder protocol:
283 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
284 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
285 # < dgit-remote-push-ready <actual-proto-vsn>
292 # > supplementary-message NBYTES # $protovsn >= 3
297 # > file parsed-changelog
298 # [indicates that output of dpkg-parsechangelog follows]
299 # > data-block NBYTES
300 # > [NBYTES bytes of data (no newline)]
301 # [maybe some more blocks]
310 # > param head DGIT-VIEW-HEAD
311 # > param csuite SUITE
312 # > param tagformat old|new
313 # > param maint-view MAINT-VIEW-HEAD
315 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
316 # # goes into tag, for replay prevention
319 # [indicates that signed tag is wanted]
320 # < data-block NBYTES
321 # < [NBYTES bytes of data (no newline)]
322 # [maybe some more blocks]
326 # > want signed-dsc-changes
327 # < data-block NBYTES [transfer of signed dsc]
329 # < data-block NBYTES [transfer of signed changes]
337 sub i_child_report () {
338 # Sees if our child has died, and reap it if so. Returns a string
339 # describing how it died if it failed, or undef otherwise.
340 return undef unless $i_child_pid;
341 my $got = waitpid $i_child_pid, WNOHANG;
342 return undef if $got <= 0;
343 die unless $got == $i_child_pid;
344 $i_child_pid = undef;
345 return undef unless $?;
346 return "build host child ".waitstatusmsg();
351 fail "connection lost: $!" if $fh->error;
352 fail "protocol violation; $m not expected";
355 sub badproto_badread ($$) {
357 fail "connection lost: $!" if $!;
358 my $report = i_child_report();
359 fail $report if defined $report;
360 badproto $fh, "eof (reading $wh)";
363 sub protocol_expect (&$) {
364 my ($match, $fh) = @_;
367 defined && chomp or badproto_badread $fh, "protocol message";
375 badproto $fh, "\`$_'";
378 sub protocol_send_file ($$) {
379 my ($fh, $ourfn) = @_;
380 open PF, "<", $ourfn or die "$ourfn: $!";
383 my $got = read PF, $d, 65536;
384 die "$ourfn: $!" unless defined $got;
386 print $fh "data-block ".length($d)."\n" or die $!;
387 print $fh $d or die $!;
389 PF->error and die "$ourfn $!";
390 print $fh "data-end\n" or die $!;
394 sub protocol_read_bytes ($$) {
395 my ($fh, $nbytes) = @_;
396 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
398 my $got = read $fh, $d, $nbytes;
399 $got==$nbytes or badproto_badread $fh, "data block";
403 sub protocol_receive_file ($$) {
404 my ($fh, $ourfn) = @_;
405 printdebug "() $ourfn\n";
406 open PF, ">", $ourfn or die "$ourfn: $!";
408 my ($y,$l) = protocol_expect {
409 m/^data-block (.*)$/ ? (1,$1) :
410 m/^data-end$/ ? (0,) :
414 my $d = protocol_read_bytes $fh, $l;
415 print PF $d or die $!;
420 #---------- remote protocol support, responder ----------
422 sub responder_send_command ($) {
424 return unless $we_are_responder;
425 # called even without $we_are_responder
426 printdebug ">> $command\n";
427 print PO $command, "\n" or die $!;
430 sub responder_send_file ($$) {
431 my ($keyword, $ourfn) = @_;
432 return unless $we_are_responder;
433 printdebug "]] $keyword $ourfn\n";
434 responder_send_command "file $keyword";
435 protocol_send_file \*PO, $ourfn;
438 sub responder_receive_files ($@) {
439 my ($keyword, @ourfns) = @_;
440 die unless $we_are_responder;
441 printdebug "[[ $keyword @ourfns\n";
442 responder_send_command "want $keyword";
443 foreach my $fn (@ourfns) {
444 protocol_receive_file \*PI, $fn;
447 protocol_expect { m/^files-end$/ } \*PI;
450 #---------- remote protocol support, initiator ----------
452 sub initiator_expect (&) {
454 protocol_expect { &$match } \*RO;
457 #---------- end remote code ----------
460 if ($we_are_responder) {
462 responder_send_command "progress ".length($m) or die $!;
463 print PO $m or die $!;
473 $ua = LWP::UserAgent->new();
477 progress "downloading $what...";
478 my $r = $ua->get(@_) or die $!;
479 return undef if $r->code == 404;
480 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
481 return $r->decoded_content(charset => 'none');
484 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
489 failedcmd @_ if system @_;
492 sub act_local () { return $dryrun_level <= 1; }
493 sub act_scary () { return !$dryrun_level; }
496 if (!$dryrun_level) {
497 progress "$us ok: @_";
499 progress "would be ok: @_ (but dry run only)";
504 printcmd(\*STDERR,$debugprefix."#",@_);
507 sub runcmd_ordryrun {
515 sub runcmd_ordryrun_local {
524 my ($first_shell, @cmd) = @_;
525 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
528 our $helpmsg = <<END;
530 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
531 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
532 dgit [dgit-opts] build [dpkg-buildpackage-opts]
533 dgit [dgit-opts] sbuild [sbuild-opts]
534 dgit [dgit-opts] push [dgit-opts] [suite]
535 dgit [dgit-opts] rpush build-host:build-dir ...
536 important dgit options:
537 -k<keyid> sign tag and package with <keyid> instead of default
538 --dry-run -n do not change anything, but go through the motions
539 --damp-run -L like --dry-run but make local changes, without signing
540 --new -N allow introducing a new package
541 --debug -D increase debug level
542 -c<name>=<value> set git config option (used directly by dgit too)
545 our $later_warning_msg = <<END;
546 Perhaps the upload is stuck in incoming. Using the version from git.
550 print STDERR "$us: @_\n", $helpmsg or die $!;
555 @ARGV or badusage "too few arguments";
556 return scalar shift @ARGV;
560 print $helpmsg or die $!;
564 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
566 our %defcfg = ('dgit.default.distro' => 'debian',
567 'dgit-suite.*-security.distro' => 'debian-security',
568 'dgit.default.username' => '',
569 'dgit.default.archive-query-default-component' => 'main',
570 'dgit.default.ssh' => 'ssh',
571 'dgit.default.archive-query' => 'madison:',
572 'dgit.default.sshpsql-dbname' => 'service=projectb',
573 'dgit.default.aptget-components' => 'main',
574 'dgit.default.dgit-tag-format' => 'new,old,maint',
575 # old means "repo server accepts pushes with old dgit tags"
576 # new means "repo server accepts pushes with new dgit tags"
577 # maint means "repo server accepts split brain pushes"
578 # hist means "repo server may have old pushes without new tag"
579 # ("hist" is implied by "old")
580 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
581 'dgit-distro.debian.git-check' => 'url',
582 'dgit-distro.debian.git-check-suffix' => '/info/refs',
583 'dgit-distro.debian.new-private-pushers' => 't',
584 'dgit-distro.debian/push.git-url' => '',
585 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
586 'dgit-distro.debian/push.git-user-force' => 'dgit',
587 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
588 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
589 'dgit-distro.debian/push.git-create' => 'true',
590 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
591 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
592 # 'dgit-distro.debian.archive-query-tls-key',
593 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
594 # ^ this does not work because curl is broken nowadays
595 # Fixing #790093 properly will involve providing providing the key
596 # in some pacagke and maybe updating these paths.
598 # 'dgit-distro.debian.archive-query-tls-curl-args',
599 # '--ca-path=/etc/ssl/ca-debian',
600 # ^ this is a workaround but works (only) on DSA-administered machines
601 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
602 'dgit-distro.debian.git-url-suffix' => '',
603 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
604 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
605 'dgit-distro.debian-security.archive-query' => 'aptget:',
606 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
607 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
608 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
609 'dgit-distro.debian-security.nominal-distro' => 'debian',
610 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
611 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
612 'dgit-distro.ubuntu.git-check' => 'false',
613 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
614 'dgit-distro.test-dummy.ssh' => "$td/ssh",
615 'dgit-distro.test-dummy.username' => "alice",
616 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
617 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
618 'dgit-distro.test-dummy.git-url' => "$td/git",
619 'dgit-distro.test-dummy.git-host' => "git",
620 'dgit-distro.test-dummy.git-path' => "$td/git",
621 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
622 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
623 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
624 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
628 our @gitcfgsources = qw(cmdline local global system);
630 sub git_slurp_config () {
631 local ($debuglevel) = $debuglevel-2;
634 # This algoritm is a bit subtle, but this is needed so that for
635 # options which we want to be single-valued, we allow the
636 # different config sources to override properly. See #835858.
637 foreach my $src (@gitcfgsources) {
638 next if $src eq 'cmdline';
639 # we do this ourselves since git doesn't handle it
641 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
644 open GITS, "-|", @cmd or die $!;
647 printdebug "=> ", (messagequote $_), "\n";
649 push @{ $gitcfgs{$src}{$`} }, $'; #';
653 or ($!==0 && $?==256)
658 sub git_get_config ($) {
660 foreach my $src (@gitcfgsources) {
661 my $l = $gitcfgs{$src}{$c};
662 printdebug"C $c ".(defined $l ?
663 join " ", map { messagequote "'$_'" } @$l :
667 @$l==1 or badcfg "multiple values for $c".
668 " (in $src git config)" if @$l > 1;
676 return undef if $c =~ /RETURN-UNDEF/;
677 my $v = git_get_config($c);
678 return $v if defined $v;
679 my $dv = $defcfg{$c};
681 printdebug "CD $c $dv\n" if $debuglevel >= 4;
685 badcfg "need value for one of: @_\n".
686 "$us: distro or suite appears not to be (properly) supported";
689 sub access_basedistro () {
690 if (defined $idistro) {
693 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
694 return $def if defined $def;
695 foreach my $src (@gitcfgsources, 'internal') {
696 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
698 foreach my $k (keys %$kl) {
699 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
701 next unless match_glob $dpat, $isuite;
705 return cfg("dgit.default.distro");
709 sub access_nomdistro () {
710 my $base = access_basedistro();
711 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
712 $r =~ m/^$distro_re$/ or badcfg
713 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
717 sub access_quirk () {
718 # returns (quirk name, distro to use instead or undef, quirk-specific info)
719 my $basedistro = access_basedistro();
720 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
722 if (defined $backports_quirk) {
723 my $re = $backports_quirk;
724 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
726 $re =~ s/\%/([-0-9a-z_]+)/
727 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
728 if ($isuite =~ m/^$re$/) {
729 return ('backports',"$basedistro-backports",$1);
732 return ('none',undef);
737 sub parse_cfg_bool ($$$) {
738 my ($what,$def,$v) = @_;
741 $v =~ m/^[ty1]/ ? 1 :
742 $v =~ m/^[fn0]/ ? 0 :
743 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
746 sub access_forpush_config () {
747 my $d = access_basedistro();
751 parse_cfg_bool('new-private-pushers', 0,
752 cfg("dgit-distro.$d.new-private-pushers",
755 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
758 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
759 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
760 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
761 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
764 sub access_forpush () {
765 $access_forpush //= access_forpush_config();
766 return $access_forpush;
770 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
771 badcfg "pushing but distro is configured readonly"
772 if access_forpush_config() eq '0';
774 $supplementary_message = <<'END' unless $we_are_responder;
775 Push failed, before we got started.
776 You can retry the push, after fixing the problem, if you like.
778 parseopts_late_defaults();
782 parseopts_late_defaults();
785 sub supplementary_message ($) {
787 if (!$we_are_responder) {
788 $supplementary_message = $msg;
790 } elsif ($protovsn >= 3) {
791 responder_send_command "supplementary-message ".length($msg)
793 print PO $msg or die $!;
797 sub access_distros () {
798 # Returns list of distros to try, in order
801 # 0. `instead of' distro name(s) we have been pointed to
802 # 1. the access_quirk distro, if any
803 # 2a. the user's specified distro, or failing that } basedistro
804 # 2b. the distro calculated from the suite }
805 my @l = access_basedistro();
807 my (undef,$quirkdistro) = access_quirk();
808 unshift @l, $quirkdistro;
809 unshift @l, $instead_distro;
810 @l = grep { defined } @l;
812 push @l, access_nomdistro();
814 if (access_forpush()) {
815 @l = map { ("$_/push", $_) } @l;
820 sub access_cfg_cfgs (@) {
823 # The nesting of these loops determines the search order. We put
824 # the key loop on the outside so that we search all the distros
825 # for each key, before going on to the next key. That means that
826 # if access_cfg is called with a more specific, and then a less
827 # specific, key, an earlier distro can override the less specific
828 # without necessarily overriding any more specific keys. (If the
829 # distro wants to override the more specific keys it can simply do
830 # so; whereas if we did the loop the other way around, it would be
831 # impossible to for an earlier distro to override a less specific
832 # key but not the more specific ones without restating the unknown
833 # values of the more specific keys.
836 # We have to deal with RETURN-UNDEF specially, so that we don't
837 # terminate the search prematurely.
839 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
842 foreach my $d (access_distros()) {
843 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
845 push @cfgs, map { "dgit.default.$_" } @realkeys;
852 my (@cfgs) = access_cfg_cfgs(@keys);
853 my $value = cfg(@cfgs);
857 sub access_cfg_bool ($$) {
858 my ($def, @keys) = @_;
859 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
862 sub string_to_ssh ($) {
864 if ($spec =~ m/\s/) {
865 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
871 sub access_cfg_ssh () {
872 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
873 if (!defined $gitssh) {
876 return string_to_ssh $gitssh;
880 sub access_runeinfo ($) {
882 return ": dgit ".access_basedistro()." $info ;";
885 sub access_someuserhost ($) {
887 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
888 defined($user) && length($user) or
889 $user = access_cfg("$some-user",'username');
890 my $host = access_cfg("$some-host");
891 return length($user) ? "$user\@$host" : $host;
894 sub access_gituserhost () {
895 return access_someuserhost('git');
898 sub access_giturl (;$) {
900 my $url = access_cfg('git-url','RETURN-UNDEF');
903 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
904 return undef unless defined $proto;
907 access_gituserhost().
908 access_cfg('git-path');
910 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
913 return "$url/$package$suffix";
916 sub parsecontrolfh ($$;$) {
917 my ($fh, $desc, $allowsigned) = @_;
918 our $dpkgcontrolhash_noissigned;
921 my %opts = ('name' => $desc);
922 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
923 $c = Dpkg::Control::Hash->new(%opts);
924 $c->parse($fh,$desc) or die "parsing of $desc failed";
925 last if $allowsigned;
926 last if $dpkgcontrolhash_noissigned;
927 my $issigned= $c->get_option('is_pgp_signed');
928 if (!defined $issigned) {
929 $dpkgcontrolhash_noissigned= 1;
930 seek $fh, 0,0 or die "seek $desc: $!";
931 } elsif ($issigned) {
932 fail "control file $desc is (already) PGP-signed. ".
933 " Note that dgit push needs to modify the .dsc and then".
934 " do the signature itself";
943 my ($file, $desc, $allowsigned) = @_;
944 my $fh = new IO::Handle;
945 open $fh, '<', $file or die "$file: $!";
946 my $c = parsecontrolfh($fh,$desc,$allowsigned);
947 $fh->error and die $!;
953 my ($dctrl,$field) = @_;
954 my $v = $dctrl->{$field};
955 return $v if defined $v;
956 fail "missing field $field in ".$dctrl->get_option('name');
960 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
961 my $p = new IO::Handle;
962 my @cmd = (qw(dpkg-parsechangelog), @_);
963 open $p, '-|', @cmd or die $!;
965 $?=0; $!=0; close $p or failedcmd @cmd;
969 sub commit_getclogp ($) {
970 # Returns the parsed changelog hashref for a particular commit
972 our %commit_getclogp_memo;
973 my $memo = $commit_getclogp_memo{$objid};
974 return $memo if $memo;
976 my $mclog = ".git/dgit/clog-$objid";
977 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
978 "$objid:debian/changelog";
979 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
984 defined $d or fail "getcwd failed: $!";
988 sub parse_dscdata () {
989 my $dscfh = new IO::File \$dscdata, '<' or die $!;
990 printdebug Dumper($dscdata) if $debuglevel>1;
991 $dsc = parsecontrolfh($dscfh,$dscurl,1);
992 printdebug Dumper($dsc) if $debuglevel>1;
997 sub archive_query ($;@) {
998 my ($method) = shift @_;
999 fail "this operation does not support multiple comma-separated suites"
1001 my $query = access_cfg('archive-query','RETURN-UNDEF');
1002 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1005 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1008 sub archive_query_prepend_mirror {
1009 my $m = access_cfg('mirror');
1010 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1013 sub pool_dsc_subpath ($$) {
1014 my ($vsn,$component) = @_; # $package is implict arg
1015 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1016 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1019 sub cfg_apply_map ($$$) {
1020 my ($varref, $what, $mapspec) = @_;
1021 return unless $mapspec;
1023 printdebug "config $what EVAL{ $mapspec; }\n";
1025 eval "package Dgit::Config; $mapspec;";
1030 #---------- `ftpmasterapi' archive query method (nascent) ----------
1032 sub archive_api_query_cmd ($) {
1034 my @cmd = (@curl, qw(-sS));
1035 my $url = access_cfg('archive-query-url');
1036 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1038 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1039 foreach my $key (split /\:/, $keys) {
1040 $key =~ s/\%HOST\%/$host/g;
1042 fail "for $url: stat $key: $!" unless $!==ENOENT;
1045 fail "config requested specific TLS key but do not know".
1046 " how to get curl to use exactly that EE key ($key)";
1047 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1048 # # Sadly the above line does not work because of changes
1049 # # to gnutls. The real fix for #790093 may involve
1050 # # new curl options.
1053 # Fixing #790093 properly will involve providing a value
1054 # for this on clients.
1055 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1056 push @cmd, split / /, $kargs if defined $kargs;
1058 push @cmd, $url.$subpath;
1062 sub api_query ($$;$) {
1064 my ($data, $subpath, $ok404) = @_;
1065 badcfg "ftpmasterapi archive query method takes no data part"
1067 my @cmd = archive_api_query_cmd($subpath);
1068 my $url = $cmd[$#cmd];
1069 push @cmd, qw(-w %{http_code});
1070 my $json = cmdoutput @cmd;
1071 unless ($json =~ s/\d+\d+\d$//) {
1072 failedcmd_report_cmd undef, @cmd;
1073 fail "curl failed to print 3-digit HTTP code";
1076 return undef if $code eq '404' && $ok404;
1077 fail "fetch of $url gave HTTP code $code"
1078 unless $url =~ m#^file://# or $code =~ m/^2/;
1079 return decode_json($json);
1082 sub canonicalise_suite_ftpmasterapi {
1083 my ($proto,$data) = @_;
1084 my $suites = api_query($data, 'suites');
1086 foreach my $entry (@$suites) {
1088 my $v = $entry->{$_};
1089 defined $v && $v eq $isuite;
1090 } qw(codename name);
1091 push @matched, $entry;
1093 fail "unknown suite $isuite" unless @matched;
1096 @matched==1 or die "multiple matches for suite $isuite\n";
1097 $cn = "$matched[0]{codename}";
1098 defined $cn or die "suite $isuite info has no codename\n";
1099 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1101 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1106 sub archive_query_ftpmasterapi {
1107 my ($proto,$data) = @_;
1108 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1110 my $digester = Digest::SHA->new(256);
1111 foreach my $entry (@$info) {
1113 my $vsn = "$entry->{version}";
1114 my ($ok,$msg) = version_check $vsn;
1115 die "bad version: $msg\n" unless $ok;
1116 my $component = "$entry->{component}";
1117 $component =~ m/^$component_re$/ or die "bad component";
1118 my $filename = "$entry->{filename}";
1119 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1120 or die "bad filename";
1121 my $sha256sum = "$entry->{sha256sum}";
1122 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1123 push @rows, [ $vsn, "/pool/$component/$filename",
1124 $digester, $sha256sum ];
1126 die "bad ftpmaster api response: $@\n".Dumper($entry)
1129 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1130 return archive_query_prepend_mirror @rows;
1133 sub file_in_archive_ftpmasterapi {
1134 my ($proto,$data,$filename) = @_;
1135 my $pat = $filename;
1138 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1139 my $info = api_query($data, "file_in_archive/$pat", 1);
1142 #---------- `aptget' archive query method ----------
1145 our $aptget_releasefile;
1146 our $aptget_configpath;
1148 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1149 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1151 sub aptget_cache_clean {
1152 runcmd_ordryrun_local qw(sh -ec),
1153 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1157 sub aptget_lock_acquire () {
1158 my $lockfile = "$aptget_base/lock";
1159 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1160 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1163 sub aptget_prep ($) {
1165 return if defined $aptget_base;
1167 badcfg "aptget archive query method takes no data part"
1170 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1173 ensuredir "$cache/dgit";
1175 access_cfg('aptget-cachekey','RETURN-UNDEF')
1176 // access_nomdistro();
1178 $aptget_base = "$cache/dgit/aptget";
1179 ensuredir $aptget_base;
1181 my $quoted_base = $aptget_base;
1182 die "$quoted_base contains bad chars, cannot continue"
1183 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1185 ensuredir $aptget_base;
1187 aptget_lock_acquire();
1189 aptget_cache_clean();
1191 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1192 my $sourceslist = "source.list#$cachekey";
1194 my $aptsuites = $isuite;
1195 cfg_apply_map(\$aptsuites, 'suite map',
1196 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1198 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1199 printf SRCS "deb-src %s %s %s\n",
1200 access_cfg('mirror'),
1202 access_cfg('aptget-components')
1205 ensuredir "$aptget_base/cache";
1206 ensuredir "$aptget_base/lists";
1208 open CONF, ">", $aptget_configpath or die $!;
1210 Debug::NoLocking "true";
1211 APT::Get::List-Cleanup "false";
1212 #clear APT::Update::Post-Invoke-Success;
1213 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1214 Dir::State::Lists "$quoted_base/lists";
1215 Dir::Etc::preferences "$quoted_base/preferences";
1216 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1217 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1220 foreach my $key (qw(
1223 Dir::Cache::Archives
1224 Dir::Etc::SourceParts
1225 Dir::Etc::preferencesparts
1227 ensuredir "$aptget_base/$key";
1228 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1231 my $oldatime = (time // die $!) - 1;
1232 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1233 next unless stat_exists $oldlist;
1234 my ($mtime) = (stat _)[9];
1235 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1238 runcmd_ordryrun_local aptget_aptget(), qw(update);
1241 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1242 next unless stat_exists $oldlist;
1243 my ($atime) = (stat _)[8];
1244 next if $atime == $oldatime;
1245 push @releasefiles, $oldlist;
1247 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1248 @releasefiles = @inreleasefiles if @inreleasefiles;
1249 die "apt updated wrong number of Release files (@releasefiles), erk"
1250 unless @releasefiles == 1;
1252 ($aptget_releasefile) = @releasefiles;
1255 sub canonicalise_suite_aptget {
1256 my ($proto,$data) = @_;
1259 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1261 foreach my $name (qw(Codename Suite)) {
1262 my $val = $release->{$name};
1264 printdebug "release file $name: $val\n";
1265 $val =~ m/^$suite_re$/o or fail
1266 "Release file ($aptget_releasefile) specifies intolerable $name";
1267 cfg_apply_map(\$val, 'suite rmap',
1268 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1275 sub archive_query_aptget {
1276 my ($proto,$data) = @_;
1279 ensuredir "$aptget_base/source";
1280 foreach my $old (<$aptget_base/source/*.dsc>) {
1281 unlink $old or die "$old: $!";
1284 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1285 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1286 # avoids apt-get source failing with ambiguous error code
1288 runcmd_ordryrun_local
1289 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1290 aptget_aptget(), qw(--download-only --only-source source), $package;
1292 my @dscs = <$aptget_base/source/*.dsc>;
1293 fail "apt-get source did not produce a .dsc" unless @dscs;
1294 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1296 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1299 my $uri = "file://". uri_escape $dscs[0];
1300 $uri =~ s{\%2f}{/}gi;
1301 return [ (getfield $pre_dsc, 'Version'), $uri ];
1304 #---------- `dummyapicat' archive query method ----------
1306 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1307 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1309 sub file_in_archive_dummycatapi ($$$) {
1310 my ($proto,$data,$filename) = @_;
1311 my $mirror = access_cfg('mirror');
1312 $mirror =~ s#^file://#/# or die "$mirror ?";
1314 my @cmd = (qw(sh -ec), '
1316 find -name "$2" -print0 |
1318 ', qw(x), $mirror, $filename);
1319 debugcmd "-|", @cmd;
1320 open FIA, "-|", @cmd or die $!;
1323 printdebug "| $_\n";
1324 m/^(\w+) (\S+)$/ or die "$_ ?";
1325 push @out, { sha256sum => $1, filename => $2 };
1327 close FIA or die failedcmd @cmd;
1331 #---------- `madison' archive query method ----------
1333 sub archive_query_madison {
1334 return archive_query_prepend_mirror
1335 map { [ @$_[0..1] ] } madison_get_parse(@_);
1338 sub madison_get_parse {
1339 my ($proto,$data) = @_;
1340 die unless $proto eq 'madison';
1341 if (!length $data) {
1342 $data= access_cfg('madison-distro','RETURN-UNDEF');
1343 $data //= access_basedistro();
1345 $rmad{$proto,$data,$package} ||= cmdoutput
1346 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1347 my $rmad = $rmad{$proto,$data,$package};
1350 foreach my $l (split /\n/, $rmad) {
1351 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1352 \s*( [^ \t|]+ )\s* \|
1353 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1354 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1355 $1 eq $package or die "$rmad $package ?";
1362 $component = access_cfg('archive-query-default-component');
1364 $5 eq 'source' or die "$rmad ?";
1365 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1367 return sort { -version_compare($a->[0],$b->[0]); } @out;
1370 sub canonicalise_suite_madison {
1371 # madison canonicalises for us
1372 my @r = madison_get_parse(@_);
1374 "unable to canonicalise suite using package $package".
1375 " which does not appear to exist in suite $isuite;".
1376 " --existing-package may help";
1380 sub file_in_archive_madison { return undef; }
1382 #---------- `sshpsql' archive query method ----------
1385 my ($data,$runeinfo,$sql) = @_;
1386 if (!length $data) {
1387 $data= access_someuserhost('sshpsql').':'.
1388 access_cfg('sshpsql-dbname');
1390 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1391 my ($userhost,$dbname) = ($`,$'); #';
1393 my @cmd = (access_cfg_ssh, $userhost,
1394 access_runeinfo("ssh-psql $runeinfo").
1395 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1396 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1398 open P, "-|", @cmd or die $!;
1401 printdebug(">|$_|\n");
1404 $!=0; $?=0; close P or failedcmd @cmd;
1406 my $nrows = pop @rows;
1407 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1408 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1409 @rows = map { [ split /\|/, $_ ] } @rows;
1410 my $ncols = scalar @{ shift @rows };
1411 die if grep { scalar @$_ != $ncols } @rows;
1415 sub sql_injection_check {
1416 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1419 sub archive_query_sshpsql ($$) {
1420 my ($proto,$data) = @_;
1421 sql_injection_check $isuite, $package;
1422 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1423 SELECT source.version, component.name, files.filename, files.sha256sum
1425 JOIN src_associations ON source.id = src_associations.source
1426 JOIN suite ON suite.id = src_associations.suite
1427 JOIN dsc_files ON dsc_files.source = source.id
1428 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1429 JOIN component ON component.id = files_archive_map.component_id
1430 JOIN files ON files.id = dsc_files.file
1431 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1432 AND source.source='$package'
1433 AND files.filename LIKE '%.dsc';
1435 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1436 my $digester = Digest::SHA->new(256);
1438 my ($vsn,$component,$filename,$sha256sum) = @$_;
1439 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1441 return archive_query_prepend_mirror @rows;
1444 sub canonicalise_suite_sshpsql ($$) {
1445 my ($proto,$data) = @_;
1446 sql_injection_check $isuite;
1447 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1448 SELECT suite.codename
1449 FROM suite where suite_name='$isuite' or codename='$isuite';
1451 @rows = map { $_->[0] } @rows;
1452 fail "unknown suite $isuite" unless @rows;
1453 die "ambiguous $isuite: @rows ?" if @rows>1;
1457 sub file_in_archive_sshpsql ($$$) { return undef; }
1459 #---------- `dummycat' archive query method ----------
1461 sub canonicalise_suite_dummycat ($$) {
1462 my ($proto,$data) = @_;
1463 my $dpath = "$data/suite.$isuite";
1464 if (!open C, "<", $dpath) {
1465 $!==ENOENT or die "$dpath: $!";
1466 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1470 chomp or die "$dpath: $!";
1472 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1476 sub archive_query_dummycat ($$) {
1477 my ($proto,$data) = @_;
1478 canonicalise_suite();
1479 my $dpath = "$data/package.$csuite.$package";
1480 if (!open C, "<", $dpath) {
1481 $!==ENOENT or die "$dpath: $!";
1482 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1490 printdebug "dummycat query $csuite $package $dpath | $_\n";
1491 my @row = split /\s+/, $_;
1492 @row==2 or die "$dpath: $_ ?";
1495 C->error and die "$dpath: $!";
1497 return archive_query_prepend_mirror
1498 sort { -version_compare($a->[0],$b->[0]); } @rows;
1501 sub file_in_archive_dummycat () { return undef; }
1503 #---------- tag format handling ----------
1505 sub access_cfg_tagformats () {
1506 split /\,/, access_cfg('dgit-tag-format');
1509 sub access_cfg_tagformats_can_splitbrain () {
1510 my %y = map { $_ => 1 } access_cfg_tagformats;
1511 foreach my $needtf (qw(new maint)) {
1512 next if $y{$needtf};
1518 sub need_tagformat ($$) {
1519 my ($fmt, $why) = @_;
1520 fail "need to use tag format $fmt ($why) but also need".
1521 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1522 " - no way to proceed"
1523 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1524 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1527 sub select_tagformat () {
1529 return if $tagformatfn && !$tagformat_want;
1530 die 'bug' if $tagformatfn && $tagformat_want;
1531 # ... $tagformat_want assigned after previous select_tagformat
1533 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1534 printdebug "select_tagformat supported @supported\n";
1536 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1537 printdebug "select_tagformat specified @$tagformat_want\n";
1539 my ($fmt,$why,$override) = @$tagformat_want;
1541 fail "target distro supports tag formats @supported".
1542 " but have to use $fmt ($why)"
1544 or grep { $_ eq $fmt } @supported;
1546 $tagformat_want = undef;
1548 $tagformatfn = ${*::}{"debiantag_$fmt"};
1550 fail "trying to use unknown tag format \`$fmt' ($why) !"
1551 unless $tagformatfn;
1554 #---------- archive query entrypoints and rest of program ----------
1556 sub canonicalise_suite () {
1557 return if defined $csuite;
1558 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1559 $csuite = archive_query('canonicalise_suite');
1560 if ($isuite ne $csuite) {
1561 progress "canonical suite name for $isuite is $csuite";
1563 progress "canonical suite name is $csuite";
1567 sub get_archive_dsc () {
1568 canonicalise_suite();
1569 my @vsns = archive_query('archive_query');
1570 foreach my $vinfo (@vsns) {
1571 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1572 $dscurl = $vsn_dscurl;
1573 $dscdata = url_get($dscurl);
1575 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1580 $digester->add($dscdata);
1581 my $got = $digester->hexdigest();
1583 fail "$dscurl has hash $got but".
1584 " archive told us to expect $digest";
1587 my $fmt = getfield $dsc, 'Format';
1588 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1589 "unsupported source format $fmt, sorry";
1591 $dsc_checked = !!$digester;
1592 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1596 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1599 sub check_for_git ();
1600 sub check_for_git () {
1602 my $how = access_cfg('git-check');
1603 if ($how eq 'ssh-cmd') {
1605 (access_cfg_ssh, access_gituserhost(),
1606 access_runeinfo("git-check $package").
1607 " set -e; cd ".access_cfg('git-path').";".
1608 " if test -d $package.git; then echo 1; else echo 0; fi");
1609 my $r= cmdoutput @cmd;
1610 if (defined $r and $r =~ m/^divert (\w+)$/) {
1612 my ($usedistro,) = access_distros();
1613 # NB that if we are pushing, $usedistro will be $distro/push
1614 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1615 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1616 progress "diverting to $divert (using config for $instead_distro)";
1617 return check_for_git();
1619 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1621 } elsif ($how eq 'url') {
1622 my $prefix = access_cfg('git-check-url','git-url');
1623 my $suffix = access_cfg('git-check-suffix','git-suffix',
1624 'RETURN-UNDEF') // '.git';
1625 my $url = "$prefix/$package$suffix";
1626 my @cmd = (@curl, qw(-sS -I), $url);
1627 my $result = cmdoutput @cmd;
1628 $result =~ s/^\S+ 200 .*\n\r?\n//;
1629 # curl -sS -I with https_proxy prints
1630 # HTTP/1.0 200 Connection established
1631 $result =~ m/^\S+ (404|200) /s or
1632 fail "unexpected results from git check query - ".
1633 Dumper($prefix, $result);
1635 if ($code eq '404') {
1637 } elsif ($code eq '200') {
1642 } elsif ($how eq 'true') {
1644 } elsif ($how eq 'false') {
1647 badcfg "unknown git-check \`$how'";
1651 sub create_remote_git_repo () {
1652 my $how = access_cfg('git-create');
1653 if ($how eq 'ssh-cmd') {
1655 (access_cfg_ssh, access_gituserhost(),
1656 access_runeinfo("git-create $package").
1657 "set -e; cd ".access_cfg('git-path').";".
1658 " cp -a _template $package.git");
1659 } elsif ($how eq 'true') {
1662 badcfg "unknown git-create \`$how'";
1666 our ($dsc_hash,$lastpush_mergeinput);
1667 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1669 our $ud = '.git/dgit/unpack';
1679 sub mktree_in_ud_here () {
1680 runcmd qw(git init -q);
1681 runcmd qw(git config gc.auto 0);
1682 rmtree('.git/objects');
1683 symlink '../../../../objects','.git/objects' or die $!;
1686 sub git_write_tree () {
1687 my $tree = cmdoutput @git, qw(write-tree);
1688 $tree =~ m/^\w+$/ or die "$tree ?";
1692 sub git_add_write_tree () {
1693 runcmd @git, qw(add -Af .);
1694 return git_write_tree();
1697 sub remove_stray_gits ($) {
1699 my @gitscmd = qw(find -name .git -prune -print0);
1700 debugcmd "|",@gitscmd;
1701 open GITS, "-|", @gitscmd or die $!;
1706 print STDERR "$us: warning: removing from $what: ",
1707 (messagequote $_), "\n";
1711 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1714 sub mktree_in_ud_from_only_subdir ($;$) {
1715 my ($what,$raw) = @_;
1717 # changes into the subdir
1719 die "expected one subdir but found @dirs ?" unless @dirs==1;
1720 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1724 remove_stray_gits($what);
1725 mktree_in_ud_here();
1727 my ($format, $fopts) = get_source_format();
1728 if (madformat($format)) {
1733 my $tree=git_add_write_tree();
1734 return ($tree,$dir);
1737 our @files_csum_info_fields =
1738 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1739 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1740 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1742 sub dsc_files_info () {
1743 foreach my $csumi (@files_csum_info_fields) {
1744 my ($fname, $module, $method) = @$csumi;
1745 my $field = $dsc->{$fname};
1746 next unless defined $field;
1747 eval "use $module; 1;" or die $@;
1749 foreach (split /\n/, $field) {
1751 m/^(\w+) (\d+) (\S+)$/ or
1752 fail "could not parse .dsc $fname line \`$_'";
1753 my $digester = eval "$module"."->$method;" or die $@;
1758 Digester => $digester,
1763 fail "missing any supported Checksums-* or Files field in ".
1764 $dsc->get_option('name');
1768 map { $_->{Filename} } dsc_files_info();
1771 sub files_compare_inputs (@) {
1776 my $showinputs = sub {
1777 return join "; ", map { $_->get_option('name') } @$inputs;
1780 foreach my $in (@$inputs) {
1782 my $in_name = $in->get_option('name');
1784 printdebug "files_compare_inputs $in_name\n";
1786 foreach my $csumi (@files_csum_info_fields) {
1787 my ($fname) = @$csumi;
1788 printdebug "files_compare_inputs $in_name $fname\n";
1790 my $field = $in->{$fname};
1791 next unless defined $field;
1794 foreach (split /\n/, $field) {
1797 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1798 fail "could not parse $in_name $fname line \`$_'";
1800 printdebug "files_compare_inputs $in_name $fname $f\n";
1804 my $re = \ $record{$f}{$fname};
1806 $fchecked{$f}{$in_name} = 1;
1808 fail "hash or size of $f varies in $fname fields".
1809 " (between: ".$showinputs->().")";
1814 @files = sort @files;
1815 $expected_files //= \@files;
1816 "@$expected_files" eq "@files" or
1817 fail "file list in $in_name varies between hash fields!";
1820 fail "$in_name has no files list field(s)";
1822 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1825 grep { keys %$_ == @$inputs-1 } values %fchecked
1826 or fail "no file appears in all file lists".
1827 " (looked in: ".$showinputs->().")";
1830 sub is_orig_file_in_dsc ($$) {
1831 my ($f, $dsc_files_info) = @_;
1832 return 0 if @$dsc_files_info <= 1;
1833 # One file means no origs, and the filename doesn't have a "what
1834 # part of dsc" component. (Consider versions ending `.orig'.)
1835 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1839 sub is_orig_file_of_vsn ($$) {
1840 my ($f, $upstreamvsn) = @_;
1841 my $base = srcfn $upstreamvsn, '';
1842 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1846 sub changes_update_origs_from_dsc ($$$$) {
1847 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1849 printdebug "checking origs needed ($upstreamvsn)...\n";
1850 $_ = getfield $changes, 'Files';
1851 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1852 fail "cannot find section/priority from .changes Files field";
1853 my $placementinfo = $1;
1855 printdebug "checking origs needed placement '$placementinfo'...\n";
1856 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1857 $l =~ m/\S+$/ or next;
1859 printdebug "origs $file | $l\n";
1860 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1861 printdebug "origs $file is_orig\n";
1862 my $have = archive_query('file_in_archive', $file);
1863 if (!defined $have) {
1865 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1871 printdebug "origs $file \$#\$have=$#$have\n";
1872 foreach my $h (@$have) {
1875 foreach my $csumi (@files_csum_info_fields) {
1876 my ($fname, $module, $method, $archivefield) = @$csumi;
1877 next unless defined $h->{$archivefield};
1878 $_ = $dsc->{$fname};
1879 next unless defined;
1880 m/^(\w+) .* \Q$file\E$/m or
1881 fail ".dsc $fname missing entry for $file";
1882 if ($h->{$archivefield} eq $1) {
1886 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1889 die "$file ".Dumper($h)." ?!" if $same && @differ;
1892 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1895 printdebug "origs $file f.same=$found_same".
1896 " #f._differ=$#found_differ\n";
1897 if (@found_differ && !$found_same) {
1899 "archive contains $file with different checksum",
1902 # Now we edit the changes file to add or remove it
1903 foreach my $csumi (@files_csum_info_fields) {
1904 my ($fname, $module, $method, $archivefield) = @$csumi;
1905 next unless defined $changes->{$fname};
1907 # in archive, delete from .changes if it's there
1908 $changed{$file} = "removed" if
1909 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1910 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1911 # not in archive, but it's here in the .changes
1913 my $dsc_data = getfield $dsc, $fname;
1914 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1916 $extra =~ s/ \d+ /$&$placementinfo /
1917 or die "$fname $extra >$dsc_data< ?"
1918 if $fname eq 'Files';
1919 $changes->{$fname} .= "\n". $extra;
1920 $changed{$file} = "added";
1925 foreach my $file (keys %changed) {
1927 "edited .changes for archive .orig contents: %s %s",
1928 $changed{$file}, $file;
1930 my $chtmp = "$changesfile.tmp";
1931 $changes->save($chtmp);
1933 rename $chtmp,$changesfile or die "$changesfile $!";
1935 progress "[new .changes left in $changesfile]";
1938 progress "$changesfile already has appropriate .orig(s) (if any)";
1942 sub make_commit ($) {
1944 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1947 sub make_commit_text ($) {
1950 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1952 print Dumper($text) if $debuglevel > 1;
1953 my $child = open2($out, $in, @cmd) or die $!;
1956 print $in $text or die $!;
1957 close $in or die $!;
1959 $h =~ m/^\w+$/ or die;
1961 printdebug "=> $h\n";
1964 waitpid $child, 0 == $child or die "$child $!";
1965 $? and failedcmd @cmd;
1969 sub clogp_authline ($) {
1971 my $author = getfield $clogp, 'Maintainer';
1972 $author =~ s#,.*##ms;
1973 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1974 my $authline = "$author $date";
1975 $authline =~ m/$git_authline_re/o or
1976 fail "unexpected commit author line format \`$authline'".
1977 " (was generated from changelog Maintainer field)";
1978 return ($1,$2,$3) if wantarray;
1982 sub vendor_patches_distro ($$) {
1983 my ($checkdistro, $what) = @_;
1984 return unless defined $checkdistro;
1986 my $series = "debian/patches/\L$checkdistro\E.series";
1987 printdebug "checking for vendor-specific $series ($what)\n";
1989 if (!open SERIES, "<", $series) {
1990 die "$series $!" unless $!==ENOENT;
1999 Unfortunately, this source package uses a feature of dpkg-source where
2000 the same source package unpacks to different source code on different
2001 distros. dgit cannot safely operate on such packages on affected
2002 distros, because the meaning of source packages is not stable.
2004 Please ask the distro/maintainer to remove the distro-specific series
2005 files and use a different technique (if necessary, uploading actually
2006 different packages, if different distros are supposed to have
2010 fail "Found active distro-specific series file for".
2011 " $checkdistro ($what): $series, cannot continue";
2013 die "$series $!" if SERIES->error;
2017 sub check_for_vendor_patches () {
2018 # This dpkg-source feature doesn't seem to be documented anywhere!
2019 # But it can be found in the changelog (reformatted):
2021 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2022 # Author: Raphael Hertzog <hertzog@debian.org>
2023 # Date: Sun Oct 3 09:36:48 2010 +0200
2025 # dpkg-source: correctly create .pc/.quilt_series with alternate
2028 # If you have debian/patches/ubuntu.series and you were
2029 # unpacking the source package on ubuntu, quilt was still
2030 # directed to debian/patches/series instead of
2031 # debian/patches/ubuntu.series.
2033 # debian/changelog | 3 +++
2034 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2035 # 2 files changed, 6 insertions(+), 1 deletion(-)
2038 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2039 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2040 "Dpkg::Vendor \`current vendor'");
2041 vendor_patches_distro(access_basedistro(),
2042 "(base) distro being accessed");
2043 vendor_patches_distro(access_nomdistro(),
2044 "(nominal) distro being accessed");
2047 sub generate_commits_from_dsc () {
2048 # See big comment in fetch_from_archive, below.
2049 # See also README.dsc-import.
2053 my @dfi = dsc_files_info();
2054 foreach my $fi (@dfi) {
2055 my $f = $fi->{Filename};
2056 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2058 printdebug "considering linking $f: ";
2060 link_ltarget "../../../../$f", $f
2061 or ((printdebug "($!) "), 0)
2065 printdebug "linked.\n";
2067 complete_file_from_dsc('.', $fi)
2070 if (is_orig_file_in_dsc($f, \@dfi)) {
2071 link $f, "../../../../$f"
2077 # We unpack and record the orig tarballs first, so that we only
2078 # need disk space for one private copy of the unpacked source.
2079 # But we can't make them into commits until we have the metadata
2080 # from the debian/changelog, so we record the tree objects now and
2081 # make them into commits later.
2083 my $upstreamv = upstreamversion $dsc->{version};
2084 my $orig_f_base = srcfn $upstreamv, '';
2086 foreach my $fi (@dfi) {
2087 # We actually import, and record as a commit, every tarball
2088 # (unless there is only one file, in which case there seems
2091 my $f = $fi->{Filename};
2092 printdebug "import considering $f ";
2093 (printdebug "only one dfi\n"), next if @dfi == 1;
2094 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2095 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2099 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2101 printdebug "Y ", (join ' ', map { $_//"(none)" }
2102 $compr_ext, $orig_f_part
2105 my $input = new IO::File $f, '<' or die "$f $!";
2109 if (defined $compr_ext) {
2111 Dpkg::Compression::compression_guess_from_filename $f;
2112 fail "Dpkg::Compression cannot handle file $f in source package"
2113 if defined $compr_ext && !defined $cname;
2115 new Dpkg::Compression::Process compression => $cname;
2116 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2117 my $compr_fh = new IO::Handle;
2118 my $compr_pid = open $compr_fh, "-|" // die $!;
2120 open STDIN, "<&", $input or die $!;
2122 die "dgit (child): exec $compr_cmd[0]: $!\n";
2127 rmtree "_unpack-tar";
2128 mkdir "_unpack-tar" or die $!;
2129 my @tarcmd = qw(tar -x -f -
2130 --no-same-owner --no-same-permissions
2131 --no-acls --no-xattrs --no-selinux);
2132 my $tar_pid = fork // die $!;
2134 chdir "_unpack-tar" or die $!;
2135 open STDIN, "<&", $input or die $!;
2137 die "dgit (child): exec $tarcmd[0]: $!";
2139 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2140 !$? or failedcmd @tarcmd;
2143 (@compr_cmd ? failedcmd @compr_cmd
2145 # finally, we have the results in "tarball", but maybe
2146 # with the wrong permissions
2148 runcmd qw(chmod -R +rwX _unpack-tar);
2149 changedir "_unpack-tar";
2150 remove_stray_gits($f);
2151 mktree_in_ud_here();
2153 my ($tree) = git_add_write_tree();
2154 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2155 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2157 printdebug "one subtree $1\n";
2159 printdebug "multiple subtrees\n";
2162 rmtree "_unpack-tar";
2164 my $ent = [ $f, $tree ];
2166 Orig => !!$orig_f_part,
2167 Sort => (!$orig_f_part ? 2 :
2168 $orig_f_part =~ m/-/g ? 1 :
2176 # put any without "_" first (spec is not clear whether files
2177 # are always in the usual order). Tarballs without "_" are
2178 # the main orig or the debian tarball.
2179 $a->{Sort} <=> $b->{Sort} or
2183 my $any_orig = grep { $_->{Orig} } @tartrees;
2185 my $dscfn = "$package.dsc";
2187 my $treeimporthow = 'package';
2189 open D, ">", $dscfn or die "$dscfn: $!";
2190 print D $dscdata or die "$dscfn: $!";
2191 close D or die "$dscfn: $!";
2192 my @cmd = qw(dpkg-source);
2193 push @cmd, '--no-check' if $dsc_checked;
2194 if (madformat $dsc->{format}) {
2195 push @cmd, '--skip-patches';
2196 $treeimporthow = 'unpatched';
2198 push @cmd, qw(-x --), $dscfn;
2201 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2202 if (madformat $dsc->{format}) {
2203 check_for_vendor_patches();
2207 if (madformat $dsc->{format}) {
2208 my @pcmd = qw(dpkg-source --before-build .);
2209 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2211 $dappliedtree = git_add_write_tree();
2214 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2215 debugcmd "|",@clogcmd;
2216 open CLOGS, "-|", @clogcmd or die $!;
2221 printdebug "import clog search...\n";
2224 my $stanzatext = do { local $/=""; <CLOGS>; };
2225 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2226 last if !defined $stanzatext;
2228 my $desc = "package changelog, entry no.$.";
2229 open my $stanzafh, "<", \$stanzatext or die;
2230 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2231 $clogp //= $thisstanza;
2233 printdebug "import clog $thisstanza->{version} $desc...\n";
2235 last if !$any_orig; # we don't need $r1clogp
2237 # We look for the first (most recent) changelog entry whose
2238 # version number is lower than the upstream version of this
2239 # package. Then the last (least recent) previous changelog
2240 # entry is treated as the one which introduced this upstream
2241 # version and used for the synthetic commits for the upstream
2244 # One might think that a more sophisticated algorithm would be
2245 # necessary. But: we do not want to scan the whole changelog
2246 # file. Stopping when we see an earlier version, which
2247 # necessarily then is an earlier upstream version, is the only
2248 # realistic way to do that. Then, either the earliest
2249 # changelog entry we have seen so far is indeed the earliest
2250 # upload of this upstream version; or there are only changelog
2251 # entries relating to later upstream versions (which is not
2252 # possible unless the changelog and .dsc disagree about the
2253 # version). Then it remains to choose between the physically
2254 # last entry in the file, and the one with the lowest version
2255 # number. If these are not the same, we guess that the
2256 # versions were created in a non-monotic order rather than
2257 # that the changelog entries have been misordered.
2259 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2261 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2262 $r1clogp = $thisstanza;
2264 printdebug "import clog $r1clogp->{version} becomes r1\n";
2266 die $! if CLOGS->error;
2267 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2269 $clogp or fail "package changelog has no entries!";
2271 my $authline = clogp_authline $clogp;
2272 my $changes = getfield $clogp, 'Changes';
2273 my $cversion = getfield $clogp, 'Version';
2276 $r1clogp //= $clogp; # maybe there's only one entry;
2277 my $r1authline = clogp_authline $r1clogp;
2278 # Strictly, r1authline might now be wrong if it's going to be
2279 # unused because !$any_orig. Whatever.
2281 printdebug "import tartrees authline $authline\n";
2282 printdebug "import tartrees r1authline $r1authline\n";
2284 foreach my $tt (@tartrees) {
2285 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2287 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2290 committer $r1authline
2294 [dgit import orig $tt->{F}]
2302 [dgit import tarball $package $cversion $tt->{F}]
2307 printdebug "import main commit\n";
2309 open C, ">../commit.tmp" or die $!;
2310 print C <<END or die $!;
2313 print C <<END or die $! foreach @tartrees;
2316 print C <<END or die $!;
2322 [dgit import $treeimporthow $package $cversion]
2326 my $rawimport_hash = make_commit qw(../commit.tmp);
2328 if (madformat $dsc->{format}) {
2329 printdebug "import apply patches...\n";
2331 # regularise the state of the working tree so that
2332 # the checkout of $rawimport_hash works nicely.
2333 my $dappliedcommit = make_commit_text(<<END);
2340 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2342 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2344 # We need the answers to be reproducible
2345 my @authline = clogp_authline($clogp);
2346 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2347 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2348 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2349 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2350 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2351 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2353 my $path = $ENV{PATH} or die;
2355 foreach my $use_absurd (qw(0 1)) {
2356 runcmd @git, qw(checkout -q unpa);
2357 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2358 local $ENV{PATH} = $path;
2361 progress "warning: $@";
2362 $path = "$absurdity:$path";
2363 progress "$us: trying slow absurd-git-apply...";
2364 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2369 die "forbid absurd git-apply\n" if $use_absurd
2370 && forceing [qw(import-gitapply-no-absurd)];
2371 die "only absurd git-apply!\n" if !$use_absurd
2372 && forceing [qw(import-gitapply-absurd)];
2374 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2375 local $ENV{PATH} = $path if $use_absurd;
2377 my @showcmd = (gbp_pq, qw(import));
2378 my @realcmd = shell_cmd
2379 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2380 debugcmd "+",@realcmd;
2381 if (system @realcmd) {
2382 die +(shellquote @showcmd).
2384 failedcmd_waitstatus()."\n";
2387 my $gapplied = git_rev_parse('HEAD');
2388 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2389 $gappliedtree eq $dappliedtree or
2391 gbp-pq import and dpkg-source disagree!
2392 gbp-pq import gave commit $gapplied
2393 gbp-pq import gave tree $gappliedtree
2394 dpkg-source --before-build gave tree $dappliedtree
2396 $rawimport_hash = $gapplied;
2401 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2406 progress "synthesised git commit from .dsc $cversion";
2408 my $rawimport_mergeinput = {
2409 Commit => $rawimport_hash,
2410 Info => "Import of source package",
2412 my @output = ($rawimport_mergeinput);
2414 if ($lastpush_mergeinput) {
2415 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2416 my $oversion = getfield $oldclogp, 'Version';
2418 version_compare($oversion, $cversion);
2420 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2421 { Message => <<END, ReverseParents => 1 });
2422 Record $package ($cversion) in archive suite $csuite
2424 } elsif ($vcmp > 0) {
2425 print STDERR <<END or die $!;
2427 Version actually in archive: $cversion (older)
2428 Last version pushed with dgit: $oversion (newer or same)
2431 @output = $lastpush_mergeinput;
2433 # Same version. Use what's in the server git branch,
2434 # discarding our own import. (This could happen if the
2435 # server automatically imports all packages into git.)
2436 @output = $lastpush_mergeinput;
2439 changedir '../../../..';
2444 sub complete_file_from_dsc ($$) {
2445 our ($dstdir, $fi) = @_;
2446 # Ensures that we have, in $dir, the file $fi, with the correct
2447 # contents. (Downloading it from alongside $dscurl if necessary.)
2449 my $f = $fi->{Filename};
2450 my $tf = "$dstdir/$f";
2453 if (stat_exists $tf) {
2454 progress "using existing $f";
2456 printdebug "$tf does not exist, need to fetch\n";
2458 $furl =~ s{/[^/]+$}{};
2460 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2461 die "$f ?" if $f =~ m#/#;
2462 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2463 return 0 if !act_local();
2467 open F, "<", "$tf" or die "$tf: $!";
2468 $fi->{Digester}->reset();
2469 $fi->{Digester}->addfile(*F);
2470 F->error and die $!;
2471 my $got = $fi->{Digester}->hexdigest();
2472 $got eq $fi->{Hash} or
2473 fail "file $f has hash $got but .dsc".
2474 " demands hash $fi->{Hash} ".
2475 ($downloaded ? "(got wrong file from archive!)"
2476 : "(perhaps you should delete this file?)");
2481 sub ensure_we_have_orig () {
2482 my @dfi = dsc_files_info();
2483 foreach my $fi (@dfi) {
2484 my $f = $fi->{Filename};
2485 next unless is_orig_file_in_dsc($f, \@dfi);
2486 complete_file_from_dsc('..', $fi)
2491 #---------- git fetch ----------
2493 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2494 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2496 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2497 # locally fetched refs because they have unhelpful names and clutter
2498 # up gitk etc. So we track whether we have "used up" head ref (ie,
2499 # whether we have made another local ref which refers to this object).
2501 # (If we deleted them unconditionally, then we might end up
2502 # re-fetching the same git objects each time dgit fetch was run.)
2504 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
2505 # in git_fetch_us to fetch the refs in question, and possibly a call
2506 # to lrfetchref_used.
2508 our (%lrfetchrefs_f, %lrfetchrefs_d);
2509 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2511 sub lrfetchref_used ($) {
2512 my ($fullrefname) = @_;
2513 my $objid = $lrfetchrefs_f{$fullrefname};
2514 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2517 sub git_lrfetch_sane {
2520 # This is rather miserable:
2521 # When git fetch --prune is passed a fetchspec ending with a *,
2522 # it does a plausible thing. If there is no * then:
2523 # - it matches subpaths too, even if the supplied refspec
2524 # starts refs, and behaves completely madly if the source
2525 # has refs/refs/something. (See, for example, Debian #NNNN.)
2526 # - if there is no matching remote ref, it bombs out the whole
2528 # We want to fetch a fixed ref, and we don't know in advance
2529 # if it exists, so this is not suitable.
2531 # Our workaround is to use git ls-remote. git ls-remote has its
2532 # own qairks. Notably, it has the absurd multi-tail-matching
2533 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2534 # refs/refs/foo etc.
2536 # Also, we want an idempotent snapshot, but we have to make two
2537 # calls to the remote: one to git ls-remote and to git fetch. The
2538 # solution is use git ls-remote to obtain a target state, and
2539 # git fetch to try to generate it. If we don't manage to generate
2540 # the target state, we try again.
2542 printdebug "git_lrfetch_sane specs @specs\n";
2544 my $specre = join '|', map {
2550 printdebug "git_lrfetch_sane specre=$specre\n";
2551 my $wanted_rref = sub {
2553 return m/^(?:$specre)$/o;
2556 my $fetch_iteration = 0;
2559 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2560 if (++$fetch_iteration > 10) {
2561 fail "too many iterations trying to get sane fetch!";
2564 my @look = map { "refs/$_" } @specs;
2565 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2569 open GITLS, "-|", @lcmd or die $!;
2571 printdebug "=> ", $_;
2572 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2573 my ($objid,$rrefname) = ($1,$2);
2574 if (!$wanted_rref->($rrefname)) {
2576 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2580 $wantr{$rrefname} = $objid;
2583 close GITLS or failedcmd @lcmd;
2585 # OK, now %want is exactly what we want for refs in @specs
2587 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2588 "+refs/$_:".lrfetchrefs."/$_";
2591 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2593 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2594 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2597 %lrfetchrefs_f = ();
2600 git_for_each_ref(lrfetchrefs, sub {
2601 my ($objid,$objtype,$lrefname,$reftail) = @_;
2602 $lrfetchrefs_f{$lrefname} = $objid;
2603 $objgot{$objid} = 1;
2606 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2607 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2608 if (!exists $wantr{$rrefname}) {
2609 if ($wanted_rref->($rrefname)) {
2611 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2615 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2618 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2619 delete $lrfetchrefs_f{$lrefname};
2623 foreach my $rrefname (sort keys %wantr) {
2624 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2625 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2626 my $want = $wantr{$rrefname};
2627 next if $got eq $want;
2628 if (!defined $objgot{$want}) {
2630 warning: git ls-remote suggests we want $lrefname
2631 warning: and it should refer to $want
2632 warning: but git fetch didn't fetch that object to any relevant ref.
2633 warning: This may be due to a race with someone updating the server.
2634 warning: Will try again...
2636 next FETCH_ITERATION;
2639 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2641 runcmd_ordryrun_local @git, qw(update-ref -m),
2642 "dgit fetch git fetch fixup", $lrefname, $want;
2643 $lrfetchrefs_f{$lrefname} = $want;
2647 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2648 Dumper(\%lrfetchrefs_f);
2651 sub git_fetch_us () {
2652 # Want to fetch only what we are going to use, unless
2653 # deliberately-not-ff, in which case we must fetch everything.
2655 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2657 (quiltmode_splitbrain
2658 ? (map { $_->('*',access_nomdistro) }
2659 \&debiantag_new, \&debiantag_maintview)
2660 : debiantags('*',access_nomdistro));
2661 push @specs, server_branch($csuite);
2662 push @specs, $rewritemap;
2663 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2665 git_lrfetch_sane @specs;
2668 my @tagpats = debiantags('*',access_nomdistro);
2670 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2671 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2672 printdebug "currently $fullrefname=$objid\n";
2673 $here{$fullrefname} = $objid;
2675 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2676 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2677 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2678 printdebug "offered $lref=$objid\n";
2679 if (!defined $here{$lref}) {
2680 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2681 runcmd_ordryrun_local @upd;
2682 lrfetchref_used $fullrefname;
2683 } elsif ($here{$lref} eq $objid) {
2684 lrfetchref_used $fullrefname;
2687 "Not updateting $lref from $here{$lref} to $objid.\n";
2692 #---------- dsc and archive handling ----------
2694 sub mergeinfo_getclogp ($) {
2695 # Ensures thit $mi->{Clogp} exists and returns it
2697 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2700 sub mergeinfo_version ($) {
2701 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2704 sub fetch_from_archive_record_1 ($) {
2706 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2707 'DGIT_ARCHIVE', $hash;
2708 cmdoutput @git, qw(log -n2), $hash;
2709 # ... gives git a chance to complain if our commit is malformed
2712 sub fetch_from_archive_record_2 ($) {
2714 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2718 dryrun_report @upd_cmd;
2722 sub parse_dsc_field ($$) {
2723 my ($dsc, $what) = @_;
2725 foreach my $field (@ourdscfield) {
2726 $f = $dsc->{$field};
2730 progress "$what: NO git hash";
2731 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2732 = $f =~ m/^(\w+) ($distro_re) ($versiontag_re) (\S+)(?:\s|$)/) {
2733 progress "$what: specified git info ($dsc_distro)";
2734 $dsc_hint_tag = [ $dsc_hint_tag ];
2735 } elsif ($f =~ m/^\w+\s*$/) {
2737 $dsc_distro //= 'debian';
2738 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2740 progress "$what: specified git hash";
2742 fail "$what: invalid Dgit info";
2746 sub resolve_dsc_field_commit ($$) {
2747 my ($already_distro, $already_mapref) = @_;
2749 return unless defined $dsc_hash;
2751 my $rewritemapdata = git_cat_file $already_mapref.':map';
2752 if (defined $rewritemapdata
2753 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2754 progress "server's git history rewrite map contains a relevant entry!";
2757 if (defined $dsc_hash) {
2758 progress "using rewritten git hash in place of .dsc value";
2760 progress "server data says .dsc hash is to be disregarded";
2765 sub fetch_from_archive () {
2766 ensure_setup_existing_tree();
2768 # Ensures that lrref() is what is actually in the archive, one way
2769 # or another, according to us - ie this client's
2770 # appropritaely-updated archive view. Also returns the commit id.
2771 # If there is nothing in the archive, leaves lrref alone and
2772 # returns undef. git_fetch_us must have already been called.
2776 parse_dsc_field($dsc, 'last upload to archive');
2777 resolve_dsc_field_commit access_basedistro,
2778 lrfetchrefs."/".$rewritemap
2780 progress "no version available from the archive";
2783 # If the archive's .dsc has a Dgit field, there are three
2784 # relevant git commitids we need to choose between and/or merge
2786 # 1. $dsc_hash: the Dgit field from the archive
2787 # 2. $lastpush_hash: the suite branch on the dgit git server
2788 # 3. $lastfetch_hash: our local tracking brach for the suite
2790 # These may all be distinct and need not be in any fast forward
2793 # If the dsc was pushed to this suite, then the server suite
2794 # branch will have been updated; but it might have been pushed to
2795 # a different suite and copied by the archive. Conversely a more
2796 # recent version may have been pushed with dgit but not appeared
2797 # in the archive (yet).
2799 # $lastfetch_hash may be awkward because archive imports
2800 # (particularly, imports of Dgit-less .dscs) are performed only as
2801 # needed on individual clients, so different clients may perform a
2802 # different subset of them - and these imports are only made
2803 # public during push. So $lastfetch_hash may represent a set of
2804 # imports different to a subsequent upload by a different dgit
2807 # Our approach is as follows:
2809 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2810 # descendant of $dsc_hash, then it was pushed by a dgit user who
2811 # had based their work on $dsc_hash, so we should prefer it.
2812 # Otherwise, $dsc_hash was installed into this suite in the
2813 # archive other than by a dgit push, and (necessarily) after the
2814 # last dgit push into that suite (since a dgit push would have
2815 # been descended from the dgit server git branch); thus, in that
2816 # case, we prefer the archive's version (and produce a
2817 # pseudo-merge to overwrite the dgit server git branch).
2819 # (If there is no Dgit field in the archive's .dsc then
2820 # generate_commit_from_dsc uses the version numbers to decide
2821 # whether the suite branch or the archive is newer. If the suite
2822 # branch is newer it ignores the archive's .dsc; otherwise it
2823 # generates an import of the .dsc, and produces a pseudo-merge to
2824 # overwrite the suite branch with the archive contents.)
2826 # The outcome of that part of the algorithm is the `public view',
2827 # and is same for all dgit clients: it does not depend on any
2828 # unpublished history in the local tracking branch.
2830 # As between the public view and the local tracking branch: The
2831 # local tracking branch is only updated by dgit fetch, and
2832 # whenever dgit fetch runs it includes the public view in the
2833 # local tracking branch. Therefore if the public view is not
2834 # descended from the local tracking branch, the local tracking
2835 # branch must contain history which was imported from the archive
2836 # but never pushed; and, its tip is now out of date. So, we make
2837 # a pseudo-merge to overwrite the old imports and stitch the old
2840 # Finally: we do not necessarily reify the public view (as
2841 # described above). This is so that we do not end up stacking two
2842 # pseudo-merges. So what we actually do is figure out the inputs
2843 # to any public view pseudo-merge and put them in @mergeinputs.
2846 # $mergeinputs[]{Commit}
2847 # $mergeinputs[]{Info}
2848 # $mergeinputs[0] is the one whose tree we use
2849 # @mergeinputs is in the order we use in the actual commit)
2852 # $mergeinputs[]{Message} is a commit message to use
2853 # $mergeinputs[]{ReverseParents} if def specifies that parent
2854 # list should be in opposite order
2855 # Such an entry has no Commit or Info. It applies only when found
2856 # in the last entry. (This ugliness is to support making
2857 # identical imports to previous dgit versions.)
2859 my $lastpush_hash = git_get_ref(lrfetchref());
2860 printdebug "previous reference hash=$lastpush_hash\n";
2861 $lastpush_mergeinput = $lastpush_hash && {
2862 Commit => $lastpush_hash,
2863 Info => "dgit suite branch on dgit git server",
2866 my $lastfetch_hash = git_get_ref(lrref());
2867 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2868 my $lastfetch_mergeinput = $lastfetch_hash && {
2869 Commit => $lastfetch_hash,
2870 Info => "dgit client's archive history view",
2873 my $dsc_mergeinput = $dsc_hash && {
2874 Commit => $dsc_hash,
2875 Info => "Dgit field in .dsc from archive",
2879 my $del_lrfetchrefs = sub {
2882 printdebug "del_lrfetchrefs...\n";
2883 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2884 my $objid = $lrfetchrefs_d{$fullrefname};
2885 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2887 $gur ||= new IO::Handle;
2888 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2890 printf $gur "delete %s %s\n", $fullrefname, $objid;
2893 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2897 if (defined $dsc_hash) {
2898 ensure_we_have_orig();
2899 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
2900 @mergeinputs = $dsc_mergeinput
2901 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2902 print STDERR <<END or die $!;
2904 Git commit in archive is behind the last version allegedly pushed/uploaded.
2905 Commit referred to by archive: $dsc_hash
2906 Last version pushed with dgit: $lastpush_hash
2909 @mergeinputs = ($lastpush_mergeinput);
2911 # Archive has .dsc which is not a descendant of the last dgit
2912 # push. This can happen if the archive moves .dscs about.
2913 # Just follow its lead.
2914 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2915 progress "archive .dsc names newer git commit";
2916 @mergeinputs = ($dsc_mergeinput);
2918 progress "archive .dsc names other git commit, fixing up";
2919 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2923 @mergeinputs = generate_commits_from_dsc();
2924 # We have just done an import. Now, our import algorithm might
2925 # have been improved. But even so we do not want to generate
2926 # a new different import of the same package. So if the
2927 # version numbers are the same, just use our existing version.
2928 # If the version numbers are different, the archive has changed
2929 # (perhaps, rewound).
2930 if ($lastfetch_mergeinput &&
2931 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2932 (mergeinfo_version $mergeinputs[0]) )) {
2933 @mergeinputs = ($lastfetch_mergeinput);
2935 } elsif ($lastpush_hash) {
2936 # only in git, not in the archive yet
2937 @mergeinputs = ($lastpush_mergeinput);
2938 print STDERR <<END or die $!;
2940 Package not found in the archive, but has allegedly been pushed using dgit.
2944 printdebug "nothing found!\n";
2945 if (defined $skew_warning_vsn) {
2946 print STDERR <<END or die $!;
2948 Warning: relevant archive skew detected.
2949 Archive allegedly contains $skew_warning_vsn
2950 But we were not able to obtain any version from the archive or git.
2954 unshift @end, $del_lrfetchrefs;
2958 if ($lastfetch_hash &&
2960 my $h = $_->{Commit};
2961 $h and is_fast_fwd($lastfetch_hash, $h);
2962 # If true, one of the existing parents of this commit
2963 # is a descendant of the $lastfetch_hash, so we'll
2964 # be ff from that automatically.
2968 push @mergeinputs, $lastfetch_mergeinput;
2971 printdebug "fetch mergeinfos:\n";
2972 foreach my $mi (@mergeinputs) {
2974 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2976 printdebug sprintf " ReverseParents=%d Message=%s",
2977 $mi->{ReverseParents}, $mi->{Message};
2981 my $compat_info= pop @mergeinputs
2982 if $mergeinputs[$#mergeinputs]{Message};
2984 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2987 if (@mergeinputs > 1) {
2989 my $tree_commit = $mergeinputs[0]{Commit};
2991 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2992 $tree =~ m/\n\n/; $tree = $`;
2993 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2996 # We use the changelog author of the package in question the
2997 # author of this pseudo-merge. This is (roughly) correct if
2998 # this commit is simply representing aa non-dgit upload.
2999 # (Roughly because it does not record sponsorship - but we
3000 # don't have sponsorship info because that's in the .changes,
3001 # which isn't in the archivw.)
3003 # But, it might be that we are representing archive history
3004 # updates (including in-archive copies). These are not really
3005 # the responsibility of the person who created the .dsc, but
3006 # there is no-one whose name we should better use. (The
3007 # author of the .dsc-named commit is clearly worse.)
3009 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3010 my $author = clogp_authline $useclogp;
3011 my $cversion = getfield $useclogp, 'Version';
3013 my $mcf = ".git/dgit/mergecommit";
3014 open MC, ">", $mcf or die "$mcf $!";
3015 print MC <<END or die $!;
3019 my @parents = grep { $_->{Commit} } @mergeinputs;
3020 @parents = reverse @parents if $compat_info->{ReverseParents};
3021 print MC <<END or die $! foreach @parents;
3025 print MC <<END or die $!;
3031 if (defined $compat_info->{Message}) {
3032 print MC $compat_info->{Message} or die $!;
3034 print MC <<END or die $!;
3035 Record $package ($cversion) in archive suite $csuite
3039 my $message_add_info = sub {
3041 my $mversion = mergeinfo_version $mi;
3042 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3046 $message_add_info->($mergeinputs[0]);
3047 print MC <<END or die $!;
3048 should be treated as descended from
3050 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3054 $hash = make_commit $mcf;
3056 $hash = $mergeinputs[0]{Commit};
3058 printdebug "fetch hash=$hash\n";
3061 my ($lasth, $what) = @_;
3062 return unless $lasth;
3063 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3066 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3068 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3070 fetch_from_archive_record_1($hash);
3072 if (defined $skew_warning_vsn) {
3074 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3075 my $gotclogp = commit_getclogp($hash);
3076 my $got_vsn = getfield $gotclogp, 'Version';
3077 printdebug "SKEW CHECK GOT $got_vsn\n";
3078 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3079 print STDERR <<END or die $!;
3081 Warning: archive skew detected. Using the available version:
3082 Archive allegedly contains $skew_warning_vsn
3083 We were able to obtain only $got_vsn
3089 if ($lastfetch_hash ne $hash) {
3090 fetch_from_archive_record_2($hash);
3093 lrfetchref_used lrfetchref();
3095 unshift @end, $del_lrfetchrefs;
3099 sub set_local_git_config ($$) {
3101 runcmd @git, qw(config), $k, $v;
3104 sub setup_mergechangelogs (;$) {
3106 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3108 my $driver = 'dpkg-mergechangelogs';
3109 my $cb = "merge.$driver";
3110 my $attrs = '.git/info/attributes';
3111 ensuredir '.git/info';
3113 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3114 if (!open ATTRS, "<", $attrs) {
3115 $!==ENOENT or die "$attrs: $!";
3119 next if m{^debian/changelog\s};
3120 print NATTRS $_, "\n" or die $!;
3122 ATTRS->error and die $!;
3125 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3128 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3129 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3131 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3134 sub setup_useremail (;$) {
3136 return unless $always || access_cfg_bool(1, 'setup-useremail');
3139 my ($k, $envvar) = @_;
3140 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3141 return unless defined $v;
3142 set_local_git_config "user.$k", $v;
3145 $setup->('email', 'DEBEMAIL');
3146 $setup->('name', 'DEBFULLNAME');
3149 sub ensure_setup_existing_tree () {
3150 my $k = "remote.$remotename.skipdefaultupdate";
3151 my $c = git_get_config $k;
3152 return if defined $c;
3153 set_local_git_config $k, 'true';
3156 sub setup_new_tree () {
3157 setup_mergechangelogs();
3161 sub multisuite_suite_child ($$$) {
3162 my ($tsuite, $merginputs, $fn) = @_;
3163 # in child, sets things up, calls $fn->(), and returns undef
3164 # in parent, returns canonical suite name for $tsuite
3165 my $canonsuitefh = IO::File::new_tmpfile;
3166 my $pid = fork // die $!;
3169 $us .= " [$isuite]";
3170 $debugprefix .= " ";
3171 progress "fetching $tsuite...";
3172 canonicalise_suite();
3173 print $canonsuitefh $csuite, "\n" or die $!;
3174 close $canonsuitefh or die $!;
3178 waitpid $pid,0 == $pid or die $!;
3179 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3180 seek $canonsuitefh,0,0 or die $!;
3181 local $csuite = <$canonsuitefh>;
3182 die $! unless defined $csuite && chomp $csuite;
3184 printdebug "multisuite $tsuite missing\n";
3187 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3188 push @$merginputs, {
3195 sub fork_for_multisuite ($) {
3196 my ($before_fetch_merge) = @_;
3197 # if nothing unusual, just returns ''
3200 # returns 0 to caller in child, to do first of the specified suites
3201 # in child, $csuite is not yet set
3203 # returns 1 to caller in parent, to finish up anything needed after
3204 # in parent, $csuite is set to canonicalised portmanteau
3206 my $org_isuite = $isuite;
3207 my @suites = split /\,/, $isuite;
3208 return '' unless @suites > 1;
3209 printdebug "fork_for_multisuite: @suites\n";
3213 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3215 return 0 unless defined $cbasesuite;
3217 fail "package $package missing in (base suite) $cbasesuite"
3218 unless @mergeinputs;
3220 my @csuites = ($cbasesuite);
3222 $before_fetch_merge->();
3224 foreach my $tsuite (@suites[1..$#suites]) {
3225 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3231 # xxx collecte the ref here
3233 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3234 push @csuites, $csubsuite;
3237 foreach my $mi (@mergeinputs) {
3238 my $ref = git_get_ref $mi->{Ref};
3239 die "$mi->{Ref} ?" unless length $ref;
3240 $mi->{Commit} = $ref;
3243 $csuite = join ",", @csuites;
3245 my $previous = git_get_ref lrref;
3247 unshift @mergeinputs, {
3248 Commit => $previous,
3249 Info => "local combined tracking branch",
3251 "archive seems to have rewound: local tracking branch is ahead!",
3255 foreach my $ix (0..$#mergeinputs) {
3256 $mergeinputs[$ix]{Index} = $ix;
3259 @mergeinputs = sort {
3260 -version_compare(mergeinfo_version $a,
3261 mergeinfo_version $b) # highest version first
3263 $a->{Index} <=> $b->{Index}; # earliest in spec first
3269 foreach my $mi (@mergeinputs) {
3270 printdebug "multisuite merge check $mi->{Info}\n";
3271 foreach my $previous (@needed) {
3272 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3273 printdebug "multisuite merge un-needed $previous->{Info}\n";
3277 printdebug "multisuite merge this-needed\n";
3278 $mi->{Character} = '+';
3281 $needed[0]{Character} = '*';
3283 my $output = $needed[0]{Commit};
3286 printdebug "multisuite merge nontrivial\n";
3287 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3289 my $commit = "tree $tree\n";
3290 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3291 "Input branches:\n";
3293 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3294 printdebug "multisuite merge include $mi->{Info}\n";
3295 $mi->{Character} //= ' ';
3296 $commit .= "parent $mi->{Commit}\n";
3297 $msg .= sprintf " %s %-25s %s\n",
3299 (mergeinfo_version $mi),
3302 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3304 " * marks the highest version branch, which choose to use\n".
3305 " + marks each branch which was not already an ancestor\n\n".
3306 "[dgit multi-suite $csuite]\n";
3308 "author $authline\n".
3309 "committer $authline\n\n";
3310 $output = make_commit_text $commit.$msg;
3311 printdebug "multisuite merge generated $output\n";
3314 fetch_from_archive_record_1($output);
3315 fetch_from_archive_record_2($output);
3317 progress "calculated combined tracking suite $csuite";
3322 sub clone_set_head () {
3323 open H, "> .git/HEAD" or die $!;
3324 print H "ref: ".lref()."\n" or die $!;
3327 sub clone_finish ($) {
3329 runcmd @git, qw(reset --hard), lrref();
3330 runcmd qw(bash -ec), <<'END';
3332 git ls-tree -r --name-only -z HEAD | \
3333 xargs -0r touch -h -r . --
3335 printdone "ready for work in $dstdir";
3340 badusage "dry run makes no sense with clone" unless act_local();
3342 my $multi_fetched = fork_for_multisuite(sub {
3343 printdebug "multi clone before fetch merge\n";
3346 if ($multi_fetched) {
3347 printdebug "multi clone after fetch merge\n";
3349 clone_finish($dstdir);
3352 printdebug "clone main body\n";
3354 canonicalise_suite();
3355 my $hasgit = check_for_git();
3356 mkdir $dstdir or fail "create \`$dstdir': $!";
3358 runcmd @git, qw(init -q);
3360 my $giturl = access_giturl(1);
3361 if (defined $giturl) {
3362 runcmd @git, qw(remote add), 'origin', $giturl;
3365 progress "fetching existing git history";
3367 runcmd_ordryrun_local @git, qw(fetch origin);
3369 progress "starting new git history";
3371 fetch_from_archive() or no_such_package;
3372 my $vcsgiturl = $dsc->{'Vcs-Git'};
3373 if (length $vcsgiturl) {
3374 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3375 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3378 clone_finish($dstdir);
3382 canonicalise_suite();
3383 if (check_for_git()) {
3386 fetch_from_archive() or no_such_package();
3387 printdone "fetched into ".lrref();
3391 my $multi_fetched = fork_for_multisuite(sub { });
3392 fetch() unless $multi_fetched; # parent
3393 return if $multi_fetched eq '0'; # child
3394 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3396 printdone "fetched to ".lrref()." and merged into HEAD";
3399 sub check_not_dirty () {
3400 foreach my $f (qw(local-options local-patch-header)) {
3401 if (stat_exists "debian/source/$f") {
3402 fail "git tree contains debian/source/$f";
3406 return if $ignoredirty;
3408 my @cmd = (@git, qw(diff --quiet HEAD));
3410 $!=0; $?=-1; system @cmd;
3413 fail "working tree is dirty (does not match HEAD)";
3419 sub commit_admin ($) {
3422 runcmd_ordryrun_local @git, qw(commit -m), $m;
3425 sub commit_quilty_patch () {
3426 my $output = cmdoutput @git, qw(status --porcelain);
3428 foreach my $l (split /\n/, $output) {
3429 next unless $l =~ m/\S/;
3430 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3434 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3436 progress "nothing quilty to commit, ok.";
3439 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3440 runcmd_ordryrun_local @git, qw(add -f), @adds;
3442 Commit Debian 3.0 (quilt) metadata
3444 [dgit ($our_version) quilt-fixup]
3448 sub get_source_format () {
3450 if (open F, "debian/source/options") {
3454 s/\s+$//; # ignore missing final newline
3456 my ($k, $v) = ($`, $'); #');
3457 $v =~ s/^"(.*)"$/$1/;
3463 F->error and die $!;
3466 die $! unless $!==&ENOENT;
3469 if (!open F, "debian/source/format") {
3470 die $! unless $!==&ENOENT;
3474 F->error and die $!;
3476 return ($_, \%options);
3479 sub madformat_wantfixup ($) {
3481 return 0 unless $format eq '3.0 (quilt)';
3482 our $quilt_mode_warned;
3483 if ($quilt_mode eq 'nocheck') {
3484 progress "Not doing any fixup of \`$format' due to".
3485 " ----no-quilt-fixup or --quilt=nocheck"
3486 unless $quilt_mode_warned++;
3489 progress "Format \`$format', need to check/update patch stack"
3490 unless $quilt_mode_warned++;
3494 sub maybe_split_brain_save ($$$) {
3495 my ($headref, $dgitview, $msg) = @_;
3496 # => message fragment "$saved" describing disposition of $dgitview
3497 return "commit id $dgitview" unless defined $split_brain_save;
3498 my @cmd = (shell_cmd "cd ../../../..",
3499 @git, qw(update-ref -m),
3500 "dgit --dgit-view-save $msg HEAD=$headref",
3501 $split_brain_save, $dgitview);
3503 return "and left in $split_brain_save";
3506 # An "infopair" is a tuple [ $thing, $what ]
3507 # (often $thing is a commit hash; $what is a description)
3509 sub infopair_cond_equal ($$) {
3511 $x->[0] eq $y->[0] or fail <<END;
3512 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3516 sub infopair_lrf_tag_lookup ($$) {
3517 my ($tagnames, $what) = @_;
3518 # $tagname may be an array ref
3519 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3520 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3521 foreach my $tagname (@tagnames) {
3522 my $lrefname = lrfetchrefs."/tags/$tagname";
3523 my $tagobj = $lrfetchrefs_f{$lrefname};
3524 next unless defined $tagobj;
3525 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3526 return [ git_rev_parse($tagobj), $what ];
3528 fail @tagnames==1 ? <<END : <<END;
3529 Wanted tag $what (@tagnames) on dgit server, but not found
3531 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3535 sub infopair_cond_ff ($$) {
3536 my ($anc,$desc) = @_;
3537 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3538 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3542 sub pseudomerge_version_check ($$) {
3543 my ($clogp, $archive_hash) = @_;
3545 my $arch_clogp = commit_getclogp $archive_hash;
3546 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3547 'version currently in archive' ];
3548 if (defined $overwrite_version) {
3549 if (length $overwrite_version) {
3550 infopair_cond_equal([ $overwrite_version,
3551 '--overwrite= version' ],
3554 my $v = $i_arch_v->[0];
3555 progress "Checking package changelog for archive version $v ...";
3557 my @xa = ("-f$v", "-t$v");
3558 my $vclogp = parsechangelog @xa;
3559 my $cv = [ (getfield $vclogp, 'Version'),
3560 "Version field from dpkg-parsechangelog @xa" ];
3561 infopair_cond_equal($i_arch_v, $cv);
3564 $@ =~ s/^dgit: //gm;
3566 "Perhaps debian/changelog does not mention $v ?";
3571 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3575 sub pseudomerge_make_commit ($$$$ $$) {
3576 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3577 $msg_cmd, $msg_msg) = @_;
3578 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3580 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3581 my $authline = clogp_authline $clogp;
3585 !defined $overwrite_version ? ""
3586 : !length $overwrite_version ? " --overwrite"
3587 : " --overwrite=".$overwrite_version;
3590 my $pmf = ".git/dgit/pseudomerge";
3591 open MC, ">", $pmf or die "$pmf $!";
3592 print MC <<END or die $!;
3595 parent $archive_hash
3605 return make_commit($pmf);
3608 sub splitbrain_pseudomerge ($$$$) {
3609 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3610 # => $merged_dgitview
3611 printdebug "splitbrain_pseudomerge...\n";
3613 # We: debian/PREVIOUS HEAD($maintview)
3614 # expect: o ----------------- o
3617 # a/d/PREVIOUS $dgitview
3620 # we do: `------------------ o
3624 return $dgitview unless defined $archive_hash;
3626 printdebug "splitbrain_pseudomerge...\n";
3628 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3630 if (!defined $overwrite_version) {
3631 progress "Checking that HEAD inciudes all changes in archive...";
3634 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3636 if (defined $overwrite_version) {
3638 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3639 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3640 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3641 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3642 my $i_archive = [ $archive_hash, "current archive contents" ];
3644 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3646 infopair_cond_equal($i_dgit, $i_archive);
3647 infopair_cond_ff($i_dep14, $i_dgit);
3648 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3652 $us: check failed (maybe --overwrite is needed, consult documentation)
3657 my $r = pseudomerge_make_commit
3658 $clogp, $dgitview, $archive_hash, $i_arch_v,
3659 "dgit --quilt=$quilt_mode",
3660 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3661 Declare fast forward from $i_arch_v->[0]
3663 Make fast forward from $i_arch_v->[0]
3666 maybe_split_brain_save $maintview, $r, "pseudomerge";
3668 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3672 sub plain_overwrite_pseudomerge ($$$) {
3673 my ($clogp, $head, $archive_hash) = @_;
3675 printdebug "plain_overwrite_pseudomerge...";
3677 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3679 return $head if is_fast_fwd $archive_hash, $head;
3681 my $m = "Declare fast forward from $i_arch_v->[0]";
3683 my $r = pseudomerge_make_commit
3684 $clogp, $head, $archive_hash, $i_arch_v,
3687 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3689 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3693 sub push_parse_changelog ($) {
3696 my $clogp = Dpkg::Control::Hash->new();
3697 $clogp->load($clogpfn) or die;
3699 my $clogpackage = getfield $clogp, 'Source';
3700 $package //= $clogpackage;
3701 fail "-p specified $package but changelog specified $clogpackage"
3702 unless $package eq $clogpackage;
3703 my $cversion = getfield $clogp, 'Version';
3704 my $tag = debiantag($cversion, access_nomdistro);
3705 runcmd @git, qw(check-ref-format), $tag;
3707 my $dscfn = dscfn($cversion);
3709 return ($clogp, $cversion, $dscfn);
3712 sub push_parse_dsc ($$$) {
3713 my ($dscfn,$dscfnwhat, $cversion) = @_;
3714 $dsc = parsecontrol($dscfn,$dscfnwhat);
3715 my $dversion = getfield $dsc, 'Version';
3716 my $dscpackage = getfield $dsc, 'Source';
3717 ($dscpackage eq $package && $dversion eq $cversion) or
3718 fail "$dscfn is for $dscpackage $dversion".
3719 " but debian/changelog is for $package $cversion";
3722 sub push_tagwants ($$$$) {
3723 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3726 TagFn => \&debiantag,
3731 if (defined $maintviewhead) {
3733 TagFn => \&debiantag_maintview,
3734 Objid => $maintviewhead,
3735 TfSuffix => '-maintview',
3738 } elsif ($dodep14tag eq 'no' ? 0
3739 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3740 : $dodep14tag eq 'always'
3741 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3742 --dep14tag-always (or equivalent in config) means server must support
3743 both "new" and "maint" tag formats, but config says it doesn't.
3745 : die "$dodep14tag ?") {
3747 TagFn => \&debiantag_maintview,
3749 TfSuffix => '-dgit',
3753 foreach my $tw (@tagwants) {
3754 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3755 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3757 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3761 sub push_mktags ($$ $$ $) {
3763 $changesfile,$changesfilewhat,
3766 die unless $tagwants->[0]{View} eq 'dgit';
3768 my $declaredistro = access_nomdistro();
3769 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
3770 $dsc->{$ourdscfield[0]} = join " ",
3771 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
3773 $dsc->save("$dscfn.tmp") or die $!;
3775 my $changes = parsecontrol($changesfile,$changesfilewhat);
3776 foreach my $field (qw(Source Distribution Version)) {
3777 $changes->{$field} eq $clogp->{$field} or
3778 fail "changes field $field \`$changes->{$field}'".
3779 " does not match changelog \`$clogp->{$field}'";
3782 my $cversion = getfield $clogp, 'Version';
3783 my $clogsuite = getfield $clogp, 'Distribution';
3785 # We make the git tag by hand because (a) that makes it easier
3786 # to control the "tagger" (b) we can do remote signing
3787 my $authline = clogp_authline $clogp;
3788 my $delibs = join(" ", "",@deliberatelies);
3792 my $tfn = $tw->{Tfn};
3793 my $head = $tw->{Objid};
3794 my $tag = $tw->{Tag};
3796 open TO, '>', $tfn->('.tmp') or die $!;
3797 print TO <<END or die $!;
3804 if ($tw->{View} eq 'dgit') {
3805 print TO <<END or die $!;
3806 $package release $cversion for $clogsuite ($csuite) [dgit]
3807 [dgit distro=$declaredistro$delibs]
3809 foreach my $ref (sort keys %previously) {
3810 print TO <<END or die $!;
3811 [dgit previously:$ref=$previously{$ref}]
3814 } elsif ($tw->{View} eq 'maint') {
3815 print TO <<END or die $!;
3816 $package release $cversion for $clogsuite ($csuite)
3817 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3820 die Dumper($tw)."?";
3825 my $tagobjfn = $tfn->('.tmp');
3827 if (!defined $keyid) {
3828 $keyid = access_cfg('keyid','RETURN-UNDEF');
3830 if (!defined $keyid) {
3831 $keyid = getfield $clogp, 'Maintainer';
3833 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3834 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3835 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3836 push @sign_cmd, $tfn->('.tmp');
3837 runcmd_ordryrun @sign_cmd;
3839 $tagobjfn = $tfn->('.signed.tmp');
3840 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3841 $tfn->('.tmp'), $tfn->('.tmp.asc');
3847 my @r = map { $mktag->($_); } @$tagwants;
3851 sub sign_changes ($) {
3852 my ($changesfile) = @_;
3854 my @debsign_cmd = @debsign;
3855 push @debsign_cmd, "-k$keyid" if defined $keyid;
3856 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3857 push @debsign_cmd, $changesfile;
3858 runcmd_ordryrun @debsign_cmd;
3863 printdebug "actually entering push\n";
3865 supplementary_message(<<'END');
3866 Push failed, while checking state of the archive.
3867 You can retry the push, after fixing the problem, if you like.
3869 if (check_for_git()) {
3872 my $archive_hash = fetch_from_archive();
3873 if (!$archive_hash) {
3875 fail "package appears to be new in this suite;".
3876 " if this is intentional, use --new";
3879 supplementary_message(<<'END');
3880 Push failed, while preparing your push.
3881 You can retry the push, after fixing the problem, if you like.
3884 need_tagformat 'new', "quilt mode $quilt_mode"
3885 if quiltmode_splitbrain;
3889 access_giturl(); # check that success is vaguely likely
3892 my $clogpfn = ".git/dgit/changelog.822.tmp";
3893 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3895 responder_send_file('parsed-changelog', $clogpfn);
3897 my ($clogp, $cversion, $dscfn) =
3898 push_parse_changelog("$clogpfn");
3900 my $dscpath = "$buildproductsdir/$dscfn";
3901 stat_exists $dscpath or
3902 fail "looked for .dsc $dscpath, but $!;".
3903 " maybe you forgot to build";
3905 responder_send_file('dsc', $dscpath);
3907 push_parse_dsc($dscpath, $dscfn, $cversion);
3909 my $format = getfield $dsc, 'Format';
3910 printdebug "format $format\n";
3912 my $actualhead = git_rev_parse('HEAD');
3913 my $dgithead = $actualhead;
3914 my $maintviewhead = undef;
3916 my $upstreamversion = upstreamversion $clogp->{Version};
3918 if (madformat_wantfixup($format)) {
3919 # user might have not used dgit build, so maybe do this now:
3920 if (quiltmode_splitbrain()) {
3922 quilt_make_fake_dsc($upstreamversion);
3924 ($dgithead, $cachekey) =
3925 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3927 "--quilt=$quilt_mode but no cached dgit view:
3928 perhaps tree changed since dgit build[-source] ?";
3930 $dgithead = splitbrain_pseudomerge($clogp,
3931 $actualhead, $dgithead,
3933 $maintviewhead = $actualhead;
3934 changedir '../../../..';
3935 prep_ud(); # so _only_subdir() works, below
3937 commit_quilty_patch();
3941 if (defined $overwrite_version && !defined $maintviewhead) {
3942 $dgithead = plain_overwrite_pseudomerge($clogp,
3950 if ($archive_hash) {
3951 if (is_fast_fwd($archive_hash, $dgithead)) {
3953 } elsif (deliberately_not_fast_forward) {
3956 fail "dgit push: HEAD is not a descendant".
3957 " of the archive's version.\n".
3958 "To overwrite the archive's contents,".
3959 " pass --overwrite[=VERSION].\n".
3960 "To rewind history, if permitted by the archive,".
3961 " use --deliberately-not-fast-forward.";
3966 progress "checking that $dscfn corresponds to HEAD";
3967 runcmd qw(dpkg-source -x --),
3968 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3969 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
3970 check_for_vendor_patches() if madformat($dsc->{format});
3971 changedir '../../../..';
3972 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3973 debugcmd "+",@diffcmd;
3975 my $r = system @diffcmd;
3978 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3980 HEAD specifies a different tree to $dscfn:
3982 Perhaps you forgot to build. Or perhaps there is a problem with your
3983 source tree (see dgit(7) for some hints). To see a full diff, run
3990 if (!$changesfile) {
3991 my $pat = changespat $cversion;
3992 my @cs = glob "$buildproductsdir/$pat";
3993 fail "failed to find unique changes file".
3994 " (looked for $pat in $buildproductsdir);".
3995 " perhaps you need to use dgit -C"
3997 ($changesfile) = @cs;
3999 $changesfile = "$buildproductsdir/$changesfile";
4002 # Check that changes and .dsc agree enough
4003 $changesfile =~ m{[^/]*$};
4004 my $changes = parsecontrol($changesfile,$&);
4005 files_compare_inputs($dsc, $changes)
4006 unless forceing [qw(dsc-changes-mismatch)];
4008 # Perhaps adjust .dsc to contain right set of origs
4009 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4011 unless forceing [qw(changes-origs-exactly)];
4013 # Checks complete, we're going to try and go ahead:
4015 responder_send_file('changes',$changesfile);
4016 responder_send_command("param head $dgithead");
4017 responder_send_command("param csuite $csuite");
4018 responder_send_command("param tagformat $tagformat");
4019 if (defined $maintviewhead) {
4020 die unless ($protovsn//4) >= 4;
4021 responder_send_command("param maint-view $maintviewhead");
4024 if (deliberately_not_fast_forward) {
4025 git_for_each_ref(lrfetchrefs, sub {
4026 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4027 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4028 responder_send_command("previously $rrefname=$objid");
4029 $previously{$rrefname} = $objid;
4033 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4037 supplementary_message(<<'END');
4038 Push failed, while signing the tag.
4039 You can retry the push, after fixing the problem, if you like.
4041 # If we manage to sign but fail to record it anywhere, it's fine.
4042 if ($we_are_responder) {
4043 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4044 responder_receive_files('signed-tag', @tagobjfns);
4046 @tagobjfns = push_mktags($clogp,$dscpath,
4047 $changesfile,$changesfile,
4050 supplementary_message(<<'END');
4051 Push failed, *after* signing the tag.
4052 If you want to try again, you should use a new version number.
4055 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4057 foreach my $tw (@tagwants) {
4058 my $tag = $tw->{Tag};
4059 my $tagobjfn = $tw->{TagObjFn};
4061 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4062 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4063 runcmd_ordryrun_local
4064 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4067 supplementary_message(<<'END');
4068 Push failed, while updating the remote git repository - see messages above.
4069 If you want to try again, you should use a new version number.
4071 if (!check_for_git()) {
4072 create_remote_git_repo();
4075 my @pushrefs = $forceflag.$dgithead.":".rrref();
4076 foreach my $tw (@tagwants) {
4077 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4080 runcmd_ordryrun @git,
4081 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4082 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4084 supplementary_message(<<'END');
4085 Push failed, while obtaining signatures on the .changes and .dsc.
4086 If it was just that the signature failed, you may try again by using
4087 debsign by hand to sign the changes
4089 and then dput to complete the upload.
4090 If you need to change the package, you must use a new version number.
4092 if ($we_are_responder) {
4093 my $dryrunsuffix = act_local() ? "" : ".tmp";
4094 responder_receive_files('signed-dsc-changes',
4095 "$dscpath$dryrunsuffix",
4096 "$changesfile$dryrunsuffix");
4099 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4101 progress "[new .dsc left in $dscpath.tmp]";
4103 sign_changes $changesfile;
4106 supplementary_message(<<END);
4107 Push failed, while uploading package(s) to the archive server.
4108 You can retry the upload of exactly these same files with dput of:
4110 If that .changes file is broken, you will need to use a new version
4111 number for your next attempt at the upload.
4113 my $host = access_cfg('upload-host','RETURN-UNDEF');
4114 my @hostarg = defined($host) ? ($host,) : ();
4115 runcmd_ordryrun @dput, @hostarg, $changesfile;
4116 printdone "pushed and uploaded $cversion";
4118 supplementary_message('');
4119 responder_send_command("complete");
4125 badusage "-p is not allowed with clone; specify as argument instead"
4126 if defined $package;
4129 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4130 ($package,$isuite) = @ARGV;
4131 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4132 ($package,$dstdir) = @ARGV;
4133 } elsif (@ARGV==3) {
4134 ($package,$isuite,$dstdir) = @ARGV;
4136 badusage "incorrect arguments to dgit clone";
4140 $dstdir ||= "$package";
4141 if (stat_exists $dstdir) {
4142 fail "$dstdir already exists";
4146 if ($rmonerror && !$dryrun_level) {
4147 $cwd_remove= getcwd();
4149 return unless defined $cwd_remove;
4150 if (!chdir "$cwd_remove") {
4151 return if $!==&ENOENT;
4152 die "chdir $cwd_remove: $!";
4154 printdebug "clone rmonerror removing $dstdir\n";
4156 rmtree($dstdir) or die "remove $dstdir: $!\n";
4157 } elsif (grep { $! == $_ }
4158 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4160 print STDERR "check whether to remove $dstdir: $!\n";
4166 $cwd_remove = undef;
4169 sub branchsuite () {
4170 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4171 if ($branch =~ m#$lbranch_re#o) {
4178 sub fetchpullargs () {
4179 if (!defined $package) {
4180 my $sourcep = parsecontrol('debian/control','debian/control');
4181 $package = getfield $sourcep, 'Source';
4184 $isuite = branchsuite();
4186 my $clogp = parsechangelog();
4187 $isuite = getfield $clogp, 'Distribution';
4189 } elsif (@ARGV==1) {
4192 badusage "incorrect arguments to dgit fetch or dgit pull";
4200 my $multi_fetched = fork_for_multisuite(sub { });
4201 exit 0 if $multi_fetched;
4208 if (quiltmode_splitbrain()) {
4209 my ($format, $fopts) = get_source_format();
4210 madformat($format) and fail <<END
4211 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4220 badusage "-p is not allowed with dgit push" if defined $package;
4222 my $clogp = parsechangelog();
4223 $package = getfield $clogp, 'Source';
4226 } elsif (@ARGV==1) {
4227 ($specsuite) = (@ARGV);
4229 badusage "incorrect arguments to dgit push";
4231 $isuite = getfield $clogp, 'Distribution';
4233 local ($package) = $existing_package; # this is a hack
4234 canonicalise_suite();
4236 canonicalise_suite();
4238 if (defined $specsuite &&
4239 $specsuite ne $isuite &&
4240 $specsuite ne $csuite) {
4241 fail "dgit push: changelog specifies $isuite ($csuite)".
4242 " but command line specifies $specsuite";
4247 #---------- remote commands' implementation ----------
4249 sub cmd_remote_push_build_host {
4250 my ($nrargs) = shift @ARGV;
4251 my (@rargs) = @ARGV[0..$nrargs-1];
4252 @ARGV = @ARGV[$nrargs..$#ARGV];
4254 my ($dir,$vsnwant) = @rargs;
4255 # vsnwant is a comma-separated list; we report which we have
4256 # chosen in our ready response (so other end can tell if they
4259 $we_are_responder = 1;
4260 $us .= " (build host)";
4264 open PI, "<&STDIN" or die $!;
4265 open STDIN, "/dev/null" or die $!;
4266 open PO, ">&STDOUT" or die $!;
4268 open STDOUT, ">&STDERR" or die $!;
4272 ($protovsn) = grep {
4273 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4274 } @rpushprotovsn_support;
4276 fail "build host has dgit rpush protocol versions ".
4277 (join ",", @rpushprotovsn_support).
4278 " but invocation host has $vsnwant"
4279 unless defined $protovsn;
4281 responder_send_command("dgit-remote-push-ready $protovsn");
4282 rpush_handle_protovsn_bothends();
4287 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4288 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4289 # a good error message)
4291 sub rpush_handle_protovsn_bothends () {
4292 if ($protovsn < 4) {
4293 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4302 my $report = i_child_report();
4303 if (defined $report) {
4304 printdebug "($report)\n";
4305 } elsif ($i_child_pid) {
4306 printdebug "(killing build host child $i_child_pid)\n";
4307 kill 15, $i_child_pid;
4309 if (defined $i_tmp && !defined $initiator_tempdir) {
4311 eval { rmtree $i_tmp; };
4315 END { i_cleanup(); }
4318 my ($base,$selector,@args) = @_;
4319 $selector =~ s/\-/_/g;
4320 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4327 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4335 push @rargs, join ",", @rpushprotovsn_support;
4338 push @rdgit, @ropts;
4339 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4341 my @cmd = (@ssh, $host, shellquote @rdgit);
4344 if (defined $initiator_tempdir) {
4345 rmtree $initiator_tempdir;
4346 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4347 $i_tmp = $initiator_tempdir;
4351 $i_child_pid = open2(\*RO, \*RI, @cmd);
4353 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4354 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4355 $supplementary_message = '' unless $protovsn >= 3;
4357 fail "rpush negotiated protocol version $protovsn".
4358 " which does not support quilt mode $quilt_mode"
4359 if quiltmode_splitbrain;
4361 rpush_handle_protovsn_bothends();
4363 my ($icmd,$iargs) = initiator_expect {
4364 m/^(\S+)(?: (.*))?$/;
4367 i_method "i_resp", $icmd, $iargs;
4371 sub i_resp_progress ($) {
4373 my $msg = protocol_read_bytes \*RO, $rhs;
4377 sub i_resp_supplementary_message ($) {
4379 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4382 sub i_resp_complete {
4383 my $pid = $i_child_pid;
4384 $i_child_pid = undef; # prevents killing some other process with same pid
4385 printdebug "waiting for build host child $pid...\n";
4386 my $got = waitpid $pid, 0;
4387 die $! unless $got == $pid;
4388 die "build host child failed $?" if $?;
4391 printdebug "all done\n";
4395 sub i_resp_file ($) {
4397 my $localname = i_method "i_localname", $keyword;
4398 my $localpath = "$i_tmp/$localname";
4399 stat_exists $localpath and
4400 badproto \*RO, "file $keyword ($localpath) twice";
4401 protocol_receive_file \*RO, $localpath;
4402 i_method "i_file", $keyword;
4407 sub i_resp_param ($) {
4408 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4412 sub i_resp_previously ($) {
4413 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4414 or badproto \*RO, "bad previously spec";
4415 my $r = system qw(git check-ref-format), $1;
4416 die "bad previously ref spec ($r)" if $r;
4417 $previously{$1} = $2;
4422 sub i_resp_want ($) {
4424 die "$keyword ?" if $i_wanted{$keyword}++;
4425 my @localpaths = i_method "i_want", $keyword;
4426 printdebug "[[ $keyword @localpaths\n";
4427 foreach my $localpath (@localpaths) {
4428 protocol_send_file \*RI, $localpath;
4430 print RI "files-end\n" or die $!;
4433 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4435 sub i_localname_parsed_changelog {
4436 return "remote-changelog.822";
4438 sub i_file_parsed_changelog {
4439 ($i_clogp, $i_version, $i_dscfn) =
4440 push_parse_changelog "$i_tmp/remote-changelog.822";
4441 die if $i_dscfn =~ m#/|^\W#;
4444 sub i_localname_dsc {
4445 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4450 sub i_localname_changes {
4451 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4452 $i_changesfn = $i_dscfn;
4453 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4454 return $i_changesfn;
4456 sub i_file_changes { }
4458 sub i_want_signed_tag {
4459 printdebug Dumper(\%i_param, $i_dscfn);
4460 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4461 && defined $i_param{'csuite'}
4462 or badproto \*RO, "premature desire for signed-tag";
4463 my $head = $i_param{'head'};
4464 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4466 my $maintview = $i_param{'maint-view'};
4467 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4470 if ($protovsn >= 4) {
4471 my $p = $i_param{'tagformat'} // '<undef>';
4473 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4476 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4478 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4480 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4483 push_mktags $i_clogp, $i_dscfn,
4484 $i_changesfn, 'remote changes',
4488 sub i_want_signed_dsc_changes {
4489 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4490 sign_changes $i_changesfn;
4491 return ($i_dscfn, $i_changesfn);
4494 #---------- building etc. ----------
4500 #----- `3.0 (quilt)' handling -----
4502 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4504 sub quiltify_dpkg_commit ($$$;$) {
4505 my ($patchname,$author,$msg, $xinfo) = @_;
4509 my $descfn = ".git/dgit/quilt-description.tmp";
4510 open O, '>', $descfn or die "$descfn: $!";
4511 $msg =~ s/\n+/\n\n/;
4512 print O <<END or die $!;
4514 ${xinfo}Subject: $msg
4521 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4522 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4523 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4524 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4528 sub quiltify_trees_differ ($$;$$$) {
4529 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4530 # returns true iff the two tree objects differ other than in debian/
4531 # with $finegrained,
4532 # returns bitmask 01 - differ in upstream files except .gitignore
4533 # 02 - differ in .gitignore
4534 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4535 # is set for each modified .gitignore filename $fn
4536 # if $unrepres is defined, array ref to which is appeneded
4537 # a list of unrepresentable changes (removals of upstream files
4540 my @cmd = (@git, qw(diff-tree -z));
4541 push @cmd, qw(--name-only) unless $unrepres;
4542 push @cmd, qw(-r) if $finegrained || $unrepres;
4544 my $diffs= cmdoutput @cmd;
4547 foreach my $f (split /\0/, $diffs) {
4548 if ($unrepres && !@lmodes) {
4549 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4552 my ($oldmode,$newmode) = @lmodes;
4555 next if $f =~ m#^debian(?:/.*)?$#s;
4559 die "not a plain file\n"
4560 unless $newmode =~ m/^10\d{4}$/ ||
4561 $oldmode =~ m/^10\d{4}$/;
4562 if ($oldmode =~ m/[^0]/ &&
4563 $newmode =~ m/[^0]/) {
4564 die "mode changed\n" if $oldmode ne $newmode;
4566 die "non-default mode\n"
4567 unless $newmode =~ m/^100644$/ ||
4568 $oldmode =~ m/^100644$/;
4572 local $/="\n"; chomp $@;
4573 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4577 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4578 $r |= $isignore ? 02 : 01;
4579 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4581 printdebug "quiltify_trees_differ $x $y => $r\n";
4585 sub quiltify_tree_sentinelfiles ($) {
4586 # lists the `sentinel' files present in the tree
4588 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4589 qw(-- debian/rules debian/control);
4594 sub quiltify_splitbrain_needed () {
4595 if (!$split_brain) {
4596 progress "dgit view: changes are required...";
4597 runcmd @git, qw(checkout -q -b dgit-view);
4602 sub quiltify_splitbrain ($$$$$$) {
4603 my ($clogp, $unapplied, $headref, $diffbits,
4604 $editedignores, $cachekey) = @_;
4605 if ($quilt_mode !~ m/gbp|dpm/) {
4606 # treat .gitignore just like any other upstream file
4607 $diffbits = { %$diffbits };
4608 $_ = !!$_ foreach values %$diffbits;
4610 # We would like any commits we generate to be reproducible
4611 my @authline = clogp_authline($clogp);
4612 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4613 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4614 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4615 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4616 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4617 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4619 if ($quilt_mode =~ m/gbp|unapplied/ &&
4620 ($diffbits->{O2H} & 01)) {
4622 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4623 " but git tree differs from orig in upstream files.";
4624 if (!stat_exists "debian/patches") {
4626 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4630 if ($quilt_mode =~ m/dpm/ &&
4631 ($diffbits->{H2A} & 01)) {
4633 --quilt=$quilt_mode specified, implying patches-applied git tree
4634 but git tree differs from result of applying debian/patches to upstream
4637 if ($quilt_mode =~ m/gbp|unapplied/ &&
4638 ($diffbits->{O2A} & 01)) { # some patches
4639 quiltify_splitbrain_needed();
4640 progress "dgit view: creating patches-applied version using gbp pq";
4641 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4642 # gbp pq import creates a fresh branch; push back to dgit-view
4643 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4644 runcmd @git, qw(checkout -q dgit-view);
4646 if ($quilt_mode =~ m/gbp|dpm/ &&
4647 ($diffbits->{O2A} & 02)) {
4649 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4650 tool which does not create patches for changes to upstream
4651 .gitignores: but, such patches exist in debian/patches.
4654 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4655 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4656 quiltify_splitbrain_needed();
4657 progress "dgit view: creating patch to represent .gitignore changes";
4658 ensuredir "debian/patches";
4659 my $gipatch = "debian/patches/auto-gitignore";
4660 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4661 stat GIPATCH or die "$gipatch: $!";
4662 fail "$gipatch already exists; but want to create it".
4663 " to record .gitignore changes" if (stat _)[7];
4664 print GIPATCH <<END or die "$gipatch: $!";
4665 Subject: Update .gitignore from Debian packaging branch
4667 The Debian packaging git branch contains these updates to the upstream
4668 .gitignore file(s). This patch is autogenerated, to provide these
4669 updates to users of the official Debian archive view of the package.
4671 [dgit ($our_version) update-gitignore]
4674 close GIPATCH or die "$gipatch: $!";
4675 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4676 $unapplied, $headref, "--", sort keys %$editedignores;
4677 open SERIES, "+>>", "debian/patches/series" or die $!;
4678 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4680 defined read SERIES, $newline, 1 or die $!;
4681 print SERIES "\n" or die $! unless $newline eq "\n";
4682 print SERIES "auto-gitignore\n" or die $!;
4683 close SERIES or die $!;
4684 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4686 Commit patch to update .gitignore
4688 [dgit ($our_version) update-gitignore-quilt-fixup]
4692 my $dgitview = git_rev_parse 'HEAD';
4694 changedir '../../../..';
4695 # When we no longer need to support squeeze, use --create-reflog
4697 ensuredir ".git/logs/refs/dgit-intern";
4698 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4701 my $oldcache = git_get_ref "refs/$splitbraincache";
4702 if ($oldcache eq $dgitview) {
4703 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4704 # git update-ref doesn't always update, in this case. *sigh*
4705 my $dummy = make_commit_text <<END;
4708 author Dgit <dgit\@example.com> 1000000000 +0000
4709 committer Dgit <dgit\@example.com> 1000000000 +0000
4711 Dummy commit - do not use
4713 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4714 "refs/$splitbraincache", $dummy;
4716 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4719 changedir '.git/dgit/unpack/work';
4721 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4722 progress "dgit view: created ($saved)";
4725 sub quiltify ($$$$) {
4726 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4728 # Quilt patchification algorithm
4730 # We search backwards through the history of the main tree's HEAD
4731 # (T) looking for a start commit S whose tree object is identical
4732 # to to the patch tip tree (ie the tree corresponding to the
4733 # current dpkg-committed patch series). For these purposes
4734 # `identical' disregards anything in debian/ - this wrinkle is
4735 # necessary because dpkg-source treates debian/ specially.
4737 # We can only traverse edges where at most one of the ancestors'
4738 # trees differs (in changes outside in debian/). And we cannot
4739 # handle edges which change .pc/ or debian/patches. To avoid
4740 # going down a rathole we avoid traversing edges which introduce
4741 # debian/rules or debian/control. And we set a limit on the
4742 # number of edges we are willing to look at.
4744 # If we succeed, we walk forwards again. For each traversed edge
4745 # PC (with P parent, C child) (starting with P=S and ending with
4746 # C=T) to we do this:
4748 # - dpkg-source --commit with a patch name and message derived from C
4749 # After traversing PT, we git commit the changes which
4750 # should be contained within debian/patches.
4752 # The search for the path S..T is breadth-first. We maintain a
4753 # todo list containing search nodes. A search node identifies a
4754 # commit, and looks something like this:
4756 # Commit => $git_commit_id,
4757 # Child => $c, # or undef if P=T
4758 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4759 # Nontrivial => true iff $p..$c has relevant changes
4766 my %considered; # saves being exponential on some weird graphs
4768 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4771 my ($search,$whynot) = @_;
4772 printdebug " search NOT $search->{Commit} $whynot\n";
4773 $search->{Whynot} = $whynot;
4774 push @nots, $search;
4775 no warnings qw(exiting);
4784 my $c = shift @todo;
4785 next if $considered{$c->{Commit}}++;
4787 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4789 printdebug "quiltify investigate $c->{Commit}\n";
4792 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4793 printdebug " search finished hooray!\n";
4798 if ($quilt_mode eq 'nofix') {
4799 fail "quilt fixup required but quilt mode is \`nofix'\n".
4800 "HEAD commit $c->{Commit} differs from tree implied by ".
4801 " debian/patches (tree object $oldtiptree)";
4803 if ($quilt_mode eq 'smash') {
4804 printdebug " search quitting smash\n";
4808 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4809 $not->($c, "has $c_sentinels not $t_sentinels")
4810 if $c_sentinels ne $t_sentinels;
4812 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4813 $commitdata =~ m/\n\n/;
4815 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4816 @parents = map { { Commit => $_, Child => $c } } @parents;
4818 $not->($c, "root commit") if !@parents;
4820 foreach my $p (@parents) {
4821 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4823 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4824 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4826 foreach my $p (@parents) {
4827 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4829 my @cmd= (@git, qw(diff-tree -r --name-only),
4830 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4831 my $patchstackchange = cmdoutput @cmd;
4832 if (length $patchstackchange) {
4833 $patchstackchange =~ s/\n/,/g;
4834 $not->($p, "changed $patchstackchange");
4837 printdebug " search queue P=$p->{Commit} ",
4838 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4844 printdebug "quiltify want to smash\n";
4847 my $x = $_[0]{Commit};
4848 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4851 my $reportnot = sub {
4853 my $s = $abbrev->($notp);
4854 my $c = $notp->{Child};
4855 $s .= "..".$abbrev->($c) if $c;
4856 $s .= ": ".$notp->{Whynot};
4859 if ($quilt_mode eq 'linear') {
4860 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4861 foreach my $notp (@nots) {
4862 print STDERR "$us: ", $reportnot->($notp), "\n";
4864 print STDERR "$us: $_\n" foreach @$failsuggestion;
4865 fail "quilt fixup naive history linearisation failed.\n".
4866 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4867 } elsif ($quilt_mode eq 'smash') {
4868 } elsif ($quilt_mode eq 'auto') {
4869 progress "quilt fixup cannot be linear, smashing...";
4871 die "$quilt_mode ?";
4874 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4875 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4877 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4879 quiltify_dpkg_commit "auto-$version-$target-$time",
4880 (getfield $clogp, 'Maintainer'),
4881 "Automatically generated patch ($clogp->{Version})\n".
4882 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4886 progress "quiltify linearisation planning successful, executing...";
4888 for (my $p = $sref_S;
4889 my $c = $p->{Child};
4891 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4892 next unless $p->{Nontrivial};
4894 my $cc = $c->{Commit};
4896 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4897 $commitdata =~ m/\n\n/ or die "$c ?";
4900 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4903 my $commitdate = cmdoutput
4904 @git, qw(log -n1 --pretty=format:%aD), $cc;
4906 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4908 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4915 my $gbp_check_suitable = sub {
4920 die "contains unexpected slashes\n" if m{//} || m{/$};
4921 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4922 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4923 die "too long" if length > 200;
4925 return $_ unless $@;
4926 print STDERR "quiltifying commit $cc:".
4927 " ignoring/dropping Gbp-Pq $what: $@";
4931 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4933 (\S+) \s* \n //ixm) {
4934 $patchname = $gbp_check_suitable->($1, 'Name');
4936 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4938 (\S+) \s* \n //ixm) {
4939 $patchdir = $gbp_check_suitable->($1, 'Topic');
4944 if (!defined $patchname) {
4945 $patchname = $title;
4946 $patchname =~ s/[.:]$//;
4949 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4950 my $translitname = $converter->convert($patchname);
4951 die unless defined $translitname;
4952 $patchname = $translitname;
4955 "dgit: patch title transliteration error: $@"
4957 $patchname =~ y/ A-Z/-a-z/;
4958 $patchname =~ y/-a-z0-9_.+=~//cd;
4959 $patchname =~ s/^\W/x-$&/;
4960 $patchname = substr($patchname,0,40);
4962 if (!defined $patchdir) {
4965 if (length $patchdir) {
4966 $patchname = "$patchdir/$patchname";
4968 if ($patchname =~ m{^(.*)/}) {
4969 mkpath "debian/patches/$1";
4974 stat "debian/patches/$patchname$index";
4976 $!==ENOENT or die "$patchname$index $!";
4978 runcmd @git, qw(checkout -q), $cc;
4980 # We use the tip's changelog so that dpkg-source doesn't
4981 # produce complaining messages from dpkg-parsechangelog. None
4982 # of the information dpkg-source gets from the changelog is
4983 # actually relevant - it gets put into the original message
4984 # which dpkg-source provides our stunt editor, and then
4986 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4988 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4989 "Date: $commitdate\n".
4990 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4992 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4995 runcmd @git, qw(checkout -q master);
4998 sub build_maybe_quilt_fixup () {
4999 my ($format,$fopts) = get_source_format;
5000 return unless madformat_wantfixup $format;
5003 check_for_vendor_patches();
5005 if (quiltmode_splitbrain) {
5006 fail <<END unless access_cfg_tagformats_can_splitbrain;
5007 quilt mode $quilt_mode requires split view so server needs to support
5008 both "new" and "maint" tag formats, but config says it doesn't.
5012 my $clogp = parsechangelog();
5013 my $headref = git_rev_parse('HEAD');
5018 my $upstreamversion = upstreamversion $version;
5020 if ($fopts->{'single-debian-patch'}) {
5021 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5023 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5026 die 'bug' if $split_brain && !$need_split_build_invocation;
5028 changedir '../../../..';
5029 runcmd_ordryrun_local
5030 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5033 sub quilt_fixup_mkwork ($) {
5036 mkdir "work" or die $!;
5038 mktree_in_ud_here();
5039 runcmd @git, qw(reset -q --hard), $headref;
5042 sub quilt_fixup_linkorigs ($$) {
5043 my ($upstreamversion, $fn) = @_;
5044 # calls $fn->($leafname);
5046 foreach my $f (<../../../../*>) { #/){
5047 my $b=$f; $b =~ s{.*/}{};
5049 local ($debuglevel) = $debuglevel-1;
5050 printdebug "QF linkorigs $b, $f ?\n";
5052 next unless is_orig_file_of_vsn $b, $upstreamversion;
5053 printdebug "QF linkorigs $b, $f Y\n";
5054 link_ltarget $f, $b or die "$b $!";
5059 sub quilt_fixup_delete_pc () {
5060 runcmd @git, qw(rm -rqf .pc);
5062 Commit removal of .pc (quilt series tracking data)
5064 [dgit ($our_version) upgrade quilt-remove-pc]
5068 sub quilt_fixup_singlepatch ($$$) {
5069 my ($clogp, $headref, $upstreamversion) = @_;
5071 progress "starting quiltify (single-debian-patch)";
5073 # dpkg-source --commit generates new patches even if
5074 # single-debian-patch is in debian/source/options. In order to
5075 # get it to generate debian/patches/debian-changes, it is
5076 # necessary to build the source package.
5078 quilt_fixup_linkorigs($upstreamversion, sub { });
5079 quilt_fixup_mkwork($headref);
5081 rmtree("debian/patches");
5083 runcmd @dpkgsource, qw(-b .);
5085 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5086 rename srcfn("$upstreamversion", "/debian/patches"),
5087 "work/debian/patches";
5090 commit_quilty_patch();
5093 sub quilt_make_fake_dsc ($) {
5094 my ($upstreamversion) = @_;
5096 my $fakeversion="$upstreamversion-~~DGITFAKE";
5098 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5099 print $fakedsc <<END or die $!;
5102 Version: $fakeversion
5106 my $dscaddfile=sub {
5109 my $md = new Digest::MD5;
5111 my $fh = new IO::File $b, '<' or die "$b $!";
5116 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5119 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5121 my @files=qw(debian/source/format debian/rules
5122 debian/control debian/changelog);
5123 foreach my $maybe (qw(debian/patches debian/source/options
5124 debian/tests/control)) {
5125 next unless stat_exists "../../../$maybe";
5126 push @files, $maybe;
5129 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5130 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5132 $dscaddfile->($debtar);
5133 close $fakedsc or die $!;
5136 sub quilt_check_splitbrain_cache ($$) {
5137 my ($headref, $upstreamversion) = @_;
5138 # Called only if we are in (potentially) split brain mode.
5140 # Computes the cache key and looks in the cache.
5141 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5143 my $splitbrain_cachekey;
5146 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5147 # we look in the reflog of dgit-intern/quilt-cache
5148 # we look for an entry whose message is the key for the cache lookup
5149 my @cachekey = (qw(dgit), $our_version);
5150 push @cachekey, $upstreamversion;
5151 push @cachekey, $quilt_mode;
5152 push @cachekey, $headref;
5154 push @cachekey, hashfile('fake.dsc');
5156 my $srcshash = Digest::SHA->new(256);
5157 my %sfs = ( %INC, '$0(dgit)' => $0 );
5158 foreach my $sfk (sort keys %sfs) {
5159 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5160 $srcshash->add($sfk," ");
5161 $srcshash->add(hashfile($sfs{$sfk}));
5162 $srcshash->add("\n");
5164 push @cachekey, $srcshash->hexdigest();
5165 $splitbrain_cachekey = "@cachekey";
5167 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5169 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5170 debugcmd "|(probably)",@cmd;
5171 my $child = open GC, "-|"; defined $child or die $!;
5173 chdir '../../..' or die $!;
5174 if (!stat ".git/logs/refs/$splitbraincache") {
5175 $! == ENOENT or die $!;
5176 printdebug ">(no reflog)\n";
5183 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5184 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5187 quilt_fixup_mkwork($headref);
5188 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5189 if ($cachehit ne $headref) {
5190 progress "dgit view: found cached ($saved)";
5191 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5193 return ($cachehit, $splitbrain_cachekey);
5195 progress "dgit view: found cached, no changes required";
5196 return ($headref, $splitbrain_cachekey);
5198 die $! if GC->error;
5199 failedcmd unless close GC;
5201 printdebug "splitbrain cache miss\n";
5202 return (undef, $splitbrain_cachekey);
5205 sub quilt_fixup_multipatch ($$$) {
5206 my ($clogp, $headref, $upstreamversion) = @_;
5208 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5211 # - honour any existing .pc in case it has any strangeness
5212 # - determine the git commit corresponding to the tip of
5213 # the patch stack (if there is one)
5214 # - if there is such a git commit, convert each subsequent
5215 # git commit into a quilt patch with dpkg-source --commit
5216 # - otherwise convert all the differences in the tree into
5217 # a single git commit
5221 # Our git tree doesn't necessarily contain .pc. (Some versions of
5222 # dgit would include the .pc in the git tree.) If there isn't
5223 # one, we need to generate one by unpacking the patches that we
5226 # We first look for a .pc in the git tree. If there is one, we
5227 # will use it. (This is not the normal case.)
5229 # Otherwise need to regenerate .pc so that dpkg-source --commit
5230 # can work. We do this as follows:
5231 # 1. Collect all relevant .orig from parent directory
5232 # 2. Generate a debian.tar.gz out of
5233 # debian/{patches,rules,source/format,source/options}
5234 # 3. Generate a fake .dsc containing just these fields:
5235 # Format Source Version Files
5236 # 4. Extract the fake .dsc
5237 # Now the fake .dsc has a .pc directory.
5238 # (In fact we do this in every case, because in future we will
5239 # want to search for a good base commit for generating patches.)
5241 # Then we can actually do the dpkg-source --commit
5242 # 1. Make a new working tree with the same object
5243 # store as our main tree and check out the main
5245 # 2. Copy .pc from the fake's extraction, if necessary
5246 # 3. Run dpkg-source --commit
5247 # 4. If the result has changes to debian/, then
5248 # - git add them them
5249 # - git add .pc if we had a .pc in-tree
5251 # 5. If we had a .pc in-tree, delete it, and git commit
5252 # 6. Back in the main tree, fast forward to the new HEAD
5254 # Another situation we may have to cope with is gbp-style
5255 # patches-unapplied trees.
5257 # We would want to detect these, so we know to escape into
5258 # quilt_fixup_gbp. However, this is in general not possible.
5259 # Consider a package with a one patch which the dgit user reverts
5260 # (with git revert or the moral equivalent).
5262 # That is indistinguishable in contents from a patches-unapplied
5263 # tree. And looking at the history to distinguish them is not
5264 # useful because the user might have made a confusing-looking git
5265 # history structure (which ought to produce an error if dgit can't
5266 # cope, not a silent reintroduction of an unwanted patch).
5268 # So gbp users will have to pass an option. But we can usually
5269 # detect their failure to do so: if the tree is not a clean
5270 # patches-applied tree, quilt linearisation fails, but the tree
5271 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5272 # they want --quilt=unapplied.
5274 # To help detect this, when we are extracting the fake dsc, we
5275 # first extract it with --skip-patches, and then apply the patches
5276 # afterwards with dpkg-source --before-build. That lets us save a
5277 # tree object corresponding to .origs.
5279 my $splitbrain_cachekey;
5281 quilt_make_fake_dsc($upstreamversion);
5283 if (quiltmode_splitbrain()) {
5285 ($cachehit, $splitbrain_cachekey) =
5286 quilt_check_splitbrain_cache($headref, $upstreamversion);
5287 return if $cachehit;
5291 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5293 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5294 rename $fakexdir, "fake" or die "$fakexdir $!";
5298 remove_stray_gits("source package");
5299 mktree_in_ud_here();
5303 my $unapplied=git_add_write_tree();
5304 printdebug "fake orig tree object $unapplied\n";
5308 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5310 if (system @bbcmd) {
5311 failedcmd @bbcmd if $? < 0;
5313 failed to apply your git tree's patch stack (from debian/patches/) to
5314 the corresponding upstream tarball(s). Your source tree and .orig
5315 are probably too inconsistent. dgit can only fix up certain kinds of
5316 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5322 quilt_fixup_mkwork($headref);
5325 if (stat_exists ".pc") {
5327 progress "Tree already contains .pc - will use it then delete it.";
5330 rename '../fake/.pc','.pc' or die $!;
5333 changedir '../fake';
5335 my $oldtiptree=git_add_write_tree();
5336 printdebug "fake o+d/p tree object $unapplied\n";
5337 changedir '../work';
5340 # We calculate some guesswork now about what kind of tree this might
5341 # be. This is mostly for error reporting.
5347 # O = orig, without patches applied
5348 # A = "applied", ie orig with H's debian/patches applied
5349 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5350 \%editedignores, \@unrepres),
5351 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5352 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5356 foreach my $b (qw(01 02)) {
5357 foreach my $v (qw(O2H O2A H2A)) {
5358 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5361 printdebug "differences \@dl @dl.\n";
5364 "$us: base trees orig=%.20s o+d/p=%.20s",
5365 $unapplied, $oldtiptree;
5367 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5368 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5369 $dl[0], $dl[1], $dl[3], $dl[4],
5373 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5375 forceable_fail [qw(unrepresentable)], <<END;
5376 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5381 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5382 push @failsuggestion, "This might be a patches-unapplied branch.";
5383 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5384 push @failsuggestion, "This might be a patches-applied branch.";
5386 push @failsuggestion, "Maybe you need to specify one of".
5387 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5389 if (quiltmode_splitbrain()) {
5390 quiltify_splitbrain($clogp, $unapplied, $headref,
5391 $diffbits, \%editedignores,
5392 $splitbrain_cachekey);
5396 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5397 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5399 if (!open P, '>>', ".pc/applied-patches") {
5400 $!==&ENOENT or die $!;
5405 commit_quilty_patch();
5407 if ($mustdeletepc) {
5408 quilt_fixup_delete_pc();
5412 sub quilt_fixup_editor () {
5413 my $descfn = $ENV{$fakeeditorenv};
5414 my $editing = $ARGV[$#ARGV];
5415 open I1, '<', $descfn or die "$descfn: $!";
5416 open I2, '<', $editing or die "$editing: $!";
5417 unlink $editing or die "$editing: $!";
5418 open O, '>', $editing or die "$editing: $!";
5419 while (<I1>) { print O or die $!; } I1->error and die $!;
5422 $copying ||= m/^\-\-\- /;
5423 next unless $copying;
5426 I2->error and die $!;
5431 sub maybe_apply_patches_dirtily () {
5432 return unless $quilt_mode =~ m/gbp|unapplied/;
5433 print STDERR <<END or die $!;
5435 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5436 dgit: Have to apply the patches - making the tree dirty.
5437 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5440 $patches_applied_dirtily = 01;
5441 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5442 runcmd qw(dpkg-source --before-build .);
5445 sub maybe_unapply_patches_again () {
5446 progress "dgit: Unapplying patches again to tidy up the tree."
5447 if $patches_applied_dirtily;
5448 runcmd qw(dpkg-source --after-build .)
5449 if $patches_applied_dirtily & 01;
5451 if $patches_applied_dirtily & 02;
5452 $patches_applied_dirtily = 0;
5455 #----- other building -----
5457 our $clean_using_builder;
5458 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5459 # clean the tree before building (perhaps invoked indirectly by
5460 # whatever we are using to run the build), rather than separately
5461 # and explicitly by us.
5464 return if $clean_using_builder;
5465 if ($cleanmode eq 'dpkg-source') {
5466 maybe_apply_patches_dirtily();
5467 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5468 } elsif ($cleanmode eq 'dpkg-source-d') {
5469 maybe_apply_patches_dirtily();
5470 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5471 } elsif ($cleanmode eq 'git') {
5472 runcmd_ordryrun_local @git, qw(clean -xdf);
5473 } elsif ($cleanmode eq 'git-ff') {
5474 runcmd_ordryrun_local @git, qw(clean -xdff);
5475 } elsif ($cleanmode eq 'check') {
5476 my $leftovers = cmdoutput @git, qw(clean -xdn);
5477 if (length $leftovers) {
5478 print STDERR $leftovers, "\n" or die $!;
5479 fail "tree contains uncommitted files and --clean=check specified";
5481 } elsif ($cleanmode eq 'none') {
5488 badusage "clean takes no additional arguments" if @ARGV;
5491 maybe_unapply_patches_again();
5494 sub build_prep_early () {
5495 our $build_prep_early_done //= 0;
5496 return if $build_prep_early_done++;
5498 badusage "-p is not allowed when building" if defined $package;
5499 my $clogp = parsechangelog();
5500 $isuite = getfield $clogp, 'Distribution';
5501 $package = getfield $clogp, 'Source';
5502 $version = getfield $clogp, 'Version';
5509 build_maybe_quilt_fixup();
5511 my $pat = changespat $version;
5512 foreach my $f (glob "$buildproductsdir/$pat") {
5514 unlink $f or fail "remove old changes file $f: $!";
5516 progress "would remove $f";
5522 sub changesopts_initial () {
5523 my @opts =@changesopts[1..$#changesopts];
5526 sub changesopts_version () {
5527 if (!defined $changes_since_version) {
5528 my @vsns = archive_query('archive_query');
5529 my @quirk = access_quirk();
5530 if ($quirk[0] eq 'backports') {
5531 local $isuite = $quirk[2];
5533 canonicalise_suite();
5534 push @vsns, archive_query('archive_query');
5537 @vsns = map { $_->[0] } @vsns;
5538 @vsns = sort { -version_compare($a, $b) } @vsns;
5539 $changes_since_version = $vsns[0];
5540 progress "changelog will contain changes since $vsns[0]";
5542 $changes_since_version = '_';
5543 progress "package seems new, not specifying -v<version>";
5546 if ($changes_since_version ne '_') {
5547 return ("-v$changes_since_version");
5553 sub changesopts () {
5554 return (changesopts_initial(), changesopts_version());
5557 sub massage_dbp_args ($;$) {
5558 my ($cmd,$xargs) = @_;
5561 # - if we're going to split the source build out so we can
5562 # do strange things to it, massage the arguments to dpkg-buildpackage
5563 # so that the main build doessn't build source (or add an argument
5564 # to stop it building source by default).
5566 # - add -nc to stop dpkg-source cleaning the source tree,
5567 # unless we're not doing a split build and want dpkg-source
5568 # as cleanmode, in which case we can do nothing
5571 # 0 - source will NOT need to be built separately by caller
5572 # +1 - source will need to be built separately by caller
5573 # +2 - source will need to be built separately by caller AND
5574 # dpkg-buildpackage should not in fact be run at all!
5575 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5576 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5577 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5578 $clean_using_builder = 1;
5581 # -nc has the side effect of specifying -b if nothing else specified
5582 # and some combinations of -S, -b, et al, are errors, rather than
5583 # later simply overriding earlie. So we need to:
5584 # - search the command line for these options
5585 # - pick the last one
5586 # - perhaps add our own as a default
5587 # - perhaps adjust it to the corresponding non-source-building version
5589 foreach my $l ($cmd, $xargs) {
5591 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5594 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5596 if ($need_split_build_invocation) {
5597 printdebug "massage split $dmode.\n";
5598 $r = $dmode =~ m/[S]/ ? +2 :
5599 $dmode =~ y/gGF/ABb/ ? +1 :
5600 $dmode =~ m/[ABb]/ ? 0 :
5603 printdebug "massage done $r $dmode.\n";
5605 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5611 my $wasdir = must_getcwd();
5617 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5618 my ($msg_if_onlyone) = @_;
5619 # If there is only one .changes file, fail with $msg_if_onlyone,
5620 # or if that is undef, be a no-op.
5621 # Returns the changes file to report to the user.
5622 my $pat = changespat $version;
5623 my @changesfiles = glob $pat;
5624 @changesfiles = sort {
5625 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5629 if (@changesfiles==1) {
5630 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5631 only one changes file from build (@changesfiles)
5633 $result = $changesfiles[0];
5634 } elsif (@changesfiles==2) {
5635 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5636 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5637 fail "$l found in binaries changes file $binchanges"
5640 runcmd_ordryrun_local @mergechanges, @changesfiles;
5641 my $multichanges = changespat $version,'multi';
5643 stat_exists $multichanges or fail "$multichanges: $!";
5644 foreach my $cf (glob $pat) {
5645 next if $cf eq $multichanges;
5646 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5649 $result = $multichanges;
5651 fail "wrong number of different changes files (@changesfiles)";
5653 printdone "build successful, results in $result\n" or die $!;
5656 sub midbuild_checkchanges () {
5657 my $pat = changespat $version;
5658 return if $rmchanges;
5659 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5660 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5662 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5663 Suggest you delete @unwanted.
5668 sub midbuild_checkchanges_vanilla ($) {
5670 midbuild_checkchanges() if $wantsrc == 1;
5673 sub postbuild_mergechanges_vanilla ($) {
5675 if ($wantsrc == 1) {
5677 postbuild_mergechanges(undef);
5680 printdone "build successful\n";
5686 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5687 my $wantsrc = massage_dbp_args \@dbp;
5690 midbuild_checkchanges_vanilla $wantsrc;
5695 push @dbp, changesopts_version();
5696 maybe_apply_patches_dirtily();
5697 runcmd_ordryrun_local @dbp;
5699 maybe_unapply_patches_again();
5700 postbuild_mergechanges_vanilla $wantsrc;
5704 $quilt_mode //= 'gbp';
5710 # gbp can make .origs out of thin air. In my tests it does this
5711 # even for a 1.0 format package, with no origs present. So I
5712 # guess it keys off just the version number. We don't know
5713 # exactly what .origs ought to exist, but let's assume that we
5714 # should run gbp if: the version has an upstream part and the main
5716 my $upstreamversion = upstreamversion $version;
5717 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5718 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5720 if ($gbp_make_orig) {
5722 $cleanmode = 'none'; # don't do it again
5723 $need_split_build_invocation = 1;
5726 my @dbp = @dpkgbuildpackage;
5728 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5730 if (!length $gbp_build[0]) {
5731 if (length executable_on_path('git-buildpackage')) {
5732 $gbp_build[0] = qw(git-buildpackage);
5734 $gbp_build[0] = 'gbp buildpackage';
5737 my @cmd = opts_opt_multi_cmd @gbp_build;
5739 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5741 if ($gbp_make_orig) {
5742 ensuredir '.git/dgit';
5743 my $ok = '.git/dgit/origs-gen-ok';
5744 unlink $ok or $!==&ENOENT or die $!;
5745 my @origs_cmd = @cmd;
5746 push @origs_cmd, qw(--git-cleaner=true);
5747 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5748 push @origs_cmd, @ARGV;
5750 debugcmd @origs_cmd;
5752 do { local $!; stat_exists $ok; }
5753 or failedcmd @origs_cmd;
5755 dryrun_report @origs_cmd;
5761 midbuild_checkchanges_vanilla $wantsrc;
5763 if (!$clean_using_builder) {
5764 push @cmd, '--git-cleaner=true';
5768 maybe_unapply_patches_again();
5770 push @cmd, changesopts();
5771 runcmd_ordryrun_local @cmd, @ARGV;
5773 postbuild_mergechanges_vanilla $wantsrc;
5775 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5779 my $our_cleanmode = $cleanmode;
5780 if ($need_split_build_invocation) {
5781 # Pretend that clean is being done some other way. This
5782 # forces us not to try to use dpkg-buildpackage to clean and
5783 # build source all in one go; and instead we run dpkg-source
5784 # (and build_prep() will do the clean since $clean_using_builder
5786 $our_cleanmode = 'ELSEWHERE';
5788 if ($our_cleanmode =~ m/^dpkg-source/) {
5789 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5790 $clean_using_builder = 1;
5793 $sourcechanges = changespat $version,'source';
5795 unlink "../$sourcechanges" or $!==ENOENT
5796 or fail "remove $sourcechanges: $!";
5798 $dscfn = dscfn($version);
5799 if ($our_cleanmode eq 'dpkg-source') {
5800 maybe_apply_patches_dirtily();
5801 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5803 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5804 maybe_apply_patches_dirtily();
5805 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5808 my @cmd = (@dpkgsource, qw(-b --));
5811 runcmd_ordryrun_local @cmd, "work";
5812 my @udfiles = <${package}_*>;
5813 changedir "../../..";
5814 foreach my $f (@udfiles) {
5815 printdebug "source copy, found $f\n";
5818 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5819 $f eq srcfn($version, $&));
5820 printdebug "source copy, found $f - renaming\n";
5821 rename "$ud/$f", "../$f" or $!==ENOENT
5822 or fail "put in place new source file ($f): $!";
5825 my $pwd = must_getcwd();
5826 my $leafdir = basename $pwd;
5828 runcmd_ordryrun_local @cmd, $leafdir;
5831 runcmd_ordryrun_local qw(sh -ec),
5832 'exec >$1; shift; exec "$@"','x',
5833 "../$sourcechanges",
5834 @dpkggenchanges, qw(-S), changesopts();
5838 sub cmd_build_source {
5840 badusage "build-source takes no additional arguments" if @ARGV;
5842 maybe_unapply_patches_again();
5843 printdone "source built, results in $dscfn and $sourcechanges";
5848 midbuild_checkchanges();
5851 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5852 stat_exists $sourcechanges
5853 or fail "$sourcechanges (in parent directory): $!";
5855 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5857 maybe_unapply_patches_again();
5859 postbuild_mergechanges(<<END);
5860 perhaps you need to pass -A ? (sbuild's default is to build only
5861 arch-specific binaries; dgit 1.4 used to override that.)
5866 sub cmd_quilt_fixup {
5867 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5870 build_maybe_quilt_fixup();
5873 sub cmd_import_dsc {
5877 last unless $ARGV[0] =~ m/^-/;
5880 if (m/^--require-valid-signature$/) {
5883 badusage "unknown dgit import-dsc sub-option \`$_'";
5887 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5888 my ($dscfn, $dstbranch) = @ARGV;
5890 badusage "dry run makes no sense with import-dsc" unless act_local();
5892 my $force = $dstbranch =~ s/^\+// ? +1 :
5893 $dstbranch =~ s/^\.\.// ? -1 :
5895 my $info = $force ? " $&" : '';
5896 $info = "$dscfn$info";
5898 my $specbranch = $dstbranch;
5899 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5900 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5902 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
5903 my $chead = cmdoutput_errok @symcmd;
5904 defined $chead or $?==256 or failedcmd @symcmd;
5906 fail "$dstbranch is checked out - will not update it"
5907 if defined $chead and $chead eq $dstbranch;
5909 my $oldhash = git_get_ref $dstbranch;
5911 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5912 $dscdata = do { local $/ = undef; <D>; };
5913 D->error and fail "read $dscfn: $!";
5916 # we don't normally need this so import it here
5917 use Dpkg::Source::Package;
5918 my $dp = new Dpkg::Source::Package filename => $dscfn,
5919 require_valid_signature => $needsig;
5921 local $SIG{__WARN__} = sub {
5923 return unless $needsig;
5924 fail "import-dsc signature check failed";
5926 if (!$dp->is_signed()) {
5927 warn "$us: warning: importing unsigned .dsc\n";
5929 my $r = $dp->check_signature();
5930 die "->check_signature => $r" if $needsig && $r;
5936 parse_dsc_field($dsc, "Dgit metadata in .dsc");
5938 if (defined $dsc_hash
5939 && !forceing [qw(import-dsc-with-dgit-field)]) {
5940 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5941 my @cmd = (qw(sh -ec),
5942 "echo $dsc_hash | git cat-file --batch-check");
5943 my $objgot = cmdoutput @cmd;
5944 if ($objgot =~ m#^\w+ missing\b#) {
5946 .dsc contains Dgit field referring to object $dsc_hash
5947 Your git tree does not have that object. Try `git fetch' from a
5948 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5951 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
5953 progress "Not fast forward, forced update.";
5955 fail "Not fast forward to $dsc_hash";
5958 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
5959 $dstbranch, $dsc_hash);
5961 progress "dgit: import-dsc updated git ref $dstbranch";
5966 Branch $dstbranch already exists
5967 Specify ..$specbranch for a pseudo-merge, binding in existing history
5968 Specify +$specbranch to overwrite, discarding existing history
5970 if $oldhash && !$force;
5972 $package = getfield $dsc, 'Source';
5973 my @dfi = dsc_files_info();
5974 foreach my $fi (@dfi) {
5975 my $f = $fi->{Filename};
5977 next if lstat $here;
5978 fail "stat $here: $!" unless $! == ENOENT;
5980 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5982 } elsif ($dscfn =~ m#^/#) {
5985 fail "cannot import $dscfn which seems to be inside working tree!";
5987 $there =~ s#/+[^/]+$## or
5988 fail "cannot import $dscfn which seems to not have a basename";
5990 symlink $there, $here or fail "symlink $there to $here: $!";
5991 progress "made symlink $here -> $there";
5992 # print STDERR Dumper($fi);
5994 my @mergeinputs = generate_commits_from_dsc();
5995 die unless @mergeinputs == 1;
5997 my $newhash = $mergeinputs[0]{Commit};
6001 progress "Import, forced update - synthetic orphan git history.";
6002 } elsif ($force < 0) {
6003 progress "Import, merging.";
6004 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6005 my $version = getfield $dsc, 'Version';
6006 my $clogp = commit_getclogp $newhash;
6007 my $authline = clogp_authline $clogp;
6008 $newhash = make_commit_text <<END;
6015 Merge $package ($version) import into $dstbranch
6018 die; # caught earlier
6022 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
6023 $dstbranch, $newhash);
6025 progress "dgit: import-dsc results are in in git ref $dstbranch";
6028 sub cmd_archive_api_query {
6029 badusage "need only 1 subpath argument" unless @ARGV==1;
6030 my ($subpath) = @ARGV;
6031 my @cmd = archive_api_query_cmd($subpath);
6034 exec @cmd or fail "exec curl: $!\n";
6037 sub cmd_clone_dgit_repos_server {
6038 badusage "need destination argument" unless @ARGV==1;
6039 my ($destdir) = @ARGV;
6040 $package = '_dgit-repos-server';
6041 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6043 exec @cmd or fail "exec git clone: $!\n";
6046 sub cmd_setup_mergechangelogs {
6047 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6048 setup_mergechangelogs(1);
6051 sub cmd_setup_useremail {
6052 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6056 sub cmd_setup_new_tree {
6057 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6061 #---------- argument parsing and main program ----------
6064 print "dgit version $our_version\n" or die $!;
6068 our (%valopts_long, %valopts_short);
6071 sub defvalopt ($$$$) {
6072 my ($long,$short,$val_re,$how) = @_;
6073 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6074 $valopts_long{$long} = $oi;
6075 $valopts_short{$short} = $oi;
6076 # $how subref should:
6077 # do whatever assignemnt or thing it likes with $_[0]
6078 # if the option should not be passed on to remote, @rvalopts=()
6079 # or $how can be a scalar ref, meaning simply assign the value
6082 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6083 defvalopt '--distro', '-d', '.+', \$idistro;
6084 defvalopt '', '-k', '.+', \$keyid;
6085 defvalopt '--existing-package','', '.*', \$existing_package;
6086 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6087 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6088 defvalopt '--package', '-p', $package_re, \$package;
6089 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6091 defvalopt '', '-C', '.+', sub {
6092 ($changesfile) = (@_);
6093 if ($changesfile =~ s#^(.*)/##) {
6094 $buildproductsdir = $1;
6098 defvalopt '--initiator-tempdir','','.*', sub {
6099 ($initiator_tempdir) = (@_);
6100 $initiator_tempdir =~ m#^/# or
6101 badusage "--initiator-tempdir must be used specify an".
6102 " absolute, not relative, directory."
6108 if (defined $ENV{'DGIT_SSH'}) {
6109 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6110 } elsif (defined $ENV{'GIT_SSH'}) {
6111 @ssh = ($ENV{'GIT_SSH'});
6119 if (!defined $val) {
6120 badusage "$what needs a value" unless @ARGV;
6122 push @rvalopts, $val;
6124 badusage "bad value \`$val' for $what" unless
6125 $val =~ m/^$oi->{Re}$(?!\n)/s;
6126 my $how = $oi->{How};
6127 if (ref($how) eq 'SCALAR') {
6132 push @ropts, @rvalopts;
6136 last unless $ARGV[0] =~ m/^-/;
6140 if (m/^--dry-run$/) {
6143 } elsif (m/^--damp-run$/) {
6146 } elsif (m/^--no-sign$/) {
6149 } elsif (m/^--help$/) {
6151 } elsif (m/^--version$/) {
6153 } elsif (m/^--new$/) {
6156 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6157 ($om = $opts_opt_map{$1}) &&
6161 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6162 !$opts_opt_cmdonly{$1} &&
6163 ($om = $opts_opt_map{$1})) {
6166 } elsif (m/^--(gbp|dpm)$/s) {
6167 push @ropts, "--quilt=$1";
6169 } elsif (m/^--ignore-dirty$/s) {
6172 } elsif (m/^--no-quilt-fixup$/s) {
6174 $quilt_mode = 'nocheck';
6175 } elsif (m/^--no-rm-on-error$/s) {
6178 } elsif (m/^--overwrite$/s) {
6180 $overwrite_version = '';
6181 } elsif (m/^--overwrite=(.+)$/s) {
6183 $overwrite_version = $1;
6184 } elsif (m/^--dep14tag$/s) {
6186 $dodep14tag= 'want';
6187 } elsif (m/^--no-dep14tag$/s) {
6190 } elsif (m/^--always-dep14tag$/s) {
6192 $dodep14tag= 'always';
6193 } elsif (m/^--delayed=(\d+)$/s) {
6196 } elsif (m/^--dgit-view-save=(.+)$/s) {
6198 $split_brain_save = $1;
6199 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6200 } elsif (m/^--(no-)?rm-old-changes$/s) {
6203 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6205 push @deliberatelies, $&;
6206 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6210 } elsif (m/^--force-/) {
6212 "$us: warning: ignoring unknown force option $_\n";
6214 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6215 # undocumented, for testing
6217 $tagformat_want = [ $1, 'command line', 1 ];
6218 # 1 menas overrides distro configuration
6219 } elsif (m/^--always-split-source-build$/s) {
6220 # undocumented, for testing
6222 $need_split_build_invocation = 1;
6223 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6224 $val = $2 ? $' : undef; #';
6225 $valopt->($oi->{Long});
6227 badusage "unknown long option \`$_'";
6234 } elsif (s/^-L/-/) {
6237 } elsif (s/^-h/-/) {
6239 } elsif (s/^-D/-/) {
6243 } elsif (s/^-N/-/) {
6248 push @changesopts, $_;
6250 } elsif (s/^-wn$//s) {
6252 $cleanmode = 'none';
6253 } elsif (s/^-wg$//s) {
6256 } elsif (s/^-wgf$//s) {
6258 $cleanmode = 'git-ff';
6259 } elsif (s/^-wd$//s) {
6261 $cleanmode = 'dpkg-source';
6262 } elsif (s/^-wdd$//s) {
6264 $cleanmode = 'dpkg-source-d';
6265 } elsif (s/^-wc$//s) {
6267 $cleanmode = 'check';
6268 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6269 push @git, '-c', $&;
6270 $gitcfgs{cmdline}{$1} = [ $2 ];
6271 } elsif (s/^-c([^=]+)$//s) {
6272 push @git, '-c', $&;
6273 $gitcfgs{cmdline}{$1} = [ 'true' ];
6274 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6276 $val = undef unless length $val;
6277 $valopt->($oi->{Short});
6280 badusage "unknown short option \`$_'";
6287 sub check_env_sanity () {
6288 my $blocked = new POSIX::SigSet;
6289 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6292 foreach my $name (qw(PIPE CHLD)) {
6293 my $signame = "SIG$name";
6294 my $signum = eval "POSIX::$signame" // die;
6295 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6296 die "$signame is set to something other than SIG_DFL\n";
6297 $blocked->ismember($signum) and
6298 die "$signame is blocked\n";
6304 On entry to dgit, $@
6305 This is a bug produced by something in in your execution environment.
6311 sub parseopts_late_defaults () {
6312 foreach my $k (keys %opts_opt_map) {
6313 my $om = $opts_opt_map{$k};
6315 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6317 badcfg "cannot set command for $k"
6318 unless length $om->[0];
6322 foreach my $c (access_cfg_cfgs("opts-$k")) {
6324 map { $_ ? @$_ : () }
6325 map { $gitcfgs{$_}{$c} }
6326 reverse @gitcfgsources;
6327 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6328 "\n" if $debuglevel >= 4;
6330 badcfg "cannot configure options for $k"
6331 if $opts_opt_cmdonly{$k};
6332 my $insertpos = $opts_cfg_insertpos{$k};
6333 @$om = ( @$om[0..$insertpos-1],
6335 @$om[$insertpos..$#$om] );
6339 if (!defined $rmchanges) {
6340 local $access_forpush;
6341 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6344 if (!defined $quilt_mode) {
6345 local $access_forpush;
6346 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6347 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6349 $quilt_mode =~ m/^($quilt_modes_re)$/
6350 or badcfg "unknown quilt-mode \`$quilt_mode'";
6354 if (!defined $dodep14tag) {
6355 local $access_forpush;
6356 $dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
6357 $dodep14tag =~ m/^($dodep14tag_re)$/
6358 or badcfg "unknown dep14tag setting \`$dodep14tag'";
6362 $need_split_build_invocation ||= quiltmode_splitbrain();
6364 if (!defined $cleanmode) {
6365 local $access_forpush;
6366 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6367 $cleanmode //= 'dpkg-source';
6369 badcfg "unknown clean-mode \`$cleanmode'" unless
6370 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6374 if ($ENV{$fakeeditorenv}) {
6376 quilt_fixup_editor();
6383 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6384 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6385 if $dryrun_level == 1;
6387 print STDERR $helpmsg or die $!;
6390 my $cmd = shift @ARGV;
6393 my $pre_fn = ${*::}{"pre_$cmd"};
6394 $pre_fn->() if $pre_fn;
6396 my $fn = ${*::}{"cmd_$cmd"};
6397 $fn or badusage "unknown operation $cmd";