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);
43 our $our_version = 'UNRELEASED'; ###substituted###
44 our $absurdity = undef; ###substituted###
46 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
49 our $isuite = 'unstable';
55 our $dryrun_level = 0;
57 our $buildproductsdir = '..';
63 our $existing_package = 'dpkg';
65 our $changes_since_version;
67 our $overwrite_version; # undef: not specified; '': check changelog
69 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
70 our $we_are_responder;
71 our $initiator_tempdir;
72 our $patches_applied_dirtily = 00;
77 our %forceopts = map { $_=>0 }
78 qw(unrepresentable unsupported-source-format
80 import-gitapply-absurd
81 import-gitapply-no-absurd);
83 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
85 our $suite_re = '[-+.0-9a-z]+';
86 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
87 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
88 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
89 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
91 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
92 our $splitbraincache = 'dgit-intern/quilt-cache';
95 our (@dget) = qw(dget);
96 our (@curl) = qw(curl);
97 our (@dput) = qw(dput);
98 our (@debsign) = qw(debsign);
100 our (@sbuild) = qw(sbuild);
102 our (@dgit) = qw(dgit);
103 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
104 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
105 our (@dpkggenchanges) = qw(dpkg-genchanges);
106 our (@mergechanges) = qw(mergechanges -f);
107 our (@gbp_build) = ('');
108 our (@gbp_pq) = ('gbp pq');
109 our (@changesopts) = ('');
111 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
114 'debsign' => \@debsign,
116 'sbuild' => \@sbuild,
120 'dpkg-source' => \@dpkgsource,
121 'dpkg-buildpackage' => \@dpkgbuildpackage,
122 'dpkg-genchanges' => \@dpkggenchanges,
123 'gbp-build' => \@gbp_build,
124 'gbp-pq' => \@gbp_pq,
125 'ch' => \@changesopts,
126 'mergechanges' => \@mergechanges);
128 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
129 our %opts_cfg_insertpos = map {
131 scalar @{ $opts_opt_map{$_} }
132 } keys %opts_opt_map;
134 sub finalise_opts_opts();
140 our $supplementary_message = '';
141 our $need_split_build_invocation = 0;
142 our $split_brain = 0;
146 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
149 our $remotename = 'dgit';
150 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
154 if (!defined $absurdity) {
156 $absurdity =~ s{/[^/]+$}{/absurd} or die;
160 my ($v,$distro) = @_;
161 return $tagformatfn->($v, $distro);
164 sub debiantag_maintview ($$) {
165 my ($v,$distro) = @_;
170 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
172 sub lbranch () { return "$branchprefix/$csuite"; }
173 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
174 sub lref () { return "refs/heads/".lbranch(); }
175 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
176 sub rrref () { return server_ref($csuite); }
178 sub lrfetchrefs () { return "refs/dgit-fetch/$csuite"; }
179 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
181 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
182 # locally fetched refs because they have unhelpful names and clutter
183 # up gitk etc. So we track whether we have "used up" head ref (ie,
184 # whether we have made another local ref which refers to this object).
186 # (If we deleted them unconditionally, then we might end up
187 # re-fetching the same git objects each time dgit fetch was run.)
189 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
190 # in git_fetch_us to fetch the refs in question, and possibly a call
191 # to lrfetchref_used.
193 our (%lrfetchrefs_f, %lrfetchrefs_d);
194 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
196 sub lrfetchref_used ($) {
197 my ($fullrefname) = @_;
198 my $objid = $lrfetchrefs_f{$fullrefname};
199 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
210 return "${package}_".(stripepoch $vsn).$sfx
215 return srcfn($vsn,".dsc");
218 sub changespat ($;$) {
219 my ($vsn, $arch) = @_;
220 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
229 foreach my $f (@end) {
231 print STDERR "$us: cleanup: $@" if length $@;
235 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
237 sub forceable_fail ($$) {
238 my ($forceoptsl, $msg) = @_;
239 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
240 print STDERR "warning: overriding problem due to --force:\n". $msg;
244 my ($forceoptsl) = @_;
245 my @got = grep { $forceopts{$_} } @$forceoptsl;
246 return 0 unless @got;
248 "warning: skipping checks or functionality due to --force-$got[0]\n";
251 sub no_such_package () {
252 print STDERR "$us: package $package does not exist in suite $isuite\n";
258 printdebug "CD $newdir\n";
259 chdir $newdir or confess "chdir: $newdir: $!";
262 sub deliberately ($) {
264 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
267 sub deliberately_not_fast_forward () {
268 foreach (qw(not-fast-forward fresh-repo)) {
269 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
273 sub quiltmode_splitbrain () {
274 $quilt_mode =~ m/gbp|dpm|unapplied/;
277 sub opts_opt_multi_cmd {
279 push @cmd, split /\s+/, shift @_;
285 return opts_opt_multi_cmd @gbp_pq;
288 #---------- remote protocol support, common ----------
290 # remote push initiator/responder protocol:
291 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
292 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
293 # < dgit-remote-push-ready <actual-proto-vsn>
300 # > supplementary-message NBYTES # $protovsn >= 3
305 # > file parsed-changelog
306 # [indicates that output of dpkg-parsechangelog follows]
307 # > data-block NBYTES
308 # > [NBYTES bytes of data (no newline)]
309 # [maybe some more blocks]
318 # > param head DGIT-VIEW-HEAD
319 # > param csuite SUITE
320 # > param tagformat old|new
321 # > param maint-view MAINT-VIEW-HEAD
323 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
324 # # goes into tag, for replay prevention
327 # [indicates that signed tag is wanted]
328 # < data-block NBYTES
329 # < [NBYTES bytes of data (no newline)]
330 # [maybe some more blocks]
334 # > want signed-dsc-changes
335 # < data-block NBYTES [transfer of signed dsc]
337 # < data-block NBYTES [transfer of signed changes]
345 sub i_child_report () {
346 # Sees if our child has died, and reap it if so. Returns a string
347 # describing how it died if it failed, or undef otherwise.
348 return undef unless $i_child_pid;
349 my $got = waitpid $i_child_pid, WNOHANG;
350 return undef if $got <= 0;
351 die unless $got == $i_child_pid;
352 $i_child_pid = undef;
353 return undef unless $?;
354 return "build host child ".waitstatusmsg();
359 fail "connection lost: $!" if $fh->error;
360 fail "protocol violation; $m not expected";
363 sub badproto_badread ($$) {
365 fail "connection lost: $!" if $!;
366 my $report = i_child_report();
367 fail $report if defined $report;
368 badproto $fh, "eof (reading $wh)";
371 sub protocol_expect (&$) {
372 my ($match, $fh) = @_;
375 defined && chomp or badproto_badread $fh, "protocol message";
383 badproto $fh, "\`$_'";
386 sub protocol_send_file ($$) {
387 my ($fh, $ourfn) = @_;
388 open PF, "<", $ourfn or die "$ourfn: $!";
391 my $got = read PF, $d, 65536;
392 die "$ourfn: $!" unless defined $got;
394 print $fh "data-block ".length($d)."\n" or die $!;
395 print $fh $d or die $!;
397 PF->error and die "$ourfn $!";
398 print $fh "data-end\n" or die $!;
402 sub protocol_read_bytes ($$) {
403 my ($fh, $nbytes) = @_;
404 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
406 my $got = read $fh, $d, $nbytes;
407 $got==$nbytes or badproto_badread $fh, "data block";
411 sub protocol_receive_file ($$) {
412 my ($fh, $ourfn) = @_;
413 printdebug "() $ourfn\n";
414 open PF, ">", $ourfn or die "$ourfn: $!";
416 my ($y,$l) = protocol_expect {
417 m/^data-block (.*)$/ ? (1,$1) :
418 m/^data-end$/ ? (0,) :
422 my $d = protocol_read_bytes $fh, $l;
423 print PF $d or die $!;
428 #---------- remote protocol support, responder ----------
430 sub responder_send_command ($) {
432 return unless $we_are_responder;
433 # called even without $we_are_responder
434 printdebug ">> $command\n";
435 print PO $command, "\n" or die $!;
438 sub responder_send_file ($$) {
439 my ($keyword, $ourfn) = @_;
440 return unless $we_are_responder;
441 printdebug "]] $keyword $ourfn\n";
442 responder_send_command "file $keyword";
443 protocol_send_file \*PO, $ourfn;
446 sub responder_receive_files ($@) {
447 my ($keyword, @ourfns) = @_;
448 die unless $we_are_responder;
449 printdebug "[[ $keyword @ourfns\n";
450 responder_send_command "want $keyword";
451 foreach my $fn (@ourfns) {
452 protocol_receive_file \*PI, $fn;
455 protocol_expect { m/^files-end$/ } \*PI;
458 #---------- remote protocol support, initiator ----------
460 sub initiator_expect (&) {
462 protocol_expect { &$match } \*RO;
465 #---------- end remote code ----------
468 if ($we_are_responder) {
470 responder_send_command "progress ".length($m) or die $!;
471 print PO $m or die $!;
481 $ua = LWP::UserAgent->new();
485 progress "downloading $what...";
486 my $r = $ua->get(@_) or die $!;
487 return undef if $r->code == 404;
488 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
489 return $r->decoded_content(charset => 'none');
492 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
497 failedcmd @_ if system @_;
500 sub act_local () { return $dryrun_level <= 1; }
501 sub act_scary () { return !$dryrun_level; }
504 if (!$dryrun_level) {
505 progress "dgit ok: @_";
507 progress "would be ok: @_ (but dry run only)";
512 printcmd(\*STDERR,$debugprefix."#",@_);
515 sub runcmd_ordryrun {
523 sub runcmd_ordryrun_local {
532 my ($first_shell, @cmd) = @_;
533 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
536 our $helpmsg = <<END;
538 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
539 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
540 dgit [dgit-opts] build [dpkg-buildpackage-opts]
541 dgit [dgit-opts] sbuild [sbuild-opts]
542 dgit [dgit-opts] push [dgit-opts] [suite]
543 dgit [dgit-opts] rpush build-host:build-dir ...
544 important dgit options:
545 -k<keyid> sign tag and package with <keyid> instead of default
546 --dry-run -n do not change anything, but go through the motions
547 --damp-run -L like --dry-run but make local changes, without signing
548 --new -N allow introducing a new package
549 --debug -D increase debug level
550 -c<name>=<value> set git config option (used directly by dgit too)
553 our $later_warning_msg = <<END;
554 Perhaps the upload is stuck in incoming. Using the version from git.
558 print STDERR "$us: @_\n", $helpmsg or die $!;
563 @ARGV or badusage "too few arguments";
564 return scalar shift @ARGV;
568 print $helpmsg or die $!;
572 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
574 our %defcfg = ('dgit.default.distro' => 'debian',
575 'dgit.default.username' => '',
576 'dgit.default.archive-query-default-component' => 'main',
577 'dgit.default.ssh' => 'ssh',
578 'dgit.default.archive-query' => 'madison:',
579 'dgit.default.sshpsql-dbname' => 'service=projectb',
580 'dgit.default.dgit-tag-format' => 'new,old,maint',
581 # old means "repo server accepts pushes with old dgit tags"
582 # new means "repo server accepts pushes with new dgit tags"
583 # maint means "repo server accepts split brain pushes"
584 # hist means "repo server may have old pushes without new tag"
585 # ("hist" is implied by "old")
586 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
587 'dgit-distro.debian.git-check' => 'url',
588 'dgit-distro.debian.git-check-suffix' => '/info/refs',
589 'dgit-distro.debian.new-private-pushers' => 't',
590 'dgit-distro.debian/push.git-url' => '',
591 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
592 'dgit-distro.debian/push.git-user-force' => 'dgit',
593 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
594 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
595 'dgit-distro.debian/push.git-create' => 'true',
596 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
597 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
598 # 'dgit-distro.debian.archive-query-tls-key',
599 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
600 # ^ this does not work because curl is broken nowadays
601 # Fixing #790093 properly will involve providing providing the key
602 # in some pacagke and maybe updating these paths.
604 # 'dgit-distro.debian.archive-query-tls-curl-args',
605 # '--ca-path=/etc/ssl/ca-debian',
606 # ^ this is a workaround but works (only) on DSA-administered machines
607 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
608 'dgit-distro.debian.git-url-suffix' => '',
609 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
610 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
611 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
612 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
613 'dgit-distro.ubuntu.git-check' => 'false',
614 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
615 'dgit-distro.test-dummy.ssh' => "$td/ssh",
616 'dgit-distro.test-dummy.username' => "alice",
617 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
618 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
619 'dgit-distro.test-dummy.git-url' => "$td/git",
620 'dgit-distro.test-dummy.git-host' => "git",
621 'dgit-distro.test-dummy.git-path' => "$td/git",
622 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
623 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
624 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
625 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
629 our @gitcfgsources = qw(cmdline local global system);
631 sub git_slurp_config () {
632 local ($debuglevel) = $debuglevel-2;
635 # This algoritm is a bit subtle, but this is needed so that for
636 # options which we want to be single-valued, we allow the
637 # different config sources to override properly. See #835858.
638 foreach my $src (@gitcfgsources) {
639 next if $src eq 'cmdline';
640 # we do this ourselves since git doesn't handle it
642 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
645 open GITS, "-|", @cmd or die $!;
648 printdebug "=> ", (messagequote $_), "\n";
650 push @{ $gitcfgs{$src}{$`} }, $'; #';
654 or ($!==0 && $?==256)
659 sub git_get_config ($) {
661 foreach my $src (@gitcfgsources) {
662 my $l = $gitcfgs{$src}{$c};
663 printdebug"C $c ".(defined $l ? messagequote "'$l'" : "undef")."\n"
666 @$l==1 or badcfg "multiple values for $c".
667 " (in $src git config)" if @$l > 1;
675 return undef if $c =~ /RETURN-UNDEF/;
676 my $v = git_get_config($c);
677 return $v if defined $v;
678 my $dv = $defcfg{$c};
679 return $dv if defined $dv;
681 badcfg "need value for one of: @_\n".
682 "$us: distro or suite appears not to be (properly) supported";
685 sub access_basedistro () {
686 if (defined $idistro) {
689 return cfg("dgit-suite.$isuite.distro",
690 "dgit.default.distro");
694 sub access_quirk () {
695 # returns (quirk name, distro to use instead or undef, quirk-specific info)
696 my $basedistro = access_basedistro();
697 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
699 if (defined $backports_quirk) {
700 my $re = $backports_quirk;
701 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
703 $re =~ s/\%/([-0-9a-z_]+)/
704 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
705 if ($isuite =~ m/^$re$/) {
706 return ('backports',"$basedistro-backports",$1);
709 return ('none',undef);
714 sub parse_cfg_bool ($$$) {
715 my ($what,$def,$v) = @_;
718 $v =~ m/^[ty1]/ ? 1 :
719 $v =~ m/^[fn0]/ ? 0 :
720 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
723 sub access_forpush_config () {
724 my $d = access_basedistro();
728 parse_cfg_bool('new-private-pushers', 0,
729 cfg("dgit-distro.$d.new-private-pushers",
732 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
735 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
736 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
737 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
738 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
741 sub access_forpush () {
742 $access_forpush //= access_forpush_config();
743 return $access_forpush;
747 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
748 badcfg "pushing but distro is configured readonly"
749 if access_forpush_config() eq '0';
751 $supplementary_message = <<'END' unless $we_are_responder;
752 Push failed, before we got started.
753 You can retry the push, after fixing the problem, if you like.
755 finalise_opts_opts();
759 finalise_opts_opts();
762 sub supplementary_message ($) {
764 if (!$we_are_responder) {
765 $supplementary_message = $msg;
767 } elsif ($protovsn >= 3) {
768 responder_send_command "supplementary-message ".length($msg)
770 print PO $msg or die $!;
774 sub access_distros () {
775 # Returns list of distros to try, in order
778 # 0. `instead of' distro name(s) we have been pointed to
779 # 1. the access_quirk distro, if any
780 # 2a. the user's specified distro, or failing that } basedistro
781 # 2b. the distro calculated from the suite }
782 my @l = access_basedistro();
784 my (undef,$quirkdistro) = access_quirk();
785 unshift @l, $quirkdistro;
786 unshift @l, $instead_distro;
787 @l = grep { defined } @l;
789 if (access_forpush()) {
790 @l = map { ("$_/push", $_) } @l;
795 sub access_cfg_cfgs (@) {
798 # The nesting of these loops determines the search order. We put
799 # the key loop on the outside so that we search all the distros
800 # for each key, before going on to the next key. That means that
801 # if access_cfg is called with a more specific, and then a less
802 # specific, key, an earlier distro can override the less specific
803 # without necessarily overriding any more specific keys. (If the
804 # distro wants to override the more specific keys it can simply do
805 # so; whereas if we did the loop the other way around, it would be
806 # impossible to for an earlier distro to override a less specific
807 # key but not the more specific ones without restating the unknown
808 # values of the more specific keys.
811 # We have to deal with RETURN-UNDEF specially, so that we don't
812 # terminate the search prematurely.
814 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
817 foreach my $d (access_distros()) {
818 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
820 push @cfgs, map { "dgit.default.$_" } @realkeys;
827 my (@cfgs) = access_cfg_cfgs(@keys);
828 my $value = cfg(@cfgs);
832 sub access_cfg_bool ($$) {
833 my ($def, @keys) = @_;
834 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
837 sub string_to_ssh ($) {
839 if ($spec =~ m/\s/) {
840 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
846 sub access_cfg_ssh () {
847 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
848 if (!defined $gitssh) {
851 return string_to_ssh $gitssh;
855 sub access_runeinfo ($) {
857 return ": dgit ".access_basedistro()." $info ;";
860 sub access_someuserhost ($) {
862 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
863 defined($user) && length($user) or
864 $user = access_cfg("$some-user",'username');
865 my $host = access_cfg("$some-host");
866 return length($user) ? "$user\@$host" : $host;
869 sub access_gituserhost () {
870 return access_someuserhost('git');
873 sub access_giturl (;$) {
875 my $url = access_cfg('git-url','RETURN-UNDEF');
878 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
879 return undef unless defined $proto;
882 access_gituserhost().
883 access_cfg('git-path');
885 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
888 return "$url/$package$suffix";
891 sub parsecontrolfh ($$;$) {
892 my ($fh, $desc, $allowsigned) = @_;
893 our $dpkgcontrolhash_noissigned;
896 my %opts = ('name' => $desc);
897 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
898 $c = Dpkg::Control::Hash->new(%opts);
899 $c->parse($fh,$desc) or die "parsing of $desc failed";
900 last if $allowsigned;
901 last if $dpkgcontrolhash_noissigned;
902 my $issigned= $c->get_option('is_pgp_signed');
903 if (!defined $issigned) {
904 $dpkgcontrolhash_noissigned= 1;
905 seek $fh, 0,0 or die "seek $desc: $!";
906 } elsif ($issigned) {
907 fail "control file $desc is (already) PGP-signed. ".
908 " Note that dgit push needs to modify the .dsc and then".
909 " do the signature itself";
918 my ($file, $desc) = @_;
919 my $fh = new IO::Handle;
920 open $fh, '<', $file or die "$file: $!";
921 my $c = parsecontrolfh($fh,$desc);
922 $fh->error and die $!;
928 my ($dctrl,$field) = @_;
929 my $v = $dctrl->{$field};
930 return $v if defined $v;
931 fail "missing field $field in ".$dctrl->get_option('name');
935 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
936 my $p = new IO::Handle;
937 my @cmd = (qw(dpkg-parsechangelog), @_);
938 open $p, '-|', @cmd or die $!;
940 $?=0; $!=0; close $p or failedcmd @cmd;
944 sub commit_getclogp ($) {
945 # Returns the parsed changelog hashref for a particular commit
947 our %commit_getclogp_memo;
948 my $memo = $commit_getclogp_memo{$objid};
949 return $memo if $memo;
951 my $mclog = ".git/dgit/clog-$objid";
952 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
953 "$objid:debian/changelog";
954 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
959 defined $d or fail "getcwd failed: $!";
965 sub archive_query ($;@) {
966 my ($method) = shift @_;
967 my $query = access_cfg('archive-query','RETURN-UNDEF');
968 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
971 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
974 sub pool_dsc_subpath ($$) {
975 my ($vsn,$component) = @_; # $package is implict arg
976 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
977 return "/pool/$component/$prefix/$package/".dscfn($vsn);
980 #---------- `ftpmasterapi' archive query method (nascent) ----------
982 sub archive_api_query_cmd ($) {
984 my @cmd = (@curl, qw(-sS));
985 my $url = access_cfg('archive-query-url');
986 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
988 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
989 foreach my $key (split /\:/, $keys) {
990 $key =~ s/\%HOST\%/$host/g;
992 fail "for $url: stat $key: $!" unless $!==ENOENT;
995 fail "config requested specific TLS key but do not know".
996 " how to get curl to use exactly that EE key ($key)";
997 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
998 # # Sadly the above line does not work because of changes
999 # # to gnutls. The real fix for #790093 may involve
1000 # # new curl options.
1003 # Fixing #790093 properly will involve providing a value
1004 # for this on clients.
1005 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1006 push @cmd, split / /, $kargs if defined $kargs;
1008 push @cmd, $url.$subpath;
1012 sub api_query ($$;$) {
1014 my ($data, $subpath, $ok404) = @_;
1015 badcfg "ftpmasterapi archive query method takes no data part"
1017 my @cmd = archive_api_query_cmd($subpath);
1018 my $url = $cmd[$#cmd];
1019 push @cmd, qw(-w %{http_code});
1020 my $json = cmdoutput @cmd;
1021 unless ($json =~ s/\d+\d+\d$//) {
1022 failedcmd_report_cmd undef, @cmd;
1023 fail "curl failed to print 3-digit HTTP code";
1026 return undef if $code eq '404' && $ok404;
1027 fail "fetch of $url gave HTTP code $code"
1028 unless $url =~ m#^file://# or $code =~ m/^2/;
1029 return decode_json($json);
1032 sub canonicalise_suite_ftpmasterapi {
1033 my ($proto,$data) = @_;
1034 my $suites = api_query($data, 'suites');
1036 foreach my $entry (@$suites) {
1038 my $v = $entry->{$_};
1039 defined $v && $v eq $isuite;
1040 } qw(codename name);
1041 push @matched, $entry;
1043 fail "unknown suite $isuite" unless @matched;
1046 @matched==1 or die "multiple matches for suite $isuite\n";
1047 $cn = "$matched[0]{codename}";
1048 defined $cn or die "suite $isuite info has no codename\n";
1049 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1051 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1056 sub archive_query_ftpmasterapi {
1057 my ($proto,$data) = @_;
1058 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1060 my $digester = Digest::SHA->new(256);
1061 foreach my $entry (@$info) {
1063 my $vsn = "$entry->{version}";
1064 my ($ok,$msg) = version_check $vsn;
1065 die "bad version: $msg\n" unless $ok;
1066 my $component = "$entry->{component}";
1067 $component =~ m/^$component_re$/ or die "bad component";
1068 my $filename = "$entry->{filename}";
1069 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1070 or die "bad filename";
1071 my $sha256sum = "$entry->{sha256sum}";
1072 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1073 push @rows, [ $vsn, "/pool/$component/$filename",
1074 $digester, $sha256sum ];
1076 die "bad ftpmaster api response: $@\n".Dumper($entry)
1079 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1083 sub file_in_archive_ftpmasterapi {
1084 my ($proto,$data,$filename) = @_;
1085 my $pat = $filename;
1088 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1089 my $info = api_query($data, "file_in_archive/$pat", 1);
1092 #---------- `dummyapicat' archive query method ----------
1094 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1095 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1097 sub file_in_archive_dummycatapi ($$$) {
1098 my ($proto,$data,$filename) = @_;
1099 my $mirror = access_cfg('mirror');
1100 $mirror =~ s#^file://#/# or die "$mirror ?";
1102 my @cmd = (qw(sh -ec), '
1104 find -name "$2" -print0 |
1106 ', qw(x), $mirror, $filename);
1107 debugcmd "-|", @cmd;
1108 open FIA, "-|", @cmd or die $!;
1111 printdebug "| $_\n";
1112 m/^(\w+) (\S+)$/ or die "$_ ?";
1113 push @out, { sha256sum => $1, filename => $2 };
1115 close FIA or die failedcmd @cmd;
1119 #---------- `madison' archive query method ----------
1121 sub archive_query_madison {
1122 return map { [ @$_[0..1] ] } madison_get_parse(@_);
1125 sub madison_get_parse {
1126 my ($proto,$data) = @_;
1127 die unless $proto eq 'madison';
1128 if (!length $data) {
1129 $data= access_cfg('madison-distro','RETURN-UNDEF');
1130 $data //= access_basedistro();
1132 $rmad{$proto,$data,$package} ||= cmdoutput
1133 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1134 my $rmad = $rmad{$proto,$data,$package};
1137 foreach my $l (split /\n/, $rmad) {
1138 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1139 \s*( [^ \t|]+ )\s* \|
1140 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1141 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1142 $1 eq $package or die "$rmad $package ?";
1149 $component = access_cfg('archive-query-default-component');
1151 $5 eq 'source' or die "$rmad ?";
1152 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1154 return sort { -version_compare($a->[0],$b->[0]); } @out;
1157 sub canonicalise_suite_madison {
1158 # madison canonicalises for us
1159 my @r = madison_get_parse(@_);
1161 "unable to canonicalise suite using package $package".
1162 " which does not appear to exist in suite $isuite;".
1163 " --existing-package may help";
1167 sub file_in_archive_madison { return undef; }
1169 #---------- `sshpsql' archive query method ----------
1172 my ($data,$runeinfo,$sql) = @_;
1173 if (!length $data) {
1174 $data= access_someuserhost('sshpsql').':'.
1175 access_cfg('sshpsql-dbname');
1177 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1178 my ($userhost,$dbname) = ($`,$'); #';
1180 my @cmd = (access_cfg_ssh, $userhost,
1181 access_runeinfo("ssh-psql $runeinfo").
1182 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1183 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1185 open P, "-|", @cmd or die $!;
1188 printdebug(">|$_|\n");
1191 $!=0; $?=0; close P or failedcmd @cmd;
1193 my $nrows = pop @rows;
1194 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1195 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1196 @rows = map { [ split /\|/, $_ ] } @rows;
1197 my $ncols = scalar @{ shift @rows };
1198 die if grep { scalar @$_ != $ncols } @rows;
1202 sub sql_injection_check {
1203 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1206 sub archive_query_sshpsql ($$) {
1207 my ($proto,$data) = @_;
1208 sql_injection_check $isuite, $package;
1209 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1210 SELECT source.version, component.name, files.filename, files.sha256sum
1212 JOIN src_associations ON source.id = src_associations.source
1213 JOIN suite ON suite.id = src_associations.suite
1214 JOIN dsc_files ON dsc_files.source = source.id
1215 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1216 JOIN component ON component.id = files_archive_map.component_id
1217 JOIN files ON files.id = dsc_files.file
1218 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1219 AND source.source='$package'
1220 AND files.filename LIKE '%.dsc';
1222 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1223 my $digester = Digest::SHA->new(256);
1225 my ($vsn,$component,$filename,$sha256sum) = @$_;
1226 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1231 sub canonicalise_suite_sshpsql ($$) {
1232 my ($proto,$data) = @_;
1233 sql_injection_check $isuite;
1234 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1235 SELECT suite.codename
1236 FROM suite where suite_name='$isuite' or codename='$isuite';
1238 @rows = map { $_->[0] } @rows;
1239 fail "unknown suite $isuite" unless @rows;
1240 die "ambiguous $isuite: @rows ?" if @rows>1;
1244 sub file_in_archive_sshpsql ($$$) { return undef; }
1246 #---------- `dummycat' archive query method ----------
1248 sub canonicalise_suite_dummycat ($$) {
1249 my ($proto,$data) = @_;
1250 my $dpath = "$data/suite.$isuite";
1251 if (!open C, "<", $dpath) {
1252 $!==ENOENT or die "$dpath: $!";
1253 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1257 chomp or die "$dpath: $!";
1259 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1263 sub archive_query_dummycat ($$) {
1264 my ($proto,$data) = @_;
1265 canonicalise_suite();
1266 my $dpath = "$data/package.$csuite.$package";
1267 if (!open C, "<", $dpath) {
1268 $!==ENOENT or die "$dpath: $!";
1269 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1277 printdebug "dummycat query $csuite $package $dpath | $_\n";
1278 my @row = split /\s+/, $_;
1279 @row==2 or die "$dpath: $_ ?";
1282 C->error and die "$dpath: $!";
1284 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1287 sub file_in_archive_dummycat () { return undef; }
1289 #---------- tag format handling ----------
1291 sub access_cfg_tagformats () {
1292 split /\,/, access_cfg('dgit-tag-format');
1295 sub need_tagformat ($$) {
1296 my ($fmt, $why) = @_;
1297 fail "need to use tag format $fmt ($why) but also need".
1298 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1299 " - no way to proceed"
1300 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1301 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1304 sub select_tagformat () {
1306 return if $tagformatfn && !$tagformat_want;
1307 die 'bug' if $tagformatfn && $tagformat_want;
1308 # ... $tagformat_want assigned after previous select_tagformat
1310 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1311 printdebug "select_tagformat supported @supported\n";
1313 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1314 printdebug "select_tagformat specified @$tagformat_want\n";
1316 my ($fmt,$why,$override) = @$tagformat_want;
1318 fail "target distro supports tag formats @supported".
1319 " but have to use $fmt ($why)"
1321 or grep { $_ eq $fmt } @supported;
1323 $tagformat_want = undef;
1325 $tagformatfn = ${*::}{"debiantag_$fmt"};
1327 fail "trying to use unknown tag format \`$fmt' ($why) !"
1328 unless $tagformatfn;
1331 #---------- archive query entrypoints and rest of program ----------
1333 sub canonicalise_suite () {
1334 return if defined $csuite;
1335 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1336 $csuite = archive_query('canonicalise_suite');
1337 if ($isuite ne $csuite) {
1338 progress "canonical suite name for $isuite is $csuite";
1342 sub get_archive_dsc () {
1343 canonicalise_suite();
1344 my @vsns = archive_query('archive_query');
1345 foreach my $vinfo (@vsns) {
1346 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1347 $dscurl = access_cfg('mirror').$subpath;
1348 $dscdata = url_get($dscurl);
1350 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1355 $digester->add($dscdata);
1356 my $got = $digester->hexdigest();
1358 fail "$dscurl has hash $got but".
1359 " archive told us to expect $digest";
1361 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1362 printdebug Dumper($dscdata) if $debuglevel>1;
1363 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1364 printdebug Dumper($dsc) if $debuglevel>1;
1365 my $fmt = getfield $dsc, 'Format';
1366 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1367 "unsupported source format $fmt, sorry";
1369 $dsc_checked = !!$digester;
1370 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1374 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1377 sub check_for_git ();
1378 sub check_for_git () {
1380 my $how = access_cfg('git-check');
1381 if ($how eq 'ssh-cmd') {
1383 (access_cfg_ssh, access_gituserhost(),
1384 access_runeinfo("git-check $package").
1385 " set -e; cd ".access_cfg('git-path').";".
1386 " if test -d $package.git; then echo 1; else echo 0; fi");
1387 my $r= cmdoutput @cmd;
1388 if (defined $r and $r =~ m/^divert (\w+)$/) {
1390 my ($usedistro,) = access_distros();
1391 # NB that if we are pushing, $usedistro will be $distro/push
1392 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1393 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1394 progress "diverting to $divert (using config for $instead_distro)";
1395 return check_for_git();
1397 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1399 } elsif ($how eq 'url') {
1400 my $prefix = access_cfg('git-check-url','git-url');
1401 my $suffix = access_cfg('git-check-suffix','git-suffix',
1402 'RETURN-UNDEF') // '.git';
1403 my $url = "$prefix/$package$suffix";
1404 my @cmd = (@curl, qw(-sS -I), $url);
1405 my $result = cmdoutput @cmd;
1406 $result =~ s/^\S+ 200 .*\n\r?\n//;
1407 # curl -sS -I with https_proxy prints
1408 # HTTP/1.0 200 Connection established
1409 $result =~ m/^\S+ (404|200) /s or
1410 fail "unexpected results from git check query - ".
1411 Dumper($prefix, $result);
1413 if ($code eq '404') {
1415 } elsif ($code eq '200') {
1420 } elsif ($how eq 'true') {
1422 } elsif ($how eq 'false') {
1425 badcfg "unknown git-check \`$how'";
1429 sub create_remote_git_repo () {
1430 my $how = access_cfg('git-create');
1431 if ($how eq 'ssh-cmd') {
1433 (access_cfg_ssh, access_gituserhost(),
1434 access_runeinfo("git-create $package").
1435 "set -e; cd ".access_cfg('git-path').";".
1436 " cp -a _template $package.git");
1437 } elsif ($how eq 'true') {
1440 badcfg "unknown git-create \`$how'";
1444 our ($dsc_hash,$lastpush_mergeinput);
1446 our $ud = '.git/dgit/unpack';
1456 sub mktree_in_ud_here () {
1457 runcmd qw(git init -q);
1458 runcmd qw(git config gc.auto 0);
1459 rmtree('.git/objects');
1460 symlink '../../../../objects','.git/objects' or die $!;
1463 sub git_write_tree () {
1464 my $tree = cmdoutput @git, qw(write-tree);
1465 $tree =~ m/^\w+$/ or die "$tree ?";
1469 sub remove_stray_gits () {
1470 my @gitscmd = qw(find -name .git -prune -print0);
1471 debugcmd "|",@gitscmd;
1472 open GITS, "-|", @gitscmd or die $!;
1477 print STDERR "$us: warning: removing from source package: ",
1478 (messagequote $_), "\n";
1482 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1485 sub mktree_in_ud_from_only_subdir (;$) {
1488 # changes into the subdir
1490 die "expected one subdir but found @dirs ?" unless @dirs==1;
1491 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1495 remove_stray_gits();
1496 mktree_in_ud_here();
1498 my ($format, $fopts) = get_source_format();
1499 if (madformat($format)) {
1504 runcmd @git, qw(add -Af);
1505 my $tree=git_write_tree();
1506 return ($tree,$dir);
1509 our @files_csum_info_fields =
1510 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1511 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1512 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1514 sub dsc_files_info () {
1515 foreach my $csumi (@files_csum_info_fields) {
1516 my ($fname, $module, $method) = @$csumi;
1517 my $field = $dsc->{$fname};
1518 next unless defined $field;
1519 eval "use $module; 1;" or die $@;
1521 foreach (split /\n/, $field) {
1523 m/^(\w+) (\d+) (\S+)$/ or
1524 fail "could not parse .dsc $fname line \`$_'";
1525 my $digester = eval "$module"."->$method;" or die $@;
1530 Digester => $digester,
1535 fail "missing any supported Checksums-* or Files field in ".
1536 $dsc->get_option('name');
1540 map { $_->{Filename} } dsc_files_info();
1543 sub files_compare_inputs (@) {
1548 my $showinputs = sub {
1549 return join "; ", map { $_->get_option('name') } @$inputs;
1552 foreach my $in (@$inputs) {
1554 my $in_name = $in->get_option('name');
1556 printdebug "files_compare_inputs $in_name\n";
1558 foreach my $csumi (@files_csum_info_fields) {
1559 my ($fname) = @$csumi;
1560 printdebug "files_compare_inputs $in_name $fname\n";
1562 my $field = $in->{$fname};
1563 next unless defined $field;
1566 foreach (split /\n/, $field) {
1569 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1570 fail "could not parse $in_name $fname line \`$_'";
1572 printdebug "files_compare_inputs $in_name $fname $f\n";
1576 my $re = \ $record{$f}{$fname};
1578 $fchecked{$f}{$in_name} = 1;
1580 fail "hash or size of $f varies in $fname fields".
1581 " (between: ".$showinputs->().")";
1586 @files = sort @files;
1587 $expected_files //= \@files;
1588 "@$expected_files" eq "@files" or
1589 fail "file list in $in_name varies between hash fields!";
1592 fail "$in_name has no files list field(s)";
1594 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1597 grep { keys %$_ == @$inputs-1 } values %fchecked
1598 or fail "no file appears in all file lists".
1599 " (looked in: ".$showinputs->().")";
1602 sub is_orig_file_in_dsc ($$) {
1603 my ($f, $dsc_files_info) = @_;
1604 return 0 if @$dsc_files_info <= 1;
1605 # One file means no origs, and the filename doesn't have a "what
1606 # part of dsc" component. (Consider versions ending `.orig'.)
1607 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1611 sub is_orig_file_of_vsn ($$) {
1612 my ($f, $upstreamvsn) = @_;
1613 my $base = srcfn $upstreamvsn, '';
1614 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1618 sub changes_update_origs_from_dsc ($$$$) {
1619 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1621 printdebug "checking origs needed ($upstreamvsn)...\n";
1622 $_ = getfield $changes, 'Files';
1623 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1624 fail "cannot find section/priority from .changes Files field";
1625 my $placementinfo = $1;
1627 printdebug "checking origs needed placement '$placementinfo'...\n";
1628 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1629 $l =~ m/\S+$/ or next;
1631 printdebug "origs $file | $l\n";
1632 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1633 printdebug "origs $file is_orig\n";
1634 my $have = archive_query('file_in_archive', $file);
1635 if (!defined $have) {
1637 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1643 printdebug "origs $file \$#\$have=$#$have\n";
1644 foreach my $h (@$have) {
1647 foreach my $csumi (@files_csum_info_fields) {
1648 my ($fname, $module, $method, $archivefield) = @$csumi;
1649 next unless defined $h->{$archivefield};
1650 $_ = $dsc->{$fname};
1651 next unless defined;
1652 m/^(\w+) .* \Q$file\E$/m or
1653 fail ".dsc $fname missing entry for $file";
1654 if ($h->{$archivefield} eq $1) {
1658 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1661 die "$file ".Dumper($h)." ?!" if $same && @differ;
1664 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1667 print "origs $file f.same=$found_same #f._differ=$#found_differ\n";
1668 if (@found_differ && !$found_same) {
1670 "archive contains $file with different checksum",
1673 # Now we edit the changes file to add or remove it
1674 foreach my $csumi (@files_csum_info_fields) {
1675 my ($fname, $module, $method, $archivefield) = @$csumi;
1676 next unless defined $changes->{$fname};
1678 # in archive, delete from .changes if it's there
1679 $changed{$file} = "removed" if
1680 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1681 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1682 # not in archive, but it's here in the .changes
1684 my $dsc_data = getfield $dsc, $fname;
1685 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1687 $extra =~ s/ \d+ /$&$placementinfo /
1688 or die "$fname $extra >$dsc_data< ?"
1689 if $fname eq 'Files';
1690 $changes->{$fname} .= "\n". $extra;
1691 $changed{$file} = "added";
1696 foreach my $file (keys %changed) {
1698 "edited .changes for archive .orig contents: %s %s",
1699 $changed{$file}, $file;
1701 my $chtmp = "$changesfile.tmp";
1702 $changes->save($chtmp);
1704 rename $chtmp,$changesfile or die "$changesfile $!";
1706 progress "[new .changes left in $changesfile]";
1709 progress "$changesfile already has appropriate .orig(s) (if any)";
1713 sub make_commit ($) {
1715 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1718 sub make_commit_text ($) {
1721 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1723 print Dumper($text) if $debuglevel > 1;
1724 my $child = open2($out, $in, @cmd) or die $!;
1727 print $in $text or die $!;
1728 close $in or die $!;
1730 $h =~ m/^\w+$/ or die;
1732 printdebug "=> $h\n";
1735 waitpid $child, 0 == $child or die "$child $!";
1736 $? and failedcmd @cmd;
1740 sub clogp_authline ($) {
1742 my $author = getfield $clogp, 'Maintainer';
1743 $author =~ s#,.*##ms;
1744 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1745 my $authline = "$author $date";
1746 $authline =~ m/$git_authline_re/o or
1747 fail "unexpected commit author line format \`$authline'".
1748 " (was generated from changelog Maintainer field)";
1749 return ($1,$2,$3) if wantarray;
1753 sub vendor_patches_distro ($$) {
1754 my ($checkdistro, $what) = @_;
1755 return unless defined $checkdistro;
1757 my $series = "debian/patches/\L$checkdistro\E.series";
1758 printdebug "checking for vendor-specific $series ($what)\n";
1760 if (!open SERIES, "<", $series) {
1761 die "$series $!" unless $!==ENOENT;
1770 Unfortunately, this source package uses a feature of dpkg-source where
1771 the same source package unpacks to different source code on different
1772 distros. dgit cannot safely operate on such packages on affected
1773 distros, because the meaning of source packages is not stable.
1775 Please ask the distro/maintainer to remove the distro-specific series
1776 files and use a different technique (if necessary, uploading actually
1777 different packages, if different distros are supposed to have
1781 fail "Found active distro-specific series file for".
1782 " $checkdistro ($what): $series, cannot continue";
1784 die "$series $!" if SERIES->error;
1788 sub check_for_vendor_patches () {
1789 # This dpkg-source feature doesn't seem to be documented anywhere!
1790 # But it can be found in the changelog (reformatted):
1792 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1793 # Author: Raphael Hertzog <hertzog@debian.org>
1794 # Date: Sun Oct 3 09:36:48 2010 +0200
1796 # dpkg-source: correctly create .pc/.quilt_series with alternate
1799 # If you have debian/patches/ubuntu.series and you were
1800 # unpacking the source package on ubuntu, quilt was still
1801 # directed to debian/patches/series instead of
1802 # debian/patches/ubuntu.series.
1804 # debian/changelog | 3 +++
1805 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1806 # 2 files changed, 6 insertions(+), 1 deletion(-)
1809 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1810 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1811 "Dpkg::Vendor \`current vendor'");
1812 vendor_patches_distro(access_basedistro(),
1813 "distro being accessed");
1816 sub generate_commits_from_dsc () {
1817 # See big comment in fetch_from_archive, below.
1818 # See also README.dsc-import.
1822 my @dfi = dsc_files_info();
1823 foreach my $fi (@dfi) {
1824 my $f = $fi->{Filename};
1825 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1827 link_ltarget "../../../$f", $f
1831 complete_file_from_dsc('.', $fi)
1834 if (is_orig_file_in_dsc($f, \@dfi)) {
1835 link $f, "../../../../$f"
1841 # We unpack and record the orig tarballs first, so that we only
1842 # need disk space for one private copy of the unpacked source.
1843 # But we can't make them into commits until we have the metadata
1844 # from the debian/changelog, so we record the tree objects now and
1845 # make them into commits later.
1847 my $upstreamv = $dsc->{version};
1848 $upstreamv =~ s/-[^-]+$//;
1849 my $orig_f_base = srcfn $upstreamv, '';
1851 foreach my $fi (@dfi) {
1852 # We actually import, and record as a commit, every tarball
1853 # (unless there is only one file, in which case there seems
1856 my $f = $fi->{Filename};
1857 printdebug "import considering $f ";
1858 (printdebug "only one dfi\n"), next if @dfi == 1;
1859 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
1860 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
1864 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
1866 printdebug "Y ", (join ' ', map { $_//"(none)" }
1867 $compr_ext, $orig_f_part
1870 my $input = new IO::File $f, '<' or die "$f $!";
1874 if (defined $compr_ext) {
1876 Dpkg::Compression::compression_guess_from_filename $f;
1877 fail "Dpkg::Compression cannot handle file $f in source package"
1878 if defined $compr_ext && !defined $cname;
1880 new Dpkg::Compression::Process compression => $cname;
1881 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
1882 my $compr_fh = new IO::Handle;
1883 my $compr_pid = open $compr_fh, "-|" // die $!;
1885 open STDIN, "<&", $input or die $!;
1887 die "dgit (child): exec $compr_cmd[0]: $!\n";
1892 rmtree "../unpack-tar";
1893 mkdir "../unpack-tar" or die $!;
1894 my @tarcmd = qw(tar -x -f -
1895 --no-same-owner --no-same-permissions
1896 --no-acls --no-xattrs --no-selinux);
1897 my $tar_pid = fork // die $!;
1899 chdir "../unpack-tar" or die $!;
1900 open STDIN, "<&", $input or die $!;
1902 die "dgit (child): exec $tarcmd[0]: $!";
1904 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
1905 !$? or failedcmd @tarcmd;
1908 (@compr_cmd ? failedcmd @compr_cmd
1910 # finally, we have the results in "tarball", but maybe
1911 # with the wrong permissions
1913 runcmd qw(chmod -R +rwX ../unpack-tar);
1914 changedir "../unpack-tar";
1915 my ($tree) = mktree_in_ud_from_only_subdir(1);
1916 changedir "../../unpack";
1917 rmtree "../unpack-tar";
1919 my $ent = [ $f, $tree ];
1921 Orig => !!$orig_f_part,
1922 Sort => (!$orig_f_part ? 2 :
1923 $orig_f_part =~ m/-/g ? 1 :
1931 # put any without "_" first (spec is not clear whether files
1932 # are always in the usual order). Tarballs without "_" are
1933 # the main orig or the debian tarball.
1934 $a->{Sort} <=> $b->{Sort} or
1938 my $any_orig = grep { $_->{Orig} } @tartrees;
1940 my $dscfn = "$package.dsc";
1942 my $treeimporthow = 'package';
1944 open D, ">", $dscfn or die "$dscfn: $!";
1945 print D $dscdata or die "$dscfn: $!";
1946 close D or die "$dscfn: $!";
1947 my @cmd = qw(dpkg-source);
1948 push @cmd, '--no-check' if $dsc_checked;
1949 if (madformat $dsc->{format}) {
1950 push @cmd, '--skip-patches';
1951 $treeimporthow = 'unpatched';
1953 push @cmd, qw(-x --), $dscfn;
1956 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1957 if (madformat $dsc->{format}) {
1958 check_for_vendor_patches();
1962 if (madformat $dsc->{format}) {
1963 my @pcmd = qw(dpkg-source --before-build .);
1964 runcmd shell_cmd 'exec >/dev/null', @pcmd;
1966 runcmd @git, qw(add -Af);
1967 $dappliedtree = git_write_tree();
1970 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
1971 debugcmd "|",@clogcmd;
1972 open CLOGS, "-|", @clogcmd or die $!;
1977 printdebug "import clog search...\n";
1980 my $stanzatext = do { local $/=""; <CLOGS>; };
1981 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
1982 last if !defined $stanzatext;
1984 my $desc = "package changelog, entry no.$.";
1985 open my $stanzafh, "<", \$stanzatext or die;
1986 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
1987 $clogp //= $thisstanza;
1989 printdebug "import clog $thisstanza->{version} $desc...\n";
1991 last if !$any_orig; # we don't need $r1clogp
1993 # We look for the first (most recent) changelog entry whose
1994 # version number is lower than the upstream version of this
1995 # package. Then the last (least recent) previous changelog
1996 # entry is treated as the one which introduced this upstream
1997 # version and used for the synthetic commits for the upstream
2000 # One might think that a more sophisticated algorithm would be
2001 # necessary. But: we do not want to scan the whole changelog
2002 # file. Stopping when we see an earlier version, which
2003 # necessarily then is an earlier upstream version, is the only
2004 # realistic way to do that. Then, either the earliest
2005 # changelog entry we have seen so far is indeed the earliest
2006 # upload of this upstream version; or there are only changelog
2007 # entries relating to later upstream versions (which is not
2008 # possible unless the changelog and .dsc disagree about the
2009 # version). Then it remains to choose between the physically
2010 # last entry in the file, and the one with the lowest version
2011 # number. If these are not the same, we guess that the
2012 # versions were created in a non-monotic order rather than
2013 # that the changelog entries have been misordered.
2015 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2017 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2018 $r1clogp = $thisstanza;
2020 printdebug "import clog $r1clogp->{version} becomes r1\n";
2022 die $! if CLOGS->error;
2023 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2025 $clogp or fail "package changelog has no entries!";
2027 my $authline = clogp_authline $clogp;
2028 my $changes = getfield $clogp, 'Changes';
2029 my $cversion = getfield $clogp, 'Version';
2032 $r1clogp //= $clogp; # maybe there's only one entry;
2033 my $r1authline = clogp_authline $r1clogp;
2034 # Strictly, r1authline might now be wrong if it's going to be
2035 # unused because !$any_orig. Whatever.
2037 printdebug "import tartrees authline $authline\n";
2038 printdebug "import tartrees r1authline $r1authline\n";
2040 foreach my $tt (@tartrees) {
2041 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2043 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2046 committer $r1authline
2050 [dgit import orig $tt->{F}]
2058 [dgit import tarball $package $cversion $tt->{F}]
2063 printdebug "import main commit\n";
2065 open C, ">../commit.tmp" or die $!;
2066 print C <<END or die $!;
2069 print C <<END or die $! foreach @tartrees;
2072 print C <<END or die $!;
2078 [dgit import $treeimporthow $package $cversion]
2082 my $rawimport_hash = make_commit qw(../commit.tmp);
2084 if (madformat $dsc->{format}) {
2085 printdebug "import apply patches...\n";
2087 # regularise the state of the working tree so that
2088 # the checkout of $rawimport_hash works nicely.
2089 my $dappliedcommit = make_commit_text(<<END);
2096 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2098 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2100 # We need the answers to be reproducible
2101 my @authline = clogp_authline($clogp);
2102 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2103 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2104 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2105 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2106 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2107 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2109 my $path = $ENV{PATH} or die;
2111 foreach my $use_absurd (qw(0 1)) {
2112 local $ENV{PATH} = $path;
2115 progress "warning: $@";
2116 $path = "$absurdity:$path";
2117 progress "$us: trying slow absurd-git-apply...";
2118 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2123 die "forbid absurd git-apply\n" if $use_absurd
2124 && forceing [qw(import-gitapply-no-absurd)];
2125 die "only absurd git-apply!\n" if !$use_absurd
2126 && forceing [qw(import-gitapply-absurd)];
2128 local $ENV{PATH} = $path if $use_absurd;
2130 my @showcmd = (gbp_pq, qw(import));
2131 my @realcmd = shell_cmd
2132 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2133 debugcmd "+",@realcmd;
2134 if (system @realcmd) {
2135 die +(shellquote @showcmd).
2137 failedcmd_waitstatus()."\n";
2140 my $gapplied = git_rev_parse('HEAD');
2141 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2142 $gappliedtree eq $dappliedtree or
2144 gbp-pq import and dpkg-source disagree!
2145 gbp-pq import gave commit $gapplied
2146 gbp-pq import gave tree $gappliedtree
2147 dpkg-source --before-build gave tree $dappliedtree
2149 $rawimport_hash = $gapplied;
2154 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2159 progress "synthesised git commit from .dsc $cversion";
2161 my $rawimport_mergeinput = {
2162 Commit => $rawimport_hash,
2163 Info => "Import of source package",
2165 my @output = ($rawimport_mergeinput);
2167 if ($lastpush_mergeinput) {
2168 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2169 my $oversion = getfield $oldclogp, 'Version';
2171 version_compare($oversion, $cversion);
2173 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2174 { Message => <<END, ReverseParents => 1 });
2175 Record $package ($cversion) in archive suite $csuite
2177 } elsif ($vcmp > 0) {
2178 print STDERR <<END or die $!;
2180 Version actually in archive: $cversion (older)
2181 Last version pushed with dgit: $oversion (newer or same)
2184 @output = $lastpush_mergeinput;
2186 # Same version. Use what's in the server git branch,
2187 # discarding our own import. (This could happen if the
2188 # server automatically imports all packages into git.)
2189 @output = $lastpush_mergeinput;
2192 changedir '../../../..';
2197 sub complete_file_from_dsc ($$) {
2198 our ($dstdir, $fi) = @_;
2199 # Ensures that we have, in $dir, the file $fi, with the correct
2200 # contents. (Downloading it from alongside $dscurl if necessary.)
2202 my $f = $fi->{Filename};
2203 my $tf = "$dstdir/$f";
2206 if (stat_exists $tf) {
2207 progress "using existing $f";
2210 $furl =~ s{/[^/]+$}{};
2212 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2213 die "$f ?" if $f =~ m#/#;
2214 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2215 return 0 if !act_local();
2219 open F, "<", "$tf" or die "$tf: $!";
2220 $fi->{Digester}->reset();
2221 $fi->{Digester}->addfile(*F);
2222 F->error and die $!;
2223 my $got = $fi->{Digester}->hexdigest();
2224 $got eq $fi->{Hash} or
2225 fail "file $f has hash $got but .dsc".
2226 " demands hash $fi->{Hash} ".
2227 ($downloaded ? "(got wrong file from archive!)"
2228 : "(perhaps you should delete this file?)");
2233 sub ensure_we_have_orig () {
2234 my @dfi = dsc_files_info();
2235 foreach my $fi (@dfi) {
2236 my $f = $fi->{Filename};
2237 next unless is_orig_file_in_dsc($f, \@dfi);
2238 complete_file_from_dsc('..', $fi)
2243 sub git_fetch_us () {
2244 # Want to fetch only what we are going to use, unless
2245 # deliberately-not-ff, in which case we must fetch everything.
2247 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2249 (quiltmode_splitbrain
2250 ? (map { $_->('*',access_basedistro) }
2251 \&debiantag_new, \&debiantag_maintview)
2252 : debiantags('*',access_basedistro));
2253 push @specs, server_branch($csuite);
2254 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2256 # This is rather miserable:
2257 # When git fetch --prune is passed a fetchspec ending with a *,
2258 # it does a plausible thing. If there is no * then:
2259 # - it matches subpaths too, even if the supplied refspec
2260 # starts refs, and behaves completely madly if the source
2261 # has refs/refs/something. (See, for example, Debian #NNNN.)
2262 # - if there is no matching remote ref, it bombs out the whole
2264 # We want to fetch a fixed ref, and we don't know in advance
2265 # if it exists, so this is not suitable.
2267 # Our workaround is to use git ls-remote. git ls-remote has its
2268 # own qairks. Notably, it has the absurd multi-tail-matching
2269 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2270 # refs/refs/foo etc.
2272 # Also, we want an idempotent snapshot, but we have to make two
2273 # calls to the remote: one to git ls-remote and to git fetch. The
2274 # solution is use git ls-remote to obtain a target state, and
2275 # git fetch to try to generate it. If we don't manage to generate
2276 # the target state, we try again.
2278 my $specre = join '|', map {
2284 printdebug "git_fetch_us specre=$specre\n";
2285 my $wanted_rref = sub {
2287 return m/^(?:$specre)$/o;
2290 my $fetch_iteration = 0;
2293 if (++$fetch_iteration > 10) {
2294 fail "too many iterations trying to get sane fetch!";
2297 my @look = map { "refs/$_" } @specs;
2298 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2302 open GITLS, "-|", @lcmd or die $!;
2304 printdebug "=> ", $_;
2305 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2306 my ($objid,$rrefname) = ($1,$2);
2307 if (!$wanted_rref->($rrefname)) {
2309 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2313 $wantr{$rrefname} = $objid;
2316 close GITLS or failedcmd @lcmd;
2318 # OK, now %want is exactly what we want for refs in @specs
2320 return () if !m/\*$/ && !exists $wantr{"refs/$_"};
2321 "+refs/$_:".lrfetchrefs."/$_";
2324 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2325 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2328 %lrfetchrefs_f = ();
2331 git_for_each_ref(lrfetchrefs, sub {
2332 my ($objid,$objtype,$lrefname,$reftail) = @_;
2333 $lrfetchrefs_f{$lrefname} = $objid;
2334 $objgot{$objid} = 1;
2337 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2338 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2339 if (!exists $wantr{$rrefname}) {
2340 if ($wanted_rref->($rrefname)) {
2342 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2346 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2349 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2350 delete $lrfetchrefs_f{$lrefname};
2354 foreach my $rrefname (sort keys %wantr) {
2355 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2356 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2357 my $want = $wantr{$rrefname};
2358 next if $got eq $want;
2359 if (!defined $objgot{$want}) {
2361 warning: git ls-remote suggests we want $lrefname
2362 warning: and it should refer to $want
2363 warning: but git fetch didn't fetch that object to any relevant ref.
2364 warning: This may be due to a race with someone updating the server.
2365 warning: Will try again...
2367 next FETCH_ITERATION;
2370 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2372 runcmd_ordryrun_local @git, qw(update-ref -m),
2373 "dgit fetch git fetch fixup", $lrefname, $want;
2374 $lrfetchrefs_f{$lrefname} = $want;
2378 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2379 Dumper(\%lrfetchrefs_f);
2382 my @tagpats = debiantags('*',access_basedistro);
2384 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2385 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2386 printdebug "currently $fullrefname=$objid\n";
2387 $here{$fullrefname} = $objid;
2389 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2390 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2391 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2392 printdebug "offered $lref=$objid\n";
2393 if (!defined $here{$lref}) {
2394 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2395 runcmd_ordryrun_local @upd;
2396 lrfetchref_used $fullrefname;
2397 } elsif ($here{$lref} eq $objid) {
2398 lrfetchref_used $fullrefname;
2401 "Not updateting $lref from $here{$lref} to $objid.\n";
2406 sub mergeinfo_getclogp ($) {
2407 # Ensures thit $mi->{Clogp} exists and returns it
2409 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2412 sub mergeinfo_version ($) {
2413 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2416 sub fetch_from_archive () {
2417 ensure_setup_existing_tree();
2419 # Ensures that lrref() is what is actually in the archive, one way
2420 # or another, according to us - ie this client's
2421 # appropritaely-updated archive view. Also returns the commit id.
2422 # If there is nothing in the archive, leaves lrref alone and
2423 # returns undef. git_fetch_us must have already been called.
2427 foreach my $field (@ourdscfield) {
2428 $dsc_hash = $dsc->{$field};
2429 last if defined $dsc_hash;
2431 if (defined $dsc_hash) {
2432 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2434 progress "last upload to archive specified git hash";
2436 progress "last upload to archive has NO git hash";
2439 progress "no version available from the archive";
2442 # If the archive's .dsc has a Dgit field, there are three
2443 # relevant git commitids we need to choose between and/or merge
2445 # 1. $dsc_hash: the Dgit field from the archive
2446 # 2. $lastpush_hash: the suite branch on the dgit git server
2447 # 3. $lastfetch_hash: our local tracking brach for the suite
2449 # These may all be distinct and need not be in any fast forward
2452 # If the dsc was pushed to this suite, then the server suite
2453 # branch will have been updated; but it might have been pushed to
2454 # a different suite and copied by the archive. Conversely a more
2455 # recent version may have been pushed with dgit but not appeared
2456 # in the archive (yet).
2458 # $lastfetch_hash may be awkward because archive imports
2459 # (particularly, imports of Dgit-less .dscs) are performed only as
2460 # needed on individual clients, so different clients may perform a
2461 # different subset of them - and these imports are only made
2462 # public during push. So $lastfetch_hash may represent a set of
2463 # imports different to a subsequent upload by a different dgit
2466 # Our approach is as follows:
2468 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2469 # descendant of $dsc_hash, then it was pushed by a dgit user who
2470 # had based their work on $dsc_hash, so we should prefer it.
2471 # Otherwise, $dsc_hash was installed into this suite in the
2472 # archive other than by a dgit push, and (necessarily) after the
2473 # last dgit push into that suite (since a dgit push would have
2474 # been descended from the dgit server git branch); thus, in that
2475 # case, we prefer the archive's version (and produce a
2476 # pseudo-merge to overwrite the dgit server git branch).
2478 # (If there is no Dgit field in the archive's .dsc then
2479 # generate_commit_from_dsc uses the version numbers to decide
2480 # whether the suite branch or the archive is newer. If the suite
2481 # branch is newer it ignores the archive's .dsc; otherwise it
2482 # generates an import of the .dsc, and produces a pseudo-merge to
2483 # overwrite the suite branch with the archive contents.)
2485 # The outcome of that part of the algorithm is the `public view',
2486 # and is same for all dgit clients: it does not depend on any
2487 # unpublished history in the local tracking branch.
2489 # As between the public view and the local tracking branch: The
2490 # local tracking branch is only updated by dgit fetch, and
2491 # whenever dgit fetch runs it includes the public view in the
2492 # local tracking branch. Therefore if the public view is not
2493 # descended from the local tracking branch, the local tracking
2494 # branch must contain history which was imported from the archive
2495 # but never pushed; and, its tip is now out of date. So, we make
2496 # a pseudo-merge to overwrite the old imports and stitch the old
2499 # Finally: we do not necessarily reify the public view (as
2500 # described above). This is so that we do not end up stacking two
2501 # pseudo-merges. So what we actually do is figure out the inputs
2502 # to any public view pseudo-merge and put them in @mergeinputs.
2505 # $mergeinputs[]{Commit}
2506 # $mergeinputs[]{Info}
2507 # $mergeinputs[0] is the one whose tree we use
2508 # @mergeinputs is in the order we use in the actual commit)
2511 # $mergeinputs[]{Message} is a commit message to use
2512 # $mergeinputs[]{ReverseParents} if def specifies that parent
2513 # list should be in opposite order
2514 # Such an entry has no Commit or Info. It applies only when found
2515 # in the last entry. (This ugliness is to support making
2516 # identical imports to previous dgit versions.)
2518 my $lastpush_hash = git_get_ref(lrfetchref());
2519 printdebug "previous reference hash=$lastpush_hash\n";
2520 $lastpush_mergeinput = $lastpush_hash && {
2521 Commit => $lastpush_hash,
2522 Info => "dgit suite branch on dgit git server",
2525 my $lastfetch_hash = git_get_ref(lrref());
2526 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2527 my $lastfetch_mergeinput = $lastfetch_hash && {
2528 Commit => $lastfetch_hash,
2529 Info => "dgit client's archive history view",
2532 my $dsc_mergeinput = $dsc_hash && {
2533 Commit => $dsc_hash,
2534 Info => "Dgit field in .dsc from archive",
2538 my $del_lrfetchrefs = sub {
2541 printdebug "del_lrfetchrefs...\n";
2542 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2543 my $objid = $lrfetchrefs_d{$fullrefname};
2544 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2546 $gur ||= new IO::Handle;
2547 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2549 printf $gur "delete %s %s\n", $fullrefname, $objid;
2552 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2556 if (defined $dsc_hash) {
2557 fail "missing remote git history even though dsc has hash -".
2558 " could not find ref ".rref()." at ".access_giturl()
2559 unless $lastpush_hash;
2560 ensure_we_have_orig();
2561 if ($dsc_hash eq $lastpush_hash) {
2562 @mergeinputs = $dsc_mergeinput
2563 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2564 print STDERR <<END or die $!;
2566 Git commit in archive is behind the last version allegedly pushed/uploaded.
2567 Commit referred to by archive: $dsc_hash
2568 Last version pushed with dgit: $lastpush_hash
2571 @mergeinputs = ($lastpush_mergeinput);
2573 # Archive has .dsc which is not a descendant of the last dgit
2574 # push. This can happen if the archive moves .dscs about.
2575 # Just follow its lead.
2576 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2577 progress "archive .dsc names newer git commit";
2578 @mergeinputs = ($dsc_mergeinput);
2580 progress "archive .dsc names other git commit, fixing up";
2581 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2585 @mergeinputs = generate_commits_from_dsc();
2586 # We have just done an import. Now, our import algorithm might
2587 # have been improved. But even so we do not want to generate
2588 # a new different import of the same package. So if the
2589 # version numbers are the same, just use our existing version.
2590 # If the version numbers are different, the archive has changed
2591 # (perhaps, rewound).
2592 if ($lastfetch_mergeinput &&
2593 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2594 (mergeinfo_version $mergeinputs[0]) )) {
2595 @mergeinputs = ($lastfetch_mergeinput);
2597 } elsif ($lastpush_hash) {
2598 # only in git, not in the archive yet
2599 @mergeinputs = ($lastpush_mergeinput);
2600 print STDERR <<END or die $!;
2602 Package not found in the archive, but has allegedly been pushed using dgit.
2606 printdebug "nothing found!\n";
2607 if (defined $skew_warning_vsn) {
2608 print STDERR <<END or die $!;
2610 Warning: relevant archive skew detected.
2611 Archive allegedly contains $skew_warning_vsn
2612 But we were not able to obtain any version from the archive or git.
2616 unshift @end, $del_lrfetchrefs;
2620 if ($lastfetch_hash &&
2622 my $h = $_->{Commit};
2623 $h and is_fast_fwd($lastfetch_hash, $h);
2624 # If true, one of the existing parents of this commit
2625 # is a descendant of the $lastfetch_hash, so we'll
2626 # be ff from that automatically.
2630 push @mergeinputs, $lastfetch_mergeinput;
2633 printdebug "fetch mergeinfos:\n";
2634 foreach my $mi (@mergeinputs) {
2636 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2638 printdebug sprintf " ReverseParents=%d Message=%s",
2639 $mi->{ReverseParents}, $mi->{Message};
2643 my $compat_info= pop @mergeinputs
2644 if $mergeinputs[$#mergeinputs]{Message};
2646 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2649 if (@mergeinputs > 1) {
2651 my $tree_commit = $mergeinputs[0]{Commit};
2653 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2654 $tree =~ m/\n\n/; $tree = $`;
2655 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2658 # We use the changelog author of the package in question the
2659 # author of this pseudo-merge. This is (roughly) correct if
2660 # this commit is simply representing aa non-dgit upload.
2661 # (Roughly because it does not record sponsorship - but we
2662 # don't have sponsorship info because that's in the .changes,
2663 # which isn't in the archivw.)
2665 # But, it might be that we are representing archive history
2666 # updates (including in-archive copies). These are not really
2667 # the responsibility of the person who created the .dsc, but
2668 # there is no-one whose name we should better use. (The
2669 # author of the .dsc-named commit is clearly worse.)
2671 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2672 my $author = clogp_authline $useclogp;
2673 my $cversion = getfield $useclogp, 'Version';
2675 my $mcf = ".git/dgit/mergecommit";
2676 open MC, ">", $mcf or die "$mcf $!";
2677 print MC <<END or die $!;
2681 my @parents = grep { $_->{Commit} } @mergeinputs;
2682 @parents = reverse @parents if $compat_info->{ReverseParents};
2683 print MC <<END or die $! foreach @parents;
2687 print MC <<END or die $!;
2693 if (defined $compat_info->{Message}) {
2694 print MC $compat_info->{Message} or die $!;
2696 print MC <<END or die $!;
2697 Record $package ($cversion) in archive suite $csuite
2701 my $message_add_info = sub {
2703 my $mversion = mergeinfo_version $mi;
2704 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2708 $message_add_info->($mergeinputs[0]);
2709 print MC <<END or die $!;
2710 should be treated as descended from
2712 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2716 $hash = make_commit $mcf;
2718 $hash = $mergeinputs[0]{Commit};
2720 printdebug "fetch hash=$hash\n";
2723 my ($lasth, $what) = @_;
2724 return unless $lasth;
2725 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2728 $chkff->($lastpush_hash, 'dgit repo server tip (last push)');
2729 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2731 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2732 'DGIT_ARCHIVE', $hash;
2733 cmdoutput @git, qw(log -n2), $hash;
2734 # ... gives git a chance to complain if our commit is malformed
2736 if (defined $skew_warning_vsn) {
2738 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2739 my $gotclogp = commit_getclogp($hash);
2740 my $got_vsn = getfield $gotclogp, 'Version';
2741 printdebug "SKEW CHECK GOT $got_vsn\n";
2742 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2743 print STDERR <<END or die $!;
2745 Warning: archive skew detected. Using the available version:
2746 Archive allegedly contains $skew_warning_vsn
2747 We were able to obtain only $got_vsn
2753 if ($lastfetch_hash ne $hash) {
2754 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2758 dryrun_report @upd_cmd;
2762 lrfetchref_used lrfetchref();
2764 unshift @end, $del_lrfetchrefs;
2768 sub set_local_git_config ($$) {
2770 runcmd @git, qw(config), $k, $v;
2773 sub setup_mergechangelogs (;$) {
2775 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
2777 my $driver = 'dpkg-mergechangelogs';
2778 my $cb = "merge.$driver";
2779 my $attrs = '.git/info/attributes';
2780 ensuredir '.git/info';
2782 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
2783 if (!open ATTRS, "<", $attrs) {
2784 $!==ENOENT or die "$attrs: $!";
2788 next if m{^debian/changelog\s};
2789 print NATTRS $_, "\n" or die $!;
2791 ATTRS->error and die $!;
2794 print NATTRS "debian/changelog merge=$driver\n" or die $!;
2797 set_local_git_config "$cb.name", 'debian/changelog merge driver';
2798 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
2800 rename "$attrs.new", "$attrs" or die "$attrs: $!";
2803 sub setup_useremail (;$) {
2805 return unless $always || access_cfg_bool(1, 'setup-useremail');
2808 my ($k, $envvar) = @_;
2809 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
2810 return unless defined $v;
2811 set_local_git_config "user.$k", $v;
2814 $setup->('email', 'DEBEMAIL');
2815 $setup->('name', 'DEBFULLNAME');
2818 sub ensure_setup_existing_tree () {
2819 my $k = "remote.$remotename.skipdefaultupdate";
2820 my $c = git_get_config $k;
2821 return if defined $c;
2822 set_local_git_config $k, 'true';
2825 sub setup_new_tree () {
2826 setup_mergechangelogs();
2832 canonicalise_suite();
2833 badusage "dry run makes no sense with clone" unless act_local();
2834 my $hasgit = check_for_git();
2835 mkdir $dstdir or fail "create \`$dstdir': $!";
2837 runcmd @git, qw(init -q);
2838 my $giturl = access_giturl(1);
2839 if (defined $giturl) {
2840 open H, "> .git/HEAD" or die $!;
2841 print H "ref: ".lref()."\n" or die $!;
2843 runcmd @git, qw(remote add), 'origin', $giturl;
2846 progress "fetching existing git history";
2848 runcmd_ordryrun_local @git, qw(fetch origin);
2850 progress "starting new git history";
2852 fetch_from_archive() or no_such_package;
2853 my $vcsgiturl = $dsc->{'Vcs-Git'};
2854 if (length $vcsgiturl) {
2855 $vcsgiturl =~ s/\s+-b\s+\S+//g;
2856 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
2859 runcmd @git, qw(reset --hard), lrref();
2860 printdone "ready for work in $dstdir";
2864 if (check_for_git()) {
2867 fetch_from_archive() or no_such_package();
2868 printdone "fetched into ".lrref();
2873 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
2875 printdone "fetched to ".lrref()." and merged into HEAD";
2878 sub check_not_dirty () {
2879 foreach my $f (qw(local-options local-patch-header)) {
2880 if (stat_exists "debian/source/$f") {
2881 fail "git tree contains debian/source/$f";
2885 return if $ignoredirty;
2887 my @cmd = (@git, qw(diff --quiet HEAD));
2889 $!=0; $?=-1; system @cmd;
2892 fail "working tree is dirty (does not match HEAD)";
2898 sub commit_admin ($) {
2901 runcmd_ordryrun_local @git, qw(commit -m), $m;
2904 sub commit_quilty_patch () {
2905 my $output = cmdoutput @git, qw(status --porcelain);
2907 foreach my $l (split /\n/, $output) {
2908 next unless $l =~ m/\S/;
2909 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
2913 delete $adds{'.pc'}; # if there wasn't one before, don't add it
2915 progress "nothing quilty to commit, ok.";
2918 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
2919 runcmd_ordryrun_local @git, qw(add -f), @adds;
2921 Commit Debian 3.0 (quilt) metadata
2923 [dgit ($our_version) quilt-fixup]
2927 sub get_source_format () {
2929 if (open F, "debian/source/options") {
2933 s/\s+$//; # ignore missing final newline
2935 my ($k, $v) = ($`, $'); #');
2936 $v =~ s/^"(.*)"$/$1/;
2942 F->error and die $!;
2945 die $! unless $!==&ENOENT;
2948 if (!open F, "debian/source/format") {
2949 die $! unless $!==&ENOENT;
2953 F->error and die $!;
2955 return ($_, \%options);
2958 sub madformat_wantfixup ($) {
2960 return 0 unless $format eq '3.0 (quilt)';
2961 our $quilt_mode_warned;
2962 if ($quilt_mode eq 'nocheck') {
2963 progress "Not doing any fixup of \`$format' due to".
2964 " ----no-quilt-fixup or --quilt=nocheck"
2965 unless $quilt_mode_warned++;
2968 progress "Format \`$format', need to check/update patch stack"
2969 unless $quilt_mode_warned++;
2973 # An "infopair" is a tuple [ $thing, $what ]
2974 # (often $thing is a commit hash; $what is a description)
2976 sub infopair_cond_equal ($$) {
2978 $x->[0] eq $y->[0] or fail <<END;
2979 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
2983 sub infopair_lrf_tag_lookup ($$) {
2984 my ($tagnames, $what) = @_;
2985 # $tagname may be an array ref
2986 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
2987 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
2988 foreach my $tagname (@tagnames) {
2989 my $lrefname = lrfetchrefs."/tags/$tagname";
2990 my $tagobj = $lrfetchrefs_f{$lrefname};
2991 next unless defined $tagobj;
2992 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
2993 return [ git_rev_parse($tagobj), $what ];
2995 fail @tagnames==1 ? <<END : <<END;
2996 Wanted tag $what (@tagnames) on dgit server, but not found
2998 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3002 sub infopair_cond_ff ($$) {
3003 my ($anc,$desc) = @_;
3004 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3005 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3009 sub pseudomerge_version_check ($$) {
3010 my ($clogp, $archive_hash) = @_;
3012 my $arch_clogp = commit_getclogp $archive_hash;
3013 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3014 'version currently in archive' ];
3015 if (defined $overwrite_version) {
3016 if (length $overwrite_version) {
3017 infopair_cond_equal([ $overwrite_version,
3018 '--overwrite= version' ],
3021 my $v = $i_arch_v->[0];
3022 progress "Checking package changelog for archive version $v ...";
3024 my @xa = ("-f$v", "-t$v");
3025 my $vclogp = parsechangelog @xa;
3026 my $cv = [ (getfield $vclogp, 'Version'),
3027 "Version field from dpkg-parsechangelog @xa" ];
3028 infopair_cond_equal($i_arch_v, $cv);
3031 $@ =~ s/^dgit: //gm;
3033 "Perhaps debian/changelog does not mention $v ?";
3038 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3042 sub pseudomerge_make_commit ($$$$ $$) {
3043 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3044 $msg_cmd, $msg_msg) = @_;
3045 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3047 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3048 my $authline = clogp_authline $clogp;
3052 !defined $overwrite_version ? ""
3053 : !length $overwrite_version ? " --overwrite"
3054 : " --overwrite=".$overwrite_version;
3057 my $pmf = ".git/dgit/pseudomerge";
3058 open MC, ">", $pmf or die "$pmf $!";
3059 print MC <<END or die $!;
3062 parent $archive_hash
3072 return make_commit($pmf);
3075 sub splitbrain_pseudomerge ($$$$) {
3076 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3077 # => $merged_dgitview
3078 printdebug "splitbrain_pseudomerge...\n";
3080 # We: debian/PREVIOUS HEAD($maintview)
3081 # expect: o ----------------- o
3084 # a/d/PREVIOUS $dgitview
3087 # we do: `------------------ o
3091 return $dgitview unless defined $archive_hash;
3093 printdebug "splitbrain_pseudomerge...\n";
3095 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3097 if (!defined $overwrite_version) {
3098 progress "Checking that HEAD inciudes all changes in archive...";
3101 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3103 if (defined $overwrite_version) {
3105 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
3106 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3107 my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
3108 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3109 my $i_archive = [ $archive_hash, "current archive contents" ];
3111 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3113 infopair_cond_equal($i_dgit, $i_archive);
3114 infopair_cond_ff($i_dep14, $i_dgit);
3115 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3119 $us: check failed (maybe --overwrite is needed, consult documentation)
3124 my $r = pseudomerge_make_commit
3125 $clogp, $dgitview, $archive_hash, $i_arch_v,
3126 "dgit --quilt=$quilt_mode",
3127 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3128 Declare fast forward from $i_arch_v->[0]
3130 Make fast forward from $i_arch_v->[0]
3133 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3137 sub plain_overwrite_pseudomerge ($$$) {
3138 my ($clogp, $head, $archive_hash) = @_;
3140 printdebug "plain_overwrite_pseudomerge...";
3142 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3144 return $head if is_fast_fwd $archive_hash, $head;
3146 my $m = "Declare fast forward from $i_arch_v->[0]";
3148 my $r = pseudomerge_make_commit
3149 $clogp, $head, $archive_hash, $i_arch_v,
3152 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3154 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3158 sub push_parse_changelog ($) {
3161 my $clogp = Dpkg::Control::Hash->new();
3162 $clogp->load($clogpfn) or die;
3164 $package = getfield $clogp, 'Source';
3165 my $cversion = getfield $clogp, 'Version';
3166 my $tag = debiantag($cversion, access_basedistro);
3167 runcmd @git, qw(check-ref-format), $tag;
3169 my $dscfn = dscfn($cversion);
3171 return ($clogp, $cversion, $dscfn);
3174 sub push_parse_dsc ($$$) {
3175 my ($dscfn,$dscfnwhat, $cversion) = @_;
3176 $dsc = parsecontrol($dscfn,$dscfnwhat);
3177 my $dversion = getfield $dsc, 'Version';
3178 my $dscpackage = getfield $dsc, 'Source';
3179 ($dscpackage eq $package && $dversion eq $cversion) or
3180 fail "$dscfn is for $dscpackage $dversion".
3181 " but debian/changelog is for $package $cversion";
3184 sub push_tagwants ($$$$) {
3185 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3188 TagFn => \&debiantag,
3193 if (defined $maintviewhead) {
3195 TagFn => \&debiantag_maintview,
3196 Objid => $maintviewhead,
3197 TfSuffix => '-maintview',
3201 foreach my $tw (@tagwants) {
3202 $tw->{Tag} = $tw->{TagFn}($cversion, access_basedistro);
3203 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3205 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3209 sub push_mktags ($$ $$ $) {
3211 $changesfile,$changesfilewhat,
3214 die unless $tagwants->[0]{View} eq 'dgit';
3216 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3217 $dsc->save("$dscfn.tmp") or die $!;
3219 my $changes = parsecontrol($changesfile,$changesfilewhat);
3220 foreach my $field (qw(Source Distribution Version)) {
3221 $changes->{$field} eq $clogp->{$field} or
3222 fail "changes field $field \`$changes->{$field}'".
3223 " does not match changelog \`$clogp->{$field}'";
3226 my $cversion = getfield $clogp, 'Version';
3227 my $clogsuite = getfield $clogp, 'Distribution';
3229 # We make the git tag by hand because (a) that makes it easier
3230 # to control the "tagger" (b) we can do remote signing
3231 my $authline = clogp_authline $clogp;
3232 my $delibs = join(" ", "",@deliberatelies);
3233 my $declaredistro = access_basedistro();
3237 my $tfn = $tw->{Tfn};
3238 my $head = $tw->{Objid};
3239 my $tag = $tw->{Tag};
3241 open TO, '>', $tfn->('.tmp') or die $!;
3242 print TO <<END or die $!;
3249 if ($tw->{View} eq 'dgit') {
3250 print TO <<END or die $!;
3251 $package release $cversion for $clogsuite ($csuite) [dgit]
3252 [dgit distro=$declaredistro$delibs]
3254 foreach my $ref (sort keys %previously) {
3255 print TO <<END or die $!;
3256 [dgit previously:$ref=$previously{$ref}]
3259 } elsif ($tw->{View} eq 'maint') {
3260 print TO <<END or die $!;
3261 $package release $cversion for $clogsuite ($csuite)
3262 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3265 die Dumper($tw)."?";
3270 my $tagobjfn = $tfn->('.tmp');
3272 if (!defined $keyid) {
3273 $keyid = access_cfg('keyid','RETURN-UNDEF');
3275 if (!defined $keyid) {
3276 $keyid = getfield $clogp, 'Maintainer';
3278 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3279 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3280 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3281 push @sign_cmd, $tfn->('.tmp');
3282 runcmd_ordryrun @sign_cmd;
3284 $tagobjfn = $tfn->('.signed.tmp');
3285 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3286 $tfn->('.tmp'), $tfn->('.tmp.asc');
3292 my @r = map { $mktag->($_); } @$tagwants;
3296 sub sign_changes ($) {
3297 my ($changesfile) = @_;
3299 my @debsign_cmd = @debsign;
3300 push @debsign_cmd, "-k$keyid" if defined $keyid;
3301 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3302 push @debsign_cmd, $changesfile;
3303 runcmd_ordryrun @debsign_cmd;
3308 printdebug "actually entering push\n";
3310 supplementary_message(<<'END');
3311 Push failed, while checking state of the archive.
3312 You can retry the push, after fixing the problem, if you like.
3314 if (check_for_git()) {
3317 my $archive_hash = fetch_from_archive();
3318 if (!$archive_hash) {
3320 fail "package appears to be new in this suite;".
3321 " if this is intentional, use --new";
3324 supplementary_message(<<'END');
3325 Push failed, while preparing your push.
3326 You can retry the push, after fixing the problem, if you like.
3329 need_tagformat 'new', "quilt mode $quilt_mode"
3330 if quiltmode_splitbrain;
3334 access_giturl(); # check that success is vaguely likely
3337 my $clogpfn = ".git/dgit/changelog.822.tmp";
3338 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3340 responder_send_file('parsed-changelog', $clogpfn);
3342 my ($clogp, $cversion, $dscfn) =
3343 push_parse_changelog("$clogpfn");
3345 my $dscpath = "$buildproductsdir/$dscfn";
3346 stat_exists $dscpath or
3347 fail "looked for .dsc $dscfn, but $!;".
3348 " maybe you forgot to build";
3350 responder_send_file('dsc', $dscpath);
3352 push_parse_dsc($dscpath, $dscfn, $cversion);
3354 my $format = getfield $dsc, 'Format';
3355 printdebug "format $format\n";
3357 my $actualhead = git_rev_parse('HEAD');
3358 my $dgithead = $actualhead;
3359 my $maintviewhead = undef;
3361 my $upstreamversion = $clogp->{Version};
3362 $upstreamversion =~ s/-[^-]*$//;
3364 if (madformat_wantfixup($format)) {
3365 # user might have not used dgit build, so maybe do this now:
3366 if (quiltmode_splitbrain()) {
3368 quilt_make_fake_dsc($upstreamversion);
3370 ($dgithead, $cachekey) =
3371 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3373 "--quilt=$quilt_mode but no cached dgit view:
3374 perhaps tree changed since dgit build[-source] ?";
3376 $dgithead = splitbrain_pseudomerge($clogp,
3377 $actualhead, $dgithead,
3379 $maintviewhead = $actualhead;
3380 changedir '../../../..';
3381 prep_ud(); # so _only_subdir() works, below
3383 commit_quilty_patch();
3387 if (defined $overwrite_version && !defined $maintviewhead) {
3388 $dgithead = plain_overwrite_pseudomerge($clogp,
3396 if ($archive_hash) {
3397 if (is_fast_fwd($archive_hash, $dgithead)) {
3399 } elsif (deliberately_not_fast_forward) {
3402 fail "dgit push: HEAD is not a descendant".
3403 " of the archive's version.\n".
3404 "To overwrite the archive's contents,".
3405 " pass --overwrite[=VERSION].\n".
3406 "To rewind history, if permitted by the archive,".
3407 " use --deliberately-not-fast-forward.";
3412 progress "checking that $dscfn corresponds to HEAD";
3413 runcmd qw(dpkg-source -x --),
3414 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3415 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3416 check_for_vendor_patches() if madformat($dsc->{format});
3417 changedir '../../../..';
3418 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3419 debugcmd "+",@diffcmd;
3421 my $r = system @diffcmd;
3424 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3426 HEAD specifies a different tree to $dscfn:
3428 Perhaps you forgot to build. Or perhaps there is a problem with your
3429 source tree (see dgit(7) for some hints). To see a full diff, run
3436 if (!$changesfile) {
3437 my $pat = changespat $cversion;
3438 my @cs = glob "$buildproductsdir/$pat";
3439 fail "failed to find unique changes file".
3440 " (looked for $pat in $buildproductsdir);".
3441 " perhaps you need to use dgit -C"
3443 ($changesfile) = @cs;
3445 $changesfile = "$buildproductsdir/$changesfile";
3448 # Check that changes and .dsc agree enough
3449 $changesfile =~ m{[^/]*$};
3450 my $changes = parsecontrol($changesfile,$&);
3451 files_compare_inputs($dsc, $changes)
3452 unless forceing [qw(dsc-changes-mismatch)];
3454 # Perhaps adjust .dsc to contain right set of origs
3455 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3458 # Checks complete, we're going to try and go ahead:
3460 responder_send_file('changes',$changesfile);
3461 responder_send_command("param head $dgithead");
3462 responder_send_command("param csuite $csuite");
3463 responder_send_command("param tagformat $tagformat");
3464 if (defined $maintviewhead) {
3465 die unless ($protovsn//4) >= 4;
3466 responder_send_command("param maint-view $maintviewhead");
3469 if (deliberately_not_fast_forward) {
3470 git_for_each_ref(lrfetchrefs, sub {
3471 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3472 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3473 responder_send_command("previously $rrefname=$objid");
3474 $previously{$rrefname} = $objid;
3478 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3482 supplementary_message(<<'END');
3483 Push failed, while signing the tag.
3484 You can retry the push, after fixing the problem, if you like.
3486 # If we manage to sign but fail to record it anywhere, it's fine.
3487 if ($we_are_responder) {
3488 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3489 responder_receive_files('signed-tag', @tagobjfns);
3491 @tagobjfns = push_mktags($clogp,$dscpath,
3492 $changesfile,$changesfile,
3495 supplementary_message(<<'END');
3496 Push failed, *after* signing the tag.
3497 If you want to try again, you should use a new version number.
3500 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3502 foreach my $tw (@tagwants) {
3503 my $tag = $tw->{Tag};
3504 my $tagobjfn = $tw->{TagObjFn};
3506 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3507 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3508 runcmd_ordryrun_local
3509 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3512 supplementary_message(<<'END');
3513 Push failed, while updating the remote git repository - see messages above.
3514 If you want to try again, you should use a new version number.
3516 if (!check_for_git()) {
3517 create_remote_git_repo();
3520 my @pushrefs = $forceflag.$dgithead.":".rrref();
3521 foreach my $tw (@tagwants) {
3522 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3525 runcmd_ordryrun @git,
3526 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3527 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3529 supplementary_message(<<'END');
3530 Push failed, after updating the remote git repository.
3531 If you want to try again, you must use a new version number.
3533 if ($we_are_responder) {
3534 my $dryrunsuffix = act_local() ? "" : ".tmp";
3535 responder_receive_files('signed-dsc-changes',
3536 "$dscpath$dryrunsuffix",
3537 "$changesfile$dryrunsuffix");
3540 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3542 progress "[new .dsc left in $dscpath.tmp]";
3544 sign_changes $changesfile;
3547 supplementary_message(<<END);
3548 Push failed, while uploading package(s) to the archive server.
3549 You can retry the upload of exactly these same files with dput of:
3551 If that .changes file is broken, you will need to use a new version
3552 number for your next attempt at the upload.
3554 my $host = access_cfg('upload-host','RETURN-UNDEF');
3555 my @hostarg = defined($host) ? ($host,) : ();
3556 runcmd_ordryrun @dput, @hostarg, $changesfile;
3557 printdone "pushed and uploaded $cversion";
3559 supplementary_message('');
3560 responder_send_command("complete");
3567 badusage "-p is not allowed with clone; specify as argument instead"
3568 if defined $package;
3571 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3572 ($package,$isuite) = @ARGV;
3573 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3574 ($package,$dstdir) = @ARGV;
3575 } elsif (@ARGV==3) {
3576 ($package,$isuite,$dstdir) = @ARGV;
3578 badusage "incorrect arguments to dgit clone";
3580 $dstdir ||= "$package";
3582 if (stat_exists $dstdir) {
3583 fail "$dstdir already exists";
3587 if ($rmonerror && !$dryrun_level) {
3588 $cwd_remove= getcwd();
3590 return unless defined $cwd_remove;
3591 if (!chdir "$cwd_remove") {
3592 return if $!==&ENOENT;
3593 die "chdir $cwd_remove: $!";
3596 rmtree($dstdir) or die "remove $dstdir: $!\n";
3597 } elsif (grep { $! == $_ }
3598 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3600 print STDERR "check whether to remove $dstdir: $!\n";
3606 $cwd_remove = undef;
3609 sub branchsuite () {
3610 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3611 if ($branch =~ m#$lbranch_re#o) {
3618 sub fetchpullargs () {
3620 if (!defined $package) {
3621 my $sourcep = parsecontrol('debian/control','debian/control');
3622 $package = getfield $sourcep, 'Source';
3625 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3627 my $clogp = parsechangelog();
3628 $isuite = getfield $clogp, 'Distribution';
3630 canonicalise_suite();
3631 progress "fetching from suite $csuite";
3632 } elsif (@ARGV==1) {
3634 canonicalise_suite();
3636 badusage "incorrect arguments to dgit fetch or dgit pull";
3655 badusage "-p is not allowed with dgit push" if defined $package;
3657 my $clogp = parsechangelog();
3658 $package = getfield $clogp, 'Source';
3661 } elsif (@ARGV==1) {
3662 ($specsuite) = (@ARGV);
3664 badusage "incorrect arguments to dgit push";
3666 $isuite = getfield $clogp, 'Distribution';
3668 local ($package) = $existing_package; # this is a hack
3669 canonicalise_suite();
3671 canonicalise_suite();
3673 if (defined $specsuite &&
3674 $specsuite ne $isuite &&
3675 $specsuite ne $csuite) {
3676 fail "dgit push: changelog specifies $isuite ($csuite)".
3677 " but command line specifies $specsuite";
3682 #---------- remote commands' implementation ----------
3684 sub cmd_remote_push_build_host {
3685 my ($nrargs) = shift @ARGV;
3686 my (@rargs) = @ARGV[0..$nrargs-1];
3687 @ARGV = @ARGV[$nrargs..$#ARGV];
3689 my ($dir,$vsnwant) = @rargs;
3690 # vsnwant is a comma-separated list; we report which we have
3691 # chosen in our ready response (so other end can tell if they
3694 $we_are_responder = 1;
3695 $us .= " (build host)";
3699 open PI, "<&STDIN" or die $!;
3700 open STDIN, "/dev/null" or die $!;
3701 open PO, ">&STDOUT" or die $!;
3703 open STDOUT, ">&STDERR" or die $!;
3707 ($protovsn) = grep {
3708 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3709 } @rpushprotovsn_support;
3711 fail "build host has dgit rpush protocol versions ".
3712 (join ",", @rpushprotovsn_support).
3713 " but invocation host has $vsnwant"
3714 unless defined $protovsn;
3716 responder_send_command("dgit-remote-push-ready $protovsn");
3717 rpush_handle_protovsn_bothends();
3722 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3723 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3724 # a good error message)
3726 sub rpush_handle_protovsn_bothends () {
3727 if ($protovsn < 4) {
3728 need_tagformat 'old', "rpush negotiated protocol $protovsn";
3737 my $report = i_child_report();
3738 if (defined $report) {
3739 printdebug "($report)\n";
3740 } elsif ($i_child_pid) {
3741 printdebug "(killing build host child $i_child_pid)\n";
3742 kill 15, $i_child_pid;
3744 if (defined $i_tmp && !defined $initiator_tempdir) {
3746 eval { rmtree $i_tmp; };
3750 END { i_cleanup(); }
3753 my ($base,$selector,@args) = @_;
3754 $selector =~ s/\-/_/g;
3755 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
3762 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
3770 push @rargs, join ",", @rpushprotovsn_support;
3773 push @rdgit, @ropts;
3774 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
3776 my @cmd = (@ssh, $host, shellquote @rdgit);
3779 if (defined $initiator_tempdir) {
3780 rmtree $initiator_tempdir;
3781 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
3782 $i_tmp = $initiator_tempdir;
3786 $i_child_pid = open2(\*RO, \*RI, @cmd);
3788 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
3789 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
3790 $supplementary_message = '' unless $protovsn >= 3;
3792 fail "rpush negotiated protocol version $protovsn".
3793 " which does not support quilt mode $quilt_mode"
3794 if quiltmode_splitbrain;
3796 rpush_handle_protovsn_bothends();
3798 my ($icmd,$iargs) = initiator_expect {
3799 m/^(\S+)(?: (.*))?$/;
3802 i_method "i_resp", $icmd, $iargs;
3806 sub i_resp_progress ($) {
3808 my $msg = protocol_read_bytes \*RO, $rhs;
3812 sub i_resp_supplementary_message ($) {
3814 $supplementary_message = protocol_read_bytes \*RO, $rhs;
3817 sub i_resp_complete {
3818 my $pid = $i_child_pid;
3819 $i_child_pid = undef; # prevents killing some other process with same pid
3820 printdebug "waiting for build host child $pid...\n";
3821 my $got = waitpid $pid, 0;
3822 die $! unless $got == $pid;
3823 die "build host child failed $?" if $?;
3826 printdebug "all done\n";
3830 sub i_resp_file ($) {
3832 my $localname = i_method "i_localname", $keyword;
3833 my $localpath = "$i_tmp/$localname";
3834 stat_exists $localpath and
3835 badproto \*RO, "file $keyword ($localpath) twice";
3836 protocol_receive_file \*RO, $localpath;
3837 i_method "i_file", $keyword;
3842 sub i_resp_param ($) {
3843 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
3847 sub i_resp_previously ($) {
3848 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
3849 or badproto \*RO, "bad previously spec";
3850 my $r = system qw(git check-ref-format), $1;
3851 die "bad previously ref spec ($r)" if $r;
3852 $previously{$1} = $2;
3857 sub i_resp_want ($) {
3859 die "$keyword ?" if $i_wanted{$keyword}++;
3860 my @localpaths = i_method "i_want", $keyword;
3861 printdebug "[[ $keyword @localpaths\n";
3862 foreach my $localpath (@localpaths) {
3863 protocol_send_file \*RI, $localpath;
3865 print RI "files-end\n" or die $!;
3868 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
3870 sub i_localname_parsed_changelog {
3871 return "remote-changelog.822";
3873 sub i_file_parsed_changelog {
3874 ($i_clogp, $i_version, $i_dscfn) =
3875 push_parse_changelog "$i_tmp/remote-changelog.822";
3876 die if $i_dscfn =~ m#/|^\W#;
3879 sub i_localname_dsc {
3880 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3885 sub i_localname_changes {
3886 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3887 $i_changesfn = $i_dscfn;
3888 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
3889 return $i_changesfn;
3891 sub i_file_changes { }
3893 sub i_want_signed_tag {
3894 printdebug Dumper(\%i_param, $i_dscfn);
3895 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
3896 && defined $i_param{'csuite'}
3897 or badproto \*RO, "premature desire for signed-tag";
3898 my $head = $i_param{'head'};
3899 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
3901 my $maintview = $i_param{'maint-view'};
3902 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
3905 if ($protovsn >= 4) {
3906 my $p = $i_param{'tagformat'} // '<undef>';
3908 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
3911 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
3913 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
3915 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
3918 push_mktags $i_clogp, $i_dscfn,
3919 $i_changesfn, 'remote changes',
3923 sub i_want_signed_dsc_changes {
3924 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
3925 sign_changes $i_changesfn;
3926 return ($i_dscfn, $i_changesfn);
3929 #---------- building etc. ----------
3935 #----- `3.0 (quilt)' handling -----
3937 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
3939 sub quiltify_dpkg_commit ($$$;$) {
3940 my ($patchname,$author,$msg, $xinfo) = @_;
3944 my $descfn = ".git/dgit/quilt-description.tmp";
3945 open O, '>', $descfn or die "$descfn: $!";
3946 $msg =~ s/\n+/\n\n/;
3947 print O <<END or die $!;
3949 ${xinfo}Subject: $msg
3956 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
3957 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
3958 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
3959 runcmd @dpkgsource, qw(--commit .), $patchname;
3963 sub quiltify_trees_differ ($$;$$$) {
3964 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
3965 # returns true iff the two tree objects differ other than in debian/
3966 # with $finegrained,
3967 # returns bitmask 01 - differ in upstream files except .gitignore
3968 # 02 - differ in .gitignore
3969 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
3970 # is set for each modified .gitignore filename $fn
3971 # if $unrepres is defined, array ref to which is appeneded
3972 # a list of unrepresentable changes (removals of upstream files
3975 my @cmd = (@git, qw(diff-tree -z));
3976 push @cmd, qw(--name-only) unless $unrepres;
3977 push @cmd, qw(-r) if $finegrained || $unrepres;
3979 my $diffs= cmdoutput @cmd;
3982 foreach my $f (split /\0/, $diffs) {
3983 if ($unrepres && !@lmodes) {
3984 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
3987 my ($oldmode,$newmode) = @lmodes;
3990 next if $f =~ m#^debian(?:/.*)?$#s;
3994 die "deleted\n" unless $newmode =~ m/[^0]/;
3995 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
3996 if ($oldmode =~ m/[^0]/) {
3997 die "mode changed\n" if $oldmode ne $newmode;
3999 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4003 local $/="\n"; chomp $@;
4004 push @$unrepres, [ $f, $@ ];
4008 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4009 $r |= $isignore ? 02 : 01;
4010 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4012 printdebug "quiltify_trees_differ $x $y => $r\n";
4016 sub quiltify_tree_sentinelfiles ($) {
4017 # lists the `sentinel' files present in the tree
4019 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4020 qw(-- debian/rules debian/control);
4025 sub quiltify_splitbrain_needed () {
4026 if (!$split_brain) {
4027 progress "dgit view: changes are required...";
4028 runcmd @git, qw(checkout -q -b dgit-view);
4033 sub quiltify_splitbrain ($$$$$$) {
4034 my ($clogp, $unapplied, $headref, $diffbits,
4035 $editedignores, $cachekey) = @_;
4036 if ($quilt_mode !~ m/gbp|dpm/) {
4037 # treat .gitignore just like any other upstream file
4038 $diffbits = { %$diffbits };
4039 $_ = !!$_ foreach values %$diffbits;
4041 # We would like any commits we generate to be reproducible
4042 my @authline = clogp_authline($clogp);
4043 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4044 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4045 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4046 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4047 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4048 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4050 if ($quilt_mode =~ m/gbp|unapplied/ &&
4051 ($diffbits->{O2H} & 01)) {
4053 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4054 " but git tree differs from orig in upstream files.";
4055 if (!stat_exists "debian/patches") {
4057 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4061 if ($quilt_mode =~ m/dpm/ &&
4062 ($diffbits->{H2A} & 01)) {
4064 --quilt=$quilt_mode specified, implying patches-applied git tree
4065 but git tree differs from result of applying debian/patches to upstream
4068 if ($quilt_mode =~ m/gbp|unapplied/ &&
4069 ($diffbits->{O2A} & 01)) { # some patches
4070 quiltify_splitbrain_needed();
4071 progress "dgit view: creating patches-applied version using gbp pq";
4072 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4073 # gbp pq import creates a fresh branch; push back to dgit-view
4074 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4075 runcmd @git, qw(checkout -q dgit-view);
4077 if ($quilt_mode =~ m/gbp|dpm/ &&
4078 ($diffbits->{O2A} & 02)) {
4080 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4081 tool which does not create patches for changes to upstream
4082 .gitignores: but, such patches exist in debian/patches.
4085 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4086 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4087 quiltify_splitbrain_needed();
4088 progress "dgit view: creating patch to represent .gitignore changes";
4089 ensuredir "debian/patches";
4090 my $gipatch = "debian/patches/auto-gitignore";
4091 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4092 stat GIPATCH or die "$gipatch: $!";
4093 fail "$gipatch already exists; but want to create it".
4094 " to record .gitignore changes" if (stat _)[7];
4095 print GIPATCH <<END or die "$gipatch: $!";
4096 Subject: Update .gitignore from Debian packaging branch
4098 The Debian packaging git branch contains these updates to the upstream
4099 .gitignore file(s). This patch is autogenerated, to provide these
4100 updates to users of the official Debian archive view of the package.
4102 [dgit ($our_version) update-gitignore]
4105 close GIPATCH or die "$gipatch: $!";
4106 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4107 $unapplied, $headref, "--", sort keys %$editedignores;
4108 open SERIES, "+>>", "debian/patches/series" or die $!;
4109 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4111 defined read SERIES, $newline, 1 or die $!;
4112 print SERIES "\n" or die $! unless $newline eq "\n";
4113 print SERIES "auto-gitignore\n" or die $!;
4114 close SERIES or die $!;
4115 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4117 Commit patch to update .gitignore
4119 [dgit ($our_version) update-gitignore-quilt-fixup]
4123 my $dgitview = git_rev_parse 'HEAD';
4125 changedir '../../../..';
4126 # When we no longer need to support squeeze, use --create-reflog
4128 ensuredir ".git/logs/refs/dgit-intern";
4129 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4132 my $oldcache = git_get_ref "refs/$splitbraincache";
4133 if ($oldcache eq $dgitview) {
4134 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4135 # git update-ref doesn't always update, in this case. *sigh*
4136 my $dummy = make_commit_text <<END;
4139 author Dgit <dgit\@example.com> 1000000000 +0000
4140 committer Dgit <dgit\@example.com> 1000000000 +0000
4142 Dummy commit - do not use
4144 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4145 "refs/$splitbraincache", $dummy;
4147 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4150 progress "dgit view: created (commit id $dgitview)";
4152 changedir '.git/dgit/unpack/work';
4155 sub quiltify ($$$$) {
4156 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4158 # Quilt patchification algorithm
4160 # We search backwards through the history of the main tree's HEAD
4161 # (T) looking for a start commit S whose tree object is identical
4162 # to to the patch tip tree (ie the tree corresponding to the
4163 # current dpkg-committed patch series). For these purposes
4164 # `identical' disregards anything in debian/ - this wrinkle is
4165 # necessary because dpkg-source treates debian/ specially.
4167 # We can only traverse edges where at most one of the ancestors'
4168 # trees differs (in changes outside in debian/). And we cannot
4169 # handle edges which change .pc/ or debian/patches. To avoid
4170 # going down a rathole we avoid traversing edges which introduce
4171 # debian/rules or debian/control. And we set a limit on the
4172 # number of edges we are willing to look at.
4174 # If we succeed, we walk forwards again. For each traversed edge
4175 # PC (with P parent, C child) (starting with P=S and ending with
4176 # C=T) to we do this:
4178 # - dpkg-source --commit with a patch name and message derived from C
4179 # After traversing PT, we git commit the changes which
4180 # should be contained within debian/patches.
4182 # The search for the path S..T is breadth-first. We maintain a
4183 # todo list containing search nodes. A search node identifies a
4184 # commit, and looks something like this:
4186 # Commit => $git_commit_id,
4187 # Child => $c, # or undef if P=T
4188 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4189 # Nontrivial => true iff $p..$c has relevant changes
4196 my %considered; # saves being exponential on some weird graphs
4198 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4201 my ($search,$whynot) = @_;
4202 printdebug " search NOT $search->{Commit} $whynot\n";
4203 $search->{Whynot} = $whynot;
4204 push @nots, $search;
4205 no warnings qw(exiting);
4214 my $c = shift @todo;
4215 next if $considered{$c->{Commit}}++;
4217 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4219 printdebug "quiltify investigate $c->{Commit}\n";
4222 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4223 printdebug " search finished hooray!\n";
4228 if ($quilt_mode eq 'nofix') {
4229 fail "quilt fixup required but quilt mode is \`nofix'\n".
4230 "HEAD commit $c->{Commit} differs from tree implied by ".
4231 " debian/patches (tree object $oldtiptree)";
4233 if ($quilt_mode eq 'smash') {
4234 printdebug " search quitting smash\n";
4238 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4239 $not->($c, "has $c_sentinels not $t_sentinels")
4240 if $c_sentinels ne $t_sentinels;
4242 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4243 $commitdata =~ m/\n\n/;
4245 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4246 @parents = map { { Commit => $_, Child => $c } } @parents;
4248 $not->($c, "root commit") if !@parents;
4250 foreach my $p (@parents) {
4251 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4253 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4254 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4256 foreach my $p (@parents) {
4257 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4259 my @cmd= (@git, qw(diff-tree -r --name-only),
4260 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4261 my $patchstackchange = cmdoutput @cmd;
4262 if (length $patchstackchange) {
4263 $patchstackchange =~ s/\n/,/g;
4264 $not->($p, "changed $patchstackchange");
4267 printdebug " search queue P=$p->{Commit} ",
4268 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4274 printdebug "quiltify want to smash\n";
4277 my $x = $_[0]{Commit};
4278 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4281 my $reportnot = sub {
4283 my $s = $abbrev->($notp);
4284 my $c = $notp->{Child};
4285 $s .= "..".$abbrev->($c) if $c;
4286 $s .= ": ".$notp->{Whynot};
4289 if ($quilt_mode eq 'linear') {
4290 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4291 foreach my $notp (@nots) {
4292 print STDERR "$us: ", $reportnot->($notp), "\n";
4294 print STDERR "$us: $_\n" foreach @$failsuggestion;
4295 fail "quilt fixup naive history linearisation failed.\n".
4296 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4297 } elsif ($quilt_mode eq 'smash') {
4298 } elsif ($quilt_mode eq 'auto') {
4299 progress "quilt fixup cannot be linear, smashing...";
4301 die "$quilt_mode ?";
4304 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4305 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4307 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4309 quiltify_dpkg_commit "auto-$version-$target-$time",
4310 (getfield $clogp, 'Maintainer'),
4311 "Automatically generated patch ($clogp->{Version})\n".
4312 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4316 progress "quiltify linearisation planning successful, executing...";
4318 for (my $p = $sref_S;
4319 my $c = $p->{Child};
4321 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4322 next unless $p->{Nontrivial};
4324 my $cc = $c->{Commit};
4326 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4327 $commitdata =~ m/\n\n/ or die "$c ?";
4330 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4333 my $commitdate = cmdoutput
4334 @git, qw(log -n1 --pretty=format:%aD), $cc;
4336 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4338 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4345 my $gbp_check_suitable = sub {
4350 die "contains unexpected slashes\n" if m{//} || m{/$};
4351 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4352 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4353 die "too long" if length > 200;
4355 return $_ unless $@;
4356 print STDERR "quiltifying commit $cc:".
4357 " ignoring/dropping Gbp-Pq $what: $@";
4361 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4363 (\S+) \s* \n //ixm) {
4364 $patchname = $gbp_check_suitable->($1, 'Name');
4366 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4368 (\S+) \s* \n //ixm) {
4369 $patchdir = $gbp_check_suitable->($1, 'Topic');
4374 if (!defined $patchname) {
4375 $patchname = $title;
4376 $patchname =~ s/[.:]$//;
4379 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4380 my $translitname = $converter->convert($patchname);
4381 die unless defined $translitname;
4382 $patchname = $translitname;
4385 "dgit: patch title transliteration error: $@"
4387 $patchname =~ y/ A-Z/-a-z/;
4388 $patchname =~ y/-a-z0-9_.+=~//cd;
4389 $patchname =~ s/^\W/x-$&/;
4390 $patchname = substr($patchname,0,40);
4392 if (!defined $patchdir) {
4395 if (length $patchdir) {
4396 $patchname = "$patchdir/$patchname";
4398 if ($patchname =~ m{^(.*)/}) {
4399 mkpath "debian/patches/$1";
4404 stat "debian/patches/$patchname$index";
4406 $!==ENOENT or die "$patchname$index $!";
4408 runcmd @git, qw(checkout -q), $cc;
4410 # We use the tip's changelog so that dpkg-source doesn't
4411 # produce complaining messages from dpkg-parsechangelog. None
4412 # of the information dpkg-source gets from the changelog is
4413 # actually relevant - it gets put into the original message
4414 # which dpkg-source provides our stunt editor, and then
4416 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4418 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4419 "Date: $commitdate\n".
4420 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4422 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4425 runcmd @git, qw(checkout -q master);
4428 sub build_maybe_quilt_fixup () {
4429 my ($format,$fopts) = get_source_format;
4430 return unless madformat_wantfixup $format;
4433 check_for_vendor_patches();
4435 if (quiltmode_splitbrain) {
4436 foreach my $needtf (qw(new maint)) {
4437 next if grep { $_ eq $needtf } access_cfg_tagformats;
4439 quilt mode $quilt_mode requires split view so server needs to support
4440 both "new" and "maint" tag formats, but config says it doesn't.
4445 my $clogp = parsechangelog();
4446 my $headref = git_rev_parse('HEAD');
4451 my $upstreamversion=$version;
4452 $upstreamversion =~ s/-[^-]*$//;
4454 if ($fopts->{'single-debian-patch'}) {
4455 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4457 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4460 die 'bug' if $split_brain && !$need_split_build_invocation;
4462 changedir '../../../..';
4463 runcmd_ordryrun_local
4464 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4467 sub quilt_fixup_mkwork ($) {
4470 mkdir "work" or die $!;
4472 mktree_in_ud_here();
4473 runcmd @git, qw(reset -q --hard), $headref;
4476 sub quilt_fixup_linkorigs ($$) {
4477 my ($upstreamversion, $fn) = @_;
4478 # calls $fn->($leafname);
4480 foreach my $f (<../../../../*>) { #/){
4481 my $b=$f; $b =~ s{.*/}{};
4483 local ($debuglevel) = $debuglevel-1;
4484 printdebug "QF linkorigs $b, $f ?\n";
4486 next unless is_orig_file_of_vsn $b, $upstreamversion;
4487 printdebug "QF linkorigs $b, $f Y\n";
4488 link_ltarget $f, $b or die "$b $!";
4493 sub quilt_fixup_delete_pc () {
4494 runcmd @git, qw(rm -rqf .pc);
4496 Commit removal of .pc (quilt series tracking data)
4498 [dgit ($our_version) upgrade quilt-remove-pc]
4502 sub quilt_fixup_singlepatch ($$$) {
4503 my ($clogp, $headref, $upstreamversion) = @_;
4505 progress "starting quiltify (single-debian-patch)";
4507 # dpkg-source --commit generates new patches even if
4508 # single-debian-patch is in debian/source/options. In order to
4509 # get it to generate debian/patches/debian-changes, it is
4510 # necessary to build the source package.
4512 quilt_fixup_linkorigs($upstreamversion, sub { });
4513 quilt_fixup_mkwork($headref);
4515 rmtree("debian/patches");
4517 runcmd @dpkgsource, qw(-b .);
4519 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4520 rename srcfn("$upstreamversion", "/debian/patches"),
4521 "work/debian/patches";
4524 commit_quilty_patch();
4527 sub quilt_make_fake_dsc ($) {
4528 my ($upstreamversion) = @_;
4530 my $fakeversion="$upstreamversion-~~DGITFAKE";
4532 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4533 print $fakedsc <<END or die $!;
4536 Version: $fakeversion
4540 my $dscaddfile=sub {
4543 my $md = new Digest::MD5;
4545 my $fh = new IO::File $b, '<' or die "$b $!";
4550 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4553 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4555 my @files=qw(debian/source/format debian/rules
4556 debian/control debian/changelog);
4557 foreach my $maybe (qw(debian/patches debian/source/options
4558 debian/tests/control)) {
4559 next unless stat_exists "../../../$maybe";
4560 push @files, $maybe;
4563 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4564 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4566 $dscaddfile->($debtar);
4567 close $fakedsc or die $!;
4570 sub quilt_check_splitbrain_cache ($$) {
4571 my ($headref, $upstreamversion) = @_;
4572 # Called only if we are in (potentially) split brain mode.
4574 # Computes the cache key and looks in the cache.
4575 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4577 my $splitbrain_cachekey;
4580 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4581 # we look in the reflog of dgit-intern/quilt-cache
4582 # we look for an entry whose message is the key for the cache lookup
4583 my @cachekey = (qw(dgit), $our_version);
4584 push @cachekey, $upstreamversion;
4585 push @cachekey, $quilt_mode;
4586 push @cachekey, $headref;
4588 push @cachekey, hashfile('fake.dsc');
4590 my $srcshash = Digest::SHA->new(256);
4591 my %sfs = ( %INC, '$0(dgit)' => $0 );
4592 foreach my $sfk (sort keys %sfs) {
4593 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4594 $srcshash->add($sfk," ");
4595 $srcshash->add(hashfile($sfs{$sfk}));
4596 $srcshash->add("\n");
4598 push @cachekey, $srcshash->hexdigest();
4599 $splitbrain_cachekey = "@cachekey";
4601 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4603 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4604 debugcmd "|(probably)",@cmd;
4605 my $child = open GC, "-|"; defined $child or die $!;
4607 chdir '../../..' or die $!;
4608 if (!stat ".git/logs/refs/$splitbraincache") {
4609 $! == ENOENT or die $!;
4610 printdebug ">(no reflog)\n";
4617 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4618 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4621 quilt_fixup_mkwork($headref);
4622 if ($cachehit ne $headref) {
4623 progress "dgit view: found cached (commit id $cachehit)";
4624 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4626 return ($cachehit, $splitbrain_cachekey);
4628 progress "dgit view: found cached, no changes required";
4629 return ($headref, $splitbrain_cachekey);
4631 die $! if GC->error;
4632 failedcmd unless close GC;
4634 printdebug "splitbrain cache miss\n";
4635 return (undef, $splitbrain_cachekey);
4638 sub quilt_fixup_multipatch ($$$) {
4639 my ($clogp, $headref, $upstreamversion) = @_;
4641 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4644 # - honour any existing .pc in case it has any strangeness
4645 # - determine the git commit corresponding to the tip of
4646 # the patch stack (if there is one)
4647 # - if there is such a git commit, convert each subsequent
4648 # git commit into a quilt patch with dpkg-source --commit
4649 # - otherwise convert all the differences in the tree into
4650 # a single git commit
4654 # Our git tree doesn't necessarily contain .pc. (Some versions of
4655 # dgit would include the .pc in the git tree.) If there isn't
4656 # one, we need to generate one by unpacking the patches that we
4659 # We first look for a .pc in the git tree. If there is one, we
4660 # will use it. (This is not the normal case.)
4662 # Otherwise need to regenerate .pc so that dpkg-source --commit
4663 # can work. We do this as follows:
4664 # 1. Collect all relevant .orig from parent directory
4665 # 2. Generate a debian.tar.gz out of
4666 # debian/{patches,rules,source/format,source/options}
4667 # 3. Generate a fake .dsc containing just these fields:
4668 # Format Source Version Files
4669 # 4. Extract the fake .dsc
4670 # Now the fake .dsc has a .pc directory.
4671 # (In fact we do this in every case, because in future we will
4672 # want to search for a good base commit for generating patches.)
4674 # Then we can actually do the dpkg-source --commit
4675 # 1. Make a new working tree with the same object
4676 # store as our main tree and check out the main
4678 # 2. Copy .pc from the fake's extraction, if necessary
4679 # 3. Run dpkg-source --commit
4680 # 4. If the result has changes to debian/, then
4681 # - git add them them
4682 # - git add .pc if we had a .pc in-tree
4684 # 5. If we had a .pc in-tree, delete it, and git commit
4685 # 6. Back in the main tree, fast forward to the new HEAD
4687 # Another situation we may have to cope with is gbp-style
4688 # patches-unapplied trees.
4690 # We would want to detect these, so we know to escape into
4691 # quilt_fixup_gbp. However, this is in general not possible.
4692 # Consider a package with a one patch which the dgit user reverts
4693 # (with git revert or the moral equivalent).
4695 # That is indistinguishable in contents from a patches-unapplied
4696 # tree. And looking at the history to distinguish them is not
4697 # useful because the user might have made a confusing-looking git
4698 # history structure (which ought to produce an error if dgit can't
4699 # cope, not a silent reintroduction of an unwanted patch).
4701 # So gbp users will have to pass an option. But we can usually
4702 # detect their failure to do so: if the tree is not a clean
4703 # patches-applied tree, quilt linearisation fails, but the tree
4704 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4705 # they want --quilt=unapplied.
4707 # To help detect this, when we are extracting the fake dsc, we
4708 # first extract it with --skip-patches, and then apply the patches
4709 # afterwards with dpkg-source --before-build. That lets us save a
4710 # tree object corresponding to .origs.
4712 my $splitbrain_cachekey;
4714 quilt_make_fake_dsc($upstreamversion);
4716 if (quiltmode_splitbrain()) {
4718 ($cachehit, $splitbrain_cachekey) =
4719 quilt_check_splitbrain_cache($headref, $upstreamversion);
4720 return if $cachehit;
4724 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4726 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4727 rename $fakexdir, "fake" or die "$fakexdir $!";
4731 remove_stray_gits();
4732 mktree_in_ud_here();
4736 runcmd @git, qw(add -Af .);
4737 my $unapplied=git_write_tree();
4738 printdebug "fake orig tree object $unapplied\n";
4742 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
4744 if (system @bbcmd) {
4745 failedcmd @bbcmd if $? < 0;
4747 failed to apply your git tree's patch stack (from debian/patches/) to
4748 the corresponding upstream tarball(s). Your source tree and .orig
4749 are probably too inconsistent. dgit can only fix up certain kinds of
4750 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
4756 quilt_fixup_mkwork($headref);
4759 if (stat_exists ".pc") {
4761 progress "Tree already contains .pc - will use it then delete it.";
4764 rename '../fake/.pc','.pc' or die $!;
4767 changedir '../fake';
4769 runcmd @git, qw(add -Af .);
4770 my $oldtiptree=git_write_tree();
4771 printdebug "fake o+d/p tree object $unapplied\n";
4772 changedir '../work';
4775 # We calculate some guesswork now about what kind of tree this might
4776 # be. This is mostly for error reporting.
4782 # O = orig, without patches applied
4783 # A = "applied", ie orig with H's debian/patches applied
4784 O2H => quiltify_trees_differ($unapplied,$headref, 1,
4785 \%editedignores, \@unrepres),
4786 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
4787 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
4791 foreach my $b (qw(01 02)) {
4792 foreach my $v (qw(O2H O2A H2A)) {
4793 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
4796 printdebug "differences \@dl @dl.\n";
4799 "$us: base trees orig=%.20s o+d/p=%.20s",
4800 $unapplied, $oldtiptree;
4802 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
4803 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
4804 $dl[0], $dl[1], $dl[3], $dl[4],
4808 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
4810 forceable_fail [qw(unrepresentable)], <<END;
4811 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
4816 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
4817 push @failsuggestion, "This might be a patches-unapplied branch.";
4818 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
4819 push @failsuggestion, "This might be a patches-applied branch.";
4821 push @failsuggestion, "Maybe you need to specify one of".
4822 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
4824 if (quiltmode_splitbrain()) {
4825 quiltify_splitbrain($clogp, $unapplied, $headref,
4826 $diffbits, \%editedignores,
4827 $splitbrain_cachekey);
4831 progress "starting quiltify (multiple patches, $quilt_mode mode)";
4832 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
4834 if (!open P, '>>', ".pc/applied-patches") {
4835 $!==&ENOENT or die $!;
4840 commit_quilty_patch();
4842 if ($mustdeletepc) {
4843 quilt_fixup_delete_pc();
4847 sub quilt_fixup_editor () {
4848 my $descfn = $ENV{$fakeeditorenv};
4849 my $editing = $ARGV[$#ARGV];
4850 open I1, '<', $descfn or die "$descfn: $!";
4851 open I2, '<', $editing or die "$editing: $!";
4852 unlink $editing or die "$editing: $!";
4853 open O, '>', $editing or die "$editing: $!";
4854 while (<I1>) { print O or die $!; } I1->error and die $!;
4857 $copying ||= m/^\-\-\- /;
4858 next unless $copying;
4861 I2->error and die $!;
4866 sub maybe_apply_patches_dirtily () {
4867 return unless $quilt_mode =~ m/gbp|unapplied/;
4868 print STDERR <<END or die $!;
4870 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
4871 dgit: Have to apply the patches - making the tree dirty.
4872 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
4875 $patches_applied_dirtily = 01;
4876 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
4877 runcmd qw(dpkg-source --before-build .);
4880 sub maybe_unapply_patches_again () {
4881 progress "dgit: Unapplying patches again to tidy up the tree."
4882 if $patches_applied_dirtily;
4883 runcmd qw(dpkg-source --after-build .)
4884 if $patches_applied_dirtily & 01;
4886 if $patches_applied_dirtily & 02;
4887 $patches_applied_dirtily = 0;
4890 #----- other building -----
4892 our $clean_using_builder;
4893 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
4894 # clean the tree before building (perhaps invoked indirectly by
4895 # whatever we are using to run the build), rather than separately
4896 # and explicitly by us.
4899 return if $clean_using_builder;
4900 if ($cleanmode eq 'dpkg-source') {
4901 maybe_apply_patches_dirtily();
4902 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
4903 } elsif ($cleanmode eq 'dpkg-source-d') {
4904 maybe_apply_patches_dirtily();
4905 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
4906 } elsif ($cleanmode eq 'git') {
4907 runcmd_ordryrun_local @git, qw(clean -xdf);
4908 } elsif ($cleanmode eq 'git-ff') {
4909 runcmd_ordryrun_local @git, qw(clean -xdff);
4910 } elsif ($cleanmode eq 'check') {
4911 my $leftovers = cmdoutput @git, qw(clean -xdn);
4912 if (length $leftovers) {
4913 print STDERR $leftovers, "\n" or die $!;
4914 fail "tree contains uncommitted files and --clean=check specified";
4916 } elsif ($cleanmode eq 'none') {
4923 badusage "clean takes no additional arguments" if @ARGV;
4926 maybe_unapply_patches_again();
4931 badusage "-p is not allowed when building" if defined $package;
4934 my $clogp = parsechangelog();
4935 $isuite = getfield $clogp, 'Distribution';
4936 $package = getfield $clogp, 'Source';
4937 $version = getfield $clogp, 'Version';
4938 build_maybe_quilt_fixup();
4940 my $pat = changespat $version;
4941 foreach my $f (glob "$buildproductsdir/$pat") {
4943 unlink $f or fail "remove old changes file $f: $!";
4945 progress "would remove $f";
4951 sub changesopts_initial () {
4952 my @opts =@changesopts[1..$#changesopts];
4955 sub changesopts_version () {
4956 if (!defined $changes_since_version) {
4957 my @vsns = archive_query('archive_query');
4958 my @quirk = access_quirk();
4959 if ($quirk[0] eq 'backports') {
4960 local $isuite = $quirk[2];
4962 canonicalise_suite();
4963 push @vsns, archive_query('archive_query');
4966 @vsns = map { $_->[0] } @vsns;
4967 @vsns = sort { -version_compare($a, $b) } @vsns;
4968 $changes_since_version = $vsns[0];
4969 progress "changelog will contain changes since $vsns[0]";
4971 $changes_since_version = '_';
4972 progress "package seems new, not specifying -v<version>";
4975 if ($changes_since_version ne '_') {
4976 return ("-v$changes_since_version");
4982 sub changesopts () {
4983 return (changesopts_initial(), changesopts_version());
4986 sub massage_dbp_args ($;$) {
4987 my ($cmd,$xargs) = @_;
4990 # - if we're going to split the source build out so we can
4991 # do strange things to it, massage the arguments to dpkg-buildpackage
4992 # so that the main build doessn't build source (or add an argument
4993 # to stop it building source by default).
4995 # - add -nc to stop dpkg-source cleaning the source tree,
4996 # unless we're not doing a split build and want dpkg-source
4997 # as cleanmode, in which case we can do nothing
5000 # 0 - source will NOT need to be built separately by caller
5001 # +1 - source will need to be built separately by caller
5002 # +2 - source will need to be built separately by caller AND
5003 # dpkg-buildpackage should not in fact be run at all!
5004 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5005 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5006 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5007 $clean_using_builder = 1;
5010 # -nc has the side effect of specifying -b if nothing else specified
5011 # and some combinations of -S, -b, et al, are errors, rather than
5012 # later simply overriding earlie. So we need to:
5013 # - search the command line for these options
5014 # - pick the last one
5015 # - perhaps add our own as a default
5016 # - perhaps adjust it to the corresponding non-source-building version
5018 foreach my $l ($cmd, $xargs) {
5020 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5023 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5025 if ($need_split_build_invocation) {
5026 printdebug "massage split $dmode.\n";
5027 $r = $dmode =~ m/[S]/ ? +2 :
5028 $dmode =~ y/gGF/ABb/ ? +1 :
5029 $dmode =~ m/[ABb]/ ? 0 :
5032 printdebug "massage done $r $dmode.\n";
5034 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5040 my $wasdir = must_getcwd();
5046 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5047 my ($msg_if_onlyone) = @_;
5048 # If there is only one .changes file, fail with $msg_if_onlyone,
5049 # or if that is undef, be a no-op.
5050 # Returns the changes file to report to the user.
5051 my $pat = changespat $version;
5052 my @changesfiles = glob $pat;
5053 @changesfiles = sort {
5054 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5058 if (@changesfiles==1) {
5059 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5060 only one changes file from build (@changesfiles)
5062 $result = $changesfiles[0];
5063 } elsif (@changesfiles==2) {
5064 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5065 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5066 fail "$l found in binaries changes file $binchanges"
5069 runcmd_ordryrun_local @mergechanges, @changesfiles;
5070 my $multichanges = changespat $version,'multi';
5072 stat_exists $multichanges or fail "$multichanges: $!";
5073 foreach my $cf (glob $pat) {
5074 next if $cf eq $multichanges;
5075 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5078 $result = $multichanges;
5080 fail "wrong number of different changes files (@changesfiles)";
5082 printdone "build successful, results in $result\n" or die $!;
5085 sub midbuild_checkchanges () {
5086 my $pat = changespat $version;
5087 return if $rmchanges;
5088 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5089 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5091 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5092 Suggest you delete @unwanted.
5097 sub midbuild_checkchanges_vanilla ($) {
5099 midbuild_checkchanges() if $wantsrc == 1;
5102 sub postbuild_mergechanges_vanilla ($) {
5104 if ($wantsrc == 1) {
5106 postbuild_mergechanges(undef);
5109 printdone "build successful\n";
5114 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5115 my $wantsrc = massage_dbp_args \@dbp;
5118 midbuild_checkchanges_vanilla $wantsrc;
5123 push @dbp, changesopts_version();
5124 maybe_apply_patches_dirtily();
5125 runcmd_ordryrun_local @dbp;
5127 maybe_unapply_patches_again();
5128 postbuild_mergechanges_vanilla $wantsrc;
5132 $quilt_mode //= 'gbp';
5136 my @dbp = @dpkgbuildpackage;
5138 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5140 if (!length $gbp_build[0]) {
5141 if (length executable_on_path('git-buildpackage')) {
5142 $gbp_build[0] = qw(git-buildpackage);
5144 $gbp_build[0] = 'gbp buildpackage';
5147 my @cmd = opts_opt_multi_cmd @gbp_build;
5149 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5153 midbuild_checkchanges_vanilla $wantsrc;
5155 if (!$clean_using_builder) {
5156 push @cmd, '--git-cleaner=true';
5160 maybe_unapply_patches_again();
5162 push @cmd, changesopts();
5163 runcmd_ordryrun_local @cmd, @ARGV;
5165 postbuild_mergechanges_vanilla $wantsrc;
5167 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5170 my $our_cleanmode = $cleanmode;
5171 if ($need_split_build_invocation) {
5172 # Pretend that clean is being done some other way. This
5173 # forces us not to try to use dpkg-buildpackage to clean and
5174 # build source all in one go; and instead we run dpkg-source
5175 # (and build_prep() will do the clean since $clean_using_builder
5177 $our_cleanmode = 'ELSEWHERE';
5179 if ($our_cleanmode =~ m/^dpkg-source/) {
5180 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5181 $clean_using_builder = 1;
5184 $sourcechanges = changespat $version,'source';
5186 unlink "../$sourcechanges" or $!==ENOENT
5187 or fail "remove $sourcechanges: $!";
5189 $dscfn = dscfn($version);
5190 if ($our_cleanmode eq 'dpkg-source') {
5191 maybe_apply_patches_dirtily();
5192 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5194 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5195 maybe_apply_patches_dirtily();
5196 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5199 my @cmd = (@dpkgsource, qw(-b --));
5202 runcmd_ordryrun_local @cmd, "work";
5203 my @udfiles = <${package}_*>;
5204 changedir "../../..";
5205 foreach my $f (@udfiles) {
5206 printdebug "source copy, found $f\n";
5209 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5210 $f eq srcfn($version, $&));
5211 printdebug "source copy, found $f - renaming\n";
5212 rename "$ud/$f", "../$f" or $!==ENOENT
5213 or fail "put in place new source file ($f): $!";
5216 my $pwd = must_getcwd();
5217 my $leafdir = basename $pwd;
5219 runcmd_ordryrun_local @cmd, $leafdir;
5222 runcmd_ordryrun_local qw(sh -ec),
5223 'exec >$1; shift; exec "$@"','x',
5224 "../$sourcechanges",
5225 @dpkggenchanges, qw(-S), changesopts();
5229 sub cmd_build_source {
5230 badusage "build-source takes no additional arguments" if @ARGV;
5232 maybe_unapply_patches_again();
5233 printdone "source built, results in $dscfn and $sourcechanges";
5238 midbuild_checkchanges();
5241 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5242 stat_exists $sourcechanges
5243 or fail "$sourcechanges (in parent directory): $!";
5245 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5247 maybe_unapply_patches_again();
5249 postbuild_mergechanges(<<END);
5250 perhaps you need to pass -A ? (sbuild's default is to build only
5251 arch-specific binaries; dgit 1.4 used to override that.)
5256 sub cmd_quilt_fixup {
5257 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5258 my $clogp = parsechangelog();
5259 $version = getfield $clogp, 'Version';
5260 $package = getfield $clogp, 'Source';
5263 build_maybe_quilt_fixup();
5266 sub cmd_archive_api_query {
5267 badusage "need only 1 subpath argument" unless @ARGV==1;
5268 my ($subpath) = @ARGV;
5269 my @cmd = archive_api_query_cmd($subpath);
5272 exec @cmd or fail "exec curl: $!\n";
5275 sub cmd_clone_dgit_repos_server {
5276 badusage "need destination argument" unless @ARGV==1;
5277 my ($destdir) = @ARGV;
5278 $package = '_dgit-repos-server';
5279 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5281 exec @cmd or fail "exec git clone: $!\n";
5284 sub cmd_setup_mergechangelogs {
5285 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5286 setup_mergechangelogs(1);
5289 sub cmd_setup_useremail {
5290 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5294 sub cmd_setup_new_tree {
5295 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5299 #---------- argument parsing and main program ----------
5302 print "dgit version $our_version\n" or die $!;
5306 our (%valopts_long, %valopts_short);
5309 sub defvalopt ($$$$) {
5310 my ($long,$short,$val_re,$how) = @_;
5311 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5312 $valopts_long{$long} = $oi;
5313 $valopts_short{$short} = $oi;
5314 # $how subref should:
5315 # do whatever assignemnt or thing it likes with $_[0]
5316 # if the option should not be passed on to remote, @rvalopts=()
5317 # or $how can be a scalar ref, meaning simply assign the value
5320 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5321 defvalopt '--distro', '-d', '.+', \$idistro;
5322 defvalopt '', '-k', '.+', \$keyid;
5323 defvalopt '--existing-package','', '.*', \$existing_package;
5324 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5325 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5326 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5328 defvalopt '', '-C', '.+', sub {
5329 ($changesfile) = (@_);
5330 if ($changesfile =~ s#^(.*)/##) {
5331 $buildproductsdir = $1;
5335 defvalopt '--initiator-tempdir','','.*', sub {
5336 ($initiator_tempdir) = (@_);
5337 $initiator_tempdir =~ m#^/# or
5338 badusage "--initiator-tempdir must be used specify an".
5339 " absolute, not relative, directory."
5345 if (defined $ENV{'DGIT_SSH'}) {
5346 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5347 } elsif (defined $ENV{'GIT_SSH'}) {
5348 @ssh = ($ENV{'GIT_SSH'});
5356 if (!defined $val) {
5357 badusage "$what needs a value" unless @ARGV;
5359 push @rvalopts, $val;
5361 badusage "bad value \`$val' for $what" unless
5362 $val =~ m/^$oi->{Re}$(?!\n)/s;
5363 my $how = $oi->{How};
5364 if (ref($how) eq 'SCALAR') {
5369 push @ropts, @rvalopts;
5373 last unless $ARGV[0] =~ m/^-/;
5377 if (m/^--dry-run$/) {
5380 } elsif (m/^--damp-run$/) {
5383 } elsif (m/^--no-sign$/) {
5386 } elsif (m/^--help$/) {
5388 } elsif (m/^--version$/) {
5390 } elsif (m/^--new$/) {
5393 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5394 ($om = $opts_opt_map{$1}) &&
5398 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5399 !$opts_opt_cmdonly{$1} &&
5400 ($om = $opts_opt_map{$1})) {
5403 } elsif (m/^--(gbp|dpm)$/s) {
5404 push @ropts, "--quilt=$1";
5406 } elsif (m/^--ignore-dirty$/s) {
5409 } elsif (m/^--no-quilt-fixup$/s) {
5411 $quilt_mode = 'nocheck';
5412 } elsif (m/^--no-rm-on-error$/s) {
5415 } elsif (m/^--overwrite$/s) {
5417 $overwrite_version = '';
5418 } elsif (m/^--overwrite=(.+)$/s) {
5420 $overwrite_version = $1;
5421 } elsif (m/^--(no-)?rm-old-changes$/s) {
5424 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5426 push @deliberatelies, $&;
5427 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
5431 } elsif (m/^--force-/) {
5433 "$us: warning: ignoring unknown force option $_\n";
5435 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5436 # undocumented, for testing
5438 $tagformat_want = [ $1, 'command line', 1 ];
5439 # 1 menas overrides distro configuration
5440 } elsif (m/^--always-split-source-build$/s) {
5441 # undocumented, for testing
5443 $need_split_build_invocation = 1;
5444 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5445 $val = $2 ? $' : undef; #';
5446 $valopt->($oi->{Long});
5448 badusage "unknown long option \`$_'";
5455 } elsif (s/^-L/-/) {
5458 } elsif (s/^-h/-/) {
5460 } elsif (s/^-D/-/) {
5464 } elsif (s/^-N/-/) {
5469 push @changesopts, $_;
5471 } elsif (s/^-wn$//s) {
5473 $cleanmode = 'none';
5474 } elsif (s/^-wg$//s) {
5477 } elsif (s/^-wgf$//s) {
5479 $cleanmode = 'git-ff';
5480 } elsif (s/^-wd$//s) {
5482 $cleanmode = 'dpkg-source';
5483 } elsif (s/^-wdd$//s) {
5485 $cleanmode = 'dpkg-source-d';
5486 } elsif (s/^-wc$//s) {
5488 $cleanmode = 'check';
5489 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5490 push @git, '-c', $&;
5491 $gitcfgs{cmdline}{$1} = [ $2 ];
5492 } elsif (s/^-c([^=]+)$//s) {
5493 push @git, '-c', $&;
5494 $gitcfgs{cmdline}{$1} = [ 'true' ];
5495 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5497 $val = undef unless length $val;
5498 $valopt->($oi->{Short});
5501 badusage "unknown short option \`$_'";
5508 sub check_env_sanity () {
5509 my $blocked = new POSIX::SigSet;
5510 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5513 foreach my $name (qw(PIPE CHLD)) {
5514 my $signame = "SIG$name";
5515 my $signum = eval "POSIX::$signame" // die;
5516 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5517 die "$signame is set to something other than SIG_DFL\n";
5518 $blocked->ismember($signum) and
5519 die "$signame is blocked\n";
5525 On entry to dgit, $@
5526 This is a bug produced by something in in your execution environment.
5532 sub finalise_opts_opts () {
5533 foreach my $k (keys %opts_opt_map) {
5534 my $om = $opts_opt_map{$k};
5536 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
5538 badcfg "cannot set command for $k"
5539 unless length $om->[0];
5543 foreach my $c (access_cfg_cfgs("opts-$k")) {
5545 map { $_ ? @$_ : () }
5546 map { $gitcfgs{$_}{$c} }
5547 reverse @gitcfgsources;
5548 printdebug "CL $c ", (join " ", map { shellquote } @vl),
5549 "\n" if $debuglevel >= 4;
5551 badcfg "cannot configure options for $k"
5552 if $opts_opt_cmdonly{$k};
5553 my $insertpos = $opts_cfg_insertpos{$k};
5554 @$om = ( @$om[0..$insertpos-1],
5556 @$om[$insertpos..$#$om] );
5561 if ($ENV{$fakeeditorenv}) {
5563 quilt_fixup_editor();
5570 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
5571 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
5572 if $dryrun_level == 1;
5574 print STDERR $helpmsg or die $!;
5577 my $cmd = shift @ARGV;
5580 my $pre_fn = ${*::}{"pre_$cmd"};
5581 $pre_fn->() if $pre_fn;
5583 if (!defined $rmchanges) {
5584 local $access_forpush;
5585 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
5588 if (!defined $quilt_mode) {
5589 local $access_forpush;
5590 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
5591 // access_cfg('quilt-mode', 'RETURN-UNDEF')
5593 $quilt_mode =~ m/^($quilt_modes_re)$/
5594 or badcfg "unknown quilt-mode \`$quilt_mode'";
5598 $need_split_build_invocation ||= quiltmode_splitbrain();
5600 if (!defined $cleanmode) {
5601 local $access_forpush;
5602 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
5603 $cleanmode //= 'dpkg-source';
5605 badcfg "unknown clean-mode \`$cleanmode'" unless
5606 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
5609 my $fn = ${*::}{"cmd_$cmd"};
5610 $fn or badusage "unknown operation $cmd";