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 printdebug "considering linking $f: ";
1833 link_ltarget "../../../../$f", $f
1834 or ((printdebug "($!) "), 0)
1838 printdebug "linked.\n";
1840 complete_file_from_dsc('.', $fi)
1843 if (is_orig_file_in_dsc($f, \@dfi)) {
1844 link $f, "../../../../$f"
1850 # We unpack and record the orig tarballs first, so that we only
1851 # need disk space for one private copy of the unpacked source.
1852 # But we can't make them into commits until we have the metadata
1853 # from the debian/changelog, so we record the tree objects now and
1854 # make them into commits later.
1856 my $upstreamv = $dsc->{version};
1857 $upstreamv =~ s/-[^-]+$//;
1858 my $orig_f_base = srcfn $upstreamv, '';
1860 foreach my $fi (@dfi) {
1861 # We actually import, and record as a commit, every tarball
1862 # (unless there is only one file, in which case there seems
1865 my $f = $fi->{Filename};
1866 printdebug "import considering $f ";
1867 (printdebug "only one dfi\n"), next if @dfi == 1;
1868 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
1869 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
1873 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
1875 printdebug "Y ", (join ' ', map { $_//"(none)" }
1876 $compr_ext, $orig_f_part
1879 my $input = new IO::File $f, '<' or die "$f $!";
1883 if (defined $compr_ext) {
1885 Dpkg::Compression::compression_guess_from_filename $f;
1886 fail "Dpkg::Compression cannot handle file $f in source package"
1887 if defined $compr_ext && !defined $cname;
1889 new Dpkg::Compression::Process compression => $cname;
1890 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
1891 my $compr_fh = new IO::Handle;
1892 my $compr_pid = open $compr_fh, "-|" // die $!;
1894 open STDIN, "<&", $input or die $!;
1896 die "dgit (child): exec $compr_cmd[0]: $!\n";
1901 rmtree "../unpack-tar";
1902 mkdir "../unpack-tar" or die $!;
1903 my @tarcmd = qw(tar -x -f -
1904 --no-same-owner --no-same-permissions
1905 --no-acls --no-xattrs --no-selinux);
1906 my $tar_pid = fork // die $!;
1908 chdir "../unpack-tar" or die $!;
1909 open STDIN, "<&", $input or die $!;
1911 die "dgit (child): exec $tarcmd[0]: $!";
1913 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
1914 !$? or failedcmd @tarcmd;
1917 (@compr_cmd ? failedcmd @compr_cmd
1919 # finally, we have the results in "tarball", but maybe
1920 # with the wrong permissions
1922 runcmd qw(chmod -R +rwX ../unpack-tar);
1923 changedir "../unpack-tar";
1924 my ($tree) = mktree_in_ud_from_only_subdir(1);
1925 changedir "../../unpack";
1926 rmtree "../unpack-tar";
1928 my $ent = [ $f, $tree ];
1930 Orig => !!$orig_f_part,
1931 Sort => (!$orig_f_part ? 2 :
1932 $orig_f_part =~ m/-/g ? 1 :
1940 # put any without "_" first (spec is not clear whether files
1941 # are always in the usual order). Tarballs without "_" are
1942 # the main orig or the debian tarball.
1943 $a->{Sort} <=> $b->{Sort} or
1947 my $any_orig = grep { $_->{Orig} } @tartrees;
1949 my $dscfn = "$package.dsc";
1951 my $treeimporthow = 'package';
1953 open D, ">", $dscfn or die "$dscfn: $!";
1954 print D $dscdata or die "$dscfn: $!";
1955 close D or die "$dscfn: $!";
1956 my @cmd = qw(dpkg-source);
1957 push @cmd, '--no-check' if $dsc_checked;
1958 if (madformat $dsc->{format}) {
1959 push @cmd, '--skip-patches';
1960 $treeimporthow = 'unpatched';
1962 push @cmd, qw(-x --), $dscfn;
1965 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
1966 if (madformat $dsc->{format}) {
1967 check_for_vendor_patches();
1971 if (madformat $dsc->{format}) {
1972 my @pcmd = qw(dpkg-source --before-build .);
1973 runcmd shell_cmd 'exec >/dev/null', @pcmd;
1975 runcmd @git, qw(add -Af);
1976 $dappliedtree = git_write_tree();
1979 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
1980 debugcmd "|",@clogcmd;
1981 open CLOGS, "-|", @clogcmd or die $!;
1986 printdebug "import clog search...\n";
1989 my $stanzatext = do { local $/=""; <CLOGS>; };
1990 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
1991 last if !defined $stanzatext;
1993 my $desc = "package changelog, entry no.$.";
1994 open my $stanzafh, "<", \$stanzatext or die;
1995 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
1996 $clogp //= $thisstanza;
1998 printdebug "import clog $thisstanza->{version} $desc...\n";
2000 last if !$any_orig; # we don't need $r1clogp
2002 # We look for the first (most recent) changelog entry whose
2003 # version number is lower than the upstream version of this
2004 # package. Then the last (least recent) previous changelog
2005 # entry is treated as the one which introduced this upstream
2006 # version and used for the synthetic commits for the upstream
2009 # One might think that a more sophisticated algorithm would be
2010 # necessary. But: we do not want to scan the whole changelog
2011 # file. Stopping when we see an earlier version, which
2012 # necessarily then is an earlier upstream version, is the only
2013 # realistic way to do that. Then, either the earliest
2014 # changelog entry we have seen so far is indeed the earliest
2015 # upload of this upstream version; or there are only changelog
2016 # entries relating to later upstream versions (which is not
2017 # possible unless the changelog and .dsc disagree about the
2018 # version). Then it remains to choose between the physically
2019 # last entry in the file, and the one with the lowest version
2020 # number. If these are not the same, we guess that the
2021 # versions were created in a non-monotic order rather than
2022 # that the changelog entries have been misordered.
2024 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2026 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2027 $r1clogp = $thisstanza;
2029 printdebug "import clog $r1clogp->{version} becomes r1\n";
2031 die $! if CLOGS->error;
2032 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2034 $clogp or fail "package changelog has no entries!";
2036 my $authline = clogp_authline $clogp;
2037 my $changes = getfield $clogp, 'Changes';
2038 my $cversion = getfield $clogp, 'Version';
2041 $r1clogp //= $clogp; # maybe there's only one entry;
2042 my $r1authline = clogp_authline $r1clogp;
2043 # Strictly, r1authline might now be wrong if it's going to be
2044 # unused because !$any_orig. Whatever.
2046 printdebug "import tartrees authline $authline\n";
2047 printdebug "import tartrees r1authline $r1authline\n";
2049 foreach my $tt (@tartrees) {
2050 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2052 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2055 committer $r1authline
2059 [dgit import orig $tt->{F}]
2067 [dgit import tarball $package $cversion $tt->{F}]
2072 printdebug "import main commit\n";
2074 open C, ">../commit.tmp" or die $!;
2075 print C <<END or die $!;
2078 print C <<END or die $! foreach @tartrees;
2081 print C <<END or die $!;
2087 [dgit import $treeimporthow $package $cversion]
2091 my $rawimport_hash = make_commit qw(../commit.tmp);
2093 if (madformat $dsc->{format}) {
2094 printdebug "import apply patches...\n";
2096 # regularise the state of the working tree so that
2097 # the checkout of $rawimport_hash works nicely.
2098 my $dappliedcommit = make_commit_text(<<END);
2105 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2107 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2109 # We need the answers to be reproducible
2110 my @authline = clogp_authline($clogp);
2111 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2112 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2113 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2114 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2115 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2116 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2118 my $path = $ENV{PATH} or die;
2120 foreach my $use_absurd (qw(0 1)) {
2121 local $ENV{PATH} = $path;
2124 progress "warning: $@";
2125 $path = "$absurdity:$path";
2126 progress "$us: trying slow absurd-git-apply...";
2127 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2132 die "forbid absurd git-apply\n" if $use_absurd
2133 && forceing [qw(import-gitapply-no-absurd)];
2134 die "only absurd git-apply!\n" if !$use_absurd
2135 && forceing [qw(import-gitapply-absurd)];
2137 local $ENV{PATH} = $path if $use_absurd;
2139 my @showcmd = (gbp_pq, qw(import));
2140 my @realcmd = shell_cmd
2141 'exec >/dev/null 2>../../gbp-pq-output', @showcmd;
2142 debugcmd "+",@realcmd;
2143 if (system @realcmd) {
2144 die +(shellquote @showcmd).
2146 failedcmd_waitstatus()."\n";
2149 my $gapplied = git_rev_parse('HEAD');
2150 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2151 $gappliedtree eq $dappliedtree or
2153 gbp-pq import and dpkg-source disagree!
2154 gbp-pq import gave commit $gapplied
2155 gbp-pq import gave tree $gappliedtree
2156 dpkg-source --before-build gave tree $dappliedtree
2158 $rawimport_hash = $gapplied;
2163 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2168 progress "synthesised git commit from .dsc $cversion";
2170 my $rawimport_mergeinput = {
2171 Commit => $rawimport_hash,
2172 Info => "Import of source package",
2174 my @output = ($rawimport_mergeinput);
2176 if ($lastpush_mergeinput) {
2177 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2178 my $oversion = getfield $oldclogp, 'Version';
2180 version_compare($oversion, $cversion);
2182 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2183 { Message => <<END, ReverseParents => 1 });
2184 Record $package ($cversion) in archive suite $csuite
2186 } elsif ($vcmp > 0) {
2187 print STDERR <<END or die $!;
2189 Version actually in archive: $cversion (older)
2190 Last version pushed with dgit: $oversion (newer or same)
2193 @output = $lastpush_mergeinput;
2195 # Same version. Use what's in the server git branch,
2196 # discarding our own import. (This could happen if the
2197 # server automatically imports all packages into git.)
2198 @output = $lastpush_mergeinput;
2201 changedir '../../../..';
2206 sub complete_file_from_dsc ($$) {
2207 our ($dstdir, $fi) = @_;
2208 # Ensures that we have, in $dir, the file $fi, with the correct
2209 # contents. (Downloading it from alongside $dscurl if necessary.)
2211 my $f = $fi->{Filename};
2212 my $tf = "$dstdir/$f";
2215 if (stat_exists $tf) {
2216 progress "using existing $f";
2218 printdebug "$tf does not exist, need to fetch\n";
2220 $furl =~ s{/[^/]+$}{};
2222 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2223 die "$f ?" if $f =~ m#/#;
2224 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2225 return 0 if !act_local();
2229 open F, "<", "$tf" or die "$tf: $!";
2230 $fi->{Digester}->reset();
2231 $fi->{Digester}->addfile(*F);
2232 F->error and die $!;
2233 my $got = $fi->{Digester}->hexdigest();
2234 $got eq $fi->{Hash} or
2235 fail "file $f has hash $got but .dsc".
2236 " demands hash $fi->{Hash} ".
2237 ($downloaded ? "(got wrong file from archive!)"
2238 : "(perhaps you should delete this file?)");
2243 sub ensure_we_have_orig () {
2244 my @dfi = dsc_files_info();
2245 foreach my $fi (@dfi) {
2246 my $f = $fi->{Filename};
2247 next unless is_orig_file_in_dsc($f, \@dfi);
2248 complete_file_from_dsc('..', $fi)
2253 sub git_fetch_us () {
2254 # Want to fetch only what we are going to use, unless
2255 # deliberately-not-ff, in which case we must fetch everything.
2257 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2259 (quiltmode_splitbrain
2260 ? (map { $_->('*',access_basedistro) }
2261 \&debiantag_new, \&debiantag_maintview)
2262 : debiantags('*',access_basedistro));
2263 push @specs, server_branch($csuite);
2264 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2266 # This is rather miserable:
2267 # When git fetch --prune is passed a fetchspec ending with a *,
2268 # it does a plausible thing. If there is no * then:
2269 # - it matches subpaths too, even if the supplied refspec
2270 # starts refs, and behaves completely madly if the source
2271 # has refs/refs/something. (See, for example, Debian #NNNN.)
2272 # - if there is no matching remote ref, it bombs out the whole
2274 # We want to fetch a fixed ref, and we don't know in advance
2275 # if it exists, so this is not suitable.
2277 # Our workaround is to use git ls-remote. git ls-remote has its
2278 # own qairks. Notably, it has the absurd multi-tail-matching
2279 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2280 # refs/refs/foo etc.
2282 # Also, we want an idempotent snapshot, but we have to make two
2283 # calls to the remote: one to git ls-remote and to git fetch. The
2284 # solution is use git ls-remote to obtain a target state, and
2285 # git fetch to try to generate it. If we don't manage to generate
2286 # the target state, we try again.
2288 my $specre = join '|', map {
2294 printdebug "git_fetch_us specre=$specre\n";
2295 my $wanted_rref = sub {
2297 return m/^(?:$specre)$/o;
2300 my $fetch_iteration = 0;
2303 if (++$fetch_iteration > 10) {
2304 fail "too many iterations trying to get sane fetch!";
2307 my @look = map { "refs/$_" } @specs;
2308 my @lcmd = (@git, qw(ls-remote -q --refs), access_giturl(), @look);
2312 open GITLS, "-|", @lcmd or die $!;
2314 printdebug "=> ", $_;
2315 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2316 my ($objid,$rrefname) = ($1,$2);
2317 if (!$wanted_rref->($rrefname)) {
2319 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2323 $wantr{$rrefname} = $objid;
2326 close GITLS or failedcmd @lcmd;
2328 # OK, now %want is exactly what we want for refs in @specs
2330 return () if !m/\*$/ && !exists $wantr{"refs/$_"};
2331 "+refs/$_:".lrfetchrefs."/$_";
2334 my @fcmd = (@git, qw(fetch -p -n -q), access_giturl(), @fspecs);
2335 runcmd_ordryrun_local @git, qw(fetch -p -n -q), access_giturl(),
2338 %lrfetchrefs_f = ();
2341 git_for_each_ref(lrfetchrefs, sub {
2342 my ($objid,$objtype,$lrefname,$reftail) = @_;
2343 $lrfetchrefs_f{$lrefname} = $objid;
2344 $objgot{$objid} = 1;
2347 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2348 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2349 if (!exists $wantr{$rrefname}) {
2350 if ($wanted_rref->($rrefname)) {
2352 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2356 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2359 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2360 delete $lrfetchrefs_f{$lrefname};
2364 foreach my $rrefname (sort keys %wantr) {
2365 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2366 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2367 my $want = $wantr{$rrefname};
2368 next if $got eq $want;
2369 if (!defined $objgot{$want}) {
2371 warning: git ls-remote suggests we want $lrefname
2372 warning: and it should refer to $want
2373 warning: but git fetch didn't fetch that object to any relevant ref.
2374 warning: This may be due to a race with someone updating the server.
2375 warning: Will try again...
2377 next FETCH_ITERATION;
2380 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2382 runcmd_ordryrun_local @git, qw(update-ref -m),
2383 "dgit fetch git fetch fixup", $lrefname, $want;
2384 $lrfetchrefs_f{$lrefname} = $want;
2388 printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
2389 Dumper(\%lrfetchrefs_f);
2392 my @tagpats = debiantags('*',access_basedistro);
2394 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2395 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2396 printdebug "currently $fullrefname=$objid\n";
2397 $here{$fullrefname} = $objid;
2399 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2400 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2401 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2402 printdebug "offered $lref=$objid\n";
2403 if (!defined $here{$lref}) {
2404 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2405 runcmd_ordryrun_local @upd;
2406 lrfetchref_used $fullrefname;
2407 } elsif ($here{$lref} eq $objid) {
2408 lrfetchref_used $fullrefname;
2411 "Not updateting $lref from $here{$lref} to $objid.\n";
2416 sub mergeinfo_getclogp ($) {
2417 # Ensures thit $mi->{Clogp} exists and returns it
2419 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2422 sub mergeinfo_version ($) {
2423 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2426 sub fetch_from_archive () {
2427 ensure_setup_existing_tree();
2429 # Ensures that lrref() is what is actually in the archive, one way
2430 # or another, according to us - ie this client's
2431 # appropritaely-updated archive view. Also returns the commit id.
2432 # If there is nothing in the archive, leaves lrref alone and
2433 # returns undef. git_fetch_us must have already been called.
2437 foreach my $field (@ourdscfield) {
2438 $dsc_hash = $dsc->{$field};
2439 last if defined $dsc_hash;
2441 if (defined $dsc_hash) {
2442 $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
2444 progress "last upload to archive specified git hash";
2446 progress "last upload to archive has NO git hash";
2449 progress "no version available from the archive";
2452 # If the archive's .dsc has a Dgit field, there are three
2453 # relevant git commitids we need to choose between and/or merge
2455 # 1. $dsc_hash: the Dgit field from the archive
2456 # 2. $lastpush_hash: the suite branch on the dgit git server
2457 # 3. $lastfetch_hash: our local tracking brach for the suite
2459 # These may all be distinct and need not be in any fast forward
2462 # If the dsc was pushed to this suite, then the server suite
2463 # branch will have been updated; but it might have been pushed to
2464 # a different suite and copied by the archive. Conversely a more
2465 # recent version may have been pushed with dgit but not appeared
2466 # in the archive (yet).
2468 # $lastfetch_hash may be awkward because archive imports
2469 # (particularly, imports of Dgit-less .dscs) are performed only as
2470 # needed on individual clients, so different clients may perform a
2471 # different subset of them - and these imports are only made
2472 # public during push. So $lastfetch_hash may represent a set of
2473 # imports different to a subsequent upload by a different dgit
2476 # Our approach is as follows:
2478 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2479 # descendant of $dsc_hash, then it was pushed by a dgit user who
2480 # had based their work on $dsc_hash, so we should prefer it.
2481 # Otherwise, $dsc_hash was installed into this suite in the
2482 # archive other than by a dgit push, and (necessarily) after the
2483 # last dgit push into that suite (since a dgit push would have
2484 # been descended from the dgit server git branch); thus, in that
2485 # case, we prefer the archive's version (and produce a
2486 # pseudo-merge to overwrite the dgit server git branch).
2488 # (If there is no Dgit field in the archive's .dsc then
2489 # generate_commit_from_dsc uses the version numbers to decide
2490 # whether the suite branch or the archive is newer. If the suite
2491 # branch is newer it ignores the archive's .dsc; otherwise it
2492 # generates an import of the .dsc, and produces a pseudo-merge to
2493 # overwrite the suite branch with the archive contents.)
2495 # The outcome of that part of the algorithm is the `public view',
2496 # and is same for all dgit clients: it does not depend on any
2497 # unpublished history in the local tracking branch.
2499 # As between the public view and the local tracking branch: The
2500 # local tracking branch is only updated by dgit fetch, and
2501 # whenever dgit fetch runs it includes the public view in the
2502 # local tracking branch. Therefore if the public view is not
2503 # descended from the local tracking branch, the local tracking
2504 # branch must contain history which was imported from the archive
2505 # but never pushed; and, its tip is now out of date. So, we make
2506 # a pseudo-merge to overwrite the old imports and stitch the old
2509 # Finally: we do not necessarily reify the public view (as
2510 # described above). This is so that we do not end up stacking two
2511 # pseudo-merges. So what we actually do is figure out the inputs
2512 # to any public view pseudo-merge and put them in @mergeinputs.
2515 # $mergeinputs[]{Commit}
2516 # $mergeinputs[]{Info}
2517 # $mergeinputs[0] is the one whose tree we use
2518 # @mergeinputs is in the order we use in the actual commit)
2521 # $mergeinputs[]{Message} is a commit message to use
2522 # $mergeinputs[]{ReverseParents} if def specifies that parent
2523 # list should be in opposite order
2524 # Such an entry has no Commit or Info. It applies only when found
2525 # in the last entry. (This ugliness is to support making
2526 # identical imports to previous dgit versions.)
2528 my $lastpush_hash = git_get_ref(lrfetchref());
2529 printdebug "previous reference hash=$lastpush_hash\n";
2530 $lastpush_mergeinput = $lastpush_hash && {
2531 Commit => $lastpush_hash,
2532 Info => "dgit suite branch on dgit git server",
2535 my $lastfetch_hash = git_get_ref(lrref());
2536 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
2537 my $lastfetch_mergeinput = $lastfetch_hash && {
2538 Commit => $lastfetch_hash,
2539 Info => "dgit client's archive history view",
2542 my $dsc_mergeinput = $dsc_hash && {
2543 Commit => $dsc_hash,
2544 Info => "Dgit field in .dsc from archive",
2548 my $del_lrfetchrefs = sub {
2551 printdebug "del_lrfetchrefs...\n";
2552 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
2553 my $objid = $lrfetchrefs_d{$fullrefname};
2554 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
2556 $gur ||= new IO::Handle;
2557 open $gur, "|-", qw(git update-ref --stdin) or die $!;
2559 printf $gur "delete %s %s\n", $fullrefname, $objid;
2562 close $gur or failedcmd "git update-ref delete lrfetchrefs";
2566 if (defined $dsc_hash) {
2567 fail "missing remote git history even though dsc has hash -".
2568 " could not find ref ".rref()." at ".access_giturl()
2569 unless $lastpush_hash;
2570 ensure_we_have_orig();
2571 if ($dsc_hash eq $lastpush_hash) {
2572 @mergeinputs = $dsc_mergeinput
2573 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
2574 print STDERR <<END or die $!;
2576 Git commit in archive is behind the last version allegedly pushed/uploaded.
2577 Commit referred to by archive: $dsc_hash
2578 Last version pushed with dgit: $lastpush_hash
2581 @mergeinputs = ($lastpush_mergeinput);
2583 # Archive has .dsc which is not a descendant of the last dgit
2584 # push. This can happen if the archive moves .dscs about.
2585 # Just follow its lead.
2586 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
2587 progress "archive .dsc names newer git commit";
2588 @mergeinputs = ($dsc_mergeinput);
2590 progress "archive .dsc names other git commit, fixing up";
2591 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
2595 @mergeinputs = generate_commits_from_dsc();
2596 # We have just done an import. Now, our import algorithm might
2597 # have been improved. But even so we do not want to generate
2598 # a new different import of the same package. So if the
2599 # version numbers are the same, just use our existing version.
2600 # If the version numbers are different, the archive has changed
2601 # (perhaps, rewound).
2602 if ($lastfetch_mergeinput &&
2603 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
2604 (mergeinfo_version $mergeinputs[0]) )) {
2605 @mergeinputs = ($lastfetch_mergeinput);
2607 } elsif ($lastpush_hash) {
2608 # only in git, not in the archive yet
2609 @mergeinputs = ($lastpush_mergeinput);
2610 print STDERR <<END or die $!;
2612 Package not found in the archive, but has allegedly been pushed using dgit.
2616 printdebug "nothing found!\n";
2617 if (defined $skew_warning_vsn) {
2618 print STDERR <<END or die $!;
2620 Warning: relevant archive skew detected.
2621 Archive allegedly contains $skew_warning_vsn
2622 But we were not able to obtain any version from the archive or git.
2626 unshift @end, $del_lrfetchrefs;
2630 if ($lastfetch_hash &&
2632 my $h = $_->{Commit};
2633 $h and is_fast_fwd($lastfetch_hash, $h);
2634 # If true, one of the existing parents of this commit
2635 # is a descendant of the $lastfetch_hash, so we'll
2636 # be ff from that automatically.
2640 push @mergeinputs, $lastfetch_mergeinput;
2643 printdebug "fetch mergeinfos:\n";
2644 foreach my $mi (@mergeinputs) {
2646 printdebug " commit $mi->{Commit} $mi->{Info}\n";
2648 printdebug sprintf " ReverseParents=%d Message=%s",
2649 $mi->{ReverseParents}, $mi->{Message};
2653 my $compat_info= pop @mergeinputs
2654 if $mergeinputs[$#mergeinputs]{Message};
2656 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
2659 if (@mergeinputs > 1) {
2661 my $tree_commit = $mergeinputs[0]{Commit};
2663 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
2664 $tree =~ m/\n\n/; $tree = $`;
2665 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
2668 # We use the changelog author of the package in question the
2669 # author of this pseudo-merge. This is (roughly) correct if
2670 # this commit is simply representing aa non-dgit upload.
2671 # (Roughly because it does not record sponsorship - but we
2672 # don't have sponsorship info because that's in the .changes,
2673 # which isn't in the archivw.)
2675 # But, it might be that we are representing archive history
2676 # updates (including in-archive copies). These are not really
2677 # the responsibility of the person who created the .dsc, but
2678 # there is no-one whose name we should better use. (The
2679 # author of the .dsc-named commit is clearly worse.)
2681 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
2682 my $author = clogp_authline $useclogp;
2683 my $cversion = getfield $useclogp, 'Version';
2685 my $mcf = ".git/dgit/mergecommit";
2686 open MC, ">", $mcf or die "$mcf $!";
2687 print MC <<END or die $!;
2691 my @parents = grep { $_->{Commit} } @mergeinputs;
2692 @parents = reverse @parents if $compat_info->{ReverseParents};
2693 print MC <<END or die $! foreach @parents;
2697 print MC <<END or die $!;
2703 if (defined $compat_info->{Message}) {
2704 print MC $compat_info->{Message} or die $!;
2706 print MC <<END or die $!;
2707 Record $package ($cversion) in archive suite $csuite
2711 my $message_add_info = sub {
2713 my $mversion = mergeinfo_version $mi;
2714 printf MC " %-20s %s\n", $mversion, $mi->{Info}
2718 $message_add_info->($mergeinputs[0]);
2719 print MC <<END or die $!;
2720 should be treated as descended from
2722 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
2726 $hash = make_commit $mcf;
2728 $hash = $mergeinputs[0]{Commit};
2730 printdebug "fetch hash=$hash\n";
2733 my ($lasth, $what) = @_;
2734 return unless $lasth;
2735 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
2738 $chkff->($lastpush_hash, 'dgit repo server tip (last push)');
2739 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
2741 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2742 'DGIT_ARCHIVE', $hash;
2743 cmdoutput @git, qw(log -n2), $hash;
2744 # ... gives git a chance to complain if our commit is malformed
2746 if (defined $skew_warning_vsn) {
2748 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
2749 my $gotclogp = commit_getclogp($hash);
2750 my $got_vsn = getfield $gotclogp, 'Version';
2751 printdebug "SKEW CHECK GOT $got_vsn\n";
2752 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
2753 print STDERR <<END or die $!;
2755 Warning: archive skew detected. Using the available version:
2756 Archive allegedly contains $skew_warning_vsn
2757 We were able to obtain only $got_vsn
2763 if ($lastfetch_hash ne $hash) {
2764 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2768 dryrun_report @upd_cmd;
2772 lrfetchref_used lrfetchref();
2774 unshift @end, $del_lrfetchrefs;
2778 sub set_local_git_config ($$) {
2780 runcmd @git, qw(config), $k, $v;
2783 sub setup_mergechangelogs (;$) {
2785 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
2787 my $driver = 'dpkg-mergechangelogs';
2788 my $cb = "merge.$driver";
2789 my $attrs = '.git/info/attributes';
2790 ensuredir '.git/info';
2792 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
2793 if (!open ATTRS, "<", $attrs) {
2794 $!==ENOENT or die "$attrs: $!";
2798 next if m{^debian/changelog\s};
2799 print NATTRS $_, "\n" or die $!;
2801 ATTRS->error and die $!;
2804 print NATTRS "debian/changelog merge=$driver\n" or die $!;
2807 set_local_git_config "$cb.name", 'debian/changelog merge driver';
2808 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
2810 rename "$attrs.new", "$attrs" or die "$attrs: $!";
2813 sub setup_useremail (;$) {
2815 return unless $always || access_cfg_bool(1, 'setup-useremail');
2818 my ($k, $envvar) = @_;
2819 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
2820 return unless defined $v;
2821 set_local_git_config "user.$k", $v;
2824 $setup->('email', 'DEBEMAIL');
2825 $setup->('name', 'DEBFULLNAME');
2828 sub ensure_setup_existing_tree () {
2829 my $k = "remote.$remotename.skipdefaultupdate";
2830 my $c = git_get_config $k;
2831 return if defined $c;
2832 set_local_git_config $k, 'true';
2835 sub setup_new_tree () {
2836 setup_mergechangelogs();
2842 canonicalise_suite();
2843 badusage "dry run makes no sense with clone" unless act_local();
2844 my $hasgit = check_for_git();
2845 mkdir $dstdir or fail "create \`$dstdir': $!";
2847 runcmd @git, qw(init -q);
2848 my $giturl = access_giturl(1);
2849 if (defined $giturl) {
2850 open H, "> .git/HEAD" or die $!;
2851 print H "ref: ".lref()."\n" or die $!;
2853 runcmd @git, qw(remote add), 'origin', $giturl;
2856 progress "fetching existing git history";
2858 runcmd_ordryrun_local @git, qw(fetch origin);
2860 progress "starting new git history";
2862 fetch_from_archive() or no_such_package;
2863 my $vcsgiturl = $dsc->{'Vcs-Git'};
2864 if (length $vcsgiturl) {
2865 $vcsgiturl =~ s/\s+-b\s+\S+//g;
2866 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
2869 runcmd @git, qw(reset --hard), lrref();
2870 printdone "ready for work in $dstdir";
2874 if (check_for_git()) {
2877 fetch_from_archive() or no_such_package();
2878 printdone "fetched into ".lrref();
2883 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
2885 printdone "fetched to ".lrref()." and merged into HEAD";
2888 sub check_not_dirty () {
2889 foreach my $f (qw(local-options local-patch-header)) {
2890 if (stat_exists "debian/source/$f") {
2891 fail "git tree contains debian/source/$f";
2895 return if $ignoredirty;
2897 my @cmd = (@git, qw(diff --quiet HEAD));
2899 $!=0; $?=-1; system @cmd;
2902 fail "working tree is dirty (does not match HEAD)";
2908 sub commit_admin ($) {
2911 runcmd_ordryrun_local @git, qw(commit -m), $m;
2914 sub commit_quilty_patch () {
2915 my $output = cmdoutput @git, qw(status --porcelain);
2917 foreach my $l (split /\n/, $output) {
2918 next unless $l =~ m/\S/;
2919 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
2923 delete $adds{'.pc'}; # if there wasn't one before, don't add it
2925 progress "nothing quilty to commit, ok.";
2928 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
2929 runcmd_ordryrun_local @git, qw(add -f), @adds;
2931 Commit Debian 3.0 (quilt) metadata
2933 [dgit ($our_version) quilt-fixup]
2937 sub get_source_format () {
2939 if (open F, "debian/source/options") {
2943 s/\s+$//; # ignore missing final newline
2945 my ($k, $v) = ($`, $'); #');
2946 $v =~ s/^"(.*)"$/$1/;
2952 F->error and die $!;
2955 die $! unless $!==&ENOENT;
2958 if (!open F, "debian/source/format") {
2959 die $! unless $!==&ENOENT;
2963 F->error and die $!;
2965 return ($_, \%options);
2968 sub madformat_wantfixup ($) {
2970 return 0 unless $format eq '3.0 (quilt)';
2971 our $quilt_mode_warned;
2972 if ($quilt_mode eq 'nocheck') {
2973 progress "Not doing any fixup of \`$format' due to".
2974 " ----no-quilt-fixup or --quilt=nocheck"
2975 unless $quilt_mode_warned++;
2978 progress "Format \`$format', need to check/update patch stack"
2979 unless $quilt_mode_warned++;
2983 # An "infopair" is a tuple [ $thing, $what ]
2984 # (often $thing is a commit hash; $what is a description)
2986 sub infopair_cond_equal ($$) {
2988 $x->[0] eq $y->[0] or fail <<END;
2989 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
2993 sub infopair_lrf_tag_lookup ($$) {
2994 my ($tagnames, $what) = @_;
2995 # $tagname may be an array ref
2996 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
2997 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
2998 foreach my $tagname (@tagnames) {
2999 my $lrefname = lrfetchrefs."/tags/$tagname";
3000 my $tagobj = $lrfetchrefs_f{$lrefname};
3001 next unless defined $tagobj;
3002 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3003 return [ git_rev_parse($tagobj), $what ];
3005 fail @tagnames==1 ? <<END : <<END;
3006 Wanted tag $what (@tagnames) on dgit server, but not found
3008 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3012 sub infopair_cond_ff ($$) {
3013 my ($anc,$desc) = @_;
3014 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3015 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3019 sub pseudomerge_version_check ($$) {
3020 my ($clogp, $archive_hash) = @_;
3022 my $arch_clogp = commit_getclogp $archive_hash;
3023 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3024 'version currently in archive' ];
3025 if (defined $overwrite_version) {
3026 if (length $overwrite_version) {
3027 infopair_cond_equal([ $overwrite_version,
3028 '--overwrite= version' ],
3031 my $v = $i_arch_v->[0];
3032 progress "Checking package changelog for archive version $v ...";
3034 my @xa = ("-f$v", "-t$v");
3035 my $vclogp = parsechangelog @xa;
3036 my $cv = [ (getfield $vclogp, 'Version'),
3037 "Version field from dpkg-parsechangelog @xa" ];
3038 infopair_cond_equal($i_arch_v, $cv);
3041 $@ =~ s/^dgit: //gm;
3043 "Perhaps debian/changelog does not mention $v ?";
3048 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3052 sub pseudomerge_make_commit ($$$$ $$) {
3053 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3054 $msg_cmd, $msg_msg) = @_;
3055 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3057 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3058 my $authline = clogp_authline $clogp;
3062 !defined $overwrite_version ? ""
3063 : !length $overwrite_version ? " --overwrite"
3064 : " --overwrite=".$overwrite_version;
3067 my $pmf = ".git/dgit/pseudomerge";
3068 open MC, ">", $pmf or die "$pmf $!";
3069 print MC <<END or die $!;
3072 parent $archive_hash
3082 return make_commit($pmf);
3085 sub splitbrain_pseudomerge ($$$$) {
3086 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3087 # => $merged_dgitview
3088 printdebug "splitbrain_pseudomerge...\n";
3090 # We: debian/PREVIOUS HEAD($maintview)
3091 # expect: o ----------------- o
3094 # a/d/PREVIOUS $dgitview
3097 # we do: `------------------ o
3101 return $dgitview unless defined $archive_hash;
3103 printdebug "splitbrain_pseudomerge...\n";
3105 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3107 if (!defined $overwrite_version) {
3108 progress "Checking that HEAD inciudes all changes in archive...";
3111 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3113 if (defined $overwrite_version) {
3115 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
3116 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3117 my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
3118 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3119 my $i_archive = [ $archive_hash, "current archive contents" ];
3121 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3123 infopair_cond_equal($i_dgit, $i_archive);
3124 infopair_cond_ff($i_dep14, $i_dgit);
3125 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3129 $us: check failed (maybe --overwrite is needed, consult documentation)
3134 my $r = pseudomerge_make_commit
3135 $clogp, $dgitview, $archive_hash, $i_arch_v,
3136 "dgit --quilt=$quilt_mode",
3137 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3138 Declare fast forward from $i_arch_v->[0]
3140 Make fast forward from $i_arch_v->[0]
3143 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3147 sub plain_overwrite_pseudomerge ($$$) {
3148 my ($clogp, $head, $archive_hash) = @_;
3150 printdebug "plain_overwrite_pseudomerge...";
3152 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3154 return $head if is_fast_fwd $archive_hash, $head;
3156 my $m = "Declare fast forward from $i_arch_v->[0]";
3158 my $r = pseudomerge_make_commit
3159 $clogp, $head, $archive_hash, $i_arch_v,
3162 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3164 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3168 sub push_parse_changelog ($) {
3171 my $clogp = Dpkg::Control::Hash->new();
3172 $clogp->load($clogpfn) or die;
3174 $package = getfield $clogp, 'Source';
3175 my $cversion = getfield $clogp, 'Version';
3176 my $tag = debiantag($cversion, access_basedistro);
3177 runcmd @git, qw(check-ref-format), $tag;
3179 my $dscfn = dscfn($cversion);
3181 return ($clogp, $cversion, $dscfn);
3184 sub push_parse_dsc ($$$) {
3185 my ($dscfn,$dscfnwhat, $cversion) = @_;
3186 $dsc = parsecontrol($dscfn,$dscfnwhat);
3187 my $dversion = getfield $dsc, 'Version';
3188 my $dscpackage = getfield $dsc, 'Source';
3189 ($dscpackage eq $package && $dversion eq $cversion) or
3190 fail "$dscfn is for $dscpackage $dversion".
3191 " but debian/changelog is for $package $cversion";
3194 sub push_tagwants ($$$$) {
3195 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3198 TagFn => \&debiantag,
3203 if (defined $maintviewhead) {
3205 TagFn => \&debiantag_maintview,
3206 Objid => $maintviewhead,
3207 TfSuffix => '-maintview',
3211 foreach my $tw (@tagwants) {
3212 $tw->{Tag} = $tw->{TagFn}($cversion, access_basedistro);
3213 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3215 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3219 sub push_mktags ($$ $$ $) {
3221 $changesfile,$changesfilewhat,
3224 die unless $tagwants->[0]{View} eq 'dgit';
3226 $dsc->{$ourdscfield[0]} = $tagwants->[0]{Objid};
3227 $dsc->save("$dscfn.tmp") or die $!;
3229 my $changes = parsecontrol($changesfile,$changesfilewhat);
3230 foreach my $field (qw(Source Distribution Version)) {
3231 $changes->{$field} eq $clogp->{$field} or
3232 fail "changes field $field \`$changes->{$field}'".
3233 " does not match changelog \`$clogp->{$field}'";
3236 my $cversion = getfield $clogp, 'Version';
3237 my $clogsuite = getfield $clogp, 'Distribution';
3239 # We make the git tag by hand because (a) that makes it easier
3240 # to control the "tagger" (b) we can do remote signing
3241 my $authline = clogp_authline $clogp;
3242 my $delibs = join(" ", "",@deliberatelies);
3243 my $declaredistro = access_basedistro();
3247 my $tfn = $tw->{Tfn};
3248 my $head = $tw->{Objid};
3249 my $tag = $tw->{Tag};
3251 open TO, '>', $tfn->('.tmp') or die $!;
3252 print TO <<END or die $!;
3259 if ($tw->{View} eq 'dgit') {
3260 print TO <<END or die $!;
3261 $package release $cversion for $clogsuite ($csuite) [dgit]
3262 [dgit distro=$declaredistro$delibs]
3264 foreach my $ref (sort keys %previously) {
3265 print TO <<END or die $!;
3266 [dgit previously:$ref=$previously{$ref}]
3269 } elsif ($tw->{View} eq 'maint') {
3270 print TO <<END or die $!;
3271 $package release $cversion for $clogsuite ($csuite)
3272 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3275 die Dumper($tw)."?";
3280 my $tagobjfn = $tfn->('.tmp');
3282 if (!defined $keyid) {
3283 $keyid = access_cfg('keyid','RETURN-UNDEF');
3285 if (!defined $keyid) {
3286 $keyid = getfield $clogp, 'Maintainer';
3288 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3289 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3290 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3291 push @sign_cmd, $tfn->('.tmp');
3292 runcmd_ordryrun @sign_cmd;
3294 $tagobjfn = $tfn->('.signed.tmp');
3295 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
3296 $tfn->('.tmp'), $tfn->('.tmp.asc');
3302 my @r = map { $mktag->($_); } @$tagwants;
3306 sub sign_changes ($) {
3307 my ($changesfile) = @_;
3309 my @debsign_cmd = @debsign;
3310 push @debsign_cmd, "-k$keyid" if defined $keyid;
3311 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
3312 push @debsign_cmd, $changesfile;
3313 runcmd_ordryrun @debsign_cmd;
3318 printdebug "actually entering push\n";
3320 supplementary_message(<<'END');
3321 Push failed, while checking state of the archive.
3322 You can retry the push, after fixing the problem, if you like.
3324 if (check_for_git()) {
3327 my $archive_hash = fetch_from_archive();
3328 if (!$archive_hash) {
3330 fail "package appears to be new in this suite;".
3331 " if this is intentional, use --new";
3334 supplementary_message(<<'END');
3335 Push failed, while preparing your push.
3336 You can retry the push, after fixing the problem, if you like.
3339 need_tagformat 'new', "quilt mode $quilt_mode"
3340 if quiltmode_splitbrain;
3344 access_giturl(); # check that success is vaguely likely
3347 my $clogpfn = ".git/dgit/changelog.822.tmp";
3348 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
3350 responder_send_file('parsed-changelog', $clogpfn);
3352 my ($clogp, $cversion, $dscfn) =
3353 push_parse_changelog("$clogpfn");
3355 my $dscpath = "$buildproductsdir/$dscfn";
3356 stat_exists $dscpath or
3357 fail "looked for .dsc $dscfn, but $!;".
3358 " maybe you forgot to build";
3360 responder_send_file('dsc', $dscpath);
3362 push_parse_dsc($dscpath, $dscfn, $cversion);
3364 my $format = getfield $dsc, 'Format';
3365 printdebug "format $format\n";
3367 my $actualhead = git_rev_parse('HEAD');
3368 my $dgithead = $actualhead;
3369 my $maintviewhead = undef;
3371 my $upstreamversion = $clogp->{Version};
3372 $upstreamversion =~ s/-[^-]*$//;
3374 if (madformat_wantfixup($format)) {
3375 # user might have not used dgit build, so maybe do this now:
3376 if (quiltmode_splitbrain()) {
3378 quilt_make_fake_dsc($upstreamversion);
3380 ($dgithead, $cachekey) =
3381 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
3383 "--quilt=$quilt_mode but no cached dgit view:
3384 perhaps tree changed since dgit build[-source] ?";
3386 $dgithead = splitbrain_pseudomerge($clogp,
3387 $actualhead, $dgithead,
3389 $maintviewhead = $actualhead;
3390 changedir '../../../..';
3391 prep_ud(); # so _only_subdir() works, below
3393 commit_quilty_patch();
3397 if (defined $overwrite_version && !defined $maintviewhead) {
3398 $dgithead = plain_overwrite_pseudomerge($clogp,
3406 if ($archive_hash) {
3407 if (is_fast_fwd($archive_hash, $dgithead)) {
3409 } elsif (deliberately_not_fast_forward) {
3412 fail "dgit push: HEAD is not a descendant".
3413 " of the archive's version.\n".
3414 "To overwrite the archive's contents,".
3415 " pass --overwrite[=VERSION].\n".
3416 "To rewind history, if permitted by the archive,".
3417 " use --deliberately-not-fast-forward.";
3422 progress "checking that $dscfn corresponds to HEAD";
3423 runcmd qw(dpkg-source -x --),
3424 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
3425 my ($tree,$dir) = mktree_in_ud_from_only_subdir();
3426 check_for_vendor_patches() if madformat($dsc->{format});
3427 changedir '../../../..';
3428 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
3429 debugcmd "+",@diffcmd;
3431 my $r = system @diffcmd;
3434 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
3436 HEAD specifies a different tree to $dscfn:
3438 Perhaps you forgot to build. Or perhaps there is a problem with your
3439 source tree (see dgit(7) for some hints). To see a full diff, run
3446 if (!$changesfile) {
3447 my $pat = changespat $cversion;
3448 my @cs = glob "$buildproductsdir/$pat";
3449 fail "failed to find unique changes file".
3450 " (looked for $pat in $buildproductsdir);".
3451 " perhaps you need to use dgit -C"
3453 ($changesfile) = @cs;
3455 $changesfile = "$buildproductsdir/$changesfile";
3458 # Check that changes and .dsc agree enough
3459 $changesfile =~ m{[^/]*$};
3460 my $changes = parsecontrol($changesfile,$&);
3461 files_compare_inputs($dsc, $changes)
3462 unless forceing [qw(dsc-changes-mismatch)];
3464 # Perhaps adjust .dsc to contain right set of origs
3465 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
3467 unless forceing [qw(changes-origs-exactly)];
3469 # Checks complete, we're going to try and go ahead:
3471 responder_send_file('changes',$changesfile);
3472 responder_send_command("param head $dgithead");
3473 responder_send_command("param csuite $csuite");
3474 responder_send_command("param tagformat $tagformat");
3475 if (defined $maintviewhead) {
3476 die unless ($protovsn//4) >= 4;
3477 responder_send_command("param maint-view $maintviewhead");
3480 if (deliberately_not_fast_forward) {
3481 git_for_each_ref(lrfetchrefs, sub {
3482 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
3483 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
3484 responder_send_command("previously $rrefname=$objid");
3485 $previously{$rrefname} = $objid;
3489 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
3493 supplementary_message(<<'END');
3494 Push failed, while signing the tag.
3495 You can retry the push, after fixing the problem, if you like.
3497 # If we manage to sign but fail to record it anywhere, it's fine.
3498 if ($we_are_responder) {
3499 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
3500 responder_receive_files('signed-tag', @tagobjfns);
3502 @tagobjfns = push_mktags($clogp,$dscpath,
3503 $changesfile,$changesfile,
3506 supplementary_message(<<'END');
3507 Push failed, *after* signing the tag.
3508 If you want to try again, you should use a new version number.
3511 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
3513 foreach my $tw (@tagwants) {
3514 my $tag = $tw->{Tag};
3515 my $tagobjfn = $tw->{TagObjFn};
3517 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
3518 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
3519 runcmd_ordryrun_local
3520 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
3523 supplementary_message(<<'END');
3524 Push failed, while updating the remote git repository - see messages above.
3525 If you want to try again, you should use a new version number.
3527 if (!check_for_git()) {
3528 create_remote_git_repo();
3531 my @pushrefs = $forceflag.$dgithead.":".rrref();
3532 foreach my $tw (@tagwants) {
3533 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
3536 runcmd_ordryrun @git,
3537 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
3538 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
3540 supplementary_message(<<'END');
3541 Push failed, after updating the remote git repository.
3542 If you want to try again, you must use a new version number.
3544 if ($we_are_responder) {
3545 my $dryrunsuffix = act_local() ? "" : ".tmp";
3546 responder_receive_files('signed-dsc-changes',
3547 "$dscpath$dryrunsuffix",
3548 "$changesfile$dryrunsuffix");
3551 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
3553 progress "[new .dsc left in $dscpath.tmp]";
3555 sign_changes $changesfile;
3558 supplementary_message(<<END);
3559 Push failed, while uploading package(s) to the archive server.
3560 You can retry the upload of exactly these same files with dput of:
3562 If that .changes file is broken, you will need to use a new version
3563 number for your next attempt at the upload.
3565 my $host = access_cfg('upload-host','RETURN-UNDEF');
3566 my @hostarg = defined($host) ? ($host,) : ();
3567 runcmd_ordryrun @dput, @hostarg, $changesfile;
3568 printdone "pushed and uploaded $cversion";
3570 supplementary_message('');
3571 responder_send_command("complete");
3578 badusage "-p is not allowed with clone; specify as argument instead"
3579 if defined $package;
3582 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
3583 ($package,$isuite) = @ARGV;
3584 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
3585 ($package,$dstdir) = @ARGV;
3586 } elsif (@ARGV==3) {
3587 ($package,$isuite,$dstdir) = @ARGV;
3589 badusage "incorrect arguments to dgit clone";
3591 $dstdir ||= "$package";
3593 if (stat_exists $dstdir) {
3594 fail "$dstdir already exists";
3598 if ($rmonerror && !$dryrun_level) {
3599 $cwd_remove= getcwd();
3601 return unless defined $cwd_remove;
3602 if (!chdir "$cwd_remove") {
3603 return if $!==&ENOENT;
3604 die "chdir $cwd_remove: $!";
3607 rmtree($dstdir) or die "remove $dstdir: $!\n";
3608 } elsif (grep { $! == $_ }
3609 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
3611 print STDERR "check whether to remove $dstdir: $!\n";
3617 $cwd_remove = undef;
3620 sub branchsuite () {
3621 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
3622 if ($branch =~ m#$lbranch_re#o) {
3629 sub fetchpullargs () {
3631 if (!defined $package) {
3632 my $sourcep = parsecontrol('debian/control','debian/control');
3633 $package = getfield $sourcep, 'Source';
3636 # $isuite = branchsuite(); # this doesn't work because dak hates canons
3638 my $clogp = parsechangelog();
3639 $isuite = getfield $clogp, 'Distribution';
3641 canonicalise_suite();
3642 progress "fetching from suite $csuite";
3643 } elsif (@ARGV==1) {
3645 canonicalise_suite();
3647 badusage "incorrect arguments to dgit fetch or dgit pull";
3666 badusage "-p is not allowed with dgit push" if defined $package;
3668 my $clogp = parsechangelog();
3669 $package = getfield $clogp, 'Source';
3672 } elsif (@ARGV==1) {
3673 ($specsuite) = (@ARGV);
3675 badusage "incorrect arguments to dgit push";
3677 $isuite = getfield $clogp, 'Distribution';
3679 local ($package) = $existing_package; # this is a hack
3680 canonicalise_suite();
3682 canonicalise_suite();
3684 if (defined $specsuite &&
3685 $specsuite ne $isuite &&
3686 $specsuite ne $csuite) {
3687 fail "dgit push: changelog specifies $isuite ($csuite)".
3688 " but command line specifies $specsuite";
3693 #---------- remote commands' implementation ----------
3695 sub cmd_remote_push_build_host {
3696 my ($nrargs) = shift @ARGV;
3697 my (@rargs) = @ARGV[0..$nrargs-1];
3698 @ARGV = @ARGV[$nrargs..$#ARGV];
3700 my ($dir,$vsnwant) = @rargs;
3701 # vsnwant is a comma-separated list; we report which we have
3702 # chosen in our ready response (so other end can tell if they
3705 $we_are_responder = 1;
3706 $us .= " (build host)";
3710 open PI, "<&STDIN" or die $!;
3711 open STDIN, "/dev/null" or die $!;
3712 open PO, ">&STDOUT" or die $!;
3714 open STDOUT, ">&STDERR" or die $!;
3718 ($protovsn) = grep {
3719 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
3720 } @rpushprotovsn_support;
3722 fail "build host has dgit rpush protocol versions ".
3723 (join ",", @rpushprotovsn_support).
3724 " but invocation host has $vsnwant"
3725 unless defined $protovsn;
3727 responder_send_command("dgit-remote-push-ready $protovsn");
3728 rpush_handle_protovsn_bothends();
3733 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
3734 # ... for compatibility with proto vsn.1 dgit (just so that user gets
3735 # a good error message)
3737 sub rpush_handle_protovsn_bothends () {
3738 if ($protovsn < 4) {
3739 need_tagformat 'old', "rpush negotiated protocol $protovsn";
3748 my $report = i_child_report();
3749 if (defined $report) {
3750 printdebug "($report)\n";
3751 } elsif ($i_child_pid) {
3752 printdebug "(killing build host child $i_child_pid)\n";
3753 kill 15, $i_child_pid;
3755 if (defined $i_tmp && !defined $initiator_tempdir) {
3757 eval { rmtree $i_tmp; };
3761 END { i_cleanup(); }
3764 my ($base,$selector,@args) = @_;
3765 $selector =~ s/\-/_/g;
3766 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
3773 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
3781 push @rargs, join ",", @rpushprotovsn_support;
3784 push @rdgit, @ropts;
3785 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
3787 my @cmd = (@ssh, $host, shellquote @rdgit);
3790 if (defined $initiator_tempdir) {
3791 rmtree $initiator_tempdir;
3792 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
3793 $i_tmp = $initiator_tempdir;
3797 $i_child_pid = open2(\*RO, \*RI, @cmd);
3799 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
3800 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
3801 $supplementary_message = '' unless $protovsn >= 3;
3803 fail "rpush negotiated protocol version $protovsn".
3804 " which does not support quilt mode $quilt_mode"
3805 if quiltmode_splitbrain;
3807 rpush_handle_protovsn_bothends();
3809 my ($icmd,$iargs) = initiator_expect {
3810 m/^(\S+)(?: (.*))?$/;
3813 i_method "i_resp", $icmd, $iargs;
3817 sub i_resp_progress ($) {
3819 my $msg = protocol_read_bytes \*RO, $rhs;
3823 sub i_resp_supplementary_message ($) {
3825 $supplementary_message = protocol_read_bytes \*RO, $rhs;
3828 sub i_resp_complete {
3829 my $pid = $i_child_pid;
3830 $i_child_pid = undef; # prevents killing some other process with same pid
3831 printdebug "waiting for build host child $pid...\n";
3832 my $got = waitpid $pid, 0;
3833 die $! unless $got == $pid;
3834 die "build host child failed $?" if $?;
3837 printdebug "all done\n";
3841 sub i_resp_file ($) {
3843 my $localname = i_method "i_localname", $keyword;
3844 my $localpath = "$i_tmp/$localname";
3845 stat_exists $localpath and
3846 badproto \*RO, "file $keyword ($localpath) twice";
3847 protocol_receive_file \*RO, $localpath;
3848 i_method "i_file", $keyword;
3853 sub i_resp_param ($) {
3854 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
3858 sub i_resp_previously ($) {
3859 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
3860 or badproto \*RO, "bad previously spec";
3861 my $r = system qw(git check-ref-format), $1;
3862 die "bad previously ref spec ($r)" if $r;
3863 $previously{$1} = $2;
3868 sub i_resp_want ($) {
3870 die "$keyword ?" if $i_wanted{$keyword}++;
3871 my @localpaths = i_method "i_want", $keyword;
3872 printdebug "[[ $keyword @localpaths\n";
3873 foreach my $localpath (@localpaths) {
3874 protocol_send_file \*RI, $localpath;
3876 print RI "files-end\n" or die $!;
3879 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
3881 sub i_localname_parsed_changelog {
3882 return "remote-changelog.822";
3884 sub i_file_parsed_changelog {
3885 ($i_clogp, $i_version, $i_dscfn) =
3886 push_parse_changelog "$i_tmp/remote-changelog.822";
3887 die if $i_dscfn =~ m#/|^\W#;
3890 sub i_localname_dsc {
3891 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3896 sub i_localname_changes {
3897 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
3898 $i_changesfn = $i_dscfn;
3899 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
3900 return $i_changesfn;
3902 sub i_file_changes { }
3904 sub i_want_signed_tag {
3905 printdebug Dumper(\%i_param, $i_dscfn);
3906 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
3907 && defined $i_param{'csuite'}
3908 or badproto \*RO, "premature desire for signed-tag";
3909 my $head = $i_param{'head'};
3910 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
3912 my $maintview = $i_param{'maint-view'};
3913 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
3916 if ($protovsn >= 4) {
3917 my $p = $i_param{'tagformat'} // '<undef>';
3919 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
3922 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
3924 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
3926 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
3929 push_mktags $i_clogp, $i_dscfn,
3930 $i_changesfn, 'remote changes',
3934 sub i_want_signed_dsc_changes {
3935 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
3936 sign_changes $i_changesfn;
3937 return ($i_dscfn, $i_changesfn);
3940 #---------- building etc. ----------
3946 #----- `3.0 (quilt)' handling -----
3948 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
3950 sub quiltify_dpkg_commit ($$$;$) {
3951 my ($patchname,$author,$msg, $xinfo) = @_;
3955 my $descfn = ".git/dgit/quilt-description.tmp";
3956 open O, '>', $descfn or die "$descfn: $!";
3957 $msg =~ s/\n+/\n\n/;
3958 print O <<END or die $!;
3960 ${xinfo}Subject: $msg
3967 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
3968 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
3969 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
3970 runcmd @dpkgsource, qw(--commit .), $patchname;
3974 sub quiltify_trees_differ ($$;$$$) {
3975 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
3976 # returns true iff the two tree objects differ other than in debian/
3977 # with $finegrained,
3978 # returns bitmask 01 - differ in upstream files except .gitignore
3979 # 02 - differ in .gitignore
3980 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
3981 # is set for each modified .gitignore filename $fn
3982 # if $unrepres is defined, array ref to which is appeneded
3983 # a list of unrepresentable changes (removals of upstream files
3986 my @cmd = (@git, qw(diff-tree -z));
3987 push @cmd, qw(--name-only) unless $unrepres;
3988 push @cmd, qw(-r) if $finegrained || $unrepres;
3990 my $diffs= cmdoutput @cmd;
3993 foreach my $f (split /\0/, $diffs) {
3994 if ($unrepres && !@lmodes) {
3995 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
3998 my ($oldmode,$newmode) = @lmodes;
4001 next if $f =~ m#^debian(?:/.*)?$#s;
4005 die "deleted\n" unless $newmode =~ m/[^0]/;
4006 die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
4007 if ($oldmode =~ m/[^0]/) {
4008 die "mode changed\n" if $oldmode ne $newmode;
4010 die "non-default mode\n" unless $newmode =~ m/^100644$/;
4014 local $/="\n"; chomp $@;
4015 push @$unrepres, [ $f, $@ ];
4019 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4020 $r |= $isignore ? 02 : 01;
4021 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4023 printdebug "quiltify_trees_differ $x $y => $r\n";
4027 sub quiltify_tree_sentinelfiles ($) {
4028 # lists the `sentinel' files present in the tree
4030 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4031 qw(-- debian/rules debian/control);
4036 sub quiltify_splitbrain_needed () {
4037 if (!$split_brain) {
4038 progress "dgit view: changes are required...";
4039 runcmd @git, qw(checkout -q -b dgit-view);
4044 sub quiltify_splitbrain ($$$$$$) {
4045 my ($clogp, $unapplied, $headref, $diffbits,
4046 $editedignores, $cachekey) = @_;
4047 if ($quilt_mode !~ m/gbp|dpm/) {
4048 # treat .gitignore just like any other upstream file
4049 $diffbits = { %$diffbits };
4050 $_ = !!$_ foreach values %$diffbits;
4052 # We would like any commits we generate to be reproducible
4053 my @authline = clogp_authline($clogp);
4054 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4055 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4056 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4057 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4058 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4059 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4061 if ($quilt_mode =~ m/gbp|unapplied/ &&
4062 ($diffbits->{O2H} & 01)) {
4064 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4065 " but git tree differs from orig in upstream files.";
4066 if (!stat_exists "debian/patches") {
4068 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4072 if ($quilt_mode =~ m/dpm/ &&
4073 ($diffbits->{H2A} & 01)) {
4075 --quilt=$quilt_mode specified, implying patches-applied git tree
4076 but git tree differs from result of applying debian/patches to upstream
4079 if ($quilt_mode =~ m/gbp|unapplied/ &&
4080 ($diffbits->{O2A} & 01)) { # some patches
4081 quiltify_splitbrain_needed();
4082 progress "dgit view: creating patches-applied version using gbp pq";
4083 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4084 # gbp pq import creates a fresh branch; push back to dgit-view
4085 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4086 runcmd @git, qw(checkout -q dgit-view);
4088 if ($quilt_mode =~ m/gbp|dpm/ &&
4089 ($diffbits->{O2A} & 02)) {
4091 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4092 tool which does not create patches for changes to upstream
4093 .gitignores: but, such patches exist in debian/patches.
4096 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4097 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4098 quiltify_splitbrain_needed();
4099 progress "dgit view: creating patch to represent .gitignore changes";
4100 ensuredir "debian/patches";
4101 my $gipatch = "debian/patches/auto-gitignore";
4102 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4103 stat GIPATCH or die "$gipatch: $!";
4104 fail "$gipatch already exists; but want to create it".
4105 " to record .gitignore changes" if (stat _)[7];
4106 print GIPATCH <<END or die "$gipatch: $!";
4107 Subject: Update .gitignore from Debian packaging branch
4109 The Debian packaging git branch contains these updates to the upstream
4110 .gitignore file(s). This patch is autogenerated, to provide these
4111 updates to users of the official Debian archive view of the package.
4113 [dgit ($our_version) update-gitignore]
4116 close GIPATCH or die "$gipatch: $!";
4117 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4118 $unapplied, $headref, "--", sort keys %$editedignores;
4119 open SERIES, "+>>", "debian/patches/series" or die $!;
4120 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4122 defined read SERIES, $newline, 1 or die $!;
4123 print SERIES "\n" or die $! unless $newline eq "\n";
4124 print SERIES "auto-gitignore\n" or die $!;
4125 close SERIES or die $!;
4126 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4128 Commit patch to update .gitignore
4130 [dgit ($our_version) update-gitignore-quilt-fixup]
4134 my $dgitview = git_rev_parse 'HEAD';
4136 changedir '../../../..';
4137 # When we no longer need to support squeeze, use --create-reflog
4139 ensuredir ".git/logs/refs/dgit-intern";
4140 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4143 my $oldcache = git_get_ref "refs/$splitbraincache";
4144 if ($oldcache eq $dgitview) {
4145 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4146 # git update-ref doesn't always update, in this case. *sigh*
4147 my $dummy = make_commit_text <<END;
4150 author Dgit <dgit\@example.com> 1000000000 +0000
4151 committer Dgit <dgit\@example.com> 1000000000 +0000
4153 Dummy commit - do not use
4155 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4156 "refs/$splitbraincache", $dummy;
4158 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4161 progress "dgit view: created (commit id $dgitview)";
4163 changedir '.git/dgit/unpack/work';
4166 sub quiltify ($$$$) {
4167 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4169 # Quilt patchification algorithm
4171 # We search backwards through the history of the main tree's HEAD
4172 # (T) looking for a start commit S whose tree object is identical
4173 # to to the patch tip tree (ie the tree corresponding to the
4174 # current dpkg-committed patch series). For these purposes
4175 # `identical' disregards anything in debian/ - this wrinkle is
4176 # necessary because dpkg-source treates debian/ specially.
4178 # We can only traverse edges where at most one of the ancestors'
4179 # trees differs (in changes outside in debian/). And we cannot
4180 # handle edges which change .pc/ or debian/patches. To avoid
4181 # going down a rathole we avoid traversing edges which introduce
4182 # debian/rules or debian/control. And we set a limit on the
4183 # number of edges we are willing to look at.
4185 # If we succeed, we walk forwards again. For each traversed edge
4186 # PC (with P parent, C child) (starting with P=S and ending with
4187 # C=T) to we do this:
4189 # - dpkg-source --commit with a patch name and message derived from C
4190 # After traversing PT, we git commit the changes which
4191 # should be contained within debian/patches.
4193 # The search for the path S..T is breadth-first. We maintain a
4194 # todo list containing search nodes. A search node identifies a
4195 # commit, and looks something like this:
4197 # Commit => $git_commit_id,
4198 # Child => $c, # or undef if P=T
4199 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4200 # Nontrivial => true iff $p..$c has relevant changes
4207 my %considered; # saves being exponential on some weird graphs
4209 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4212 my ($search,$whynot) = @_;
4213 printdebug " search NOT $search->{Commit} $whynot\n";
4214 $search->{Whynot} = $whynot;
4215 push @nots, $search;
4216 no warnings qw(exiting);
4225 my $c = shift @todo;
4226 next if $considered{$c->{Commit}}++;
4228 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4230 printdebug "quiltify investigate $c->{Commit}\n";
4233 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4234 printdebug " search finished hooray!\n";
4239 if ($quilt_mode eq 'nofix') {
4240 fail "quilt fixup required but quilt mode is \`nofix'\n".
4241 "HEAD commit $c->{Commit} differs from tree implied by ".
4242 " debian/patches (tree object $oldtiptree)";
4244 if ($quilt_mode eq 'smash') {
4245 printdebug " search quitting smash\n";
4249 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4250 $not->($c, "has $c_sentinels not $t_sentinels")
4251 if $c_sentinels ne $t_sentinels;
4253 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4254 $commitdata =~ m/\n\n/;
4256 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4257 @parents = map { { Commit => $_, Child => $c } } @parents;
4259 $not->($c, "root commit") if !@parents;
4261 foreach my $p (@parents) {
4262 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4264 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4265 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
4267 foreach my $p (@parents) {
4268 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
4270 my @cmd= (@git, qw(diff-tree -r --name-only),
4271 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
4272 my $patchstackchange = cmdoutput @cmd;
4273 if (length $patchstackchange) {
4274 $patchstackchange =~ s/\n/,/g;
4275 $not->($p, "changed $patchstackchange");
4278 printdebug " search queue P=$p->{Commit} ",
4279 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
4285 printdebug "quiltify want to smash\n";
4288 my $x = $_[0]{Commit};
4289 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
4292 my $reportnot = sub {
4294 my $s = $abbrev->($notp);
4295 my $c = $notp->{Child};
4296 $s .= "..".$abbrev->($c) if $c;
4297 $s .= ": ".$notp->{Whynot};
4300 if ($quilt_mode eq 'linear') {
4301 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
4302 foreach my $notp (@nots) {
4303 print STDERR "$us: ", $reportnot->($notp), "\n";
4305 print STDERR "$us: $_\n" foreach @$failsuggestion;
4306 fail "quilt fixup naive history linearisation failed.\n".
4307 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
4308 } elsif ($quilt_mode eq 'smash') {
4309 } elsif ($quilt_mode eq 'auto') {
4310 progress "quilt fixup cannot be linear, smashing...";
4312 die "$quilt_mode ?";
4315 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
4316 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
4318 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
4320 quiltify_dpkg_commit "auto-$version-$target-$time",
4321 (getfield $clogp, 'Maintainer'),
4322 "Automatically generated patch ($clogp->{Version})\n".
4323 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
4327 progress "quiltify linearisation planning successful, executing...";
4329 for (my $p = $sref_S;
4330 my $c = $p->{Child};
4332 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
4333 next unless $p->{Nontrivial};
4335 my $cc = $c->{Commit};
4337 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
4338 $commitdata =~ m/\n\n/ or die "$c ?";
4341 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
4344 my $commitdate = cmdoutput
4345 @git, qw(log -n1 --pretty=format:%aD), $cc;
4347 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
4349 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
4356 my $gbp_check_suitable = sub {
4361 die "contains unexpected slashes\n" if m{//} || m{/$};
4362 die "contains leading punctuation\n" if m{^\W} || m{/\W};
4363 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
4364 die "too long" if length > 200;
4366 return $_ unless $@;
4367 print STDERR "quiltifying commit $cc:".
4368 " ignoring/dropping Gbp-Pq $what: $@";
4372 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
4374 (\S+) \s* \n //ixm) {
4375 $patchname = $gbp_check_suitable->($1, 'Name');
4377 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
4379 (\S+) \s* \n //ixm) {
4380 $patchdir = $gbp_check_suitable->($1, 'Topic');
4385 if (!defined $patchname) {
4386 $patchname = $title;
4387 $patchname =~ s/[.:]$//;
4390 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
4391 my $translitname = $converter->convert($patchname);
4392 die unless defined $translitname;
4393 $patchname = $translitname;
4396 "dgit: patch title transliteration error: $@"
4398 $patchname =~ y/ A-Z/-a-z/;
4399 $patchname =~ y/-a-z0-9_.+=~//cd;
4400 $patchname =~ s/^\W/x-$&/;
4401 $patchname = substr($patchname,0,40);
4403 if (!defined $patchdir) {
4406 if (length $patchdir) {
4407 $patchname = "$patchdir/$patchname";
4409 if ($patchname =~ m{^(.*)/}) {
4410 mkpath "debian/patches/$1";
4415 stat "debian/patches/$patchname$index";
4417 $!==ENOENT or die "$patchname$index $!";
4419 runcmd @git, qw(checkout -q), $cc;
4421 # We use the tip's changelog so that dpkg-source doesn't
4422 # produce complaining messages from dpkg-parsechangelog. None
4423 # of the information dpkg-source gets from the changelog is
4424 # actually relevant - it gets put into the original message
4425 # which dpkg-source provides our stunt editor, and then
4427 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
4429 quiltify_dpkg_commit "$patchname$index", $author, $msg,
4430 "Date: $commitdate\n".
4431 "X-Dgit-Generated: $clogp->{Version} $cc\n";
4433 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
4436 runcmd @git, qw(checkout -q master);
4439 sub build_maybe_quilt_fixup () {
4440 my ($format,$fopts) = get_source_format;
4441 return unless madformat_wantfixup $format;
4444 check_for_vendor_patches();
4446 if (quiltmode_splitbrain) {
4447 foreach my $needtf (qw(new maint)) {
4448 next if grep { $_ eq $needtf } access_cfg_tagformats;
4450 quilt mode $quilt_mode requires split view so server needs to support
4451 both "new" and "maint" tag formats, but config says it doesn't.
4456 my $clogp = parsechangelog();
4457 my $headref = git_rev_parse('HEAD');
4462 my $upstreamversion=$version;
4463 $upstreamversion =~ s/-[^-]*$//;
4465 if ($fopts->{'single-debian-patch'}) {
4466 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
4468 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
4471 die 'bug' if $split_brain && !$need_split_build_invocation;
4473 changedir '../../../..';
4474 runcmd_ordryrun_local
4475 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
4478 sub quilt_fixup_mkwork ($) {
4481 mkdir "work" or die $!;
4483 mktree_in_ud_here();
4484 runcmd @git, qw(reset -q --hard), $headref;
4487 sub quilt_fixup_linkorigs ($$) {
4488 my ($upstreamversion, $fn) = @_;
4489 # calls $fn->($leafname);
4491 foreach my $f (<../../../../*>) { #/){
4492 my $b=$f; $b =~ s{.*/}{};
4494 local ($debuglevel) = $debuglevel-1;
4495 printdebug "QF linkorigs $b, $f ?\n";
4497 next unless is_orig_file_of_vsn $b, $upstreamversion;
4498 printdebug "QF linkorigs $b, $f Y\n";
4499 link_ltarget $f, $b or die "$b $!";
4504 sub quilt_fixup_delete_pc () {
4505 runcmd @git, qw(rm -rqf .pc);
4507 Commit removal of .pc (quilt series tracking data)
4509 [dgit ($our_version) upgrade quilt-remove-pc]
4513 sub quilt_fixup_singlepatch ($$$) {
4514 my ($clogp, $headref, $upstreamversion) = @_;
4516 progress "starting quiltify (single-debian-patch)";
4518 # dpkg-source --commit generates new patches even if
4519 # single-debian-patch is in debian/source/options. In order to
4520 # get it to generate debian/patches/debian-changes, it is
4521 # necessary to build the source package.
4523 quilt_fixup_linkorigs($upstreamversion, sub { });
4524 quilt_fixup_mkwork($headref);
4526 rmtree("debian/patches");
4528 runcmd @dpkgsource, qw(-b .);
4530 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
4531 rename srcfn("$upstreamversion", "/debian/patches"),
4532 "work/debian/patches";
4535 commit_quilty_patch();
4538 sub quilt_make_fake_dsc ($) {
4539 my ($upstreamversion) = @_;
4541 my $fakeversion="$upstreamversion-~~DGITFAKE";
4543 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
4544 print $fakedsc <<END or die $!;
4547 Version: $fakeversion
4551 my $dscaddfile=sub {
4554 my $md = new Digest::MD5;
4556 my $fh = new IO::File $b, '<' or die "$b $!";
4561 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
4564 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
4566 my @files=qw(debian/source/format debian/rules
4567 debian/control debian/changelog);
4568 foreach my $maybe (qw(debian/patches debian/source/options
4569 debian/tests/control)) {
4570 next unless stat_exists "../../../$maybe";
4571 push @files, $maybe;
4574 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
4575 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
4577 $dscaddfile->($debtar);
4578 close $fakedsc or die $!;
4581 sub quilt_check_splitbrain_cache ($$) {
4582 my ($headref, $upstreamversion) = @_;
4583 # Called only if we are in (potentially) split brain mode.
4585 # Computes the cache key and looks in the cache.
4586 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
4588 my $splitbrain_cachekey;
4591 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
4592 # we look in the reflog of dgit-intern/quilt-cache
4593 # we look for an entry whose message is the key for the cache lookup
4594 my @cachekey = (qw(dgit), $our_version);
4595 push @cachekey, $upstreamversion;
4596 push @cachekey, $quilt_mode;
4597 push @cachekey, $headref;
4599 push @cachekey, hashfile('fake.dsc');
4601 my $srcshash = Digest::SHA->new(256);
4602 my %sfs = ( %INC, '$0(dgit)' => $0 );
4603 foreach my $sfk (sort keys %sfs) {
4604 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
4605 $srcshash->add($sfk," ");
4606 $srcshash->add(hashfile($sfs{$sfk}));
4607 $srcshash->add("\n");
4609 push @cachekey, $srcshash->hexdigest();
4610 $splitbrain_cachekey = "@cachekey";
4612 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
4614 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
4615 debugcmd "|(probably)",@cmd;
4616 my $child = open GC, "-|"; defined $child or die $!;
4618 chdir '../../..' or die $!;
4619 if (!stat ".git/logs/refs/$splitbraincache") {
4620 $! == ENOENT or die $!;
4621 printdebug ">(no reflog)\n";
4628 printdebug ">| ", $_, "\n" if $debuglevel > 1;
4629 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
4632 quilt_fixup_mkwork($headref);
4633 if ($cachehit ne $headref) {
4634 progress "dgit view: found cached (commit id $cachehit)";
4635 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
4637 return ($cachehit, $splitbrain_cachekey);
4639 progress "dgit view: found cached, no changes required";
4640 return ($headref, $splitbrain_cachekey);
4642 die $! if GC->error;
4643 failedcmd unless close GC;
4645 printdebug "splitbrain cache miss\n";
4646 return (undef, $splitbrain_cachekey);
4649 sub quilt_fixup_multipatch ($$$) {
4650 my ($clogp, $headref, $upstreamversion) = @_;
4652 progress "examining quilt state (multiple patches, $quilt_mode mode)";
4655 # - honour any existing .pc in case it has any strangeness
4656 # - determine the git commit corresponding to the tip of
4657 # the patch stack (if there is one)
4658 # - if there is such a git commit, convert each subsequent
4659 # git commit into a quilt patch with dpkg-source --commit
4660 # - otherwise convert all the differences in the tree into
4661 # a single git commit
4665 # Our git tree doesn't necessarily contain .pc. (Some versions of
4666 # dgit would include the .pc in the git tree.) If there isn't
4667 # one, we need to generate one by unpacking the patches that we
4670 # We first look for a .pc in the git tree. If there is one, we
4671 # will use it. (This is not the normal case.)
4673 # Otherwise need to regenerate .pc so that dpkg-source --commit
4674 # can work. We do this as follows:
4675 # 1. Collect all relevant .orig from parent directory
4676 # 2. Generate a debian.tar.gz out of
4677 # debian/{patches,rules,source/format,source/options}
4678 # 3. Generate a fake .dsc containing just these fields:
4679 # Format Source Version Files
4680 # 4. Extract the fake .dsc
4681 # Now the fake .dsc has a .pc directory.
4682 # (In fact we do this in every case, because in future we will
4683 # want to search for a good base commit for generating patches.)
4685 # Then we can actually do the dpkg-source --commit
4686 # 1. Make a new working tree with the same object
4687 # store as our main tree and check out the main
4689 # 2. Copy .pc from the fake's extraction, if necessary
4690 # 3. Run dpkg-source --commit
4691 # 4. If the result has changes to debian/, then
4692 # - git add them them
4693 # - git add .pc if we had a .pc in-tree
4695 # 5. If we had a .pc in-tree, delete it, and git commit
4696 # 6. Back in the main tree, fast forward to the new HEAD
4698 # Another situation we may have to cope with is gbp-style
4699 # patches-unapplied trees.
4701 # We would want to detect these, so we know to escape into
4702 # quilt_fixup_gbp. However, this is in general not possible.
4703 # Consider a package with a one patch which the dgit user reverts
4704 # (with git revert or the moral equivalent).
4706 # That is indistinguishable in contents from a patches-unapplied
4707 # tree. And looking at the history to distinguish them is not
4708 # useful because the user might have made a confusing-looking git
4709 # history structure (which ought to produce an error if dgit can't
4710 # cope, not a silent reintroduction of an unwanted patch).
4712 # So gbp users will have to pass an option. But we can usually
4713 # detect their failure to do so: if the tree is not a clean
4714 # patches-applied tree, quilt linearisation fails, but the tree
4715 # _is_ a clean patches-unapplied tree, we can suggest that maybe
4716 # they want --quilt=unapplied.
4718 # To help detect this, when we are extracting the fake dsc, we
4719 # first extract it with --skip-patches, and then apply the patches
4720 # afterwards with dpkg-source --before-build. That lets us save a
4721 # tree object corresponding to .origs.
4723 my $splitbrain_cachekey;
4725 quilt_make_fake_dsc($upstreamversion);
4727 if (quiltmode_splitbrain()) {
4729 ($cachehit, $splitbrain_cachekey) =
4730 quilt_check_splitbrain_cache($headref, $upstreamversion);
4731 return if $cachehit;
4735 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
4737 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
4738 rename $fakexdir, "fake" or die "$fakexdir $!";
4742 remove_stray_gits();
4743 mktree_in_ud_here();
4747 runcmd @git, qw(add -Af .);
4748 my $unapplied=git_write_tree();
4749 printdebug "fake orig tree object $unapplied\n";
4753 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
4755 if (system @bbcmd) {
4756 failedcmd @bbcmd if $? < 0;
4758 failed to apply your git tree's patch stack (from debian/patches/) to
4759 the corresponding upstream tarball(s). Your source tree and .orig
4760 are probably too inconsistent. dgit can only fix up certain kinds of
4761 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
4767 quilt_fixup_mkwork($headref);
4770 if (stat_exists ".pc") {
4772 progress "Tree already contains .pc - will use it then delete it.";
4775 rename '../fake/.pc','.pc' or die $!;
4778 changedir '../fake';
4780 runcmd @git, qw(add -Af .);
4781 my $oldtiptree=git_write_tree();
4782 printdebug "fake o+d/p tree object $unapplied\n";
4783 changedir '../work';
4786 # We calculate some guesswork now about what kind of tree this might
4787 # be. This is mostly for error reporting.
4793 # O = orig, without patches applied
4794 # A = "applied", ie orig with H's debian/patches applied
4795 O2H => quiltify_trees_differ($unapplied,$headref, 1,
4796 \%editedignores, \@unrepres),
4797 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
4798 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
4802 foreach my $b (qw(01 02)) {
4803 foreach my $v (qw(O2H O2A H2A)) {
4804 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
4807 printdebug "differences \@dl @dl.\n";
4810 "$us: base trees orig=%.20s o+d/p=%.20s",
4811 $unapplied, $oldtiptree;
4813 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
4814 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
4815 $dl[0], $dl[1], $dl[3], $dl[4],
4819 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
4821 forceable_fail [qw(unrepresentable)], <<END;
4822 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
4827 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
4828 push @failsuggestion, "This might be a patches-unapplied branch.";
4829 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
4830 push @failsuggestion, "This might be a patches-applied branch.";
4832 push @failsuggestion, "Maybe you need to specify one of".
4833 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
4835 if (quiltmode_splitbrain()) {
4836 quiltify_splitbrain($clogp, $unapplied, $headref,
4837 $diffbits, \%editedignores,
4838 $splitbrain_cachekey);
4842 progress "starting quiltify (multiple patches, $quilt_mode mode)";
4843 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
4845 if (!open P, '>>', ".pc/applied-patches") {
4846 $!==&ENOENT or die $!;
4851 commit_quilty_patch();
4853 if ($mustdeletepc) {
4854 quilt_fixup_delete_pc();
4858 sub quilt_fixup_editor () {
4859 my $descfn = $ENV{$fakeeditorenv};
4860 my $editing = $ARGV[$#ARGV];
4861 open I1, '<', $descfn or die "$descfn: $!";
4862 open I2, '<', $editing or die "$editing: $!";
4863 unlink $editing or die "$editing: $!";
4864 open O, '>', $editing or die "$editing: $!";
4865 while (<I1>) { print O or die $!; } I1->error and die $!;
4868 $copying ||= m/^\-\-\- /;
4869 next unless $copying;
4872 I2->error and die $!;
4877 sub maybe_apply_patches_dirtily () {
4878 return unless $quilt_mode =~ m/gbp|unapplied/;
4879 print STDERR <<END or die $!;
4881 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
4882 dgit: Have to apply the patches - making the tree dirty.
4883 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
4886 $patches_applied_dirtily = 01;
4887 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
4888 runcmd qw(dpkg-source --before-build .);
4891 sub maybe_unapply_patches_again () {
4892 progress "dgit: Unapplying patches again to tidy up the tree."
4893 if $patches_applied_dirtily;
4894 runcmd qw(dpkg-source --after-build .)
4895 if $patches_applied_dirtily & 01;
4897 if $patches_applied_dirtily & 02;
4898 $patches_applied_dirtily = 0;
4901 #----- other building -----
4903 our $clean_using_builder;
4904 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
4905 # clean the tree before building (perhaps invoked indirectly by
4906 # whatever we are using to run the build), rather than separately
4907 # and explicitly by us.
4910 return if $clean_using_builder;
4911 if ($cleanmode eq 'dpkg-source') {
4912 maybe_apply_patches_dirtily();
4913 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
4914 } elsif ($cleanmode eq 'dpkg-source-d') {
4915 maybe_apply_patches_dirtily();
4916 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
4917 } elsif ($cleanmode eq 'git') {
4918 runcmd_ordryrun_local @git, qw(clean -xdf);
4919 } elsif ($cleanmode eq 'git-ff') {
4920 runcmd_ordryrun_local @git, qw(clean -xdff);
4921 } elsif ($cleanmode eq 'check') {
4922 my $leftovers = cmdoutput @git, qw(clean -xdn);
4923 if (length $leftovers) {
4924 print STDERR $leftovers, "\n" or die $!;
4925 fail "tree contains uncommitted files and --clean=check specified";
4927 } elsif ($cleanmode eq 'none') {
4934 badusage "clean takes no additional arguments" if @ARGV;
4937 maybe_unapply_patches_again();
4942 badusage "-p is not allowed when building" if defined $package;
4945 my $clogp = parsechangelog();
4946 $isuite = getfield $clogp, 'Distribution';
4947 $package = getfield $clogp, 'Source';
4948 $version = getfield $clogp, 'Version';
4949 build_maybe_quilt_fixup();
4951 my $pat = changespat $version;
4952 foreach my $f (glob "$buildproductsdir/$pat") {
4954 unlink $f or fail "remove old changes file $f: $!";
4956 progress "would remove $f";
4962 sub changesopts_initial () {
4963 my @opts =@changesopts[1..$#changesopts];
4966 sub changesopts_version () {
4967 if (!defined $changes_since_version) {
4968 my @vsns = archive_query('archive_query');
4969 my @quirk = access_quirk();
4970 if ($quirk[0] eq 'backports') {
4971 local $isuite = $quirk[2];
4973 canonicalise_suite();
4974 push @vsns, archive_query('archive_query');
4977 @vsns = map { $_->[0] } @vsns;
4978 @vsns = sort { -version_compare($a, $b) } @vsns;
4979 $changes_since_version = $vsns[0];
4980 progress "changelog will contain changes since $vsns[0]";
4982 $changes_since_version = '_';
4983 progress "package seems new, not specifying -v<version>";
4986 if ($changes_since_version ne '_') {
4987 return ("-v$changes_since_version");
4993 sub changesopts () {
4994 return (changesopts_initial(), changesopts_version());
4997 sub massage_dbp_args ($;$) {
4998 my ($cmd,$xargs) = @_;
5001 # - if we're going to split the source build out so we can
5002 # do strange things to it, massage the arguments to dpkg-buildpackage
5003 # so that the main build doessn't build source (or add an argument
5004 # to stop it building source by default).
5006 # - add -nc to stop dpkg-source cleaning the source tree,
5007 # unless we're not doing a split build and want dpkg-source
5008 # as cleanmode, in which case we can do nothing
5011 # 0 - source will NOT need to be built separately by caller
5012 # +1 - source will need to be built separately by caller
5013 # +2 - source will need to be built separately by caller AND
5014 # dpkg-buildpackage should not in fact be run at all!
5015 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5016 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5017 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5018 $clean_using_builder = 1;
5021 # -nc has the side effect of specifying -b if nothing else specified
5022 # and some combinations of -S, -b, et al, are errors, rather than
5023 # later simply overriding earlie. So we need to:
5024 # - search the command line for these options
5025 # - pick the last one
5026 # - perhaps add our own as a default
5027 # - perhaps adjust it to the corresponding non-source-building version
5029 foreach my $l ($cmd, $xargs) {
5031 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5034 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5036 if ($need_split_build_invocation) {
5037 printdebug "massage split $dmode.\n";
5038 $r = $dmode =~ m/[S]/ ? +2 :
5039 $dmode =~ y/gGF/ABb/ ? +1 :
5040 $dmode =~ m/[ABb]/ ? 0 :
5043 printdebug "massage done $r $dmode.\n";
5045 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5051 my $wasdir = must_getcwd();
5057 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5058 my ($msg_if_onlyone) = @_;
5059 # If there is only one .changes file, fail with $msg_if_onlyone,
5060 # or if that is undef, be a no-op.
5061 # Returns the changes file to report to the user.
5062 my $pat = changespat $version;
5063 my @changesfiles = glob $pat;
5064 @changesfiles = sort {
5065 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5069 if (@changesfiles==1) {
5070 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5071 only one changes file from build (@changesfiles)
5073 $result = $changesfiles[0];
5074 } elsif (@changesfiles==2) {
5075 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5076 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5077 fail "$l found in binaries changes file $binchanges"
5080 runcmd_ordryrun_local @mergechanges, @changesfiles;
5081 my $multichanges = changespat $version,'multi';
5083 stat_exists $multichanges or fail "$multichanges: $!";
5084 foreach my $cf (glob $pat) {
5085 next if $cf eq $multichanges;
5086 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5089 $result = $multichanges;
5091 fail "wrong number of different changes files (@changesfiles)";
5093 printdone "build successful, results in $result\n" or die $!;
5096 sub midbuild_checkchanges () {
5097 my $pat = changespat $version;
5098 return if $rmchanges;
5099 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5100 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5102 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5103 Suggest you delete @unwanted.
5108 sub midbuild_checkchanges_vanilla ($) {
5110 midbuild_checkchanges() if $wantsrc == 1;
5113 sub postbuild_mergechanges_vanilla ($) {
5115 if ($wantsrc == 1) {
5117 postbuild_mergechanges(undef);
5120 printdone "build successful\n";
5125 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5126 my $wantsrc = massage_dbp_args \@dbp;
5129 midbuild_checkchanges_vanilla $wantsrc;
5134 push @dbp, changesopts_version();
5135 maybe_apply_patches_dirtily();
5136 runcmd_ordryrun_local @dbp;
5138 maybe_unapply_patches_again();
5139 postbuild_mergechanges_vanilla $wantsrc;
5143 $quilt_mode //= 'gbp';
5147 my @dbp = @dpkgbuildpackage;
5149 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5151 if (!length $gbp_build[0]) {
5152 if (length executable_on_path('git-buildpackage')) {
5153 $gbp_build[0] = qw(git-buildpackage);
5155 $gbp_build[0] = 'gbp buildpackage';
5158 my @cmd = opts_opt_multi_cmd @gbp_build;
5160 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5164 midbuild_checkchanges_vanilla $wantsrc;
5166 if (!$clean_using_builder) {
5167 push @cmd, '--git-cleaner=true';
5171 maybe_unapply_patches_again();
5173 push @cmd, changesopts();
5174 runcmd_ordryrun_local @cmd, @ARGV;
5176 postbuild_mergechanges_vanilla $wantsrc;
5178 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5181 my $our_cleanmode = $cleanmode;
5182 if ($need_split_build_invocation) {
5183 # Pretend that clean is being done some other way. This
5184 # forces us not to try to use dpkg-buildpackage to clean and
5185 # build source all in one go; and instead we run dpkg-source
5186 # (and build_prep() will do the clean since $clean_using_builder
5188 $our_cleanmode = 'ELSEWHERE';
5190 if ($our_cleanmode =~ m/^dpkg-source/) {
5191 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5192 $clean_using_builder = 1;
5195 $sourcechanges = changespat $version,'source';
5197 unlink "../$sourcechanges" or $!==ENOENT
5198 or fail "remove $sourcechanges: $!";
5200 $dscfn = dscfn($version);
5201 if ($our_cleanmode eq 'dpkg-source') {
5202 maybe_apply_patches_dirtily();
5203 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5205 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5206 maybe_apply_patches_dirtily();
5207 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5210 my @cmd = (@dpkgsource, qw(-b --));
5213 runcmd_ordryrun_local @cmd, "work";
5214 my @udfiles = <${package}_*>;
5215 changedir "../../..";
5216 foreach my $f (@udfiles) {
5217 printdebug "source copy, found $f\n";
5220 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5221 $f eq srcfn($version, $&));
5222 printdebug "source copy, found $f - renaming\n";
5223 rename "$ud/$f", "../$f" or $!==ENOENT
5224 or fail "put in place new source file ($f): $!";
5227 my $pwd = must_getcwd();
5228 my $leafdir = basename $pwd;
5230 runcmd_ordryrun_local @cmd, $leafdir;
5233 runcmd_ordryrun_local qw(sh -ec),
5234 'exec >$1; shift; exec "$@"','x',
5235 "../$sourcechanges",
5236 @dpkggenchanges, qw(-S), changesopts();
5240 sub cmd_build_source {
5241 badusage "build-source takes no additional arguments" if @ARGV;
5243 maybe_unapply_patches_again();
5244 printdone "source built, results in $dscfn and $sourcechanges";
5249 midbuild_checkchanges();
5252 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
5253 stat_exists $sourcechanges
5254 or fail "$sourcechanges (in parent directory): $!";
5256 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
5258 maybe_unapply_patches_again();
5260 postbuild_mergechanges(<<END);
5261 perhaps you need to pass -A ? (sbuild's default is to build only
5262 arch-specific binaries; dgit 1.4 used to override that.)
5267 sub cmd_quilt_fixup {
5268 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
5269 my $clogp = parsechangelog();
5270 $version = getfield $clogp, 'Version';
5271 $package = getfield $clogp, 'Source';
5274 build_maybe_quilt_fixup();
5277 sub cmd_import_dsc {
5278 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
5279 my ($dscfn, $dstbranch) = @ARGV;
5281 badusage "dry run makes no sense with import-dsc" unless act_local();
5283 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
5284 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
5286 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
5287 $dscdata = do { local $/ = undef; <D>; };
5288 D->error and fail "read $dscfn: $!";
5292 my $dgit_commit = $dsc->{$ourdscfield[0]};
5293 if (defined $dgit_commit &&
5294 !forceing [qw(import-dsc-with-dgit-field)]) {
5295 $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
5296 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
5297 my @cmd = (qw(sh -ec),
5298 "echo $dgit_commit | git cat-file --batch-check");
5299 my $objgot = cmdoutput @cmd;
5300 if ($objgot =~ m#^\w+ missing\b#) {
5302 .dsc contains Dgit field referring to object $dgit_commit
5303 Your git tree does not have that object. Try `git fetch' from a
5304 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
5307 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $dscfn",
5308 $dstbranch, $dgit_commit);
5310 progress "dgit: import-dsc updated git ref $dstbranch";
5314 $package = getfield $dsc, 'Source';
5315 my @dfi = dsc_files_info();
5316 foreach my $fi (@dfi) {
5317 my $f = $fi->{Filename};
5319 next if lstat $here;
5320 fail "stat $here: $!" unless $! == ENOENT;
5322 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
5324 } elsif ($dscfn =~ m#^/#) {
5327 fail "cannot import $dscfn which seems to be inside working tree!";
5329 $there =~ s#/+[^/]+$## or
5330 fail "cannot import $dscfn which seems to not have a basename";
5332 symlink $there, $here or fail "symlink $there to $here: $!";
5333 progress "made symlink $here -> $there";
5334 print STDERR Dumper($fi);
5336 my @mergeinputs = generate_commits_from_dsc();
5337 die unless @mergeinputs == 1;
5339 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $dscfn",
5340 $dstbranch, $mergeinputs[0]{Commit});
5342 progress "dgit: import-dsc results are in in git ref $dstbranch";
5345 sub cmd_archive_api_query {
5346 badusage "need only 1 subpath argument" unless @ARGV==1;
5347 my ($subpath) = @ARGV;
5348 my @cmd = archive_api_query_cmd($subpath);
5351 exec @cmd or fail "exec curl: $!\n";
5354 sub cmd_clone_dgit_repos_server {
5355 badusage "need destination argument" unless @ARGV==1;
5356 my ($destdir) = @ARGV;
5357 $package = '_dgit-repos-server';
5358 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
5360 exec @cmd or fail "exec git clone: $!\n";
5363 sub cmd_setup_mergechangelogs {
5364 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5365 setup_mergechangelogs(1);
5368 sub cmd_setup_useremail {
5369 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
5373 sub cmd_setup_new_tree {
5374 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
5378 #---------- argument parsing and main program ----------
5381 print "dgit version $our_version\n" or die $!;
5385 our (%valopts_long, %valopts_short);
5388 sub defvalopt ($$$$) {
5389 my ($long,$short,$val_re,$how) = @_;
5390 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
5391 $valopts_long{$long} = $oi;
5392 $valopts_short{$short} = $oi;
5393 # $how subref should:
5394 # do whatever assignemnt or thing it likes with $_[0]
5395 # if the option should not be passed on to remote, @rvalopts=()
5396 # or $how can be a scalar ref, meaning simply assign the value
5399 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
5400 defvalopt '--distro', '-d', '.+', \$idistro;
5401 defvalopt '', '-k', '.+', \$keyid;
5402 defvalopt '--existing-package','', '.*', \$existing_package;
5403 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
5404 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
5405 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
5407 defvalopt '', '-C', '.+', sub {
5408 ($changesfile) = (@_);
5409 if ($changesfile =~ s#^(.*)/##) {
5410 $buildproductsdir = $1;
5414 defvalopt '--initiator-tempdir','','.*', sub {
5415 ($initiator_tempdir) = (@_);
5416 $initiator_tempdir =~ m#^/# or
5417 badusage "--initiator-tempdir must be used specify an".
5418 " absolute, not relative, directory."
5424 if (defined $ENV{'DGIT_SSH'}) {
5425 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
5426 } elsif (defined $ENV{'GIT_SSH'}) {
5427 @ssh = ($ENV{'GIT_SSH'});
5435 if (!defined $val) {
5436 badusage "$what needs a value" unless @ARGV;
5438 push @rvalopts, $val;
5440 badusage "bad value \`$val' for $what" unless
5441 $val =~ m/^$oi->{Re}$(?!\n)/s;
5442 my $how = $oi->{How};
5443 if (ref($how) eq 'SCALAR') {
5448 push @ropts, @rvalopts;
5452 last unless $ARGV[0] =~ m/^-/;
5456 if (m/^--dry-run$/) {
5459 } elsif (m/^--damp-run$/) {
5462 } elsif (m/^--no-sign$/) {
5465 } elsif (m/^--help$/) {
5467 } elsif (m/^--version$/) {
5469 } elsif (m/^--new$/) {
5472 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
5473 ($om = $opts_opt_map{$1}) &&
5477 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
5478 !$opts_opt_cmdonly{$1} &&
5479 ($om = $opts_opt_map{$1})) {
5482 } elsif (m/^--(gbp|dpm)$/s) {
5483 push @ropts, "--quilt=$1";
5485 } elsif (m/^--ignore-dirty$/s) {
5488 } elsif (m/^--no-quilt-fixup$/s) {
5490 $quilt_mode = 'nocheck';
5491 } elsif (m/^--no-rm-on-error$/s) {
5494 } elsif (m/^--overwrite$/s) {
5496 $overwrite_version = '';
5497 } elsif (m/^--overwrite=(.+)$/s) {
5499 $overwrite_version = $1;
5500 } elsif (m/^--(no-)?rm-old-changes$/s) {
5503 } elsif (m/^--deliberately-($deliberately_re)$/s) {
5505 push @deliberatelies, $&;
5506 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
5510 } elsif (m/^--force-/) {
5512 "$us: warning: ignoring unknown force option $_\n";
5514 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
5515 # undocumented, for testing
5517 $tagformat_want = [ $1, 'command line', 1 ];
5518 # 1 menas overrides distro configuration
5519 } elsif (m/^--always-split-source-build$/s) {
5520 # undocumented, for testing
5522 $need_split_build_invocation = 1;
5523 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
5524 $val = $2 ? $' : undef; #';
5525 $valopt->($oi->{Long});
5527 badusage "unknown long option \`$_'";
5534 } elsif (s/^-L/-/) {
5537 } elsif (s/^-h/-/) {
5539 } elsif (s/^-D/-/) {
5543 } elsif (s/^-N/-/) {
5548 push @changesopts, $_;
5550 } elsif (s/^-wn$//s) {
5552 $cleanmode = 'none';
5553 } elsif (s/^-wg$//s) {
5556 } elsif (s/^-wgf$//s) {
5558 $cleanmode = 'git-ff';
5559 } elsif (s/^-wd$//s) {
5561 $cleanmode = 'dpkg-source';
5562 } elsif (s/^-wdd$//s) {
5564 $cleanmode = 'dpkg-source-d';
5565 } elsif (s/^-wc$//s) {
5567 $cleanmode = 'check';
5568 } elsif (s/^-c([^=]*)\=(.*)$//s) {
5569 push @git, '-c', $&;
5570 $gitcfgs{cmdline}{$1} = [ $2 ];
5571 } elsif (s/^-c([^=]+)$//s) {
5572 push @git, '-c', $&;
5573 $gitcfgs{cmdline}{$1} = [ 'true' ];
5574 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
5576 $val = undef unless length $val;
5577 $valopt->($oi->{Short});
5580 badusage "unknown short option \`$_'";
5587 sub check_env_sanity () {
5588 my $blocked = new POSIX::SigSet;
5589 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
5592 foreach my $name (qw(PIPE CHLD)) {
5593 my $signame = "SIG$name";
5594 my $signum = eval "POSIX::$signame" // die;
5595 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
5596 die "$signame is set to something other than SIG_DFL\n";
5597 $blocked->ismember($signum) and
5598 die "$signame is blocked\n";
5604 On entry to dgit, $@
5605 This is a bug produced by something in in your execution environment.
5611 sub finalise_opts_opts () {
5612 foreach my $k (keys %opts_opt_map) {
5613 my $om = $opts_opt_map{$k};
5615 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
5617 badcfg "cannot set command for $k"
5618 unless length $om->[0];
5622 foreach my $c (access_cfg_cfgs("opts-$k")) {
5624 map { $_ ? @$_ : () }
5625 map { $gitcfgs{$_}{$c} }
5626 reverse @gitcfgsources;
5627 printdebug "CL $c ", (join " ", map { shellquote } @vl),
5628 "\n" if $debuglevel >= 4;
5630 badcfg "cannot configure options for $k"
5631 if $opts_opt_cmdonly{$k};
5632 my $insertpos = $opts_cfg_insertpos{$k};
5633 @$om = ( @$om[0..$insertpos-1],
5635 @$om[$insertpos..$#$om] );
5640 if ($ENV{$fakeeditorenv}) {
5642 quilt_fixup_editor();
5649 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
5650 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
5651 if $dryrun_level == 1;
5653 print STDERR $helpmsg or die $!;
5656 my $cmd = shift @ARGV;
5659 my $pre_fn = ${*::}{"pre_$cmd"};
5660 $pre_fn->() if $pre_fn;
5662 if (!defined $rmchanges) {
5663 local $access_forpush;
5664 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
5667 if (!defined $quilt_mode) {
5668 local $access_forpush;
5669 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
5670 // access_cfg('quilt-mode', 'RETURN-UNDEF')
5672 $quilt_mode =~ m/^($quilt_modes_re)$/
5673 or badcfg "unknown quilt-mode \`$quilt_mode'";
5677 $need_split_build_invocation ||= quiltmode_splitbrain();
5679 if (!defined $cleanmode) {
5680 local $access_forpush;
5681 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
5682 $cleanmode //= 'dpkg-source';
5684 badcfg "unknown clean-mode \`$cleanmode'" unless
5685 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
5688 my $fn = ${*::}{"cmd_$cmd"};
5689 $fn or badusage "unknown operation $cmd";