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
79 dsc-changes-mismatch changes-origs-exactly
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: $!";
963 sub parse_dscdata () {
964 my $dscfh = new IO::File \$dscdata, '<' or die $!;
965 printdebug Dumper($dscdata) if $debuglevel>1;
966 $dsc = parsecontrolfh($dscfh,$dscurl,1);
967 printdebug Dumper($dsc) if $debuglevel>1;
972 sub archive_query ($;@) {
973 my ($method) = shift @_;
974 my $query = access_cfg('archive-query','RETURN-UNDEF');
975 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
978 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
981 sub pool_dsc_subpath ($$) {
982 my ($vsn,$component) = @_; # $package is implict arg
983 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
984 return "/pool/$component/$prefix/$package/".dscfn($vsn);
987 #---------- `ftpmasterapi' archive query method (nascent) ----------
989 sub archive_api_query_cmd ($) {
991 my @cmd = (@curl, qw(-sS));
992 my $url = access_cfg('archive-query-url');
993 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
995 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
996 foreach my $key (split /\:/, $keys) {
997 $key =~ s/\%HOST\%/$host/g;
999 fail "for $url: stat $key: $!" unless $!==ENOENT;
1002 fail "config requested specific TLS key but do not know".
1003 " how to get curl to use exactly that EE key ($key)";
1004 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1005 # # Sadly the above line does not work because of changes
1006 # # to gnutls. The real fix for #790093 may involve
1007 # # new curl options.
1010 # Fixing #790093 properly will involve providing a value
1011 # for this on clients.
1012 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1013 push @cmd, split / /, $kargs if defined $kargs;
1015 push @cmd, $url.$subpath;
1019 sub api_query ($$;$) {
1021 my ($data, $subpath, $ok404) = @_;
1022 badcfg "ftpmasterapi archive query method takes no data part"
1024 my @cmd = archive_api_query_cmd($subpath);
1025 my $url = $cmd[$#cmd];
1026 push @cmd, qw(-w %{http_code});
1027 my $json = cmdoutput @cmd;
1028 unless ($json =~ s/\d+\d+\d$//) {
1029 failedcmd_report_cmd undef, @cmd;
1030 fail "curl failed to print 3-digit HTTP code";
1033 return undef if $code eq '404' && $ok404;
1034 fail "fetch of $url gave HTTP code $code"
1035 unless $url =~ m#^file://# or $code =~ m/^2/;
1036 return decode_json($json);
1039 sub canonicalise_suite_ftpmasterapi {
1040 my ($proto,$data) = @_;
1041 my $suites = api_query($data, 'suites');
1043 foreach my $entry (@$suites) {
1045 my $v = $entry->{$_};
1046 defined $v && $v eq $isuite;
1047 } qw(codename name);
1048 push @matched, $entry;
1050 fail "unknown suite $isuite" unless @matched;
1053 @matched==1 or die "multiple matches for suite $isuite\n";
1054 $cn = "$matched[0]{codename}";
1055 defined $cn or die "suite $isuite info has no codename\n";
1056 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1058 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1063 sub archive_query_ftpmasterapi {
1064 my ($proto,$data) = @_;
1065 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1067 my $digester = Digest::SHA->new(256);
1068 foreach my $entry (@$info) {
1070 my $vsn = "$entry->{version}";
1071 my ($ok,$msg) = version_check $vsn;
1072 die "bad version: $msg\n" unless $ok;
1073 my $component = "$entry->{component}";
1074 $component =~ m/^$component_re$/ or die "bad component";
1075 my $filename = "$entry->{filename}";
1076 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1077 or die "bad filename";
1078 my $sha256sum = "$entry->{sha256sum}";
1079 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1080 push @rows, [ $vsn, "/pool/$component/$filename",
1081 $digester, $sha256sum ];
1083 die "bad ftpmaster api response: $@\n".Dumper($entry)
1086 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1090 sub file_in_archive_ftpmasterapi {
1091 my ($proto,$data,$filename) = @_;
1092 my $pat = $filename;
1095 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1096 my $info = api_query($data, "file_in_archive/$pat", 1);
1099 #---------- `dummyapicat' archive query method ----------
1101 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1102 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1104 sub file_in_archive_dummycatapi ($$$) {
1105 my ($proto,$data,$filename) = @_;
1106 my $mirror = access_cfg('mirror');
1107 $mirror =~ s#^file://#/# or die "$mirror ?";
1109 my @cmd = (qw(sh -ec), '
1111 find -name "$2" -print0 |
1113 ', qw(x), $mirror, $filename);
1114 debugcmd "-|", @cmd;
1115 open FIA, "-|", @cmd or die $!;
1118 printdebug "| $_\n";
1119 m/^(\w+) (\S+)$/ or die "$_ ?";
1120 push @out, { sha256sum => $1, filename => $2 };
1122 close FIA or die failedcmd @cmd;
1126 #---------- `madison' archive query method ----------
1128 sub archive_query_madison {
1129 return map { [ @$_[0..1] ] } madison_get_parse(@_);
1132 sub madison_get_parse {
1133 my ($proto,$data) = @_;
1134 die unless $proto eq 'madison';
1135 if (!length $data) {
1136 $data= access_cfg('madison-distro','RETURN-UNDEF');
1137 $data //= access_basedistro();
1139 $rmad{$proto,$data,$package} ||= cmdoutput
1140 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1141 my $rmad = $rmad{$proto,$data,$package};
1144 foreach my $l (split /\n/, $rmad) {
1145 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1146 \s*( [^ \t|]+ )\s* \|
1147 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1148 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1149 $1 eq $package or die "$rmad $package ?";
1156 $component = access_cfg('archive-query-default-component');
1158 $5 eq 'source' or die "$rmad ?";
1159 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1161 return sort { -version_compare($a->[0],$b->[0]); } @out;
1164 sub canonicalise_suite_madison {
1165 # madison canonicalises for us
1166 my @r = madison_get_parse(@_);
1168 "unable to canonicalise suite using package $package".
1169 " which does not appear to exist in suite $isuite;".
1170 " --existing-package may help";
1174 sub file_in_archive_madison { return undef; }
1176 #---------- `sshpsql' archive query method ----------
1179 my ($data,$runeinfo,$sql) = @_;
1180 if (!length $data) {
1181 $data= access_someuserhost('sshpsql').':'.
1182 access_cfg('sshpsql-dbname');
1184 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1185 my ($userhost,$dbname) = ($`,$'); #';
1187 my @cmd = (access_cfg_ssh, $userhost,
1188 access_runeinfo("ssh-psql $runeinfo").
1189 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1190 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1192 open P, "-|", @cmd or die $!;
1195 printdebug(">|$_|\n");
1198 $!=0; $?=0; close P or failedcmd @cmd;
1200 my $nrows = pop @rows;
1201 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1202 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1203 @rows = map { [ split /\|/, $_ ] } @rows;
1204 my $ncols = scalar @{ shift @rows };
1205 die if grep { scalar @$_ != $ncols } @rows;
1209 sub sql_injection_check {
1210 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1213 sub archive_query_sshpsql ($$) {
1214 my ($proto,$data) = @_;
1215 sql_injection_check $isuite, $package;
1216 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1217 SELECT source.version, component.name, files.filename, files.sha256sum
1219 JOIN src_associations ON source.id = src_associations.source
1220 JOIN suite ON suite.id = src_associations.suite
1221 JOIN dsc_files ON dsc_files.source = source.id
1222 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1223 JOIN component ON component.id = files_archive_map.component_id
1224 JOIN files ON files.id = dsc_files.file
1225 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1226 AND source.source='$package'
1227 AND files.filename LIKE '%.dsc';
1229 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1230 my $digester = Digest::SHA->new(256);
1232 my ($vsn,$component,$filename,$sha256sum) = @$_;
1233 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1238 sub canonicalise_suite_sshpsql ($$) {
1239 my ($proto,$data) = @_;
1240 sql_injection_check $isuite;
1241 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1242 SELECT suite.codename
1243 FROM suite where suite_name='$isuite' or codename='$isuite';
1245 @rows = map { $_->[0] } @rows;
1246 fail "unknown suite $isuite" unless @rows;
1247 die "ambiguous $isuite: @rows ?" if @rows>1;
1251 sub file_in_archive_sshpsql ($$$) { return undef; }
1253 #---------- `dummycat' archive query method ----------
1255 sub canonicalise_suite_dummycat ($$) {
1256 my ($proto,$data) = @_;
1257 my $dpath = "$data/suite.$isuite";
1258 if (!open C, "<", $dpath) {
1259 $!==ENOENT or die "$dpath: $!";
1260 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1264 chomp or die "$dpath: $!";
1266 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1270 sub archive_query_dummycat ($$) {
1271 my ($proto,$data) = @_;
1272 canonicalise_suite();
1273 my $dpath = "$data/package.$csuite.$package";
1274 if (!open C, "<", $dpath) {
1275 $!==ENOENT or die "$dpath: $!";
1276 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1284 printdebug "dummycat query $csuite $package $dpath | $_\n";
1285 my @row = split /\s+/, $_;
1286 @row==2 or die "$dpath: $_ ?";
1289 C->error and die "$dpath: $!";
1291 return sort { -version_compare($a->[0],$b->[0]); } @rows;
1294 sub file_in_archive_dummycat () { return undef; }
1296 #---------- tag format handling ----------
1298 sub access_cfg_tagformats () {
1299 split /\,/, access_cfg('dgit-tag-format');
1302 sub need_tagformat ($$) {
1303 my ($fmt, $why) = @_;
1304 fail "need to use tag format $fmt ($why) but also need".
1305 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1306 " - no way to proceed"
1307 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1308 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1311 sub select_tagformat () {
1313 return if $tagformatfn && !$tagformat_want;
1314 die 'bug' if $tagformatfn && $tagformat_want;
1315 # ... $tagformat_want assigned after previous select_tagformat
1317 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1318 printdebug "select_tagformat supported @supported\n";
1320 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1321 printdebug "select_tagformat specified @$tagformat_want\n";
1323 my ($fmt,$why,$override) = @$tagformat_want;
1325 fail "target distro supports tag formats @supported".
1326 " but have to use $fmt ($why)"
1328 or grep { $_ eq $fmt } @supported;
1330 $tagformat_want = undef;
1332 $tagformatfn = ${*::}{"debiantag_$fmt"};
1334 fail "trying to use unknown tag format \`$fmt' ($why) !"
1335 unless $tagformatfn;
1338 #---------- archive query entrypoints and rest of program ----------
1340 sub canonicalise_suite () {
1341 return if defined $csuite;
1342 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1343 $csuite = archive_query('canonicalise_suite');
1344 if ($isuite ne $csuite) {
1345 progress "canonical suite name for $isuite is $csuite";
1349 sub get_archive_dsc () {
1350 canonicalise_suite();
1351 my @vsns = archive_query('archive_query');
1352 foreach my $vinfo (@vsns) {
1353 my ($vsn,$subpath,$digester,$digest) = @$vinfo;
1354 $dscurl = access_cfg('mirror').$subpath;
1355 $dscdata = url_get($dscurl);
1357 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1362 $digester->add($dscdata);
1363 my $got = $digester->hexdigest();
1365 fail "$dscurl has hash $got but".
1366 " archive told us to expect $digest";
1369 my $fmt = getfield $dsc, 'Format';
1370 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1371 "unsupported source format $fmt, sorry";
1373 $dsc_checked = !!$digester;
1374 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1378 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1381 sub check_for_git ();
1382 sub check_for_git () {
1384 my $how = access_cfg('git-check');
1385 if ($how eq 'ssh-cmd') {
1387 (access_cfg_ssh, access_gituserhost(),
1388 access_runeinfo("git-check $package").
1389 " set -e; cd ".access_cfg('git-path').";".
1390 " if test -d $package.git; then echo 1; else echo 0; fi");
1391 my $r= cmdoutput @cmd;
1392 if (defined $r and $r =~ m/^divert (\w+)$/) {
1394 my ($usedistro,) = access_distros();
1395 # NB that if we are pushing, $usedistro will be $distro/push
1396 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1397 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1398 progress "diverting to $divert (using config for $instead_distro)";
1399 return check_for_git();
1401 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1403 } elsif ($how eq 'url') {
1404 my $prefix = access_cfg('git-check-url','git-url');
1405 my $suffix = access_cfg('git-check-suffix','git-suffix',
1406 'RETURN-UNDEF') // '.git';
1407 my $url = "$prefix/$package$suffix";
1408 my @cmd = (@curl, qw(-sS -I), $url);
1409 my $result = cmdoutput @cmd;
1410 $result =~ s/^\S+ 200 .*\n\r?\n//;
1411 # curl -sS -I with https_proxy prints
1412 # HTTP/1.0 200 Connection established
1413 $result =~ m/^\S+ (404|200) /s or
1414 fail "unexpected results from git check query - ".
1415 Dumper($prefix, $result);
1417 if ($code eq '404') {
1419 } elsif ($code eq '200') {
1424 } elsif ($how eq 'true') {
1426 } elsif ($how eq 'false') {
1429 badcfg "unknown git-check \`$how'";
1433 sub create_remote_git_repo () {
1434 my $how = access_cfg('git-create');
1435 if ($how eq 'ssh-cmd') {
1437 (access_cfg_ssh, access_gituserhost(),
1438 access_runeinfo("git-create $package").
1439 "set -e; cd ".access_cfg('git-path').";".
1440 " cp -a _template $package.git");
1441 } elsif ($how eq 'true') {
1444 badcfg "unknown git-create \`$how'";
1448 our ($dsc_hash,$lastpush_mergeinput);
1450 our $ud = '.git/dgit/unpack';
1460 sub mktree_in_ud_here () {
1461 runcmd qw(git init -q);
1462 runcmd qw(git config gc.auto 0);
1463 rmtree('.git/objects');
1464 symlink '../../../../objects','.git/objects' or die $!;
1467 sub git_write_tree () {
1468 my $tree = cmdoutput @git, qw(write-tree);
1469 $tree =~ m/^\w+$/ or die "$tree ?";
1473 sub remove_stray_gits () {
1474 my @gitscmd = qw(find -name .git -prune -print0);
1475 debugcmd "|",@gitscmd;
1476 open GITS, "-|", @gitscmd or die $!;
1481 print STDERR "$us: warning: removing from source package: ",
1482 (messagequote $_), "\n";
1486 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1489 sub mktree_in_ud_from_only_subdir (;$) {
1492 # changes into the subdir
1494 die "expected one subdir but found @dirs ?" unless @dirs==1;
1495 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1499 remove_stray_gits();
1500 mktree_in_ud_here();
1502 my ($format, $fopts) = get_source_format();
1503 if (madformat($format)) {
1508 runcmd @git, qw(add -Af);
1509 my $tree=git_write_tree();
1510 return ($tree,$dir);
1513 our @files_csum_info_fields =
1514 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1515 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1516 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1518 sub dsc_files_info () {
1519 foreach my $csumi (@files_csum_info_fields) {
1520 my ($fname, $module, $method) = @$csumi;
1521 my $field = $dsc->{$fname};
1522 next unless defined $field;
1523 eval "use $module; 1;" or die $@;
1525 foreach (split /\n/, $field) {
1527 m/^(\w+) (\d+) (\S+)$/ or
1528 fail "could not parse .dsc $fname line \`$_'";
1529 my $digester = eval "$module"."->$method;" or die $@;
1534 Digester => $digester,
1539 fail "missing any supported Checksums-* or Files field in ".
1540 $dsc->get_option('name');
1544 map { $_->{Filename} } dsc_files_info();
1547 sub files_compare_inputs (@) {
1552 my $showinputs = sub {
1553 return join "; ", map { $_->get_option('name') } @$inputs;
1556 foreach my $in (@$inputs) {
1558 my $in_name = $in->get_option('name');
1560 printdebug "files_compare_inputs $in_name\n";
1562 foreach my $csumi (@files_csum_info_fields) {
1563 my ($fname) = @$csumi;
1564 printdebug "files_compare_inputs $in_name $fname\n";
1566 my $field = $in->{$fname};
1567 next unless defined $field;
1570 foreach (split /\n/, $field) {
1573 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1574 fail "could not parse $in_name $fname line \`$_'";
1576 printdebug "files_compare_inputs $in_name $fname $f\n";
1580 my $re = \ $record{$f}{$fname};
1582 $fchecked{$f}{$in_name} = 1;
1584 fail "hash or size of $f varies in $fname fields".
1585 " (between: ".$showinputs->().")";
1590 @files = sort @files;
1591 $expected_files //= \@files;
1592 "@$expected_files" eq "@files" or
1593 fail "file list in $in_name varies between hash fields!";
1596 fail "$in_name has no files list field(s)";
1598 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1601 grep { keys %$_ == @$inputs-1 } values %fchecked
1602 or fail "no file appears in all file lists".
1603 " (looked in: ".$showinputs->().")";
1606 sub is_orig_file_in_dsc ($$) {
1607 my ($f, $dsc_files_info) = @_;
1608 return 0 if @$dsc_files_info <= 1;
1609 # One file means no origs, and the filename doesn't have a "what
1610 # part of dsc" component. (Consider versions ending `.orig'.)
1611 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1615 sub is_orig_file_of_vsn ($$) {
1616 my ($f, $upstreamvsn) = @_;
1617 my $base = srcfn $upstreamvsn, '';
1618 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1622 sub changes_update_origs_from_dsc ($$$$) {
1623 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1625 printdebug "checking origs needed ($upstreamvsn)...\n";
1626 $_ = getfield $changes, 'Files';
1627 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1628 fail "cannot find section/priority from .changes Files field";
1629 my $placementinfo = $1;
1631 printdebug "checking origs needed placement '$placementinfo'...\n";
1632 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1633 $l =~ m/\S+$/ or next;
1635 printdebug "origs $file | $l\n";
1636 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1637 printdebug "origs $file is_orig\n";
1638 my $have = archive_query('file_in_archive', $file);
1639 if (!defined $have) {
1641 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1647 printdebug "origs $file \$#\$have=$#$have\n";
1648 foreach my $h (@$have) {
1651 foreach my $csumi (@files_csum_info_fields) {
1652 my ($fname, $module, $method, $archivefield) = @$csumi;
1653 next unless defined $h->{$archivefield};
1654 $_ = $dsc->{$fname};
1655 next unless defined;
1656 m/^(\w+) .* \Q$file\E$/m or
1657 fail ".dsc $fname missing entry for $file";
1658 if ($h->{$archivefield} eq $1) {
1662 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1665 die "$file ".Dumper($h)." ?!" if $same && @differ;
1668 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1671 print "origs $file f.same=$found_same #f._differ=$#found_differ\n";
1672 if (@found_differ && !$found_same) {
1674 "archive contains $file with different checksum",
1677 # Now we edit the changes file to add or remove it
1678 foreach my $csumi (@files_csum_info_fields) {
1679 my ($fname, $module, $method, $archivefield) = @$csumi;
1680 next unless defined $changes->{$fname};
1682 # in archive, delete from .changes if it's there
1683 $changed{$file} = "removed" if
1684 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1685 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1686 # not in archive, but it's here in the .changes
1688 my $dsc_data = getfield $dsc, $fname;
1689 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1691 $extra =~ s/ \d+ /$&$placementinfo /
1692 or die "$fname $extra >$dsc_data< ?"
1693 if $fname eq 'Files';
1694 $changes->{$fname} .= "\n". $extra;
1695 $changed{$file} = "added";
1700 foreach my $file (keys %changed) {
1702 "edited .changes for archive .orig contents: %s %s",
1703 $changed{$file}, $file;
1705 my $chtmp = "$changesfile.tmp";
1706 $changes->save($chtmp);
1708 rename $chtmp,$changesfile or die "$changesfile $!";
1710 progress "[new .changes left in $changesfile]";
1713 progress "$changesfile already has appropriate .orig(s) (if any)";
1717 sub make_commit ($) {
1719 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1722 sub make_commit_text ($) {
1725 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1727 print Dumper($text) if $debuglevel > 1;
1728 my $child = open2($out, $in, @cmd) or die $!;
1731 print $in $text or die $!;
1732 close $in or die $!;
1734 $h =~ m/^\w+$/ or die;
1736 printdebug "=> $h\n";
1739 waitpid $child, 0 == $child or die "$child $!";
1740 $? and failedcmd @cmd;
1744 sub clogp_authline ($) {
1746 my $author = getfield $clogp, 'Maintainer';
1747 $author =~ s#,.*##ms;
1748 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1749 my $authline = "$author $date";
1750 $authline =~ m/$git_authline_re/o or
1751 fail "unexpected commit author line format \`$authline'".
1752 " (was generated from changelog Maintainer field)";
1753 return ($1,$2,$3) if wantarray;
1757 sub vendor_patches_distro ($$) {
1758 my ($checkdistro, $what) = @_;
1759 return unless defined $checkdistro;
1761 my $series = "debian/patches/\L$checkdistro\E.series";
1762 printdebug "checking for vendor-specific $series ($what)\n";
1764 if (!open SERIES, "<", $series) {
1765 die "$series $!" unless $!==ENOENT;
1774 Unfortunately, this source package uses a feature of dpkg-source where
1775 the same source package unpacks to different source code on different
1776 distros. dgit cannot safely operate on such packages on affected
1777 distros, because the meaning of source packages is not stable.
1779 Please ask the distro/maintainer to remove the distro-specific series
1780 files and use a different technique (if necessary, uploading actually
1781 different packages, if different distros are supposed to have
1785 fail "Found active distro-specific series file for".
1786 " $checkdistro ($what): $series, cannot continue";
1788 die "$series $!" if SERIES->error;
1792 sub check_for_vendor_patches () {
1793 # This dpkg-source feature doesn't seem to be documented anywhere!
1794 # But it can be found in the changelog (reformatted):
1796 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
1797 # Author: Raphael Hertzog <hertzog@debian.org>
1798 # Date: Sun Oct 3 09:36:48 2010 +0200
1800 # dpkg-source: correctly create .pc/.quilt_series with alternate
1803 # If you have debian/patches/ubuntu.series and you were
1804 # unpacking the source package on ubuntu, quilt was still
1805 # directed to debian/patches/series instead of
1806 # debian/patches/ubuntu.series.
1808 # debian/changelog | 3 +++
1809 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
1810 # 2 files changed, 6 insertions(+), 1 deletion(-)
1813 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
1814 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
1815 "Dpkg::Vendor \`current vendor'");
1816 vendor_patches_distro(access_basedistro(),
1817 "distro being accessed");
1820 sub generate_commits_from_dsc () {
1821 # See big comment in fetch_from_archive, below.
1822 # See also README.dsc-import.
1826 my @dfi = dsc_files_info();
1827 foreach my $fi (@dfi) {
1828 my $f = $fi->{Filename};
1829 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
1831 link_ltarget "../../../$f", $f
1835 complete_file_from_dsc('.', $fi)
1838 if (is_orig_file_in_dsc($f, \@dfi)) {
1839 link $f, "../../../../$f"
1845 # We unpack and record the orig tarballs first, so that we only
1846 # need disk space for one private copy of the unpacked source.
1847 # But we can't make them into commits until we have the metadata
1848 # from the debian/changelog, so we record the tree objects now and
1849 # make them into commits later.
1851 my $upstreamv = $dsc->{version};
1852 $upstreamv =~ s/-[^-]+$//;
1853 my $orig_f_base = srcfn $upstreamv, '';
1855 foreach my $fi (@dfi) {
1856 # We actually import, and record as a commit, every tarball
1857 # (unless there is only one file, in which case there seems
1860 my $f = $fi->{Filename};
1861 printdebug "import considering $f ";
1862 (printdebug "only one dfi\n"), next if @dfi == 1;
1863 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
1864 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
1868 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
1870 printdebug "Y ", (join ' ', map { $_//"(none)" }
1871 $compr_ext, $orig_f_part
1874 my $input = new IO::File $f, '<' or die "$f $!";
1878 if (defined $compr_ext) {
1880 Dpkg::Compression::compression_guess_from_filename $f;
1881 fail "Dpkg::Compression cannot handle file $f in source package"
1882 if defined $compr_ext && !defined $cname;
1884 new Dpkg::Compression::Process compression => $cname;
1885 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
1886 my $compr_fh = new IO::Handle;
1887 my $compr_pid = open $compr_fh, "-|" // die $!;
1889 open STDIN, "<&", $input or die $!;
1891 die "dgit (child): exec $compr_cmd[0]: $!\n";
1896 rmtree "../unpack-tar";
1897 mkdir "../unpack-tar" or die $!;
1898 my @tarcmd = qw(tar -x -f -
1899 --no-same-owner --no-same-permissions
1900 --no-acls --no-xattrs --no-selinux);
1901 my $tar_pid = fork // die $!;
1903 chdir "../unpack-tar" or die $!;
1904 open STDIN, "<&", $input or die $!;
1906 die "dgit (child): exec $tarcmd[0]: $!";
1908 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
1909 !$? or failedcmd @tarcmd;
1912 (@compr_cmd ? failedcmd @compr_cmd
1914 # finally, we have the results in "tarball", but maybe
1915 # with the wrong permissions
1917 runcmd qw(chmod -R +rwX ../unpack-tar);
1918 changedir "../unpack-tar";
1919 my ($tree) = mktree_in_ud_from_only_subdir(1);
1920 changedir "../../unpack";
1921 rmtree "../unpack-tar";
1923 my $ent = [ $f, $tree ];
1925 Orig => !!$orig_f_part,
1926 Sort => (!$orig_f_part ? 2 :
1927 $orig_f_part =~ m/-/g ? 1 :
1935 # put any without "_" first (spec is not clear whether files
1936 # are always in the usual order). Tarballs without "_" are
1937 # the main orig or the debian tarball.
1938 $a->{Sort} <=> $b->{Sort} or
1942 my $any_orig = grep { $_->{Orig} } @tartrees;
1944 my $dscfn = "$package.dsc";
1946 my $treeimporthow = 'package';
1948 open D, ">", $dscfn or die "$dscfn: $!";
1949 print D $dscdata or die "$dscfn: $!";
1950 close D or die "$dscfn: $!";
1951 my @cmd = qw(dpkg-source);
1952 push @cmd, '--no-check' if $dsc_checked;
1953 if (madformat $dsc->{format}) {
1954 push @cmd, '--skip-patches';
1955 $treeimporthow = 'unpatched';
1957 push @cmd, qw(-x --), $dscfn;
1960 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1961 if (madformat $dsc->{format}) {
1962 check_for_vendor_patches();
1966 if (madformat $dsc->{format}) {
1967 my @pcmd = qw(dpkg-source --before-build .);
1968 runcmd shell_cmd 'exec >/dev/null', @pcmd;
1970 runcmd @git, qw(add -Af);
1971 $dappliedtree = git_write_tree();
1974 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
1975 debugcmd "|",@clogcmd;
1976 open CLOGS, "-|", @clogcmd or die $!;
1981 printdebug "import clog search...\n";
1984 my $stanzatext = do { local $/=""; <CLOGS>; };
1985 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
1986 last if !defined $stanzatext;
1988 my $desc = "package changelog, entry no.$.";
1989 open my $stanzafh, "<", \$stanzatext or die;
1990 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
1991 $clogp //= $thisstanza;
1993 printdebug "import clog $thisstanza->{version} $desc...\n";
1995 last if !$any_orig; # we don't need $r1clogp
1997 # We look for the first (most recent) changelog entry whose
1998 # version number is lower than the upstream version of this
1999 # package. Then the last (least recent) previous changelog
2000 # entry is treated as the one which introduced this upstream
2001 # version and used for the synthetic commits for the upstream
2004 # One might think that a more sophisticated algorithm would be
2005 # necessary. But: we do not want to scan the whole changelog
2006 # file. Stopping when we see an earlier version, which
2007 # necessarily then is an earlier upstream version, is the only
2008 # realistic way to do that. Then, either the earliest
2009 # changelog entry we have seen so far is indeed the earliest
2010 # upload of this upstream version; or there are only changelog
2011 # entries relating to later upstream versions (which is not
2012 # possible unless the changelog and .dsc disagree about the
2013 # version). Then it remains to choose between the physically
2014 # last entry in the file, and the one with the lowest version
2015 # number. If these are not the same, we guess that the
2016 # versions were created in a non-monotic order rather than
2017 # that the changelog entries have been misordered.
2019 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2021 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2022 $r1clogp = $thisstanza;
2024 printdebug "import clog $r1clogp->{version} becomes r1\n";
2026 die $! if CLOGS->error;
2027 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2029 $clogp or fail "package changelog has no entries!";
2031 my $authline = clogp_authline $clogp;
2032 my $changes = getfield $clogp, 'Changes';
2033 my $cversion = getfield $clogp, 'Version';
2036 $r1clogp //= $clogp; # maybe there's only one entry;
2037 my $r1authline = clogp_authline $r1clogp;
2038 # Strictly, r1authline might now be wrong if it's going to be
2039 # unused because !$any_orig. Whatever.
2041 printdebug "import tartrees authline $authline\n";
2042 printdebug "import tartrees r1authline $r1authline\n";
2044 foreach my $tt (@tartrees) {
2045 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2047 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2050 committer $r1authline
2054 [dgit import orig $tt->{F}]
2062 [dgit import tarball $package $cversion $tt->{F}]
2067 printdebug "import main commit\n";
2069 open C, ">../commit.tmp" or die $!;
2070 print C <<END or die $!;
2073 print C <<END or die $! foreach @tartrees;
2076 print C <<END or die $!;
2082 [dgit import $treeimporthow $package $cversion]
2086 my $rawimport_hash = make_commit qw(../commit.tmp);
2088 if (madformat $dsc->{format}) {
2089 printdebug "import apply patches...\n";
2091 # regularise the state of the working tree so that
2092 # the checkout of $rawimport_hash works nicely.
2093 my $dappliedcommit = make_commit_text(<<END);
2100 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2102 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2104 # We need the answers to be reproducible
2105 my @authline = clogp_authline($clogp);
2106 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2107 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2108 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2109 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2110 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2111 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2113 my $path = $ENV{PATH} or die;
2115 foreach my $use_absurd (qw(0 1)) {
2116 local $ENV{PATH} = $path;
2119 progress "warning: $@";
2120 $path = "$absurdity:$path";
2121 progress "$us: trying slow absurd-git-apply...";
2122 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2127 die "forbid absurd git-apply\n" if $use_absurd
2128 && forceing [qw(import-gitapply-no-absurd)];
2129 die "only absurd git-apply!\n" if !$use_absurd
2130 && forceing [qw(import-gitapply-absurd)];
2132 local $ENV{PATH} = $path if $use_absurd;
2134 my @showcmd = (gbp_pq, qw(import));
2135 my @realcmd = shell_cmd
2136 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2137 debugcmd "+",@realcmd;
2138 if (system @realcmd) {
2139 die +(shellquote @showcmd).
2141 failedcmd_waitstatus()."\n";
2144 my $gapplied = git_rev_parse('HEAD');
2145 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2146 $gappliedtree eq $dappliedtree or
2148 gbp-pq import and dpkg-source disagree!
2149 gbp-pq import gave commit $gapplied
2150 gbp-pq import gave tree $gappliedtree
2151 dpkg-source --before-build gave tree $dappliedtree
2153 $rawimport_hash = $gapplied;
2158 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2163 progress "synthesised git commit from .dsc $cversion";
2165 my $rawimport_mergeinput = {
2166 Commit => $rawimport_hash,
2167 Info => "Import of source package",
2169 my @output = ($rawimport_mergeinput);
2171 if ($lastpush_mergeinput) {
2172 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2173 my $oversion = getfield $oldclogp, 'Version';
2175 version_compare($oversion, $cversion);
2177 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2178 { Message => <<END, ReverseParents => 1 });
2179 Record $package ($cversion) in archive suite $csuite
2181 } elsif ($vcmp > 0) {
2182 print STDERR <<END or die $!;
2184 Version actually in archive: $cversion (older)
2185 Last version pushed with dgit: $oversion (newer or same)
2188 @output = $lastpush_mergeinput;
2190 # Same version. Use what's in the server git branch,
2191 # discarding our own import. (This could happen if the
2192 # server automatically imports all packages into git.)
2193 @output = $lastpush_mergeinput;
2196 changedir '../../../..';
2201 sub complete_file_from_dsc ($$) {
2202 our ($dstdir, $fi) = @_;
2203 # Ensures that we have, in $dir, the file $fi, with the correct
2204 # contents. (Downloading it from alongside $dscurl if necessary.)
2206 my $f = $fi->{Filename};
2207 my $tf = "$dstdir/$f";
2210 if (stat_exists $tf) {
2211 progress "using existing $f";
2214 $furl =~ s{/[^/]+$}{};
2216 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2217 die "$f ?" if $f =~ m#/#;
2218 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2219 return 0 if !act_local();
2223 open F, "<", "$tf" or die "$tf: $!";
2224 $fi->{Digester}->reset();
2225 $fi->{Digester}->addfile(*F);
2226 F->error and die $!;
2227 my $got = $fi->{Digester}->hexdigest();
2228 $got eq $fi->{Hash} or
2229 fail "file $f has hash $got but .dsc".
2230 " demands hash $fi->{Hash} ".
2231 ($downloaded ? "(got wrong file from archive!)"
2232 : "(perhaps you should delete this file?)");
2237 sub ensure_we_have_orig () {
2238 my @dfi = dsc_files_info();
2239 foreach my $fi (@dfi) {
2240 my $f = $fi->{Filename};
2241 next unless is_orig_file_in_dsc($f, \@dfi);
2242 complete_file_from_dsc('..', $fi)
2247 sub git_fetch_us () {
2248 # Want to fetch only what we are going to use, unless
2249 # deliberately-not-ff, in which case we must fetch everything.
2251 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2253 (quiltmode_splitbrain
2254 ? (map { $_->('*',access_basedistro) }
2255 \&debiantag_new, \&debiantag_maintview)
2256 : debiantags('*',access_basedistro));
2257 push @specs, server_branch($csuite);
2258 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2260 # This is rather miserable:
2261 # When git fetch --prune is passed a fetchspec ending with a *,
2262 # it does a plausible thing. If there is no * then:
2263 # - it matches subpaths too, even if the supplied refspec
2264 # starts refs, and behaves completely madly if the source
2265 # has refs/refs/something. (See, for example, Debian #NNNN.)
2266 # - if there is no matching remote ref, it bombs out the whole
2268 # We want to fetch a fixed ref, and we don't know in advance
2269 # if it exists, so this is not suitable.
2271 # Our workaround is to use git ls-remote. git ls-remote has its
2272 # own qairks. Notably, it has the absurd multi-tail-matching
2273 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2274 # refs/refs/foo etc.
2276 # Also, we want an idempotent snapshot, but we have to make two
2277 # calls to the remote: one to git ls-remote and to git fetch. The
2278 # solution is use git ls-remote to obtain a target state, and
2279 # git fetch to try to generate it. If we don't manage to generate
2280 # the target state, we try again.
2282 my $specre = join '|', map {
2288 printdebug "git_fetch_us specre=$specre\n";
2289 my $wanted_rref = sub {
2291 return m/^(?:$specre)$/o;
2294 my $fetch_iteration = 0;
2297 if (++$fetch_iteration > 10) {
2298 fail "too many iterations trying to get sane fetch!";
2301 my @look = map { "refs/$_" } @specs;
2302 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2306 open GITLS, "-|", @lcmd or die $!;
2308 printdebug "=> ", $_;
2309 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2310 my ($objid,$rrefname) = ($1,$2);
2311 if (!$wanted_rref->($rrefname)) {
2313 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2317 $wantr{$rrefname} = $objid;
2320 close GITLS or failedcmd @lcmd;
2322 # OK, now %want is exactly what we want for refs in @specs
2324 return () if !m/\*$/ && !exists $wantr{"refs/$_"};
2325 "+refs/$_:".lrfetchrefs."/$_";
2328 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2329 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2332 %lrfetchrefs_f = ();
2335 git_for_each_ref(lrfetchrefs, sub {
2336 my ($objid,$objtype,$lrefname,$reftail) = @_;
2337 $lrfetchrefs_f{$lrefname} = $objid;
2338 $objgot{$objid} = 1;
2341 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2342 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2343 if (!exists $wantr{$rrefname}) {
2344 if ($wanted_rref->($rrefname)) {
2346 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2350 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2353 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2354 delete $lrfetchrefs_f{$lrefname};
2358 foreach my $rrefname (sort keys %wantr) {
2359 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2360 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2361 my $want = $wantr{$rrefname};
2362 next if $got eq $want;
2363 if (!defined $objgot{$want}) {
2365 warning: git ls-remote suggests we want $lrefname
2366 warning: and it should refer to $want
2367 warning: but git fetch didn't fetch that object to any relevant ref.
2368 warning: This may be due to a race with someone updating the server.
2369 warning: Will try again...
2371 next FETCH_ITERATION;
2374 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2376 runcmd_ordryrun_local @git, qw(update-ref -m),
2377 "dgit fetch git fetch fixup", $lrefname, $want;
2378 $lrfetchrefs_f{$lrefname} = $want;
2382 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2383 Dumper(\%lrfetchrefs_f);
2386 my @tagpats = debiantags('*',access_basedistro);
2388 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2389 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2390 printdebug "currently $fullrefname=$objid\n";
2391 $here{$fullrefname} = $objid;
2393 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2394 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2395 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2396 printdebug "offered $lref=$objid\n";
2397 if (!defined $here{$lref}) {
2398 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2399 runcmd_ordryrun_local @upd;
2400 lrfetchref_used $fullrefname;
2401 } elsif ($here{$lref} eq $objid) {
2402 lrfetchref_used $fullrefname;
2405 "Not updateting $lref from $here{$lref} to $objid.\n";
2410 sub mergeinfo_getclogp ($) {
2411 # Ensures thit $mi->{Clogp} exists and returns it
2413 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2416 sub mergeinfo_version ($) {
2417 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2420 sub fetch_from_archive () {
2421 ensure_setup_existing_tree();
2423 # Ensures that lrref() is what is actually in the archive, one way
2424 # or another, according to us - ie this client's
2425 # appropritaely-updated archive view. Also returns the commit id.
2426 # If there is nothing in the archive, leaves lrref alone and
2427 # returns undef. git_fetch_us must have already been called.
2431 foreach my $field (@ourdscfield) {
2432 $dsc_hash = $dsc->{$field};
2433 last if defined $dsc_hash;
2435 if (defined $dsc_hash) {
2436 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2438 progress "last upload to archive specified git hash";
2440 progress "last upload to archive has NO git hash";
2443 progress "no version available from the archive";
2446 # If the archive's .dsc has a Dgit field, there are three
2447 # relevant git commitids we need to choose between and/or merge
2449 # 1. $dsc_hash: the Dgit field from the archive
2450 # 2. $lastpush_hash: the suite branch on the dgit git server
2451 # 3. $lastfetch_hash: our local tracking brach for the suite
2453 # These may all be distinct and need not be in any fast forward
2456 # If the dsc was pushed to this suite, then the server suite
2457 # branch will have been updated; but it might have been pushed to
2458 # a different suite and copied by the archive. Conversely a more
2459 # recent version may have been pushed with dgit but not appeared
2460 # in the archive (yet).
2462 # $lastfetch_hash may be awkward because archive imports
2463 # (particularly, imports of Dgit-less .dscs) are performed only as
2464 # needed on individual clients, so different clients may perform a
2465 # different subset of them - and these imports are only made
2466 # public during push. So $lastfetch_hash may represent a set of
2467 # imports different to a subsequent upload by a different dgit
2470 # Our approach is as follows:
2472 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2473 # descendant of $dsc_hash, then it was pushed by a dgit user who
2474 # had based their work on $dsc_hash, so we should prefer it.
2475 # Otherwise, $dsc_hash was installed into this suite in the
2476 # archive other than by a dgit push, and (necessarily) after the
2477 # last dgit push into that suite (since a dgit push would have
2478 # been descended from the dgit server git branch); thus, in that
2479 # case, we prefer the archive's version (and produce a
2480 # pseudo-merge to overwrite the dgit server git branch).
2482 # (If there is no Dgit field in the archive's .dsc then
2483 # generate_commit_from_dsc uses the version numbers to decide
2484 # whether the suite branch or the archive is newer. If the suite
2485 # branch is newer it ignores the archive's .dsc; otherwise it
2486 # generates an import of the .dsc, and produces a pseudo-merge to
2487 # overwrite the suite branch with the archive contents.)
2489 # The outcome of that part of the algorithm is the `public view',
2490 # and is same for all dgit clients: it does not depend on any
2491 # unpublished history in the local tracking branch.
2493 # As between the public view and the local tracking branch: The
2494 # local tracking branch is only updated by dgit fetch, and
2495 # whenever dgit fetch runs it includes the public view in the
2496 # local tracking branch. Therefore if the public view is not
2497 # descended from the local tracking branch, the local tracking
2498 # branch must contain history which was imported from the archive
2499 # but never pushed; and, its tip is now out of date. So, we make
2500 # a pseudo-merge to overwrite the old imports and stitch the old
2503 # Finally: we do not necessarily reify the public view (as
2504 # described above). This is so that we do not end up stacking two
2505 # pseudo-merges. So what we actually do is figure out the inputs
2506 # to any public view pseudo-merge and put them in @mergeinputs.
2509 # $mergeinputs[]{Commit}
2510 # $mergeinputs[]{Info}
2511 # $mergeinputs[0] is the one whose tree we use
2512 # @mergeinputs is in the order we use in the actual commit)
2515 # $mergeinputs[]{Message} is a commit message to use
2516 # $mergeinputs[]{ReverseParents} if def specifies that parent
2517 # list should be in opposite order
2518 # Such an entry has no Commit or Info. It applies only when found
2519 # in the last entry. (This ugliness is to support making
2520 # identical imports to previous dgit versions.)
2522 my $lastpush_hash = git_get_ref(lrfetchref());
2523 printdebug "previous reference hash=$lastpush_hash\n";
2524 $lastpush_mergeinput = $lastpush_hash && {
2525 Commit => $lastpush_hash,
2526 Info => "dgit suite branch on dgit git server",
2529 my $lastfetch_hash = git_get_ref(lrref());
2530 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2531 my $lastfetch_mergeinput = $lastfetch_hash && {
2532 Commit => $lastfetch_hash,
2533 Info => "dgit client's archive history view",
2536 my $dsc_mergeinput = $dsc_hash && {
2537 Commit => $dsc_hash,
2538 Info => "Dgit field in .dsc from archive",
2542 my $del_lrfetchrefs = sub {
2545 printdebug "del_lrfetchrefs...\n";
2546 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2547 my $objid = $lrfetchrefs_d{$fullrefname};
2548 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2550 $gur ||= new IO::Handle;
2551 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2553 printf $gur "delete %s %s\n", $fullrefname, $objid;
2556 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2560 if (defined $dsc_hash) {
2561 fail "missing remote git history even though dsc has hash -".
2562 " could not find ref ".rref()." at ".access_giturl()
2563 unless $lastpush_hash;
2564 ensure_we_have_orig();
2565 if ($dsc_hash eq $lastpush_hash) {
2566 @mergeinputs = $dsc_mergeinput
2567 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2568 print STDERR <<END or die $!;
2570 Git commit in archive is behind the last version allegedly pushed/uploaded.
2571 Commit referred to by archive: $dsc_hash
2572 Last version pushed with dgit: $lastpush_hash
2575 @mergeinputs = ($lastpush_mergeinput);
2577 # Archive has .dsc which is not a descendant of the last dgit
2578 # push. This can happen if the archive moves .dscs about.
2579 # Just follow its lead.
2580 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2581 progress "archive .dsc names newer git commit";
2582 @mergeinputs = ($dsc_mergeinput);
2584 progress "archive .dsc names other git commit, fixing up";
2585 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2589 @mergeinputs = generate_commits_from_dsc();
2590 # We have just done an import. Now, our import algorithm might
2591 # have been improved. But even so we do not want to generate
2592 # a new different import of the same package. So if the
2593 # version numbers are the same, just use our existing version.
2594 # If the version numbers are different, the archive has changed
2595 # (perhaps, rewound).
2596 if ($lastfetch_mergeinput &&
2597 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2598 (mergeinfo_version $mergeinputs[0]) )) {
2599 @mergeinputs = ($lastfetch_mergeinput);
2601 } elsif ($lastpush_hash) {
2602 # only in git, not in the archive yet
2603 @mergeinputs = ($lastpush_mergeinput);
2604 print STDERR <<END or die $!;
2606 Package not found in the archive, but has allegedly been pushed using dgit.
2610 printdebug "nothing found!\n";
2611 if (defined $skew_warning_vsn) {
2612 print STDERR <<END or die $!;
2614 Warning: relevant archive skew detected.
2615 Archive allegedly contains $skew_warning_vsn
2616 But we were not able to obtain any version from the archive or git.
2620 unshift @end, $del_lrfetchrefs;
2624 if ($lastfetch_hash &&
2626 my $h = $_->{Commit};
2627 $h and is_fast_fwd($lastfetch_hash, $h);
2628 # If true, one of the existing parents of this commit
2629 # is a descendant of the $lastfetch_hash, so we'll
2630 # be ff from that automatically.
2634 push @mergeinputs, $lastfetch_mergeinput;
2637 printdebug "fetch mergeinfos:\n";
2638 foreach my $mi (@mergeinputs) {
2640 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2642 printdebug sprintf " ReverseParents=%d Message=%s",
2643 $mi->{ReverseParents}, $mi->{Message};
2647 my $compat_info= pop @mergeinputs
2648 if $mergeinputs[$#mergeinputs]{Message};
2650 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2653 if (@mergeinputs > 1) {
2655 my $tree_commit = $mergeinputs[0]{Commit};
2657 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2658 $tree =~ m/\n\n/; $tree = $`;
2659 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2662 # We use the changelog author of the package in question the
2663 # author of this pseudo-merge. This is (roughly) correct if
2664 # this commit is simply representing aa non-dgit upload.
2665 # (Roughly because it does not record sponsorship - but we
2666 # don't have sponsorship info because that's in the .changes,
2667 # which isn't in the archivw.)
2669 # But, it might be that we are representing archive history
2670 # updates (including in-archive copies). These are not really
2671 # the responsibility of the person who created the .dsc, but
2672 # there is no-one whose name we should better use. (The
2673 # author of the .dsc-named commit is clearly worse.)
2675 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2676 my $author = clogp_authline $useclogp;
2677 my $cversion = getfield $useclogp, 'Version';
2679 my $mcf = ".git/dgit/mergecommit";
2680 open MC, ">", $mcf or die "$mcf $!";
2681 print MC <<END or die $!;
2685 my @parents = grep { $_->{Commit} } @mergeinputs;
2686 @parents = reverse @parents if $compat_info->{ReverseParents};
2687 print MC <<END or die $! foreach @parents;
2691 print MC <<END or die $!;
2697 if (defined $compat_info->{Message}) {
2698 print MC $compat_info->{Message} or die $!;
2700 print MC <<END or die $!;
2701 Record $package ($cversion) in archive suite $csuite
2705 my $message_add_info = sub {
2707 my $mversion = mergeinfo_version $mi;
2708 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2712 $message_add_info->($mergeinputs[0]);
2713 print MC <<END or die $!;
2714 should be treated as descended from
2716 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2720 $hash = make_commit $mcf;
2722 $hash = $mergeinputs[0]{Commit};
2724 printdebug "fetch hash=$hash\n";
2727 my ($lasth, $what) = @_;
2728 return unless $lasth;
2729 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2732 $chkff->($lastpush_hash, 'dgit repo server tip (last push)');
2733 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2735 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2736 'DGIT_ARCHIVE', $hash;
2737 cmdoutput @git, qw(log -n2), $hash;
2738 # ... gives git a chance to complain if our commit is malformed
2740 if (defined $skew_warning_vsn) {
2742 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2743 my $gotclogp = commit_getclogp($hash);
2744 my $got_vsn = getfield $gotclogp, 'Version';
2745 printdebug "SKEW CHECK GOT $got_vsn\n";
2746 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2747 print STDERR <<END or die $!;
2749 Warning: archive skew detected. Using the available version:
2750 Archive allegedly contains $skew_warning_vsn
2751 We were able to obtain only $got_vsn
2757 if ($lastfetch_hash ne $hash) {
2758 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2762 dryrun_report @upd_cmd;
2766 lrfetchref_used lrfetchref();
2768 unshift @end, $del_lrfetchrefs;
2772 sub set_local_git_config ($$) {
2774 runcmd @git, qw(config), $k, $v;
2777 sub setup_mergechangelogs (;$) {
2779 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
2781 my $driver = 'dpkg-mergechangelogs';
2782 my $cb = "merge.$driver";
2783 my $attrs = '.git/info/attributes';
2784 ensuredir '.git/info';
2786 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
2787 if (!open ATTRS, "<", $attrs) {
2788 $!==ENOENT or die "$attrs: $!";
2792 next if m{^debian/changelog\s};
2793 print NATTRS $_, "\n" or die $!;
2795 ATTRS->error and die $!;
2798 print NATTRS "debian/changelog merge=$driver\n" or die $!;
2801 set_local_git_config "$cb.name", 'debian/changelog merge driver';
2802 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
2804 rename "$attrs.new", "$attrs" or die "$attrs: $!";
2807 sub setup_useremail (;$) {
2809 return unless $always || access_cfg_bool(1, 'setup-useremail');
2812 my ($k, $envvar) = @_;
2813 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
2814 return unless defined $v;
2815 set_local_git_config "user.$k", $v;
2818 $setup->('email', 'DEBEMAIL');
2819 $setup->('name', 'DEBFULLNAME');
2822 sub ensure_setup_existing_tree () {
2823 my $k = "remote.$remotename.skipdefaultupdate";
2824 my $c = git_get_config $k;
2825 return if defined $c;
2826 set_local_git_config $k, 'true';
2829 sub setup_new_tree () {
2830 setup_mergechangelogs();
2836 canonicalise_suite();
2837 badusage "dry run makes no sense with clone" unless act_local();
2838 my $hasgit = check_for_git();
2839 mkdir $dstdir or fail "create \`$dstdir': $!";
2841 runcmd @git, qw(init -q);
2842 my $giturl = access_giturl(1);
2843 if (defined $giturl) {
2844 open H, "> .git/HEAD" or die $!;
2845 print H "ref: ".lref()."\n" or die $!;
2847 runcmd @git, qw(remote add), 'origin', $giturl;
2850 progress "fetching existing git history";
2852 runcmd_ordryrun_local @git, qw(fetch origin);
2854 progress "starting new git history";
2856 fetch_from_archive() or no_such_package;
2857 my $vcsgiturl = $dsc->{'Vcs-Git'};
2858 if (length $vcsgiturl) {
2859 $vcsgiturl =~ s/\s+-b\s+\S+//g;
2860 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
2863 runcmd @git, qw(reset --hard), lrref();
2864 printdone "ready for work in $dstdir";
2868 if (check_for_git()) {
2871 fetch_from_archive() or no_such_package();
2872 printdone "fetched into ".lrref();
2877 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
2879 printdone "fetched to ".lrref()." and merged into HEAD";
2882 sub check_not_dirty () {
2883 foreach my $f (qw(local-options local-patch-header)) {
2884 if (stat_exists "debian/source/$f") {
2885 fail "git tree contains debian/source/$f";
2889 return if $ignoredirty;
2891 my @cmd = (@git, qw(diff --quiet HEAD));
2893 $!=0; $?=-1; system @cmd;
2896 fail "working tree is dirty (does not match HEAD)";
2902 sub commit_admin ($) {
2905 runcmd_ordryrun_local @git, qw(commit -m), $m;
2908 sub commit_quilty_patch () {
2909 my $output = cmdoutput @git, qw(status --porcelain);
2911 foreach my $l (split /\n/, $output) {
2912 next unless $l =~ m/\S/;
2913 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
2917 delete $adds{'.pc'}; # if there wasn't one before, don't add it
2919 progress "nothing quilty to commit, ok.";
2922 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
2923 runcmd_ordryrun_local @git, qw(add -f), @adds;
2925 Commit Debian 3.0 (quilt) metadata
2927 [dgit ($our_version) quilt-fixup]
2931 sub get_source_format () {
2933 if (open F, "debian/source/options") {
2937 s/\s+$//; # ignore missing final newline
2939 my ($k, $v) = ($`, $'); #');
2940 $v =~ s/^"(.*)"$/$1/;
2946 F->error and die $!;
2949 die $! unless $!==&ENOENT;
2952 if (!open F, "debian/source/format") {
2953 die $! unless $!==&ENOENT;
2957 F->error and die $!;
2959 return ($_, \%options);
2962 sub madformat_wantfixup ($) {
2964 return 0 unless $format eq '3.0 (quilt)';
2965 our $quilt_mode_warned;
2966 if ($quilt_mode eq 'nocheck') {
2967 progress "Not doing any fixup of \`$format' due to".
2968 " ----no-quilt-fixup or --quilt=nocheck"
2969 unless $quilt_mode_warned++;
2972 progress "Format \`$format', need to check/update patch stack"
2973 unless $quilt_mode_warned++;
2977 # An "infopair" is a tuple [ $thing, $what ]
2978 # (often $thing is a commit hash; $what is a description)
2980 sub infopair_cond_equal ($$) {
2982 $x->[0] eq $y->[0] or fail <<END;
2983 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
2987 sub infopair_lrf_tag_lookup ($$) {
2988 my ($tagnames, $what) = @_;
2989 # $tagname may be an array ref
2990 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
2991 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
2992 foreach my $tagname (@tagnames) {
2993 my $lrefname = lrfetchrefs."/tags/$tagname";
2994 my $tagobj = $lrfetchrefs_f{$lrefname};
2995 next unless defined $tagobj;
2996 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
2997 return [ git_rev_parse($tagobj), $what ];
2999 fail @tagnames==1 ? <<END : <<END;
3000 Wanted tag $what (@tagnames) on dgit server, but not found
3002 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3006 sub infopair_cond_ff ($$) {
3007 my ($anc,$desc) = @_;
3008 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3009 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3013 sub pseudomerge_version_check ($$) {
3014 my ($clogp, $archive_hash) = @_;
3016 my $arch_clogp = commit_getclogp $archive_hash;
3017 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3018 'version currently in archive' ];
3019 if (defined $overwrite_version) {
3020 if (length $overwrite_version) {
3021 infopair_cond_equal([ $overwrite_version,
3022 '--overwrite= version' ],
3025 my $v = $i_arch_v->[0];
3026 progress "Checking package changelog for archive version $v ...";
3028 my @xa = ("-f$v", "-t$v");
3029 my $vclogp = parsechangelog @xa;
3030 my $cv = [ (getfield $vclogp, 'Version'),
3031 "Version field from dpkg-parsechangelog @xa" ];
3032 infopair_cond_equal($i_arch_v, $cv);
3035 $@ =~ s/^dgit: //gm;
3037 "Perhaps debian/changelog does not mention $v ?";
3042 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3046 sub pseudomerge_make_commit ($$$$ $$) {
3047 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3048 $msg_cmd, $msg_msg) = @_;
3049 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3051 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3052 my $authline = clogp_authline $clogp;
3056 !defined $overwrite_version ? ""
3057 : !length $overwrite_version ? " --overwrite"
3058 : " --overwrite=".$overwrite_version;
3061 my $pmf = ".git/dgit/pseudomerge";
3062 open MC, ">", $pmf or die "$pmf $!";
3063 print MC <<END or die $!;
3066 parent $archive_hash
3076 return make_commit($pmf);
3079 sub splitbrain_pseudomerge ($$$$) {
3080 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3081 # => $merged_dgitview
3082 printdebug "splitbrain_pseudomerge...\n";
3084 # We: debian/PREVIOUS HEAD($maintview)
3085 # expect: o ----------------- o
3088 # a/d/PREVIOUS $dgitview
3091 # we do: `------------------ o
3095 return $dgitview unless defined $archive_hash;
3097 printdebug "splitbrain_pseudomerge...\n";
3099 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3101 if (!defined $overwrite_version) {
3102 progress "Checking that HEAD inciudes all changes in archive...";
3105 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3107 if (defined $overwrite_version) {
3109 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
3110 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3111 my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
3112 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3113 my $i_archive = [ $archive_hash, "current archive contents" ];
3115 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3117 infopair_cond_equal($i_dgit, $i_archive);
3118 infopair_cond_ff($i_dep14, $i_dgit);
3119 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3123 $us: check failed (maybe --overwrite is needed, consult documentation)
3128 my $r = pseudomerge_make_commit
3129 $clogp, $dgitview, $archive_hash, $i_arch_v,
3130 "dgit --quilt=$quilt_mode",
3131 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3132 Declare fast forward from $i_arch_v->[0]
3134 Make fast forward from $i_arch_v->[0]
3137 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3141 sub plain_overwrite_pseudomerge ($$$) {
3142 my ($clogp, $head, $archive_hash) = @_;
3144 printdebug "plain_overwrite_pseudomerge...";
3146 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3148 return $head if is_fast_fwd $archive_hash, $head;
3150 my $m = "Declare fast forward from $i_arch_v->[0]";
3152 my $r = pseudomerge_make_commit
3153 $clogp, $head, $archive_hash, $i_arch_v,
3156 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3158 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3162 sub push_parse_changelog ($) {
3165 my $clogp = Dpkg::Control::Hash->new();
3166 $clogp->load($clogpfn) or die;
3168 $package = getfield $clogp, 'Source';
3169 my $cversion = getfield $clogp, 'Version';
3170 my $tag = debiantag($cversion, access_basedistro);
3171 runcmd @git, qw(check-ref-format), $tag;
3173 my $dscfn = dscfn($cversion);
3175 return ($clogp, $cversion, $dscfn);
3178 sub push_parse_dsc ($$$) {
3179 my ($dscfn,$dscfnwhat, $cversion) = @_;
3180 $dsc = parsecontrol($dscfn,$dscfnwhat);
3181 my $dversion = getfield $dsc, 'Version';
3182 my $dscpackage = getfield $dsc, 'Source';
3183 ($dscpackage eq $package && $dversion eq $cversion) or
3184 fail "$dscfn is for $dscpackage $dversion".
3185 " but debian/changelog is for $package $cversion";
3188 sub push_tagwants ($$$$) {
3189 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3192 TagFn => \&debiantag,
3197 if (defined $maintviewhead) {
3199 TagFn => \&debiantag_maintview,
3200 Objid => $maintviewhead,
3201 TfSuffix => '-maintview',
3205 foreach my $tw (@tagwants) {
3206 $tw->{Tag} = $tw->{TagFn}($cversion, access_basedistro);
3207 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3209 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3213 sub push_mktags ($$ $$ $) {
3215 $changesfile,$changesfilewhat,
3218 die unless $tagwants->[0]{View} eq 'dgit';
3220 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3221 $dsc->save("$dscfn.tmp") or die $!;
3223 my $changes = parsecontrol($changesfile,$changesfilewhat);
3224 foreach my $field (qw(Source Distribution Version)) {
3225 $changes->{$field} eq $clogp->{$field} or
3226 fail "changes field $field \`$changes->{$field}'".
3227 " does not match changelog \`$clogp->{$field}'";
3230 my $cversion = getfield $clogp, 'Version';
3231 my $clogsuite = getfield $clogp, 'Distribution';
3233 # We make the git tag by hand because (a) that makes it easier
3234 # to control the "tagger" (b) we can do remote signing
3235 my $authline = clogp_authline $clogp;
3236 my $delibs = join(" ", "",@deliberatelies);
3237 my $declaredistro = access_basedistro();
3241 my $tfn = $tw->{Tfn};
3242 my $head = $tw->{Objid};
3243 my $tag = $tw->{Tag};
3245 open TO, '>', $tfn->('.tmp') or die $!;
3246 print TO <<END or die $!;
3253 if ($tw->{View} eq 'dgit') {
3254 print TO <<END or die $!;
3255 $package release $cversion for $clogsuite ($csuite) [dgit]
3256 [dgit distro=$declaredistro$delibs]
3258 foreach my $ref (sort keys %previously) {
3259 print TO <<END or die $!;
3260 [dgit previously:$ref=$previously{$ref}]
3263 } elsif ($tw->{View} eq 'maint') {
3264 print TO <<END or die $!;
3265 $package release $cversion for $clogsuite ($csuite)
3266 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3269 die Dumper($tw)."?";
3274 my $tagobjfn = $tfn->('.tmp');
3276 if (!defined $keyid) {
3277 $keyid = access_cfg('keyid','RETURN-UNDEF');
3279 if (!defined $keyid) {
3280 $keyid = getfield $clogp, 'Maintainer';
3282 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3283 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3284 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3285 push @sign_cmd, $tfn->('.tmp');
3286 runcmd_ordryrun @sign_cmd;
3288 $tagobjfn = $tfn->('.signed.tmp');
3289 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3290 $tfn->('.tmp'), $tfn->('.tmp.asc');
3296 my @r = map { $mktag->($_); } @$tagwants;
3300 sub sign_changes ($) {
3301 my ($changesfile) = @_;
3303 my @debsign_cmd = @debsign;
3304 push @debsign_cmd, "-k$keyid" if defined $keyid;
3305 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3306 push @debsign_cmd, $changesfile;
3307 runcmd_ordryrun @debsign_cmd;
3312 printdebug "actually entering push\n";
3314 supplementary_message(<<'END');
3315 Push failed, while checking state of the archive.
3316 You can retry the push, after fixing the problem, if you like.
3318 if (check_for_git()) {
3321 my $archive_hash = fetch_from_archive();
3322 if (!$archive_hash) {
3324 fail "package appears to be new in this suite;".
3325 " if this is intentional, use --new";
3328 supplementary_message(<<'END');
3329 Push failed, while preparing your push.
3330 You can retry the push, after fixing the problem, if you like.
3333 need_tagformat 'new', "quilt mode $quilt_mode"
3334 if quiltmode_splitbrain;
3338 access_giturl(); # check that success is vaguely likely
3341 my $clogpfn = ".git/dgit/changelog.822.tmp";
3342 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3344 responder_send_file('parsed-changelog', $clogpfn);
3346 my ($clogp, $cversion, $dscfn) =
3347 push_parse_changelog("$clogpfn");
3349 my $dscpath = "$buildproductsdir/$dscfn";
3350 stat_exists $dscpath or
3351 fail "looked for .dsc $dscfn, but $!;".
3352 " maybe you forgot to build";
3354 responder_send_file('dsc', $dscpath);
3356 push_parse_dsc($dscpath, $dscfn, $cversion);
3358 my $format = getfield $dsc, 'Format';
3359 printdebug "format $format\n";
3361 my $actualhead = git_rev_parse('HEAD');
3362 my $dgithead = $actualhead;
3363 my $maintviewhead = undef;
3365 my $upstreamversion = $clogp->{Version};
3366 $upstreamversion =~ s/-[^-]*$//;
3368 if (madformat_wantfixup($format)) {
3369 # user might have not used dgit build, so maybe do this now:
3370 if (quiltmode_splitbrain()) {
3372 quilt_make_fake_dsc($upstreamversion);
3374 ($dgithead, $cachekey) =
3375 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3377 "--quilt=$quilt_mode but no cached dgit view:
3378 perhaps tree changed since dgit build[-source] ?";
3380 $dgithead = splitbrain_pseudomerge($clogp,
3381 $actualhead, $dgithead,
3383 $maintviewhead = $actualhead;
3384 changedir '../../../..';
3385 prep_ud(); # so _only_subdir() works, below
3387 commit_quilty_patch();
3391 if (defined $overwrite_version && !defined $maintviewhead) {
3392 $dgithead = plain_overwrite_pseudomerge($clogp,
3400 if ($archive_hash) {
3401 if (is_fast_fwd($archive_hash, $dgithead)) {
3403 } elsif (deliberately_not_fast_forward) {
3406 fail "dgit push: HEAD is not a descendant".
3407 " of the archive's version.\n".
3408 "To overwrite the archive's contents,".
3409 " pass --overwrite[=VERSION].\n".
3410 "To rewind history, if permitted by the archive,".
3411 " use --deliberately-not-fast-forward.";
3416 progress "checking that $dscfn corresponds to HEAD";
3417 runcmd qw(dpkg-source -x --),
3418 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3419 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3420 check_for_vendor_patches() if madformat($dsc->{format});
3421 changedir '../../../..';
3422 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3423 debugcmd "+",@diffcmd;
3425 my $r = system @diffcmd;
3428 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3430 HEAD specifies a different tree to $dscfn:
3432 Perhaps you forgot to build. Or perhaps there is a problem with your
3433 source tree (see dgit(7) for some hints). To see a full diff, run
3440 if (!$changesfile) {
3441 my $pat = changespat $cversion;
3442 my @cs = glob "$buildproductsdir/$pat";
3443 fail "failed to find unique changes file".
3444 " (looked for $pat in $buildproductsdir);".
3445 " perhaps you need to use dgit -C"
3447 ($changesfile) = @cs;
3449 $changesfile = "$buildproductsdir/$changesfile";
3452 # Check that changes and .dsc agree enough
3453 $changesfile =~ m{[^/]*$};
3454 my $changes = parsecontrol($changesfile,$&);
3455 files_compare_inputs($dsc, $changes)
3456 unless forceing [qw(dsc-changes-mismatch)];
3458 # Perhaps adjust .dsc to contain right set of origs
3459 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3461 unless forceing [qw(changes-origs-exactly)];
3463 # Checks complete, we're going to try and go ahead:
3465 responder_send_file('changes',$changesfile);
3466 responder_send_command("param head $dgithead");
3467 responder_send_command("param csuite $csuite");
3468 responder_send_command("param tagformat $tagformat");
3469 if (defined $maintviewhead) {
3470 die unless ($protovsn//4) >= 4;
3471 responder_send_command("param maint-view $maintviewhead");
3474 if (deliberately_not_fast_forward) {
3475 git_for_each_ref(lrfetchrefs, sub {
3476 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3477 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3478 responder_send_command("previously $rrefname=$objid");
3479 $previously{$rrefname} = $objid;
3483 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3487 supplementary_message(<<'END');
3488 Push failed, while signing the tag.
3489 You can retry the push, after fixing the problem, if you like.
3491 # If we manage to sign but fail to record it anywhere, it's fine.
3492 if ($we_are_responder) {
3493 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3494 responder_receive_files('signed-tag', @tagobjfns);
3496 @tagobjfns = push_mktags($clogp,$dscpath,
3497 $changesfile,$changesfile,
3500 supplementary_message(<<'END');
3501 Push failed, *after* signing the tag.
3502 If you want to try again, you should use a new version number.
3505 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3507 foreach my $tw (@tagwants) {
3508 my $tag = $tw->{Tag};
3509 my $tagobjfn = $tw->{TagObjFn};
3511 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3512 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3513 runcmd_ordryrun_local
3514 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3517 supplementary_message(<<'END');
3518 Push failed, while updating the remote git repository - see messages above.
3519 If you want to try again, you should use a new version number.
3521 if (!check_for_git()) {
3522 create_remote_git_repo();
3525 my @pushrefs = $forceflag.$dgithead.":".rrref();
3526 foreach my $tw (@tagwants) {
3527 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3530 runcmd_ordryrun @git,
3531 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3532 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3534 supplementary_message(<<'END');
3535 Push failed, after updating the remote git repository.
3536 If you want to try again, you must use a new version number.
3538 if ($we_are_responder) {
3539 my $dryrunsuffix = act_local() ? "" : ".tmp";
3540 responder_receive_files('signed-dsc-changes',
3541 "$dscpath$dryrunsuffix",
3542 "$changesfile$dryrunsuffix");
3545 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3547 progress "[new .dsc left in $dscpath.tmp]";
3549 sign_changes $changesfile;
3552 supplementary_message(<<END);
3553 Push failed, while uploading package(s) to the archive server.
3554 You can retry the upload of exactly these same files with dput of:
3556 If that .changes file is broken, you will need to use a new version
3557 number for your next attempt at the upload.
3559 my $host = access_cfg('upload-host','RETURN-UNDEF');
3560 my @hostarg = defined($host) ? ($host,) : ();
3561 runcmd_ordryrun @dput, @hostarg, $changesfile;
3562 printdone "pushed and uploaded $cversion";
3564 supplementary_message('');
3565 responder_send_command("complete");
3572 badusage "-p is not allowed with clone; specify as argument instead"
3573 if defined $package;
3576 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3577 ($package,$isuite) = @ARGV;
3578 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3579 ($package,$dstdir) = @ARGV;
3580 } elsif (@ARGV==3) {
3581 ($package,$isuite,$dstdir) = @ARGV;
3583 badusage "incorrect arguments to dgit clone";
3585 $dstdir ||= "$package";
3587 if (stat_exists $dstdir) {
3588 fail "$dstdir already exists";
3592 if ($rmonerror && !$dryrun_level) {
3593 $cwd_remove= getcwd();
3595 return unless defined $cwd_remove;
3596 if (!chdir "$cwd_remove") {
3597 return if $!==&ENOENT;
3598 die "chdir $cwd_remove: $!";
3601 rmtree($dstdir) or die "remove $dstdir: $!\n";
3602 } elsif (grep { $! == $_ }
3603 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3605 print STDERR "check whether to remove $dstdir: $!\n";
3611 $cwd_remove = undef;
3614 sub branchsuite () {
3615 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3616 if ($branch =~ m#$lbranch_re#o) {
3623 sub fetchpullargs () {
3625 if (!defined $package) {
3626 my $sourcep = parsecontrol('debian/control','debian/control');
3627 $package = getfield $sourcep, 'Source';
3630 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3632 my $clogp = parsechangelog();
3633 $isuite = getfield $clogp, 'Distribution';
3635 canonicalise_suite();
3636 progress "fetching from suite $csuite";
3637 } elsif (@ARGV==1) {
3639 canonicalise_suite();
3641 badusage "incorrect arguments to dgit fetch or dgit pull";
3660 badusage "-p is not allowed with dgit push" if defined $package;
3662 my $clogp = parsechangelog();
3663 $package = getfield $clogp, 'Source';
3666 } elsif (@ARGV==1) {
3667 ($specsuite) = (@ARGV);
3669 badusage "incorrect arguments to dgit push";
3671 $isuite = getfield $clogp, 'Distribution';
3673 local ($package) = $existing_package; # this is a hack
3674 canonicalise_suite();
3676 canonicalise_suite();
3678 if (defined $specsuite &&
3679 $specsuite ne $isuite &&
3680 $specsuite ne $csuite) {
3681 fail "dgit push: changelog specifies $isuite ($csuite)".
3682 " but command line specifies $specsuite";
3687 #---------- remote commands' implementation ----------
3689 sub cmd_remote_push_build_host {
3690 my ($nrargs) = shift @ARGV;
3691 my (@rargs) = @ARGV[0..$nrargs-1];
3692 @ARGV = @ARGV[$nrargs..$#ARGV];
3694 my ($dir,$vsnwant) = @rargs;
3695 # vsnwant is a comma-separated list; we report which we have
3696 # chosen in our ready response (so other end can tell if they
3699 $we_are_responder = 1;
3700 $us .= " (build host)";
3704 open PI, "<&STDIN" or die $!;
3705 open STDIN, "/dev/null" or die $!;
3706 open PO, ">&STDOUT" or die $!;
3708 open STDOUT, ">&STDERR" or die $!;
3712 ($protovsn) = grep {
3713 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3714 } @rpushprotovsn_support;
3716 fail "build host has dgit rpush protocol versions ".
3717 (join ",", @rpushprotovsn_support).
3718 " but invocation host has $vsnwant"
3719 unless defined $protovsn;
3721 responder_send_command("dgit-remote-push-ready $protovsn");
3722 rpush_handle_protovsn_bothends();
3727 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3728 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3729 # a good error message)
3731 sub rpush_handle_protovsn_bothends () {
3732 if ($protovsn < 4) {
3733 need_tagformat 'old', "rpush negotiated protocol $protovsn";
3742 my $report = i_child_report();
3743 if (defined $report) {
3744 printdebug "($report)\n";
3745 } elsif ($i_child_pid) {
3746 printdebug "(killing build host child $i_child_pid)\n";
3747 kill 15, $i_child_pid;
3749 if (defined $i_tmp && !defined $initiator_tempdir) {
3751 eval { rmtree $i_tmp; };
3755 END { i_cleanup(); }
3758 my ($base,$selector,@args) = @_;
3759 $selector =~ s/\-/_/g;
3760 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
3767 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
3775 push @rargs, join ",", @rpushprotovsn_support;
3778 push @rdgit, @ropts;
3779 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
3781 my @cmd = (@ssh, $host, shellquote @rdgit);
3784 if (defined $initiator_tempdir) {
3785 rmtree $initiator_tempdir;
3786 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
3787 $i_tmp = $initiator_tempdir;
3791 $i_child_pid = open2(\*RO, \*RI, @cmd);
3793 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
3794 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
3795 $supplementary_message = '' unless $protovsn >= 3;
3797 fail "rpush negotiated protocol version $protovsn".
3798 " which does not support quilt mode $quilt_mode"
3799 if quiltmode_splitbrain;
3801 rpush_handle_protovsn_bothends();
3803 my ($icmd,$iargs) = initiator_expect {
3804 m/^(\S+)(?: (.*))?$/;
3807 i_method "i_resp", $icmd, $iargs;
3811 sub i_resp_progress ($) {
3813 my $msg = protocol_read_bytes \*RO, $rhs;
3817 sub i_resp_supplementary_message ($) {
3819 $supplementary_message = protocol_read_bytes \*RO, $rhs;
3822 sub i_resp_complete {
3823 my $pid = $i_child_pid;
3824 $i_child_pid = undef; # prevents killing some other process with same pid
3825 printdebug "waiting for build host child $pid...\n";
3826 my $got = waitpid $pid, 0;
3827 die $! unless $got == $pid;
3828 die "build host child failed $?" if $?;
3831 printdebug "all done\n";
3835 sub i_resp_file ($) {
3837 my $localname = i_method "i_localname", $keyword;
3838 my $localpath = "$i_tmp/$localname";
3839 stat_exists $localpath and
3840 badproto \*RO, "file $keyword ($localpath) twice";
3841 protocol_receive_file \*RO, $localpath;
3842 i_method "i_file", $keyword;
3847 sub i_resp_param ($) {
3848 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
3852 sub i_resp_previously ($) {
3853 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
3854 or badproto \*RO, "bad previously spec";
3855 my $r = system qw(git check-ref-format), $1;
3856 die "bad previously ref spec ($r)" if $r;
3857 $previously{$1} = $2;
3862 sub i_resp_want ($) {
3864 die "$keyword ?" if $i_wanted{$keyword}++;
3865 my @localpaths = i_method "i_want", $keyword;
3866 printdebug "[[ $keyword @localpaths\n";
3867 foreach my $localpath (@localpaths) {
3868 protocol_send_file \*RI, $localpath;
3870 print RI "files-end\n" or die $!;
3873 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
3875 sub i_localname_parsed_changelog {
3876 return "remote-changelog.822";
3878 sub i_file_parsed_changelog {
3879 ($i_clogp, $i_version, $i_dscfn) =
3880 push_parse_changelog "$i_tmp/remote-changelog.822";
3881 die if $i_dscfn =~ m#/|^\W#;
3884 sub i_localname_dsc {
3885 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3890 sub i_localname_changes {
3891 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3892 $i_changesfn = $i_dscfn;
3893 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
3894 return $i_changesfn;
3896 sub i_file_changes { }
3898 sub i_want_signed_tag {
3899 printdebug Dumper(\%i_param, $i_dscfn);
3900 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
3901 && defined $i_param{'csuite'}
3902 or badproto \*RO, "premature desire for signed-tag";
3903 my $head = $i_param{'head'};
3904 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
3906 my $maintview = $i_param{'maint-view'};
3907 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
3910 if ($protovsn >= 4) {
3911 my $p = $i_param{'tagformat'} // '<undef>';
3913 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
3916 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
3918 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
3920 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
3923 push_mktags $i_clogp, $i_dscfn,
3924 $i_changesfn, 'remote changes',
3928 sub i_want_signed_dsc_changes {
3929 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
3930 sign_changes $i_changesfn;
3931 return ($i_dscfn, $i_changesfn);
3934 #---------- building etc. ----------
3940 #----- `3.0 (quilt)' handling -----
3942 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
3944 sub quiltify_dpkg_commit ($$$;$) {
3945 my ($patchname,$author,$msg, $xinfo) = @_;
3949 my $descfn = ".git/dgit/quilt-description.tmp";
3950 open O, '>', $descfn or die "$descfn: $!";
3951 $msg =~ s/\n+/\n\n/;
3952 print O <<END or die $!;
3954 ${xinfo}Subject: $msg
3961 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
3962 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
3963 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
3964 runcmd @dpkgsource, qw(--commit .), $patchname;
3968 sub quiltify_trees_differ ($$;$$$) {
3969 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
3970 # returns true iff the two tree objects differ other than in debian/
3971 # with $finegrained,
3972 # returns bitmask 01 - differ in upstream files except .gitignore
3973 # 02 - differ in .gitignore
3974 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
3975 # is set for each modified .gitignore filename $fn
3976 # if $unrepres is defined, array ref to which is appeneded
3977 # a list of unrepresentable changes (removals of upstream files
3980 my @cmd = (@git, qw(diff-tree -z));
3981 push @cmd, qw(--name-only) unless $unrepres;
3982 push @cmd, qw(-r) if $finegrained || $unrepres;
3984 my $diffs= cmdoutput @cmd;
3987 foreach my $f (split /\0/, $diffs) {
3988 if ($unrepres && !@lmodes) {
3989 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
3992 my ($oldmode,$newmode) = @lmodes;
3995 next if $f =~ m#^debian(?:/.*)?$#s;
3999 die "deleted\n" unless $newmode =~ m/[^0]/;
4000 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4001 if ($oldmode =~ m/[^0]/) {
4002 die "mode changed\n" if $oldmode ne $newmode;
4004 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4008 local $/="\n"; chomp $@;
4009 push @$unrepres, [ $f, $@ ];
4013 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4014 $r |= $isignore ? 02 : 01;
4015 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4017 printdebug "quiltify_trees_differ $x $y => $r\n";
4021 sub quiltify_tree_sentinelfiles ($) {
4022 # lists the `sentinel' files present in the tree
4024 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4025 qw(-- debian/rules debian/control);
4030 sub quiltify_splitbrain_needed () {
4031 if (!$split_brain) {
4032 progress "dgit view: changes are required...";
4033 runcmd @git, qw(checkout -q -b dgit-view);
4038 sub quiltify_splitbrain ($$$$$$) {
4039 my ($clogp, $unapplied, $headref, $diffbits,
4040 $editedignores, $cachekey) = @_;
4041 if ($quilt_mode !~ m/gbp|dpm/) {
4042 # treat .gitignore just like any other upstream file
4043 $diffbits = { %$diffbits };
4044 $_ = !!$_ foreach values %$diffbits;
4046 # We would like any commits we generate to be reproducible
4047 my @authline = clogp_authline($clogp);
4048 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4049 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4050 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4051 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4052 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4053 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4055 if ($quilt_mode =~ m/gbp|unapplied/ &&
4056 ($diffbits->{O2H} & 01)) {
4058 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4059 " but git tree differs from orig in upstream files.";
4060 if (!stat_exists "debian/patches") {
4062 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4066 if ($quilt_mode =~ m/dpm/ &&
4067 ($diffbits->{H2A} & 01)) {
4069 --quilt=$quilt_mode specified, implying patches-applied git tree
4070 but git tree differs from result of applying debian/patches to upstream
4073 if ($quilt_mode =~ m/gbp|unapplied/ &&
4074 ($diffbits->{O2A} & 01)) { # some patches
4075 quiltify_splitbrain_needed();
4076 progress "dgit view: creating patches-applied version using gbp pq";
4077 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4078 # gbp pq import creates a fresh branch; push back to dgit-view
4079 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4080 runcmd @git, qw(checkout -q dgit-view);
4082 if ($quilt_mode =~ m/gbp|dpm/ &&
4083 ($diffbits->{O2A} & 02)) {
4085 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4086 tool which does not create patches for changes to upstream
4087 .gitignores: but, such patches exist in debian/patches.
4090 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4091 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4092 quiltify_splitbrain_needed();
4093 progress "dgit view: creating patch to represent .gitignore changes";
4094 ensuredir "debian/patches";
4095 my $gipatch = "debian/patches/auto-gitignore";
4096 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4097 stat GIPATCH or die "$gipatch: $!";
4098 fail "$gipatch already exists; but want to create it".
4099 " to record .gitignore changes" if (stat _)[7];
4100 print GIPATCH <<END or die "$gipatch: $!";
4101 Subject: Update .gitignore from Debian packaging branch
4103 The Debian packaging git branch contains these updates to the upstream
4104 .gitignore file(s). This patch is autogenerated, to provide these
4105 updates to users of the official Debian archive view of the package.
4107 [dgit ($our_version) update-gitignore]
4110 close GIPATCH or die "$gipatch: $!";
4111 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4112 $unapplied, $headref, "--", sort keys %$editedignores;
4113 open SERIES, "+>>", "debian/patches/series" or die $!;
4114 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4116 defined read SERIES, $newline, 1 or die $!;
4117 print SERIES "\n" or die $! unless $newline eq "\n";
4118 print SERIES "auto-gitignore\n" or die $!;
4119 close SERIES or die $!;
4120 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4122 Commit patch to update .gitignore
4124 [dgit ($our_version) update-gitignore-quilt-fixup]
4128 my $dgitview = git_rev_parse 'HEAD';
4130 changedir '../../../..';
4131 # When we no longer need to support squeeze, use --create-reflog
4133 ensuredir ".git/logs/refs/dgit-intern";
4134 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4137 my $oldcache = git_get_ref "refs/$splitbraincache";
4138 if ($oldcache eq $dgitview) {
4139 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4140 # git update-ref doesn't always update, in this case. *sigh*
4141 my $dummy = make_commit_text <<END;
4144 author Dgit <dgit\@example.com> 1000000000 +0000
4145 committer Dgit <dgit\@example.com> 1000000000 +0000
4147 Dummy commit - do not use
4149 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4150 "refs/$splitbraincache", $dummy;
4152 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4155 progress "dgit view: created (commit id $dgitview)";
4157 changedir '.git/dgit/unpack/work';
4160 sub quiltify ($$$$) {
4161 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4163 # Quilt patchification algorithm
4165 # We search backwards through the history of the main tree's HEAD
4166 # (T) looking for a start commit S whose tree object is identical
4167 # to to the patch tip tree (ie the tree corresponding to the
4168 # current dpkg-committed patch series). For these purposes
4169 # `identical' disregards anything in debian/ - this wrinkle is
4170 # necessary because dpkg-source treates debian/ specially.
4172 # We can only traverse edges where at most one of the ancestors'
4173 # trees differs (in changes outside in debian/). And we cannot
4174 # handle edges which change .pc/ or debian/patches. To avoid
4175 # going down a rathole we avoid traversing edges which introduce
4176 # debian/rules or debian/control. And we set a limit on the
4177 # number of edges we are willing to look at.
4179 # If we succeed, we walk forwards again. For each traversed edge
4180 # PC (with P parent, C child) (starting with P=S and ending with
4181 # C=T) to we do this:
4183 # - dpkg-source --commit with a patch name and message derived from C
4184 # After traversing PT, we git commit the changes which
4185 # should be contained within debian/patches.
4187 # The search for the path S..T is breadth-first. We maintain a
4188 # todo list containing search nodes. A search node identifies a
4189 # commit, and looks something like this:
4191 # Commit => $git_commit_id,
4192 # Child => $c, # or undef if P=T
4193 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4194 # Nontrivial => true iff $p..$c has relevant changes
4201 my %considered; # saves being exponential on some weird graphs
4203 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4206 my ($search,$whynot) = @_;
4207 printdebug " search NOT $search->{Commit} $whynot\n";
4208 $search->{Whynot} = $whynot;
4209 push @nots, $search;
4210 no warnings qw(exiting);
4219 my $c = shift @todo;
4220 next if $considered{$c->{Commit}}++;
4222 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4224 printdebug "quiltify investigate $c->{Commit}\n";
4227 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4228 printdebug " search finished hooray!\n";
4233 if ($quilt_mode eq 'nofix') {
4234 fail "quilt fixup required but quilt mode is \`nofix'\n".
4235 "HEAD commit $c->{Commit} differs from tree implied by ".
4236 " debian/patches (tree object $oldtiptree)";
4238 if ($quilt_mode eq 'smash') {
4239 printdebug " search quitting smash\n";
4243 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4244 $not->($c, "has $c_sentinels not $t_sentinels")
4245 if $c_sentinels ne $t_sentinels;
4247 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4248 $commitdata =~ m/\n\n/;
4250 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4251 @parents = map { { Commit => $_, Child => $c } } @parents;
4253 $not->($c, "root commit") if !@parents;
4255 foreach my $p (@parents) {
4256 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4258 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4259 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4261 foreach my $p (@parents) {
4262 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4264 my @cmd= (@git, qw(diff-tree -r --name-only),
4265 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4266 my $patchstackchange = cmdoutput @cmd;
4267 if (length $patchstackchange) {
4268 $patchstackchange =~ s/\n/,/g;
4269 $not->($p, "changed $patchstackchange");
4272 printdebug " search queue P=$p->{Commit} ",
4273 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4279 printdebug "quiltify want to smash\n";
4282 my $x = $_[0]{Commit};
4283 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4286 my $reportnot = sub {
4288 my $s = $abbrev->($notp);
4289 my $c = $notp->{Child};
4290 $s .= "..".$abbrev->($c) if $c;
4291 $s .= ": ".$notp->{Whynot};
4294 if ($quilt_mode eq 'linear') {
4295 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4296 foreach my $notp (@nots) {
4297 print STDERR "$us: ", $reportnot->($notp), "\n";
4299 print STDERR "$us: $_\n" foreach @$failsuggestion;
4300 fail "quilt fixup naive history linearisation failed.\n".
4301 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4302 } elsif ($quilt_mode eq 'smash') {
4303 } elsif ($quilt_mode eq 'auto') {
4304 progress "quilt fixup cannot be linear, smashing...";
4306 die "$quilt_mode ?";
4309 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4310 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4312 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4314 quiltify_dpkg_commit "auto-$version-$target-$time",
4315 (getfield $clogp, 'Maintainer'),
4316 "Automatically generated patch ($clogp->{Version})\n".
4317 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4321 progress "quiltify linearisation planning successful, executing...";
4323 for (my $p = $sref_S;
4324 my $c = $p->{Child};
4326 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4327 next unless $p->{Nontrivial};
4329 my $cc = $c->{Commit};
4331 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4332 $commitdata =~ m/\n\n/ or die "$c ?";
4335 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4338 my $commitdate = cmdoutput
4339 @git, qw(log -n1 --pretty=format:%aD), $cc;
4341 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4343 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4350 my $gbp_check_suitable = sub {
4355 die "contains unexpected slashes\n" if m{//} || m{/$};
4356 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4357 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4358 die "too long" if length > 200;
4360 return $_ unless $@;
4361 print STDERR "quiltifying commit $cc:".
4362 " ignoring/dropping Gbp-Pq $what: $@";
4366 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4368 (\S+) \s* \n //ixm) {
4369 $patchname = $gbp_check_suitable->($1, 'Name');
4371 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4373 (\S+) \s* \n //ixm) {
4374 $patchdir = $gbp_check_suitable->($1, 'Topic');
4379 if (!defined $patchname) {
4380 $patchname = $title;
4381 $patchname =~ s/[.:]$//;
4384 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4385 my $translitname = $converter->convert($patchname);
4386 die unless defined $translitname;
4387 $patchname = $translitname;
4390 "dgit: patch title transliteration error: $@"
4392 $patchname =~ y/ A-Z/-a-z/;
4393 $patchname =~ y/-a-z0-9_.+=~//cd;
4394 $patchname =~ s/^\W/x-$&/;
4395 $patchname = substr($patchname,0,40);
4397 if (!defined $patchdir) {
4400 if (length $patchdir) {
4401 $patchname = "$patchdir/$patchname";
4403 if ($patchname =~ m{^(.*)/}) {
4404 mkpath "debian/patches/$1";
4409 stat "debian/patches/$patchname$index";
4411 $!==ENOENT or die "$patchname$index $!";
4413 runcmd @git, qw(checkout -q), $cc;
4415 # We use the tip's changelog so that dpkg-source doesn't
4416 # produce complaining messages from dpkg-parsechangelog. None
4417 # of the information dpkg-source gets from the changelog is
4418 # actually relevant - it gets put into the original message
4419 # which dpkg-source provides our stunt editor, and then
4421 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4423 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4424 "Date: $commitdate\n".
4425 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4427 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4430 runcmd @git, qw(checkout -q master);
4433 sub build_maybe_quilt_fixup () {
4434 my ($format,$fopts) = get_source_format;
4435 return unless madformat_wantfixup $format;
4438 check_for_vendor_patches();
4440 if (quiltmode_splitbrain) {
4441 foreach my $needtf (qw(new maint)) {
4442 next if grep { $_ eq $needtf } access_cfg_tagformats;
4444 quilt mode $quilt_mode requires split view so server needs to support
4445 both "new" and "maint" tag formats, but config says it doesn't.
4450 my $clogp = parsechangelog();
4451 my $headref = git_rev_parse('HEAD');
4456 my $upstreamversion=$version;
4457 $upstreamversion =~ s/-[^-]*$//;
4459 if ($fopts->{'single-debian-patch'}) {
4460 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4462 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4465 die 'bug' if $split_brain && !$need_split_build_invocation;
4467 changedir '../../../..';
4468 runcmd_ordryrun_local
4469 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4472 sub quilt_fixup_mkwork ($) {
4475 mkdir "work" or die $!;
4477 mktree_in_ud_here();
4478 runcmd @git, qw(reset -q --hard), $headref;
4481 sub quilt_fixup_linkorigs ($$) {
4482 my ($upstreamversion, $fn) = @_;
4483 # calls $fn->($leafname);
4485 foreach my $f (<../../../../*>) { #/){
4486 my $b=$f; $b =~ s{.*/}{};
4488 local ($debuglevel) = $debuglevel-1;
4489 printdebug "QF linkorigs $b, $f ?\n";
4491 next unless is_orig_file_of_vsn $b, $upstreamversion;
4492 printdebug "QF linkorigs $b, $f Y\n";
4493 link_ltarget $f, $b or die "$b $!";
4498 sub quilt_fixup_delete_pc () {
4499 runcmd @git, qw(rm -rqf .pc);
4501 Commit removal of .pc (quilt series tracking data)
4503 [dgit ($our_version) upgrade quilt-remove-pc]
4507 sub quilt_fixup_singlepatch ($$$) {
4508 my ($clogp, $headref, $upstreamversion) = @_;
4510 progress "starting quiltify (single-debian-patch)";
4512 # dpkg-source --commit generates new patches even if
4513 # single-debian-patch is in debian/source/options. In order to
4514 # get it to generate debian/patches/debian-changes, it is
4515 # necessary to build the source package.
4517 quilt_fixup_linkorigs($upstreamversion, sub { });
4518 quilt_fixup_mkwork($headref);
4520 rmtree("debian/patches");
4522 runcmd @dpkgsource, qw(-b .);
4524 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4525 rename srcfn("$upstreamversion", "/debian/patches"),
4526 "work/debian/patches";
4529 commit_quilty_patch();
4532 sub quilt_make_fake_dsc ($) {
4533 my ($upstreamversion) = @_;
4535 my $fakeversion="$upstreamversion-~~DGITFAKE";
4537 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4538 print $fakedsc <<END or die $!;
4541 Version: $fakeversion
4545 my $dscaddfile=sub {
4548 my $md = new Digest::MD5;
4550 my $fh = new IO::File $b, '<' or die "$b $!";
4555 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4558 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4560 my @files=qw(debian/source/format debian/rules
4561 debian/control debian/changelog);
4562 foreach my $maybe (qw(debian/patches debian/source/options
4563 debian/tests/control)) {
4564 next unless stat_exists "../../../$maybe";
4565 push @files, $maybe;
4568 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4569 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4571 $dscaddfile->($debtar);
4572 close $fakedsc or die $!;
4575 sub quilt_check_splitbrain_cache ($$) {
4576 my ($headref, $upstreamversion) = @_;
4577 # Called only if we are in (potentially) split brain mode.
4579 # Computes the cache key and looks in the cache.
4580 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4582 my $splitbrain_cachekey;
4585 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4586 # we look in the reflog of dgit-intern/quilt-cache
4587 # we look for an entry whose message is the key for the cache lookup
4588 my @cachekey = (qw(dgit), $our_version);
4589 push @cachekey, $upstreamversion;
4590 push @cachekey, $quilt_mode;
4591 push @cachekey, $headref;
4593 push @cachekey, hashfile('fake.dsc');
4595 my $srcshash = Digest::SHA->new(256);
4596 my %sfs = ( %INC, '$0(dgit)' => $0 );
4597 foreach my $sfk (sort keys %sfs) {
4598 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4599 $srcshash->add($sfk," ");
4600 $srcshash->add(hashfile($sfs{$sfk}));
4601 $srcshash->add("\n");
4603 push @cachekey, $srcshash->hexdigest();
4604 $splitbrain_cachekey = "@cachekey";
4606 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4608 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4609 debugcmd "|(probably)",@cmd;
4610 my $child = open GC, "-|"; defined $child or die $!;
4612 chdir '../../..' or die $!;
4613 if (!stat ".git/logs/refs/$splitbraincache") {
4614 $! == ENOENT or die $!;
4615 printdebug ">(no reflog)\n";
4622 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4623 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4626 quilt_fixup_mkwork($headref);
4627 if ($cachehit ne $headref) {
4628 progress "dgit view: found cached (commit id $cachehit)";
4629 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4631 return ($cachehit, $splitbrain_cachekey);
4633 progress "dgit view: found cached, no changes required";
4634 return ($headref, $splitbrain_cachekey);
4636 die $! if GC->error;
4637 failedcmd unless close GC;
4639 printdebug "splitbrain cache miss\n";
4640 return (undef, $splitbrain_cachekey);
4643 sub quilt_fixup_multipatch ($$$) {
4644 my ($clogp, $headref, $upstreamversion) = @_;
4646 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4649 # - honour any existing .pc in case it has any strangeness
4650 # - determine the git commit corresponding to the tip of
4651 # the patch stack (if there is one)
4652 # - if there is such a git commit, convert each subsequent
4653 # git commit into a quilt patch with dpkg-source --commit
4654 # - otherwise convert all the differences in the tree into
4655 # a single git commit
4659 # Our git tree doesn't necessarily contain .pc. (Some versions of
4660 # dgit would include the .pc in the git tree.) If there isn't
4661 # one, we need to generate one by unpacking the patches that we
4664 # We first look for a .pc in the git tree. If there is one, we
4665 # will use it. (This is not the normal case.)
4667 # Otherwise need to regenerate .pc so that dpkg-source --commit
4668 # can work. We do this as follows:
4669 # 1. Collect all relevant .orig from parent directory
4670 # 2. Generate a debian.tar.gz out of
4671 # debian/{patches,rules,source/format,source/options}
4672 # 3. Generate a fake .dsc containing just these fields:
4673 # Format Source Version Files
4674 # 4. Extract the fake .dsc
4675 # Now the fake .dsc has a .pc directory.
4676 # (In fact we do this in every case, because in future we will
4677 # want to search for a good base commit for generating patches.)
4679 # Then we can actually do the dpkg-source --commit
4680 # 1. Make a new working tree with the same object
4681 # store as our main tree and check out the main
4683 # 2. Copy .pc from the fake's extraction, if necessary
4684 # 3. Run dpkg-source --commit
4685 # 4. If the result has changes to debian/, then
4686 # - git add them them
4687 # - git add .pc if we had a .pc in-tree
4689 # 5. If we had a .pc in-tree, delete it, and git commit
4690 # 6. Back in the main tree, fast forward to the new HEAD
4692 # Another situation we may have to cope with is gbp-style
4693 # patches-unapplied trees.
4695 # We would want to detect these, so we know to escape into
4696 # quilt_fixup_gbp. However, this is in general not possible.
4697 # Consider a package with a one patch which the dgit user reverts
4698 # (with git revert or the moral equivalent).
4700 # That is indistinguishable in contents from a patches-unapplied
4701 # tree. And looking at the history to distinguish them is not
4702 # useful because the user might have made a confusing-looking git
4703 # history structure (which ought to produce an error if dgit can't
4704 # cope, not a silent reintroduction of an unwanted patch).
4706 # So gbp users will have to pass an option. But we can usually
4707 # detect their failure to do so: if the tree is not a clean
4708 # patches-applied tree, quilt linearisation fails, but the tree
4709 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4710 # they want --quilt=unapplied.
4712 # To help detect this, when we are extracting the fake dsc, we
4713 # first extract it with --skip-patches, and then apply the patches
4714 # afterwards with dpkg-source --before-build. That lets us save a
4715 # tree object corresponding to .origs.
4717 my $splitbrain_cachekey;
4719 quilt_make_fake_dsc($upstreamversion);
4721 if (quiltmode_splitbrain()) {
4723 ($cachehit, $splitbrain_cachekey) =
4724 quilt_check_splitbrain_cache($headref, $upstreamversion);
4725 return if $cachehit;
4729 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4731 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4732 rename $fakexdir, "fake" or die "$fakexdir $!";
4736 remove_stray_gits();
4737 mktree_in_ud_here();
4741 runcmd @git, qw(add -Af .);
4742 my $unapplied=git_write_tree();
4743 printdebug "fake orig tree object $unapplied\n";
4747 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
4749 if (system @bbcmd) {
4750 failedcmd @bbcmd if $? < 0;
4752 failed to apply your git tree's patch stack (from debian/patches/) to
4753 the corresponding upstream tarball(s). Your source tree and .orig
4754 are probably too inconsistent. dgit can only fix up certain kinds of
4755 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
4761 quilt_fixup_mkwork($headref);
4764 if (stat_exists ".pc") {
4766 progress "Tree already contains .pc - will use it then delete it.";
4769 rename '../fake/.pc','.pc' or die $!;
4772 changedir '../fake';
4774 runcmd @git, qw(add -Af .);
4775 my $oldtiptree=git_write_tree();
4776 printdebug "fake o+d/p tree object $unapplied\n";
4777 changedir '../work';
4780 # We calculate some guesswork now about what kind of tree this might
4781 # be. This is mostly for error reporting.
4787 # O = orig, without patches applied
4788 # A = "applied", ie orig with H's debian/patches applied
4789 O2H => quiltify_trees_differ($unapplied,$headref, 1,
4790 \%editedignores, \@unrepres),
4791 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
4792 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
4796 foreach my $b (qw(01 02)) {
4797 foreach my $v (qw(O2H O2A H2A)) {
4798 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
4801 printdebug "differences \@dl @dl.\n";
4804 "$us: base trees orig=%.20s o+d/p=%.20s",
4805 $unapplied, $oldtiptree;
4807 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
4808 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
4809 $dl[0], $dl[1], $dl[3], $dl[4],
4813 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
4815 forceable_fail [qw(unrepresentable)], <<END;
4816 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
4821 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
4822 push @failsuggestion, "This might be a patches-unapplied branch.";
4823 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
4824 push @failsuggestion, "This might be a patches-applied branch.";
4826 push @failsuggestion, "Maybe you need to specify one of".
4827 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
4829 if (quiltmode_splitbrain()) {
4830 quiltify_splitbrain($clogp, $unapplied, $headref,
4831 $diffbits, \%editedignores,
4832 $splitbrain_cachekey);
4836 progress "starting quiltify (multiple patches, $quilt_mode mode)";
4837 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
4839 if (!open P, '>>', ".pc/applied-patches") {
4840 $!==&ENOENT or die $!;
4845 commit_quilty_patch();
4847 if ($mustdeletepc) {
4848 quilt_fixup_delete_pc();
4852 sub quilt_fixup_editor () {
4853 my $descfn = $ENV{$fakeeditorenv};
4854 my $editing = $ARGV[$#ARGV];
4855 open I1, '<', $descfn or die "$descfn: $!";
4856 open I2, '<', $editing or die "$editing: $!";
4857 unlink $editing or die "$editing: $!";
4858 open O, '>', $editing or die "$editing: $!";
4859 while (<I1>) { print O or die $!; } I1->error and die $!;
4862 $copying ||= m/^\-\-\- /;
4863 next unless $copying;
4866 I2->error and die $!;
4871 sub maybe_apply_patches_dirtily () {
4872 return unless $quilt_mode =~ m/gbp|unapplied/;
4873 print STDERR <<END or die $!;
4875 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
4876 dgit: Have to apply the patches - making the tree dirty.
4877 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
4880 $patches_applied_dirtily = 01;
4881 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
4882 runcmd qw(dpkg-source --before-build .);
4885 sub maybe_unapply_patches_again () {
4886 progress "dgit: Unapplying patches again to tidy up the tree."
4887 if $patches_applied_dirtily;
4888 runcmd qw(dpkg-source --after-build .)
4889 if $patches_applied_dirtily & 01;
4891 if $patches_applied_dirtily & 02;
4892 $patches_applied_dirtily = 0;
4895 #----- other building -----
4897 our $clean_using_builder;
4898 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
4899 # clean the tree before building (perhaps invoked indirectly by
4900 # whatever we are using to run the build), rather than separately
4901 # and explicitly by us.
4904 return if $clean_using_builder;
4905 if ($cleanmode eq 'dpkg-source') {
4906 maybe_apply_patches_dirtily();
4907 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
4908 } elsif ($cleanmode eq 'dpkg-source-d') {
4909 maybe_apply_patches_dirtily();
4910 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
4911 } elsif ($cleanmode eq 'git') {
4912 runcmd_ordryrun_local @git, qw(clean -xdf);
4913 } elsif ($cleanmode eq 'git-ff') {
4914 runcmd_ordryrun_local @git, qw(clean -xdff);
4915 } elsif ($cleanmode eq 'check') {
4916 my $leftovers = cmdoutput @git, qw(clean -xdn);
4917 if (length $leftovers) {
4918 print STDERR $leftovers, "\n" or die $!;
4919 fail "tree contains uncommitted files and --clean=check specified";
4921 } elsif ($cleanmode eq 'none') {
4928 badusage "clean takes no additional arguments" if @ARGV;
4931 maybe_unapply_patches_again();
4936 badusage "-p is not allowed when building" if defined $package;
4939 my $clogp = parsechangelog();
4940 $isuite = getfield $clogp, 'Distribution';
4941 $package = getfield $clogp, 'Source';
4942 $version = getfield $clogp, 'Version';
4943 build_maybe_quilt_fixup();
4945 my $pat = changespat $version;
4946 foreach my $f (glob "$buildproductsdir/$pat") {
4948 unlink $f or fail "remove old changes file $f: $!";
4950 progress "would remove $f";
4956 sub changesopts_initial () {
4957 my @opts =@changesopts[1..$#changesopts];
4960 sub changesopts_version () {
4961 if (!defined $changes_since_version) {
4962 my @vsns = archive_query('archive_query');
4963 my @quirk = access_quirk();
4964 if ($quirk[0] eq 'backports') {
4965 local $isuite = $quirk[2];
4967 canonicalise_suite();
4968 push @vsns, archive_query('archive_query');
4971 @vsns = map { $_->[0] } @vsns;
4972 @vsns = sort { -version_compare($a, $b) } @vsns;
4973 $changes_since_version = $vsns[0];
4974 progress "changelog will contain changes since $vsns[0]";
4976 $changes_since_version = '_';
4977 progress "package seems new, not specifying -v<version>";
4980 if ($changes_since_version ne '_') {
4981 return ("-v$changes_since_version");
4987 sub changesopts () {
4988 return (changesopts_initial(), changesopts_version());
4991 sub massage_dbp_args ($;$) {
4992 my ($cmd,$xargs) = @_;
4995 # - if we're going to split the source build out so we can
4996 # do strange things to it, massage the arguments to dpkg-buildpackage
4997 # so that the main build doessn't build source (or add an argument
4998 # to stop it building source by default).
5000 # - add -nc to stop dpkg-source cleaning the source tree,
5001 # unless we're not doing a split build and want dpkg-source
5002 # as cleanmode, in which case we can do nothing
5005 # 0 - source will NOT need to be built separately by caller
5006 # +1 - source will need to be built separately by caller
5007 # +2 - source will need to be built separately by caller AND
5008 # dpkg-buildpackage should not in fact be run at all!
5009 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5010 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5011 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5012 $clean_using_builder = 1;
5015 # -nc has the side effect of specifying -b if nothing else specified
5016 # and some combinations of -S, -b, et al, are errors, rather than
5017 # later simply overriding earlie. So we need to:
5018 # - search the command line for these options
5019 # - pick the last one
5020 # - perhaps add our own as a default
5021 # - perhaps adjust it to the corresponding non-source-building version
5023 foreach my $l ($cmd, $xargs) {
5025 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5028 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5030 if ($need_split_build_invocation) {
5031 printdebug "massage split $dmode.\n";
5032 $r = $dmode =~ m/[S]/ ? +2 :
5033 $dmode =~ y/gGF/ABb/ ? +1 :
5034 $dmode =~ m/[ABb]/ ? 0 :
5037 printdebug "massage done $r $dmode.\n";
5039 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5045 my $wasdir = must_getcwd();
5051 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5052 my ($msg_if_onlyone) = @_;
5053 # If there is only one .changes file, fail with $msg_if_onlyone,
5054 # or if that is undef, be a no-op.
5055 # Returns the changes file to report to the user.
5056 my $pat = changespat $version;
5057 my @changesfiles = glob $pat;
5058 @changesfiles = sort {
5059 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5063 if (@changesfiles==1) {
5064 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5065 only one changes file from build (@changesfiles)
5067 $result = $changesfiles[0];
5068 } elsif (@changesfiles==2) {
5069 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5070 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5071 fail "$l found in binaries changes file $binchanges"
5074 runcmd_ordryrun_local @mergechanges, @changesfiles;
5075 my $multichanges = changespat $version,'multi';
5077 stat_exists $multichanges or fail "$multichanges: $!";
5078 foreach my $cf (glob $pat) {
5079 next if $cf eq $multichanges;
5080 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5083 $result = $multichanges;
5085 fail "wrong number of different changes files (@changesfiles)";
5087 printdone "build successful, results in $result\n" or die $!;
5090 sub midbuild_checkchanges () {
5091 my $pat = changespat $version;
5092 return if $rmchanges;
5093 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5094 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5096 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5097 Suggest you delete @unwanted.
5102 sub midbuild_checkchanges_vanilla ($) {
5104 midbuild_checkchanges() if $wantsrc == 1;
5107 sub postbuild_mergechanges_vanilla ($) {
5109 if ($wantsrc == 1) {
5111 postbuild_mergechanges(undef);
5114 printdone "build successful\n";
5119 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5120 my $wantsrc = massage_dbp_args \@dbp;
5123 midbuild_checkchanges_vanilla $wantsrc;
5128 push @dbp, changesopts_version();
5129 maybe_apply_patches_dirtily();
5130 runcmd_ordryrun_local @dbp;
5132 maybe_unapply_patches_again();
5133 postbuild_mergechanges_vanilla $wantsrc;
5137 $quilt_mode //= 'gbp';
5141 my @dbp = @dpkgbuildpackage;
5143 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5145 if (!length $gbp_build[0]) {
5146 if (length executable_on_path('git-buildpackage')) {
5147 $gbp_build[0] = qw(git-buildpackage);
5149 $gbp_build[0] = 'gbp buildpackage';
5152 my @cmd = opts_opt_multi_cmd @gbp_build;
5154 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5158 midbuild_checkchanges_vanilla $wantsrc;
5160 if (!$clean_using_builder) {
5161 push @cmd, '--git-cleaner=true';
5165 maybe_unapply_patches_again();
5167 push @cmd, changesopts();
5168 runcmd_ordryrun_local @cmd, @ARGV;
5170 postbuild_mergechanges_vanilla $wantsrc;
5172 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5175 my $our_cleanmode = $cleanmode;
5176 if ($need_split_build_invocation) {
5177 # Pretend that clean is being done some other way. This
5178 # forces us not to try to use dpkg-buildpackage to clean and
5179 # build source all in one go; and instead we run dpkg-source
5180 # (and build_prep() will do the clean since $clean_using_builder
5182 $our_cleanmode = 'ELSEWHERE';
5184 if ($our_cleanmode =~ m/^dpkg-source/) {
5185 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5186 $clean_using_builder = 1;
5189 $sourcechanges = changespat $version,'source';
5191 unlink "../$sourcechanges" or $!==ENOENT
5192 or fail "remove $sourcechanges: $!";
5194 $dscfn = dscfn($version);
5195 if ($our_cleanmode eq 'dpkg-source') {
5196 maybe_apply_patches_dirtily();
5197 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5199 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5200 maybe_apply_patches_dirtily();
5201 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5204 my @cmd = (@dpkgsource, qw(-b --));
5207 runcmd_ordryrun_local @cmd, "work";
5208 my @udfiles = <${package}_*>;
5209 changedir "../../..";
5210 foreach my $f (@udfiles) {
5211 printdebug "source copy, found $f\n";
5214 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5215 $f eq srcfn($version, $&));
5216 printdebug "source copy, found $f - renaming\n";
5217 rename "$ud/$f", "../$f" or $!==ENOENT
5218 or fail "put in place new source file ($f): $!";
5221 my $pwd = must_getcwd();
5222 my $leafdir = basename $pwd;
5224 runcmd_ordryrun_local @cmd, $leafdir;
5227 runcmd_ordryrun_local qw(sh -ec),
5228 'exec >$1; shift; exec "$@"','x',
5229 "../$sourcechanges",
5230 @dpkggenchanges, qw(-S), changesopts();
5234 sub cmd_build_source {
5235 badusage "build-source takes no additional arguments" if @ARGV;
5237 maybe_unapply_patches_again();
5238 printdone "source built, results in $dscfn and $sourcechanges";
5243 midbuild_checkchanges();
5246 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5247 stat_exists $sourcechanges
5248 or fail "$sourcechanges (in parent directory): $!";
5250 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5252 maybe_unapply_patches_again();
5254 postbuild_mergechanges(<<END);
5255 perhaps you need to pass -A ? (sbuild's default is to build only
5256 arch-specific binaries; dgit 1.4 used to override that.)
5261 sub cmd_quilt_fixup {
5262 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5263 my $clogp = parsechangelog();
5264 $version = getfield $clogp, 'Version';
5265 $package = getfield $clogp, 'Source';
5268 build_maybe_quilt_fixup();
5271 sub cmd_archive_api_query {
5272 badusage "need only 1 subpath argument" unless @ARGV==1;
5273 my ($subpath) = @ARGV;
5274 my @cmd = archive_api_query_cmd($subpath);
5277 exec @cmd or fail "exec curl: $!\n";
5280 sub cmd_clone_dgit_repos_server {
5281 badusage "need destination argument" unless @ARGV==1;
5282 my ($destdir) = @ARGV;
5283 $package = '_dgit-repos-server';
5284 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5286 exec @cmd or fail "exec git clone: $!\n";
5289 sub cmd_setup_mergechangelogs {
5290 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5291 setup_mergechangelogs(1);
5294 sub cmd_setup_useremail {
5295 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5299 sub cmd_setup_new_tree {
5300 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5304 #---------- argument parsing and main program ----------
5307 print "dgit version $our_version\n" or die $!;
5311 our (%valopts_long, %valopts_short);
5314 sub defvalopt ($$$$) {
5315 my ($long,$short,$val_re,$how) = @_;
5316 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5317 $valopts_long{$long} = $oi;
5318 $valopts_short{$short} = $oi;
5319 # $how subref should:
5320 # do whatever assignemnt or thing it likes with $_[0]
5321 # if the option should not be passed on to remote, @rvalopts=()
5322 # or $how can be a scalar ref, meaning simply assign the value
5325 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5326 defvalopt '--distro', '-d', '.+', \$idistro;
5327 defvalopt '', '-k', '.+', \$keyid;
5328 defvalopt '--existing-package','', '.*', \$existing_package;
5329 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5330 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5331 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5333 defvalopt '', '-C', '.+', sub {
5334 ($changesfile) = (@_);
5335 if ($changesfile =~ s#^(.*)/##) {
5336 $buildproductsdir = $1;
5340 defvalopt '--initiator-tempdir','','.*', sub {
5341 ($initiator_tempdir) = (@_);
5342 $initiator_tempdir =~ m#^/# or
5343 badusage "--initiator-tempdir must be used specify an".
5344 " absolute, not relative, directory."
5350 if (defined $ENV{'DGIT_SSH'}) {
5351 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5352 } elsif (defined $ENV{'GIT_SSH'}) {
5353 @ssh = ($ENV{'GIT_SSH'});
5361 if (!defined $val) {
5362 badusage "$what needs a value" unless @ARGV;
5364 push @rvalopts, $val;
5366 badusage "bad value \`$val' for $what" unless
5367 $val =~ m/^$oi->{Re}$(?!\n)/s;
5368 my $how = $oi->{How};
5369 if (ref($how) eq 'SCALAR') {
5374 push @ropts, @rvalopts;
5378 last unless $ARGV[0] =~ m/^-/;
5382 if (m/^--dry-run$/) {
5385 } elsif (m/^--damp-run$/) {
5388 } elsif (m/^--no-sign$/) {
5391 } elsif (m/^--help$/) {
5393 } elsif (m/^--version$/) {
5395 } elsif (m/^--new$/) {
5398 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5399 ($om = $opts_opt_map{$1}) &&
5403 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5404 !$opts_opt_cmdonly{$1} &&
5405 ($om = $opts_opt_map{$1})) {
5408 } elsif (m/^--(gbp|dpm)$/s) {
5409 push @ropts, "--quilt=$1";
5411 } elsif (m/^--ignore-dirty$/s) {
5414 } elsif (m/^--no-quilt-fixup$/s) {
5416 $quilt_mode = 'nocheck';
5417 } elsif (m/^--no-rm-on-error$/s) {
5420 } elsif (m/^--overwrite$/s) {
5422 $overwrite_version = '';
5423 } elsif (m/^--overwrite=(.+)$/s) {
5425 $overwrite_version = $1;
5426 } elsif (m/^--(no-)?rm-old-changes$/s) {
5429 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5431 push @deliberatelies, $&;
5432 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
5436 } elsif (m/^--force-/) {
5438 "$us: warning: ignoring unknown force option $_\n";
5440 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5441 # undocumented, for testing
5443 $tagformat_want = [ $1, 'command line', 1 ];
5444 # 1 menas overrides distro configuration
5445 } elsif (m/^--always-split-source-build$/s) {
5446 # undocumented, for testing
5448 $need_split_build_invocation = 1;
5449 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5450 $val = $2 ? $' : undef; #';
5451 $valopt->($oi->{Long});
5453 badusage "unknown long option \`$_'";
5460 } elsif (s/^-L/-/) {
5463 } elsif (s/^-h/-/) {
5465 } elsif (s/^-D/-/) {
5469 } elsif (s/^-N/-/) {
5474 push @changesopts, $_;
5476 } elsif (s/^-wn$//s) {
5478 $cleanmode = 'none';
5479 } elsif (s/^-wg$//s) {
5482 } elsif (s/^-wgf$//s) {
5484 $cleanmode = 'git-ff';
5485 } elsif (s/^-wd$//s) {
5487 $cleanmode = 'dpkg-source';
5488 } elsif (s/^-wdd$//s) {
5490 $cleanmode = 'dpkg-source-d';
5491 } elsif (s/^-wc$//s) {
5493 $cleanmode = 'check';
5494 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5495 push @git, '-c', $&;
5496 $gitcfgs{cmdline}{$1} = [ $2 ];
5497 } elsif (s/^-c([^=]+)$//s) {
5498 push @git, '-c', $&;
5499 $gitcfgs{cmdline}{$1} = [ 'true' ];
5500 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5502 $val = undef unless length $val;
5503 $valopt->($oi->{Short});
5506 badusage "unknown short option \`$_'";
5513 sub check_env_sanity () {
5514 my $blocked = new POSIX::SigSet;
5515 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5518 foreach my $name (qw(PIPE CHLD)) {
5519 my $signame = "SIG$name";
5520 my $signum = eval "POSIX::$signame" // die;
5521 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5522 die "$signame is set to something other than SIG_DFL\n";
5523 $blocked->ismember($signum) and
5524 die "$signame is blocked\n";
5530 On entry to dgit, $@
5531 This is a bug produced by something in in your execution environment.
5537 sub finalise_opts_opts () {
5538 foreach my $k (keys %opts_opt_map) {
5539 my $om = $opts_opt_map{$k};
5541 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
5543 badcfg "cannot set command for $k"
5544 unless length $om->[0];
5548 foreach my $c (access_cfg_cfgs("opts-$k")) {
5550 map { $_ ? @$_ : () }
5551 map { $gitcfgs{$_}{$c} }
5552 reverse @gitcfgsources;
5553 printdebug "CL $c ", (join " ", map { shellquote } @vl),
5554 "\n" if $debuglevel >= 4;
5556 badcfg "cannot configure options for $k"
5557 if $opts_opt_cmdonly{$k};
5558 my $insertpos = $opts_cfg_insertpos{$k};
5559 @$om = ( @$om[0..$insertpos-1],
5561 @$om[$insertpos..$#$om] );
5566 if ($ENV{$fakeeditorenv}) {
5568 quilt_fixup_editor();
5575 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
5576 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
5577 if $dryrun_level == 1;
5579 print STDERR $helpmsg or die $!;
5582 my $cmd = shift @ARGV;
5585 my $pre_fn = ${*::}{"pre_$cmd"};
5586 $pre_fn->() if $pre_fn;
5588 if (!defined $rmchanges) {
5589 local $access_forpush;
5590 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
5593 if (!defined $quilt_mode) {
5594 local $access_forpush;
5595 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
5596 // access_cfg('quilt-mode', 'RETURN-UNDEF')
5598 $quilt_mode =~ m/^($quilt_modes_re)$/
5599 or badcfg "unknown quilt-mode \`$quilt_mode'";
5603 $need_split_build_invocation ||= quiltmode_splitbrain();
5605 if (!defined $cleanmode) {
5606 local $access_forpush;
5607 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
5608 $cleanmode //= 'dpkg-source';
5610 badcfg "unknown clean-mode \`$cleanmode'" unless
5611 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
5614 my $fn = ${*::}{"cmd_$cmd"};
5615 $fn or badusage "unknown operation $cmd";