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::MoreUtils qw(pairwise);
38 use Text::Glob qw(match_glob);
39 use Fcntl qw(:DEFAULT :flock);
44 our $our_version = 'UNRELEASED'; ###substituted###
45 our $absurdity = undef; ###substituted###
47 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
56 our $dryrun_level = 0;
58 our $buildproductsdir = '..';
64 our $existing_package = 'dpkg';
66 our $changes_since_version;
68 our $overwrite_version; # undef: not specified; '': check changelog
70 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
72 our $split_brain_save;
73 our $we_are_responder;
74 our $we_are_initiator;
75 our $initiator_tempdir;
76 our $patches_applied_dirtily = 00;
80 our $chase_dsc_distro=1;
82 our %forceopts = map { $_=>0 }
83 qw(unrepresentable unsupported-source-format
84 dsc-changes-mismatch changes-origs-exactly
85 import-gitapply-absurd
86 import-gitapply-no-absurd
87 import-dsc-with-dgit-field);
89 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
91 our $suite_re = '[-+.0-9a-z]+';
92 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
93 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
94 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
95 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
97 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
98 our $splitbraincache = 'dgit-intern/quilt-cache';
99 our $rewritemap = 'dgit-rewrite/map';
101 our (@git) = qw(git);
102 our (@dget) = qw(dget);
103 our (@curl) = qw(curl);
104 our (@dput) = qw(dput);
105 our (@debsign) = qw(debsign);
106 our (@gpg) = qw(gpg);
107 our (@sbuild) = qw(sbuild);
109 our (@dgit) = qw(dgit);
110 our (@aptget) = qw(apt-get);
111 our (@aptcache) = qw(apt-cache);
112 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
113 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
114 our (@dpkggenchanges) = qw(dpkg-genchanges);
115 our (@mergechanges) = qw(mergechanges -f);
116 our (@gbp_build) = ('');
117 our (@gbp_pq) = ('gbp pq');
118 our (@changesopts) = ('');
120 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
123 'debsign' => \@debsign,
125 'sbuild' => \@sbuild,
129 'apt-get' => \@aptget,
130 'apt-cache' => \@aptcache,
131 'dpkg-source' => \@dpkgsource,
132 'dpkg-buildpackage' => \@dpkgbuildpackage,
133 'dpkg-genchanges' => \@dpkggenchanges,
134 'gbp-build' => \@gbp_build,
135 'gbp-pq' => \@gbp_pq,
136 'ch' => \@changesopts,
137 'mergechanges' => \@mergechanges);
139 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
140 our %opts_cfg_insertpos = map {
142 scalar @{ $opts_opt_map{$_} }
143 } keys %opts_opt_map;
145 sub parseopts_late_defaults();
151 our $supplementary_message = '';
152 our $need_split_build_invocation = 0;
153 our $split_brain = 0;
157 return unless forkcheck_mainprocess();
158 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
161 our $remotename = 'dgit';
162 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
166 if (!defined $absurdity) {
168 $absurdity =~ s{/[^/]+$}{/absurd} or die;
172 my ($v,$distro) = @_;
173 return $tagformatfn->($v, $distro);
176 sub debiantag_maintview ($$) {
177 my ($v,$distro) = @_;
178 return "$distro/".dep14_version_mangle $v;
181 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
183 sub lbranch () { return "$branchprefix/$csuite"; }
184 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
185 sub lref () { return "refs/heads/".lbranch(); }
186 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
187 sub rrref () { return server_ref($csuite); }
197 return "${package}_".(stripepoch $vsn).$sfx
202 return srcfn($vsn,".dsc");
205 sub changespat ($;$) {
206 my ($vsn, $arch) = @_;
207 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
210 sub upstreamversion ($) {
222 return unless forkcheck_mainprocess();
223 foreach my $f (@end) {
225 print STDERR "$us: cleanup: $@" if length $@;
229 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
231 sub forceable_fail ($$) {
232 my ($forceoptsl, $msg) = @_;
233 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
234 print STDERR "warning: overriding problem due to --force:\n". $msg;
238 my ($forceoptsl) = @_;
239 my @got = grep { $forceopts{$_} } @$forceoptsl;
240 return 0 unless @got;
242 "warning: skipping checks or functionality due to --force-$got[0]\n";
245 sub no_such_package () {
246 print STDERR "$us: package $package does not exist in suite $isuite\n";
252 printdebug "CD $newdir\n";
253 chdir $newdir or confess "chdir: $newdir: $!";
256 sub deliberately ($) {
258 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
261 sub deliberately_not_fast_forward () {
262 foreach (qw(not-fast-forward fresh-repo)) {
263 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
267 sub quiltmode_splitbrain () {
268 $quilt_mode =~ m/gbp|dpm|unapplied/;
271 sub opts_opt_multi_cmd {
273 push @cmd, split /\s+/, shift @_;
279 return opts_opt_multi_cmd @gbp_pq;
282 #---------- remote protocol support, common ----------
284 # remote push initiator/responder protocol:
285 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
286 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
287 # < dgit-remote-push-ready <actual-proto-vsn>
294 # > supplementary-message NBYTES # $protovsn >= 3
299 # > file parsed-changelog
300 # [indicates that output of dpkg-parsechangelog follows]
301 # > data-block NBYTES
302 # > [NBYTES bytes of data (no newline)]
303 # [maybe some more blocks]
312 # > param head DGIT-VIEW-HEAD
313 # > param csuite SUITE
314 # > param tagformat old|new
315 # > param maint-view MAINT-VIEW-HEAD
317 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
318 # # goes into tag, for replay prevention
321 # [indicates that signed tag is wanted]
322 # < data-block NBYTES
323 # < [NBYTES bytes of data (no newline)]
324 # [maybe some more blocks]
328 # > want signed-dsc-changes
329 # < data-block NBYTES [transfer of signed dsc]
331 # < data-block NBYTES [transfer of signed changes]
339 sub i_child_report () {
340 # Sees if our child has died, and reap it if so. Returns a string
341 # describing how it died if it failed, or undef otherwise.
342 return undef unless $i_child_pid;
343 my $got = waitpid $i_child_pid, WNOHANG;
344 return undef if $got <= 0;
345 die unless $got == $i_child_pid;
346 $i_child_pid = undef;
347 return undef unless $?;
348 return "build host child ".waitstatusmsg();
353 fail "connection lost: $!" if $fh->error;
354 fail "protocol violation; $m not expected";
357 sub badproto_badread ($$) {
359 fail "connection lost: $!" if $!;
360 my $report = i_child_report();
361 fail $report if defined $report;
362 badproto $fh, "eof (reading $wh)";
365 sub protocol_expect (&$) {
366 my ($match, $fh) = @_;
369 defined && chomp or badproto_badread $fh, "protocol message";
377 badproto $fh, "\`$_'";
380 sub protocol_send_file ($$) {
381 my ($fh, $ourfn) = @_;
382 open PF, "<", $ourfn or die "$ourfn: $!";
385 my $got = read PF, $d, 65536;
386 die "$ourfn: $!" unless defined $got;
388 print $fh "data-block ".length($d)."\n" or die $!;
389 print $fh $d or die $!;
391 PF->error and die "$ourfn $!";
392 print $fh "data-end\n" or die $!;
396 sub protocol_read_bytes ($$) {
397 my ($fh, $nbytes) = @_;
398 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
400 my $got = read $fh, $d, $nbytes;
401 $got==$nbytes or badproto_badread $fh, "data block";
405 sub protocol_receive_file ($$) {
406 my ($fh, $ourfn) = @_;
407 printdebug "() $ourfn\n";
408 open PF, ">", $ourfn or die "$ourfn: $!";
410 my ($y,$l) = protocol_expect {
411 m/^data-block (.*)$/ ? (1,$1) :
412 m/^data-end$/ ? (0,) :
416 my $d = protocol_read_bytes $fh, $l;
417 print PF $d or die $!;
422 #---------- remote protocol support, responder ----------
424 sub responder_send_command ($) {
426 return unless $we_are_responder;
427 # called even without $we_are_responder
428 printdebug ">> $command\n";
429 print PO $command, "\n" or die $!;
432 sub responder_send_file ($$) {
433 my ($keyword, $ourfn) = @_;
434 return unless $we_are_responder;
435 printdebug "]] $keyword $ourfn\n";
436 responder_send_command "file $keyword";
437 protocol_send_file \*PO, $ourfn;
440 sub responder_receive_files ($@) {
441 my ($keyword, @ourfns) = @_;
442 die unless $we_are_responder;
443 printdebug "[[ $keyword @ourfns\n";
444 responder_send_command "want $keyword";
445 foreach my $fn (@ourfns) {
446 protocol_receive_file \*PI, $fn;
449 protocol_expect { m/^files-end$/ } \*PI;
452 #---------- remote protocol support, initiator ----------
454 sub initiator_expect (&) {
456 protocol_expect { &$match } \*RO;
459 #---------- end remote code ----------
462 if ($we_are_responder) {
464 responder_send_command "progress ".length($m) or die $!;
465 print PO $m or die $!;
475 $ua = LWP::UserAgent->new();
479 progress "downloading $what...";
480 my $r = $ua->get(@_) or die $!;
481 return undef if $r->code == 404;
482 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
483 return $r->decoded_content(charset => 'none');
486 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
491 failedcmd @_ if system @_;
494 sub act_local () { return $dryrun_level <= 1; }
495 sub act_scary () { return !$dryrun_level; }
498 if (!$dryrun_level) {
499 progress "$us ok: @_";
501 progress "would be ok: @_ (but dry run only)";
506 printcmd(\*STDERR,$debugprefix."#",@_);
509 sub runcmd_ordryrun {
517 sub runcmd_ordryrun_local {
526 my ($first_shell, @cmd) = @_;
527 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
530 our $helpmsg = <<END;
532 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
533 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
534 dgit [dgit-opts] build [dpkg-buildpackage-opts]
535 dgit [dgit-opts] sbuild [sbuild-opts]
536 dgit [dgit-opts] push [dgit-opts] [suite]
537 dgit [dgit-opts] rpush build-host:build-dir ...
538 important dgit options:
539 -k<keyid> sign tag and package with <keyid> instead of default
540 --dry-run -n do not change anything, but go through the motions
541 --damp-run -L like --dry-run but make local changes, without signing
542 --new -N allow introducing a new package
543 --debug -D increase debug level
544 -c<name>=<value> set git config option (used directly by dgit too)
547 our $later_warning_msg = <<END;
548 Perhaps the upload is stuck in incoming. Using the version from git.
552 print STDERR "$us: @_\n", $helpmsg or die $!;
557 @ARGV or badusage "too few arguments";
558 return scalar shift @ARGV;
562 print $helpmsg or die $!;
566 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
568 our %defcfg = ('dgit.default.distro' => 'debian',
569 'dgit.default.default-suite' => 'unstable',
570 'dgit.default.old-dsc-distro' => 'debian',
571 'dgit-suite.*-security.distro' => 'debian-security',
572 'dgit.default.username' => '',
573 'dgit.default.archive-query-default-component' => 'main',
574 'dgit.default.ssh' => 'ssh',
575 'dgit.default.archive-query' => 'madison:',
576 'dgit.default.sshpsql-dbname' => 'service=projectb',
577 'dgit.default.aptget-components' => 'main',
578 'dgit.default.dgit-tag-format' => 'new,old,maint',
579 'dgit.dsc-url-proto-ok.http' => 'true',
580 'dgit.dsc-url-proto-ok.https' => 'true',
581 'dgit.dsc-url-proto-ok.git' => 'true',
582 'dgit.default.dsc-url-proto-ok' => 'false',
583 # old means "repo server accepts pushes with old dgit tags"
584 # new means "repo server accepts pushes with new dgit tags"
585 # maint means "repo server accepts split brain pushes"
586 # hist means "repo server may have old pushes without new tag"
587 # ("hist" is implied by "old")
588 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
589 'dgit-distro.debian.git-check' => 'url',
590 'dgit-distro.debian.git-check-suffix' => '/info/refs',
591 'dgit-distro.debian.new-private-pushers' => 't',
592 'dgit-distro.debian/push.git-url' => '',
593 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
594 'dgit-distro.debian/push.git-user-force' => 'dgit',
595 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
596 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
597 'dgit-distro.debian/push.git-create' => 'true',
598 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
599 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
600 # 'dgit-distro.debian.archive-query-tls-key',
601 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
602 # ^ this does not work because curl is broken nowadays
603 # Fixing #790093 properly will involve providing providing the key
604 # in some pacagke and maybe updating these paths.
606 # 'dgit-distro.debian.archive-query-tls-curl-args',
607 # '--ca-path=/etc/ssl/ca-debian',
608 # ^ this is a workaround but works (only) on DSA-administered machines
609 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
610 'dgit-distro.debian.git-url-suffix' => '',
611 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
612 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
613 'dgit-distro.debian-security.archive-query' => 'aptget:',
614 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
615 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
616 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
617 'dgit-distro.debian-security.nominal-distro' => 'debian',
618 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
619 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
620 'dgit-distro.ubuntu.git-check' => 'false',
621 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
622 'dgit-distro.test-dummy.ssh' => "$td/ssh",
623 'dgit-distro.test-dummy.username' => "alice",
624 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
625 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
626 'dgit-distro.test-dummy.git-url' => "$td/git",
627 'dgit-distro.test-dummy.git-host' => "git",
628 'dgit-distro.test-dummy.git-path' => "$td/git",
629 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
630 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
631 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
632 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
636 our @gitcfgsources = qw(cmdline local global system);
638 sub git_slurp_config () {
639 local ($debuglevel) = $debuglevel-2;
642 # This algoritm is a bit subtle, but this is needed so that for
643 # options which we want to be single-valued, we allow the
644 # different config sources to override properly. See #835858.
645 foreach my $src (@gitcfgsources) {
646 next if $src eq 'cmdline';
647 # we do this ourselves since git doesn't handle it
649 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
652 open GITS, "-|", @cmd or die $!;
655 printdebug "=> ", (messagequote $_), "\n";
657 push @{ $gitcfgs{$src}{$`} }, $'; #';
661 or ($!==0 && $?==256)
666 sub git_get_config ($) {
668 foreach my $src (@gitcfgsources) {
669 my $l = $gitcfgs{$src}{$c};
670 croak "$l $c" if $l && !ref $l;
671 printdebug"C $c ".(defined $l ?
672 join " ", map { messagequote "'$_'" } @$l :
676 @$l==1 or badcfg "multiple values for $c".
677 " (in $src git config)" if @$l > 1;
685 return undef if $c =~ /RETURN-UNDEF/;
686 printdebug "C? $c\n" if $debuglevel >= 5;
687 my $v = git_get_config($c);
688 return $v if defined $v;
689 my $dv = $defcfg{$c};
691 printdebug "CD $c $dv\n" if $debuglevel >= 4;
695 badcfg "need value for one of: @_\n".
696 "$us: distro or suite appears not to be (properly) supported";
699 sub access_basedistro__noalias () {
700 if (defined $idistro) {
703 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
704 return $def if defined $def;
705 foreach my $src (@gitcfgsources, 'internal') {
706 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
708 foreach my $k (keys %$kl) {
709 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
711 next unless match_glob $dpat, $isuite;
715 return cfg("dgit.default.distro");
719 sub access_basedistro () {
720 my $noalias = access_basedistro__noalias();
721 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
722 return $canon // $noalias;
725 sub access_nomdistro () {
726 my $base = access_basedistro();
727 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
728 $r =~ m/^$distro_re$/ or badcfg
729 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
733 sub access_quirk () {
734 # returns (quirk name, distro to use instead or undef, quirk-specific info)
735 my $basedistro = access_basedistro();
736 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
738 if (defined $backports_quirk) {
739 my $re = $backports_quirk;
740 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
742 $re =~ s/\%/([-0-9a-z_]+)/
743 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
744 if ($isuite =~ m/^$re$/) {
745 return ('backports',"$basedistro-backports",$1);
748 return ('none',undef);
753 sub parse_cfg_bool ($$$) {
754 my ($what,$def,$v) = @_;
757 $v =~ m/^[ty1]/ ? 1 :
758 $v =~ m/^[fn0]/ ? 0 :
759 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
762 sub access_forpush_config () {
763 my $d = access_basedistro();
767 parse_cfg_bool('new-private-pushers', 0,
768 cfg("dgit-distro.$d.new-private-pushers",
771 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
774 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
775 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
776 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
777 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
780 sub access_forpush () {
781 $access_forpush //= access_forpush_config();
782 return $access_forpush;
786 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
787 badcfg "pushing but distro is configured readonly"
788 if access_forpush_config() eq '0';
790 $supplementary_message = <<'END' unless $we_are_responder;
791 Push failed, before we got started.
792 You can retry the push, after fixing the problem, if you like.
794 parseopts_late_defaults();
798 parseopts_late_defaults();
801 sub supplementary_message ($) {
803 if (!$we_are_responder) {
804 $supplementary_message = $msg;
806 } elsif ($protovsn >= 3) {
807 responder_send_command "supplementary-message ".length($msg)
809 print PO $msg or die $!;
813 sub access_distros () {
814 # Returns list of distros to try, in order
817 # 0. `instead of' distro name(s) we have been pointed to
818 # 1. the access_quirk distro, if any
819 # 2a. the user's specified distro, or failing that } basedistro
820 # 2b. the distro calculated from the suite }
821 my @l = access_basedistro();
823 my (undef,$quirkdistro) = access_quirk();
824 unshift @l, $quirkdistro;
825 unshift @l, $instead_distro;
826 @l = grep { defined } @l;
828 push @l, access_nomdistro();
830 if (access_forpush()) {
831 @l = map { ("$_/push", $_) } @l;
836 sub access_cfg_cfgs (@) {
839 # The nesting of these loops determines the search order. We put
840 # the key loop on the outside so that we search all the distros
841 # for each key, before going on to the next key. That means that
842 # if access_cfg is called with a more specific, and then a less
843 # specific, key, an earlier distro can override the less specific
844 # without necessarily overriding any more specific keys. (If the
845 # distro wants to override the more specific keys it can simply do
846 # so; whereas if we did the loop the other way around, it would be
847 # impossible to for an earlier distro to override a less specific
848 # key but not the more specific ones without restating the unknown
849 # values of the more specific keys.
852 # We have to deal with RETURN-UNDEF specially, so that we don't
853 # terminate the search prematurely.
855 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
858 foreach my $d (access_distros()) {
859 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
861 push @cfgs, map { "dgit.default.$_" } @realkeys;
868 my (@cfgs) = access_cfg_cfgs(@keys);
869 my $value = cfg(@cfgs);
873 sub access_cfg_bool ($$) {
874 my ($def, @keys) = @_;
875 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
878 sub string_to_ssh ($) {
880 if ($spec =~ m/\s/) {
881 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
887 sub access_cfg_ssh () {
888 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
889 if (!defined $gitssh) {
892 return string_to_ssh $gitssh;
896 sub access_runeinfo ($) {
898 return ": dgit ".access_basedistro()." $info ;";
901 sub access_someuserhost ($) {
903 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
904 defined($user) && length($user) or
905 $user = access_cfg("$some-user",'username');
906 my $host = access_cfg("$some-host");
907 return length($user) ? "$user\@$host" : $host;
910 sub access_gituserhost () {
911 return access_someuserhost('git');
914 sub access_giturl (;$) {
916 my $url = access_cfg('git-url','RETURN-UNDEF');
919 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
920 return undef unless defined $proto;
923 access_gituserhost().
924 access_cfg('git-path');
926 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
929 return "$url/$package$suffix";
932 sub parsecontrolfh ($$;$) {
933 my ($fh, $desc, $allowsigned) = @_;
934 our $dpkgcontrolhash_noissigned;
937 my %opts = ('name' => $desc);
938 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
939 $c = Dpkg::Control::Hash->new(%opts);
940 $c->parse($fh,$desc) or die "parsing of $desc failed";
941 last if $allowsigned;
942 last if $dpkgcontrolhash_noissigned;
943 my $issigned= $c->get_option('is_pgp_signed');
944 if (!defined $issigned) {
945 $dpkgcontrolhash_noissigned= 1;
946 seek $fh, 0,0 or die "seek $desc: $!";
947 } elsif ($issigned) {
948 fail "control file $desc is (already) PGP-signed. ".
949 " Note that dgit push needs to modify the .dsc and then".
950 " do the signature itself";
959 my ($file, $desc, $allowsigned) = @_;
960 my $fh = new IO::Handle;
961 open $fh, '<', $file or die "$file: $!";
962 my $c = parsecontrolfh($fh,$desc,$allowsigned);
963 $fh->error and die $!;
969 my ($dctrl,$field) = @_;
970 my $v = $dctrl->{$field};
971 return $v if defined $v;
972 fail "missing field $field in ".$dctrl->get_option('name');
976 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
977 my $p = new IO::Handle;
978 my @cmd = (qw(dpkg-parsechangelog), @_);
979 open $p, '-|', @cmd or die $!;
981 $?=0; $!=0; close $p or failedcmd @cmd;
985 sub commit_getclogp ($) {
986 # Returns the parsed changelog hashref for a particular commit
988 our %commit_getclogp_memo;
989 my $memo = $commit_getclogp_memo{$objid};
990 return $memo if $memo;
992 my $mclog = ".git/dgit/clog-$objid";
993 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
994 "$objid:debian/changelog";
995 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1000 defined $d or fail "getcwd failed: $!";
1004 sub parse_dscdata () {
1005 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1006 printdebug Dumper($dscdata) if $debuglevel>1;
1007 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1008 printdebug Dumper($dsc) if $debuglevel>1;
1013 sub archive_query ($;@) {
1014 my ($method) = shift @_;
1015 fail "this operation does not support multiple comma-separated suites"
1017 my $query = access_cfg('archive-query','RETURN-UNDEF');
1018 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1021 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1024 sub archive_query_prepend_mirror {
1025 my $m = access_cfg('mirror');
1026 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1029 sub pool_dsc_subpath ($$) {
1030 my ($vsn,$component) = @_; # $package is implict arg
1031 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1032 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1035 sub cfg_apply_map ($$$) {
1036 my ($varref, $what, $mapspec) = @_;
1037 return unless $mapspec;
1039 printdebug "config $what EVAL{ $mapspec; }\n";
1041 eval "package Dgit::Config; $mapspec;";
1046 #---------- `ftpmasterapi' archive query method (nascent) ----------
1048 sub archive_api_query_cmd ($) {
1050 my @cmd = (@curl, qw(-sS));
1051 my $url = access_cfg('archive-query-url');
1052 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1054 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1055 foreach my $key (split /\:/, $keys) {
1056 $key =~ s/\%HOST\%/$host/g;
1058 fail "for $url: stat $key: $!" unless $!==ENOENT;
1061 fail "config requested specific TLS key but do not know".
1062 " how to get curl to use exactly that EE key ($key)";
1063 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1064 # # Sadly the above line does not work because of changes
1065 # # to gnutls. The real fix for #790093 may involve
1066 # # new curl options.
1069 # Fixing #790093 properly will involve providing a value
1070 # for this on clients.
1071 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1072 push @cmd, split / /, $kargs if defined $kargs;
1074 push @cmd, $url.$subpath;
1078 sub api_query ($$;$) {
1080 my ($data, $subpath, $ok404) = @_;
1081 badcfg "ftpmasterapi archive query method takes no data part"
1083 my @cmd = archive_api_query_cmd($subpath);
1084 my $url = $cmd[$#cmd];
1085 push @cmd, qw(-w %{http_code});
1086 my $json = cmdoutput @cmd;
1087 unless ($json =~ s/\d+\d+\d$//) {
1088 failedcmd_report_cmd undef, @cmd;
1089 fail "curl failed to print 3-digit HTTP code";
1092 return undef if $code eq '404' && $ok404;
1093 fail "fetch of $url gave HTTP code $code"
1094 unless $url =~ m#^file://# or $code =~ m/^2/;
1095 return decode_json($json);
1098 sub canonicalise_suite_ftpmasterapi {
1099 my ($proto,$data) = @_;
1100 my $suites = api_query($data, 'suites');
1102 foreach my $entry (@$suites) {
1104 my $v = $entry->{$_};
1105 defined $v && $v eq $isuite;
1106 } qw(codename name);
1107 push @matched, $entry;
1109 fail "unknown suite $isuite" unless @matched;
1112 @matched==1 or die "multiple matches for suite $isuite\n";
1113 $cn = "$matched[0]{codename}";
1114 defined $cn or die "suite $isuite info has no codename\n";
1115 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1117 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1122 sub archive_query_ftpmasterapi {
1123 my ($proto,$data) = @_;
1124 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1126 my $digester = Digest::SHA->new(256);
1127 foreach my $entry (@$info) {
1129 my $vsn = "$entry->{version}";
1130 my ($ok,$msg) = version_check $vsn;
1131 die "bad version: $msg\n" unless $ok;
1132 my $component = "$entry->{component}";
1133 $component =~ m/^$component_re$/ or die "bad component";
1134 my $filename = "$entry->{filename}";
1135 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1136 or die "bad filename";
1137 my $sha256sum = "$entry->{sha256sum}";
1138 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1139 push @rows, [ $vsn, "/pool/$component/$filename",
1140 $digester, $sha256sum ];
1142 die "bad ftpmaster api response: $@\n".Dumper($entry)
1145 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1146 return archive_query_prepend_mirror @rows;
1149 sub file_in_archive_ftpmasterapi {
1150 my ($proto,$data,$filename) = @_;
1151 my $pat = $filename;
1154 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1155 my $info = api_query($data, "file_in_archive/$pat", 1);
1158 #---------- `aptget' archive query method ----------
1161 our $aptget_releasefile;
1162 our $aptget_configpath;
1164 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1165 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1167 sub aptget_cache_clean {
1168 runcmd_ordryrun_local qw(sh -ec),
1169 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1173 sub aptget_lock_acquire () {
1174 my $lockfile = "$aptget_base/lock";
1175 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1176 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1179 sub aptget_prep ($) {
1181 return if defined $aptget_base;
1183 badcfg "aptget archive query method takes no data part"
1186 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1189 ensuredir "$cache/dgit";
1191 access_cfg('aptget-cachekey','RETURN-UNDEF')
1192 // access_nomdistro();
1194 $aptget_base = "$cache/dgit/aptget";
1195 ensuredir $aptget_base;
1197 my $quoted_base = $aptget_base;
1198 die "$quoted_base contains bad chars, cannot continue"
1199 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1201 ensuredir $aptget_base;
1203 aptget_lock_acquire();
1205 aptget_cache_clean();
1207 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1208 my $sourceslist = "source.list#$cachekey";
1210 my $aptsuites = $isuite;
1211 cfg_apply_map(\$aptsuites, 'suite map',
1212 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1214 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1215 printf SRCS "deb-src %s %s %s\n",
1216 access_cfg('mirror'),
1218 access_cfg('aptget-components')
1221 ensuredir "$aptget_base/cache";
1222 ensuredir "$aptget_base/lists";
1224 open CONF, ">", $aptget_configpath or die $!;
1226 Debug::NoLocking "true";
1227 APT::Get::List-Cleanup "false";
1228 #clear APT::Update::Post-Invoke-Success;
1229 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1230 Dir::State::Lists "$quoted_base/lists";
1231 Dir::Etc::preferences "$quoted_base/preferences";
1232 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1233 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1236 foreach my $key (qw(
1239 Dir::Cache::Archives
1240 Dir::Etc::SourceParts
1241 Dir::Etc::preferencesparts
1243 ensuredir "$aptget_base/$key";
1244 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1247 my $oldatime = (time // die $!) - 1;
1248 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1249 next unless stat_exists $oldlist;
1250 my ($mtime) = (stat _)[9];
1251 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1254 runcmd_ordryrun_local aptget_aptget(), qw(update);
1257 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1258 next unless stat_exists $oldlist;
1259 my ($atime) = (stat _)[8];
1260 next if $atime == $oldatime;
1261 push @releasefiles, $oldlist;
1263 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1264 @releasefiles = @inreleasefiles if @inreleasefiles;
1265 die "apt updated wrong number of Release files (@releasefiles), erk"
1266 unless @releasefiles == 1;
1268 ($aptget_releasefile) = @releasefiles;
1271 sub canonicalise_suite_aptget {
1272 my ($proto,$data) = @_;
1275 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1277 foreach my $name (qw(Codename Suite)) {
1278 my $val = $release->{$name};
1280 printdebug "release file $name: $val\n";
1281 $val =~ m/^$suite_re$/o or fail
1282 "Release file ($aptget_releasefile) specifies intolerable $name";
1283 cfg_apply_map(\$val, 'suite rmap',
1284 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1291 sub archive_query_aptget {
1292 my ($proto,$data) = @_;
1295 ensuredir "$aptget_base/source";
1296 foreach my $old (<$aptget_base/source/*.dsc>) {
1297 unlink $old or die "$old: $!";
1300 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1301 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1302 # avoids apt-get source failing with ambiguous error code
1304 runcmd_ordryrun_local
1305 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1306 aptget_aptget(), qw(--download-only --only-source source), $package;
1308 my @dscs = <$aptget_base/source/*.dsc>;
1309 fail "apt-get source did not produce a .dsc" unless @dscs;
1310 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1312 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1315 my $uri = "file://". uri_escape $dscs[0];
1316 $uri =~ s{\%2f}{/}gi;
1317 return [ (getfield $pre_dsc, 'Version'), $uri ];
1320 #---------- `dummyapicat' archive query method ----------
1322 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1323 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1325 sub file_in_archive_dummycatapi ($$$) {
1326 my ($proto,$data,$filename) = @_;
1327 my $mirror = access_cfg('mirror');
1328 $mirror =~ s#^file://#/# or die "$mirror ?";
1330 my @cmd = (qw(sh -ec), '
1332 find -name "$2" -print0 |
1334 ', qw(x), $mirror, $filename);
1335 debugcmd "-|", @cmd;
1336 open FIA, "-|", @cmd or die $!;
1339 printdebug "| $_\n";
1340 m/^(\w+) (\S+)$/ or die "$_ ?";
1341 push @out, { sha256sum => $1, filename => $2 };
1343 close FIA or die failedcmd @cmd;
1347 #---------- `madison' archive query method ----------
1349 sub archive_query_madison {
1350 return archive_query_prepend_mirror
1351 map { [ @$_[0..1] ] } madison_get_parse(@_);
1354 sub madison_get_parse {
1355 my ($proto,$data) = @_;
1356 die unless $proto eq 'madison';
1357 if (!length $data) {
1358 $data= access_cfg('madison-distro','RETURN-UNDEF');
1359 $data //= access_basedistro();
1361 $rmad{$proto,$data,$package} ||= cmdoutput
1362 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1363 my $rmad = $rmad{$proto,$data,$package};
1366 foreach my $l (split /\n/, $rmad) {
1367 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1368 \s*( [^ \t|]+ )\s* \|
1369 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1370 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1371 $1 eq $package or die "$rmad $package ?";
1378 $component = access_cfg('archive-query-default-component');
1380 $5 eq 'source' or die "$rmad ?";
1381 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1383 return sort { -version_compare($a->[0],$b->[0]); } @out;
1386 sub canonicalise_suite_madison {
1387 # madison canonicalises for us
1388 my @r = madison_get_parse(@_);
1390 "unable to canonicalise suite using package $package".
1391 " which does not appear to exist in suite $isuite;".
1392 " --existing-package may help";
1396 sub file_in_archive_madison { return undef; }
1398 #---------- `sshpsql' archive query method ----------
1401 my ($data,$runeinfo,$sql) = @_;
1402 if (!length $data) {
1403 $data= access_someuserhost('sshpsql').':'.
1404 access_cfg('sshpsql-dbname');
1406 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1407 my ($userhost,$dbname) = ($`,$'); #';
1409 my @cmd = (access_cfg_ssh, $userhost,
1410 access_runeinfo("ssh-psql $runeinfo").
1411 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1412 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1414 open P, "-|", @cmd or die $!;
1417 printdebug(">|$_|\n");
1420 $!=0; $?=0; close P or failedcmd @cmd;
1422 my $nrows = pop @rows;
1423 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1424 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1425 @rows = map { [ split /\|/, $_ ] } @rows;
1426 my $ncols = scalar @{ shift @rows };
1427 die if grep { scalar @$_ != $ncols } @rows;
1431 sub sql_injection_check {
1432 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1435 sub archive_query_sshpsql ($$) {
1436 my ($proto,$data) = @_;
1437 sql_injection_check $isuite, $package;
1438 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1439 SELECT source.version, component.name, files.filename, files.sha256sum
1441 JOIN src_associations ON source.id = src_associations.source
1442 JOIN suite ON suite.id = src_associations.suite
1443 JOIN dsc_files ON dsc_files.source = source.id
1444 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1445 JOIN component ON component.id = files_archive_map.component_id
1446 JOIN files ON files.id = dsc_files.file
1447 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1448 AND source.source='$package'
1449 AND files.filename LIKE '%.dsc';
1451 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1452 my $digester = Digest::SHA->new(256);
1454 my ($vsn,$component,$filename,$sha256sum) = @$_;
1455 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1457 return archive_query_prepend_mirror @rows;
1460 sub canonicalise_suite_sshpsql ($$) {
1461 my ($proto,$data) = @_;
1462 sql_injection_check $isuite;
1463 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1464 SELECT suite.codename
1465 FROM suite where suite_name='$isuite' or codename='$isuite';
1467 @rows = map { $_->[0] } @rows;
1468 fail "unknown suite $isuite" unless @rows;
1469 die "ambiguous $isuite: @rows ?" if @rows>1;
1473 sub file_in_archive_sshpsql ($$$) { return undef; }
1475 #---------- `dummycat' archive query method ----------
1477 sub canonicalise_suite_dummycat ($$) {
1478 my ($proto,$data) = @_;
1479 my $dpath = "$data/suite.$isuite";
1480 if (!open C, "<", $dpath) {
1481 $!==ENOENT or die "$dpath: $!";
1482 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1486 chomp or die "$dpath: $!";
1488 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1492 sub archive_query_dummycat ($$) {
1493 my ($proto,$data) = @_;
1494 canonicalise_suite();
1495 my $dpath = "$data/package.$csuite.$package";
1496 if (!open C, "<", $dpath) {
1497 $!==ENOENT or die "$dpath: $!";
1498 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1506 printdebug "dummycat query $csuite $package $dpath | $_\n";
1507 my @row = split /\s+/, $_;
1508 @row==2 or die "$dpath: $_ ?";
1511 C->error and die "$dpath: $!";
1513 return archive_query_prepend_mirror
1514 sort { -version_compare($a->[0],$b->[0]); } @rows;
1517 sub file_in_archive_dummycat () { return undef; }
1519 #---------- tag format handling ----------
1521 sub access_cfg_tagformats () {
1522 split /\,/, access_cfg('dgit-tag-format');
1525 sub access_cfg_tagformats_can_splitbrain () {
1526 my %y = map { $_ => 1 } access_cfg_tagformats;
1527 foreach my $needtf (qw(new maint)) {
1528 next if $y{$needtf};
1534 sub need_tagformat ($$) {
1535 my ($fmt, $why) = @_;
1536 fail "need to use tag format $fmt ($why) but also need".
1537 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1538 " - no way to proceed"
1539 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1540 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1543 sub select_tagformat () {
1545 return if $tagformatfn && !$tagformat_want;
1546 die 'bug' if $tagformatfn && $tagformat_want;
1547 # ... $tagformat_want assigned after previous select_tagformat
1549 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1550 printdebug "select_tagformat supported @supported\n";
1552 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1553 printdebug "select_tagformat specified @$tagformat_want\n";
1555 my ($fmt,$why,$override) = @$tagformat_want;
1557 fail "target distro supports tag formats @supported".
1558 " but have to use $fmt ($why)"
1560 or grep { $_ eq $fmt } @supported;
1562 $tagformat_want = undef;
1564 $tagformatfn = ${*::}{"debiantag_$fmt"};
1566 fail "trying to use unknown tag format \`$fmt' ($why) !"
1567 unless $tagformatfn;
1570 #---------- archive query entrypoints and rest of program ----------
1572 sub canonicalise_suite () {
1573 return if defined $csuite;
1574 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1575 $csuite = archive_query('canonicalise_suite');
1576 if ($isuite ne $csuite) {
1577 progress "canonical suite name for $isuite is $csuite";
1579 progress "canonical suite name is $csuite";
1583 sub get_archive_dsc () {
1584 canonicalise_suite();
1585 my @vsns = archive_query('archive_query');
1586 foreach my $vinfo (@vsns) {
1587 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1588 $dscurl = $vsn_dscurl;
1589 $dscdata = url_get($dscurl);
1591 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1596 $digester->add($dscdata);
1597 my $got = $digester->hexdigest();
1599 fail "$dscurl has hash $got but".
1600 " archive told us to expect $digest";
1603 my $fmt = getfield $dsc, 'Format';
1604 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1605 "unsupported source format $fmt, sorry";
1607 $dsc_checked = !!$digester;
1608 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1612 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1615 sub check_for_git ();
1616 sub check_for_git () {
1618 my $how = access_cfg('git-check');
1619 if ($how eq 'ssh-cmd') {
1621 (access_cfg_ssh, access_gituserhost(),
1622 access_runeinfo("git-check $package").
1623 " set -e; cd ".access_cfg('git-path').";".
1624 " if test -d $package.git; then echo 1; else echo 0; fi");
1625 my $r= cmdoutput @cmd;
1626 if (defined $r and $r =~ m/^divert (\w+)$/) {
1628 my ($usedistro,) = access_distros();
1629 # NB that if we are pushing, $usedistro will be $distro/push
1630 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1631 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1632 progress "diverting to $divert (using config for $instead_distro)";
1633 return check_for_git();
1635 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1637 } elsif ($how eq 'url') {
1638 my $prefix = access_cfg('git-check-url','git-url');
1639 my $suffix = access_cfg('git-check-suffix','git-suffix',
1640 'RETURN-UNDEF') // '.git';
1641 my $url = "$prefix/$package$suffix";
1642 my @cmd = (@curl, qw(-sS -I), $url);
1643 my $result = cmdoutput @cmd;
1644 $result =~ s/^\S+ 200 .*\n\r?\n//;
1645 # curl -sS -I with https_proxy prints
1646 # HTTP/1.0 200 Connection established
1647 $result =~ m/^\S+ (404|200) /s or
1648 fail "unexpected results from git check query - ".
1649 Dumper($prefix, $result);
1651 if ($code eq '404') {
1653 } elsif ($code eq '200') {
1658 } elsif ($how eq 'true') {
1660 } elsif ($how eq 'false') {
1663 badcfg "unknown git-check \`$how'";
1667 sub create_remote_git_repo () {
1668 my $how = access_cfg('git-create');
1669 if ($how eq 'ssh-cmd') {
1671 (access_cfg_ssh, access_gituserhost(),
1672 access_runeinfo("git-create $package").
1673 "set -e; cd ".access_cfg('git-path').";".
1674 " cp -a _template $package.git");
1675 } elsif ($how eq 'true') {
1678 badcfg "unknown git-create \`$how'";
1682 our ($dsc_hash,$lastpush_mergeinput);
1683 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1685 our $ud = '.git/dgit/unpack';
1695 sub mktree_in_ud_here () {
1696 runcmd qw(git init -q);
1697 runcmd qw(git config gc.auto 0);
1698 rmtree('.git/objects');
1699 symlink '../../../../objects','.git/objects' or die $!;
1702 sub git_write_tree () {
1703 my $tree = cmdoutput @git, qw(write-tree);
1704 $tree =~ m/^\w+$/ or die "$tree ?";
1708 sub git_add_write_tree () {
1709 runcmd @git, qw(add -Af .);
1710 return git_write_tree();
1713 sub remove_stray_gits ($) {
1715 my @gitscmd = qw(find -name .git -prune -print0);
1716 debugcmd "|",@gitscmd;
1717 open GITS, "-|", @gitscmd or die $!;
1722 print STDERR "$us: warning: removing from $what: ",
1723 (messagequote $_), "\n";
1727 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1730 sub mktree_in_ud_from_only_subdir ($;$) {
1731 my ($what,$raw) = @_;
1733 # changes into the subdir
1735 die "expected one subdir but found @dirs ?" unless @dirs==1;
1736 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1740 remove_stray_gits($what);
1741 mktree_in_ud_here();
1743 my ($format, $fopts) = get_source_format();
1744 if (madformat($format)) {
1749 my $tree=git_add_write_tree();
1750 return ($tree,$dir);
1753 our @files_csum_info_fields =
1754 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1755 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1756 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1758 sub dsc_files_info () {
1759 foreach my $csumi (@files_csum_info_fields) {
1760 my ($fname, $module, $method) = @$csumi;
1761 my $field = $dsc->{$fname};
1762 next unless defined $field;
1763 eval "use $module; 1;" or die $@;
1765 foreach (split /\n/, $field) {
1767 m/^(\w+) (\d+) (\S+)$/ or
1768 fail "could not parse .dsc $fname line \`$_'";
1769 my $digester = eval "$module"."->$method;" or die $@;
1774 Digester => $digester,
1779 fail "missing any supported Checksums-* or Files field in ".
1780 $dsc->get_option('name');
1784 map { $_->{Filename} } dsc_files_info();
1787 sub files_compare_inputs (@) {
1792 my $showinputs = sub {
1793 return join "; ", map { $_->get_option('name') } @$inputs;
1796 foreach my $in (@$inputs) {
1798 my $in_name = $in->get_option('name');
1800 printdebug "files_compare_inputs $in_name\n";
1802 foreach my $csumi (@files_csum_info_fields) {
1803 my ($fname) = @$csumi;
1804 printdebug "files_compare_inputs $in_name $fname\n";
1806 my $field = $in->{$fname};
1807 next unless defined $field;
1810 foreach (split /\n/, $field) {
1813 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1814 fail "could not parse $in_name $fname line \`$_'";
1816 printdebug "files_compare_inputs $in_name $fname $f\n";
1820 my $re = \ $record{$f}{$fname};
1822 $fchecked{$f}{$in_name} = 1;
1824 fail "hash or size of $f varies in $fname fields".
1825 " (between: ".$showinputs->().")";
1830 @files = sort @files;
1831 $expected_files //= \@files;
1832 "@$expected_files" eq "@files" or
1833 fail "file list in $in_name varies between hash fields!";
1836 fail "$in_name has no files list field(s)";
1838 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1841 grep { keys %$_ == @$inputs-1 } values %fchecked
1842 or fail "no file appears in all file lists".
1843 " (looked in: ".$showinputs->().")";
1846 sub is_orig_file_in_dsc ($$) {
1847 my ($f, $dsc_files_info) = @_;
1848 return 0 if @$dsc_files_info <= 1;
1849 # One file means no origs, and the filename doesn't have a "what
1850 # part of dsc" component. (Consider versions ending `.orig'.)
1851 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1855 sub is_orig_file_of_vsn ($$) {
1856 my ($f, $upstreamvsn) = @_;
1857 my $base = srcfn $upstreamvsn, '';
1858 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1862 sub changes_update_origs_from_dsc ($$$$) {
1863 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1865 printdebug "checking origs needed ($upstreamvsn)...\n";
1866 $_ = getfield $changes, 'Files';
1867 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1868 fail "cannot find section/priority from .changes Files field";
1869 my $placementinfo = $1;
1871 printdebug "checking origs needed placement '$placementinfo'...\n";
1872 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1873 $l =~ m/\S+$/ or next;
1875 printdebug "origs $file | $l\n";
1876 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1877 printdebug "origs $file is_orig\n";
1878 my $have = archive_query('file_in_archive', $file);
1879 if (!defined $have) {
1881 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1887 printdebug "origs $file \$#\$have=$#$have\n";
1888 foreach my $h (@$have) {
1891 foreach my $csumi (@files_csum_info_fields) {
1892 my ($fname, $module, $method, $archivefield) = @$csumi;
1893 next unless defined $h->{$archivefield};
1894 $_ = $dsc->{$fname};
1895 next unless defined;
1896 m/^(\w+) .* \Q$file\E$/m or
1897 fail ".dsc $fname missing entry for $file";
1898 if ($h->{$archivefield} eq $1) {
1902 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1905 die "$file ".Dumper($h)." ?!" if $same && @differ;
1908 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1911 printdebug "origs $file f.same=$found_same".
1912 " #f._differ=$#found_differ\n";
1913 if (@found_differ && !$found_same) {
1915 "archive contains $file with different checksum",
1918 # Now we edit the changes file to add or remove it
1919 foreach my $csumi (@files_csum_info_fields) {
1920 my ($fname, $module, $method, $archivefield) = @$csumi;
1921 next unless defined $changes->{$fname};
1923 # in archive, delete from .changes if it's there
1924 $changed{$file} = "removed" if
1925 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1926 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1927 # not in archive, but it's here in the .changes
1929 my $dsc_data = getfield $dsc, $fname;
1930 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1932 $extra =~ s/ \d+ /$&$placementinfo /
1933 or die "$fname $extra >$dsc_data< ?"
1934 if $fname eq 'Files';
1935 $changes->{$fname} .= "\n". $extra;
1936 $changed{$file} = "added";
1941 foreach my $file (keys %changed) {
1943 "edited .changes for archive .orig contents: %s %s",
1944 $changed{$file}, $file;
1946 my $chtmp = "$changesfile.tmp";
1947 $changes->save($chtmp);
1949 rename $chtmp,$changesfile or die "$changesfile $!";
1951 progress "[new .changes left in $changesfile]";
1954 progress "$changesfile already has appropriate .orig(s) (if any)";
1958 sub make_commit ($) {
1960 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1963 sub make_commit_text ($) {
1966 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1968 print Dumper($text) if $debuglevel > 1;
1969 my $child = open2($out, $in, @cmd) or die $!;
1972 print $in $text or die $!;
1973 close $in or die $!;
1975 $h =~ m/^\w+$/ or die;
1977 printdebug "=> $h\n";
1980 waitpid $child, 0 == $child or die "$child $!";
1981 $? and failedcmd @cmd;
1985 sub clogp_authline ($) {
1987 my $author = getfield $clogp, 'Maintainer';
1988 $author =~ s#,.*##ms;
1989 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1990 my $authline = "$author $date";
1991 $authline =~ m/$git_authline_re/o or
1992 fail "unexpected commit author line format \`$authline'".
1993 " (was generated from changelog Maintainer field)";
1994 return ($1,$2,$3) if wantarray;
1998 sub vendor_patches_distro ($$) {
1999 my ($checkdistro, $what) = @_;
2000 return unless defined $checkdistro;
2002 my $series = "debian/patches/\L$checkdistro\E.series";
2003 printdebug "checking for vendor-specific $series ($what)\n";
2005 if (!open SERIES, "<", $series) {
2006 die "$series $!" unless $!==ENOENT;
2015 Unfortunately, this source package uses a feature of dpkg-source where
2016 the same source package unpacks to different source code on different
2017 distros. dgit cannot safely operate on such packages on affected
2018 distros, because the meaning of source packages is not stable.
2020 Please ask the distro/maintainer to remove the distro-specific series
2021 files and use a different technique (if necessary, uploading actually
2022 different packages, if different distros are supposed to have
2026 fail "Found active distro-specific series file for".
2027 " $checkdistro ($what): $series, cannot continue";
2029 die "$series $!" if SERIES->error;
2033 sub check_for_vendor_patches () {
2034 # This dpkg-source feature doesn't seem to be documented anywhere!
2035 # But it can be found in the changelog (reformatted):
2037 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2038 # Author: Raphael Hertzog <hertzog@debian.org>
2039 # Date: Sun Oct 3 09:36:48 2010 +0200
2041 # dpkg-source: correctly create .pc/.quilt_series with alternate
2044 # If you have debian/patches/ubuntu.series and you were
2045 # unpacking the source package on ubuntu, quilt was still
2046 # directed to debian/patches/series instead of
2047 # debian/patches/ubuntu.series.
2049 # debian/changelog | 3 +++
2050 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2051 # 2 files changed, 6 insertions(+), 1 deletion(-)
2054 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2055 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2056 "Dpkg::Vendor \`current vendor'");
2057 vendor_patches_distro(access_basedistro(),
2058 "(base) distro being accessed");
2059 vendor_patches_distro(access_nomdistro(),
2060 "(nominal) distro being accessed");
2063 sub generate_commits_from_dsc () {
2064 # See big comment in fetch_from_archive, below.
2065 # See also README.dsc-import.
2069 my @dfi = dsc_files_info();
2070 foreach my $fi (@dfi) {
2071 my $f = $fi->{Filename};
2072 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2073 my $upper_f = "../../../../$f";
2075 printdebug "considering reusing $f: ";
2077 if (link_ltarget "$upper_f,fetch", $f) {
2078 printdebug "linked (using ...,fetch).\n";
2079 } elsif ((printdebug "($!) "),
2081 fail "accessing ../$f,fetch: $!";
2082 } elsif (link_ltarget $upper_f, $f) {
2083 printdebug "linked.\n";
2084 } elsif ((printdebug "($!) "),
2086 fail "accessing ../$f: $!";
2088 printdebug "absent.\n";
2092 complete_file_from_dsc('.', $fi, \$refetched)
2095 printdebug "considering saving $f: ";
2097 if (link $f, $upper_f) {
2098 printdebug "linked.\n";
2099 } elsif ((printdebug "($!) "),
2101 fail "saving ../$f: $!";
2102 } elsif (!$refetched) {
2103 printdebug "no need.\n";
2104 } elsif (link $f, "$upper_f,fetch") {
2105 printdebug "linked (using ...,fetch).\n";
2106 } elsif ((printdebug "($!) "),
2108 fail "saving ../$f,fetch: $!";
2110 printdebug "cannot.\n";
2114 # We unpack and record the orig tarballs first, so that we only
2115 # need disk space for one private copy of the unpacked source.
2116 # But we can't make them into commits until we have the metadata
2117 # from the debian/changelog, so we record the tree objects now and
2118 # make them into commits later.
2120 my $upstreamv = upstreamversion $dsc->{version};
2121 my $orig_f_base = srcfn $upstreamv, '';
2123 foreach my $fi (@dfi) {
2124 # We actually import, and record as a commit, every tarball
2125 # (unless there is only one file, in which case there seems
2128 my $f = $fi->{Filename};
2129 printdebug "import considering $f ";
2130 (printdebug "only one dfi\n"), next if @dfi == 1;
2131 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2132 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2136 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2138 printdebug "Y ", (join ' ', map { $_//"(none)" }
2139 $compr_ext, $orig_f_part
2142 my $input = new IO::File $f, '<' or die "$f $!";
2146 if (defined $compr_ext) {
2148 Dpkg::Compression::compression_guess_from_filename $f;
2149 fail "Dpkg::Compression cannot handle file $f in source package"
2150 if defined $compr_ext && !defined $cname;
2152 new Dpkg::Compression::Process compression => $cname;
2153 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2154 my $compr_fh = new IO::Handle;
2155 my $compr_pid = open $compr_fh, "-|" // die $!;
2157 open STDIN, "<&", $input or die $!;
2159 die "dgit (child): exec $compr_cmd[0]: $!\n";
2164 rmtree "_unpack-tar";
2165 mkdir "_unpack-tar" or die $!;
2166 my @tarcmd = qw(tar -x -f -
2167 --no-same-owner --no-same-permissions
2168 --no-acls --no-xattrs --no-selinux);
2169 my $tar_pid = fork // die $!;
2171 chdir "_unpack-tar" or die $!;
2172 open STDIN, "<&", $input or die $!;
2174 die "dgit (child): exec $tarcmd[0]: $!";
2176 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2177 !$? or failedcmd @tarcmd;
2180 (@compr_cmd ? failedcmd @compr_cmd
2182 # finally, we have the results in "tarball", but maybe
2183 # with the wrong permissions
2185 runcmd qw(chmod -R +rwX _unpack-tar);
2186 changedir "_unpack-tar";
2187 remove_stray_gits($f);
2188 mktree_in_ud_here();
2190 my ($tree) = git_add_write_tree();
2191 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2192 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2194 printdebug "one subtree $1\n";
2196 printdebug "multiple subtrees\n";
2199 rmtree "_unpack-tar";
2201 my $ent = [ $f, $tree ];
2203 Orig => !!$orig_f_part,
2204 Sort => (!$orig_f_part ? 2 :
2205 $orig_f_part =~ m/-/g ? 1 :
2213 # put any without "_" first (spec is not clear whether files
2214 # are always in the usual order). Tarballs without "_" are
2215 # the main orig or the debian tarball.
2216 $a->{Sort} <=> $b->{Sort} or
2220 my $any_orig = grep { $_->{Orig} } @tartrees;
2222 my $dscfn = "$package.dsc";
2224 my $treeimporthow = 'package';
2226 open D, ">", $dscfn or die "$dscfn: $!";
2227 print D $dscdata or die "$dscfn: $!";
2228 close D or die "$dscfn: $!";
2229 my @cmd = qw(dpkg-source);
2230 push @cmd, '--no-check' if $dsc_checked;
2231 if (madformat $dsc->{format}) {
2232 push @cmd, '--skip-patches';
2233 $treeimporthow = 'unpatched';
2235 push @cmd, qw(-x --), $dscfn;
2238 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2239 if (madformat $dsc->{format}) {
2240 check_for_vendor_patches();
2244 if (madformat $dsc->{format}) {
2245 my @pcmd = qw(dpkg-source --before-build .);
2246 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2248 $dappliedtree = git_add_write_tree();
2251 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2252 debugcmd "|",@clogcmd;
2253 open CLOGS, "-|", @clogcmd or die $!;
2258 printdebug "import clog search...\n";
2261 my $stanzatext = do { local $/=""; <CLOGS>; };
2262 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2263 last if !defined $stanzatext;
2265 my $desc = "package changelog, entry no.$.";
2266 open my $stanzafh, "<", \$stanzatext or die;
2267 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2268 $clogp //= $thisstanza;
2270 printdebug "import clog $thisstanza->{version} $desc...\n";
2272 last if !$any_orig; # we don't need $r1clogp
2274 # We look for the first (most recent) changelog entry whose
2275 # version number is lower than the upstream version of this
2276 # package. Then the last (least recent) previous changelog
2277 # entry is treated as the one which introduced this upstream
2278 # version and used for the synthetic commits for the upstream
2281 # One might think that a more sophisticated algorithm would be
2282 # necessary. But: we do not want to scan the whole changelog
2283 # file. Stopping when we see an earlier version, which
2284 # necessarily then is an earlier upstream version, is the only
2285 # realistic way to do that. Then, either the earliest
2286 # changelog entry we have seen so far is indeed the earliest
2287 # upload of this upstream version; or there are only changelog
2288 # entries relating to later upstream versions (which is not
2289 # possible unless the changelog and .dsc disagree about the
2290 # version). Then it remains to choose between the physically
2291 # last entry in the file, and the one with the lowest version
2292 # number. If these are not the same, we guess that the
2293 # versions were created in a non-monotic order rather than
2294 # that the changelog entries have been misordered.
2296 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2298 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2299 $r1clogp = $thisstanza;
2301 printdebug "import clog $r1clogp->{version} becomes r1\n";
2303 die $! if CLOGS->error;
2304 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2306 $clogp or fail "package changelog has no entries!";
2308 my $authline = clogp_authline $clogp;
2309 my $changes = getfield $clogp, 'Changes';
2310 my $cversion = getfield $clogp, 'Version';
2313 $r1clogp //= $clogp; # maybe there's only one entry;
2314 my $r1authline = clogp_authline $r1clogp;
2315 # Strictly, r1authline might now be wrong if it's going to be
2316 # unused because !$any_orig. Whatever.
2318 printdebug "import tartrees authline $authline\n";
2319 printdebug "import tartrees r1authline $r1authline\n";
2321 foreach my $tt (@tartrees) {
2322 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2324 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2327 committer $r1authline
2331 [dgit import orig $tt->{F}]
2339 [dgit import tarball $package $cversion $tt->{F}]
2344 printdebug "import main commit\n";
2346 open C, ">../commit.tmp" or die $!;
2347 print C <<END or die $!;
2350 print C <<END or die $! foreach @tartrees;
2353 print C <<END or die $!;
2359 [dgit import $treeimporthow $package $cversion]
2363 my $rawimport_hash = make_commit qw(../commit.tmp);
2365 if (madformat $dsc->{format}) {
2366 printdebug "import apply patches...\n";
2368 # regularise the state of the working tree so that
2369 # the checkout of $rawimport_hash works nicely.
2370 my $dappliedcommit = make_commit_text(<<END);
2377 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2379 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2381 # We need the answers to be reproducible
2382 my @authline = clogp_authline($clogp);
2383 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2384 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2385 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2386 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2387 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2388 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2390 my $path = $ENV{PATH} or die;
2392 foreach my $use_absurd (qw(0 1)) {
2393 runcmd @git, qw(checkout -q unpa);
2394 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2395 local $ENV{PATH} = $path;
2398 progress "warning: $@";
2399 $path = "$absurdity:$path";
2400 progress "$us: trying slow absurd-git-apply...";
2401 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2406 die "forbid absurd git-apply\n" if $use_absurd
2407 && forceing [qw(import-gitapply-no-absurd)];
2408 die "only absurd git-apply!\n" if !$use_absurd
2409 && forceing [qw(import-gitapply-absurd)];
2411 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2412 local $ENV{PATH} = $path if $use_absurd;
2414 my @showcmd = (gbp_pq, qw(import));
2415 my @realcmd = shell_cmd
2416 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2417 debugcmd "+",@realcmd;
2418 if (system @realcmd) {
2419 die +(shellquote @showcmd).
2421 failedcmd_waitstatus()."\n";
2424 my $gapplied = git_rev_parse('HEAD');
2425 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2426 $gappliedtree eq $dappliedtree or
2428 gbp-pq import and dpkg-source disagree!
2429 gbp-pq import gave commit $gapplied
2430 gbp-pq import gave tree $gappliedtree
2431 dpkg-source --before-build gave tree $dappliedtree
2433 $rawimport_hash = $gapplied;
2438 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2443 progress "synthesised git commit from .dsc $cversion";
2445 my $rawimport_mergeinput = {
2446 Commit => $rawimport_hash,
2447 Info => "Import of source package",
2449 my @output = ($rawimport_mergeinput);
2451 if ($lastpush_mergeinput) {
2452 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2453 my $oversion = getfield $oldclogp, 'Version';
2455 version_compare($oversion, $cversion);
2457 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2458 { Message => <<END, ReverseParents => 1 });
2459 Record $package ($cversion) in archive suite $csuite
2461 } elsif ($vcmp > 0) {
2462 print STDERR <<END or die $!;
2464 Version actually in archive: $cversion (older)
2465 Last version pushed with dgit: $oversion (newer or same)
2468 @output = $lastpush_mergeinput;
2470 # Same version. Use what's in the server git branch,
2471 # discarding our own import. (This could happen if the
2472 # server automatically imports all packages into git.)
2473 @output = $lastpush_mergeinput;
2476 changedir '../../../..';
2481 sub complete_file_from_dsc ($$;$) {
2482 our ($dstdir, $fi, $refetched) = @_;
2483 # Ensures that we have, in $dstdir, the file $fi, with the correct
2484 # contents. (Downloading it from alongside $dscurl if necessary.)
2485 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2486 # and will set $$refetched=1 if it did so (or tried to).
2488 my $f = $fi->{Filename};
2489 my $tf = "$dstdir/$f";
2493 my $checkhash = sub {
2494 open F, "<", "$tf" or die "$tf: $!";
2495 $fi->{Digester}->reset();
2496 $fi->{Digester}->addfile(*F);
2497 F->error and die $!;
2498 my $got = $fi->{Digester}->hexdigest();
2499 return $got eq $fi->{Hash};
2502 if (stat_exists $tf) {
2503 if ($checkhash->()) {
2504 progress "using existing $f";
2508 fail "file $f has hash $got but .dsc".
2509 " demands hash $fi->{Hash} ".
2510 "(perhaps you should delete this file?)";
2512 progress "need to fetch correct version of $f";
2513 unlink $tf or die "$tf $!";
2516 printdebug "$tf does not exist, need to fetch\n";
2520 $furl =~ s{/[^/]+$}{};
2522 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2523 die "$f ?" if $f =~ m#/#;
2524 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2525 return 0 if !act_local();
2528 fail "file $f has hash $got but .dsc".
2529 " demands hash $fi->{Hash} ".
2530 "(got wrong file from archive!)";
2535 sub ensure_we_have_orig () {
2536 my @dfi = dsc_files_info();
2537 foreach my $fi (@dfi) {
2538 my $f = $fi->{Filename};
2539 next unless is_orig_file_in_dsc($f, \@dfi);
2540 complete_file_from_dsc('..', $fi)
2545 #---------- git fetch ----------
2547 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2548 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2550 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2551 # locally fetched refs because they have unhelpful names and clutter
2552 # up gitk etc. So we track whether we have "used up" head ref (ie,
2553 # whether we have made another local ref which refers to this object).
2555 # (If we deleted them unconditionally, then we might end up
2556 # re-fetching the same git objects each time dgit fetch was run.)
2558 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2559 # in git_fetch_us to fetch the refs in question, and possibly a call
2560 # to lrfetchref_used.
2562 our (%lrfetchrefs_f, %lrfetchrefs_d);
2563 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2565 sub lrfetchref_used ($) {
2566 my ($fullrefname) = @_;
2567 my $objid = $lrfetchrefs_f{$fullrefname};
2568 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2571 sub git_lrfetch_sane {
2572 my ($supplementary, @specs) = @_;
2573 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2574 # at least as regards @specs. Also leave the results in
2575 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2576 # able to clean these up.
2578 # With $supplementary==1, @specs must not contain wildcards
2579 # and we add to our previous fetches (non-atomically).
2581 # This is rather miserable:
2582 # When git fetch --prune is passed a fetchspec ending with a *,
2583 # it does a plausible thing. If there is no * then:
2584 # - it matches subpaths too, even if the supplied refspec
2585 # starts refs, and behaves completely madly if the source
2586 # has refs/refs/something. (See, for example, Debian #NNNN.)
2587 # - if there is no matching remote ref, it bombs out the whole
2589 # We want to fetch a fixed ref, and we don't know in advance
2590 # if it exists, so this is not suitable.
2592 # Our workaround is to use git ls-remote. git ls-remote has its
2593 # own qairks. Notably, it has the absurd multi-tail-matching
2594 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2595 # refs/refs/foo etc.
2597 # Also, we want an idempotent snapshot, but we have to make two
2598 # calls to the remote: one to git ls-remote and to git fetch. The
2599 # solution is use git ls-remote to obtain a target state, and
2600 # git fetch to try to generate it. If we don't manage to generate
2601 # the target state, we try again.
2603 my $url = access_giturl();
2605 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2607 my $specre = join '|', map {
2610 my $wildcard = $x =~ s/\\\*$/.*/;
2611 die if $wildcard && $supplementary;
2614 printdebug "git_lrfetch_sane specre=$specre\n";
2615 my $wanted_rref = sub {
2617 return m/^(?:$specre)$/;
2620 my $fetch_iteration = 0;
2623 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2624 if (++$fetch_iteration > 10) {
2625 fail "too many iterations trying to get sane fetch!";
2628 my @look = map { "refs/$_" } @specs;
2629 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2633 open GITLS, "-|", @lcmd or die $!;
2635 printdebug "=> ", $_;
2636 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2637 my ($objid,$rrefname) = ($1,$2);
2638 if (!$wanted_rref->($rrefname)) {
2640 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2644 $wantr{$rrefname} = $objid;
2647 close GITLS or failedcmd @lcmd;
2649 # OK, now %want is exactly what we want for refs in @specs
2651 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2652 "+refs/$_:".lrfetchrefs."/$_";
2655 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2657 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2658 runcmd_ordryrun_local @fcmd if @fspecs;
2660 if (!$supplementary) {
2661 %lrfetchrefs_f = ();
2665 git_for_each_ref(lrfetchrefs, sub {
2666 my ($objid,$objtype,$lrefname,$reftail) = @_;
2667 $lrfetchrefs_f{$lrefname} = $objid;
2668 $objgot{$objid} = 1;
2671 if ($supplementary) {
2675 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2676 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2677 if (!exists $wantr{$rrefname}) {
2678 if ($wanted_rref->($rrefname)) {
2680 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2684 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2687 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2688 delete $lrfetchrefs_f{$lrefname};
2692 foreach my $rrefname (sort keys %wantr) {
2693 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2694 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2695 my $want = $wantr{$rrefname};
2696 next if $got eq $want;
2697 if (!defined $objgot{$want}) {
2699 warning: git ls-remote suggests we want $lrefname
2700 warning: and it should refer to $want
2701 warning: but git fetch didn't fetch that object to any relevant ref.
2702 warning: This may be due to a race with someone updating the server.
2703 warning: Will try again...
2705 next FETCH_ITERATION;
2708 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2710 runcmd_ordryrun_local @git, qw(update-ref -m),
2711 "dgit fetch git fetch fixup", $lrefname, $want;
2712 $lrfetchrefs_f{$lrefname} = $want;
2717 if (defined $csuite) {
2718 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2719 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2720 my ($objid,$objtype,$lrefname,$reftail) = @_;
2721 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2722 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2726 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2727 Dumper(\%lrfetchrefs_f);
2730 sub git_fetch_us () {
2731 # Want to fetch only what we are going to use, unless
2732 # deliberately-not-ff, in which case we must fetch everything.
2734 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2736 (quiltmode_splitbrain
2737 ? (map { $_->('*',access_nomdistro) }
2738 \&debiantag_new, \&debiantag_maintview)
2739 : debiantags('*',access_nomdistro));
2740 push @specs, server_branch($csuite);
2741 push @specs, $rewritemap;
2742 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2744 git_lrfetch_sane 0, @specs;
2747 my @tagpats = debiantags('*',access_nomdistro);
2749 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2750 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2751 printdebug "currently $fullrefname=$objid\n";
2752 $here{$fullrefname} = $objid;
2754 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2755 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2756 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2757 printdebug "offered $lref=$objid\n";
2758 if (!defined $here{$lref}) {
2759 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2760 runcmd_ordryrun_local @upd;
2761 lrfetchref_used $fullrefname;
2762 } elsif ($here{$lref} eq $objid) {
2763 lrfetchref_used $fullrefname;
2766 "Not updating $lref from $here{$lref} to $objid.\n";
2771 #---------- dsc and archive handling ----------
2773 sub mergeinfo_getclogp ($) {
2774 # Ensures thit $mi->{Clogp} exists and returns it
2776 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2779 sub mergeinfo_version ($) {
2780 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2783 sub fetch_from_archive_record_1 ($) {
2785 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2786 'DGIT_ARCHIVE', $hash;
2787 cmdoutput @git, qw(log -n2), $hash;
2788 # ... gives git a chance to complain if our commit is malformed
2791 sub fetch_from_archive_record_2 ($) {
2793 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2797 dryrun_report @upd_cmd;
2801 sub parse_dsc_field_def_dsc_distro () {
2802 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2803 dgit.default.distro);
2806 sub parse_dsc_field ($$) {
2807 my ($dsc, $what) = @_;
2809 foreach my $field (@ourdscfield) {
2810 $f = $dsc->{$field};
2815 progress "$what: NO git hash";
2816 parse_dsc_field_def_dsc_distro();
2817 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2818 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2819 progress "$what: specified git info ($dsc_distro)";
2820 $dsc_hint_tag = [ $dsc_hint_tag ];
2821 } elsif ($f =~ m/^\w+\s*$/) {
2823 parse_dsc_field_def_dsc_distro();
2824 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2826 progress "$what: specified git hash";
2828 fail "$what: invalid Dgit info";
2832 sub resolve_dsc_field_commit ($$) {
2833 my ($already_distro, $already_mapref) = @_;
2835 return unless defined $dsc_hash;
2838 defined $already_mapref &&
2839 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2840 ? $already_mapref : undef;
2844 my ($what, @fetch) = @_;
2846 local $idistro = $dsc_distro;
2847 my $lrf = lrfetchrefs;
2849 if (!$chase_dsc_distro) {
2851 "not chasing .dsc distro $dsc_distro: not fetching $what";
2856 ".dsc names distro $dsc_distro: fetching $what";
2858 my $url = access_giturl();
2859 if (!defined $url) {
2860 defined $dsc_hint_url or fail <<END;
2861 .dsc Dgit metadata is in context of distro $dsc_distro
2862 for which we have no configured url and .dsc provides no hint
2865 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2866 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2867 parse_cfg_bool "dsc-url-proto-ok", 'false',
2868 cfg("dgit.dsc-url-proto-ok.$proto",
2869 "dgit.default.dsc-url-proto-ok")
2871 .dsc Dgit metadata is in context of distro $dsc_distro
2872 for which we have no configured url;
2873 .dsc provices hinted url with protocol $proto which is unsafe.
2874 (can be overridden by config - consult documentation)
2876 $url = $dsc_hint_url;
2879 git_lrfetch_sane 1, @fetch;
2884 my $rewrite_enable = do {
2885 local $idistro = $dsc_distro;
2886 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2889 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2890 if (!defined $mapref) {
2891 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2892 $mapref = $lrf.'/'.$rewritemap;
2894 my $rewritemapdata = git_cat_file $mapref.':map';
2895 if (defined $rewritemapdata
2896 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2898 "server's git history rewrite map contains a relevant entry!";
2901 if (defined $dsc_hash) {
2902 progress "using rewritten git hash in place of .dsc value";
2904 progress "server data says .dsc hash is to be disregarded";
2909 if (!defined git_cat_file $dsc_hash) {
2910 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2911 my $lrf = $do_fetch->("additional commits", @tags) &&
2912 defined git_cat_file $dsc_hash
2914 .dsc Dgit metadata requires commit $dsc_hash
2915 but we could not obtain that object anywhere.
2917 foreach my $t (@tags) {
2918 my $fullrefname = $lrf.'/'.$t;
2919 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2920 next unless $lrfetchrefs_f{$fullrefname};
2921 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2922 lrfetchref_used $fullrefname;
2927 sub fetch_from_archive () {
2928 ensure_setup_existing_tree();
2930 # Ensures that lrref() is what is actually in the archive, one way
2931 # or another, according to us - ie this client's
2932 # appropritaely-updated archive view. Also returns the commit id.
2933 # If there is nothing in the archive, leaves lrref alone and
2934 # returns undef. git_fetch_us must have already been called.
2938 parse_dsc_field($dsc, 'last upload to archive');
2939 resolve_dsc_field_commit access_basedistro,
2940 lrfetchrefs."/".$rewritemap
2942 progress "no version available from the archive";
2945 # If the archive's .dsc has a Dgit field, there are three
2946 # relevant git commitids we need to choose between and/or merge
2948 # 1. $dsc_hash: the Dgit field from the archive
2949 # 2. $lastpush_hash: the suite branch on the dgit git server
2950 # 3. $lastfetch_hash: our local tracking brach for the suite
2952 # These may all be distinct and need not be in any fast forward
2955 # If the dsc was pushed to this suite, then the server suite
2956 # branch will have been updated; but it might have been pushed to
2957 # a different suite and copied by the archive. Conversely a more
2958 # recent version may have been pushed with dgit but not appeared
2959 # in the archive (yet).
2961 # $lastfetch_hash may be awkward because archive imports
2962 # (particularly, imports of Dgit-less .dscs) are performed only as
2963 # needed on individual clients, so different clients may perform a
2964 # different subset of them - and these imports are only made
2965 # public during push. So $lastfetch_hash may represent a set of
2966 # imports different to a subsequent upload by a different dgit
2969 # Our approach is as follows:
2971 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2972 # descendant of $dsc_hash, then it was pushed by a dgit user who
2973 # had based their work on $dsc_hash, so we should prefer it.
2974 # Otherwise, $dsc_hash was installed into this suite in the
2975 # archive other than by a dgit push, and (necessarily) after the
2976 # last dgit push into that suite (since a dgit push would have
2977 # been descended from the dgit server git branch); thus, in that
2978 # case, we prefer the archive's version (and produce a
2979 # pseudo-merge to overwrite the dgit server git branch).
2981 # (If there is no Dgit field in the archive's .dsc then
2982 # generate_commit_from_dsc uses the version numbers to decide
2983 # whether the suite branch or the archive is newer. If the suite
2984 # branch is newer it ignores the archive's .dsc; otherwise it
2985 # generates an import of the .dsc, and produces a pseudo-merge to
2986 # overwrite the suite branch with the archive contents.)
2988 # The outcome of that part of the algorithm is the `public view',
2989 # and is same for all dgit clients: it does not depend on any
2990 # unpublished history in the local tracking branch.
2992 # As between the public view and the local tracking branch: The
2993 # local tracking branch is only updated by dgit fetch, and
2994 # whenever dgit fetch runs it includes the public view in the
2995 # local tracking branch. Therefore if the public view is not
2996 # descended from the local tracking branch, the local tracking
2997 # branch must contain history which was imported from the archive
2998 # but never pushed; and, its tip is now out of date. So, we make
2999 # a pseudo-merge to overwrite the old imports and stitch the old
3002 # Finally: we do not necessarily reify the public view (as
3003 # described above). This is so that we do not end up stacking two
3004 # pseudo-merges. So what we actually do is figure out the inputs
3005 # to any public view pseudo-merge and put them in @mergeinputs.
3008 # $mergeinputs[]{Commit}
3009 # $mergeinputs[]{Info}
3010 # $mergeinputs[0] is the one whose tree we use
3011 # @mergeinputs is in the order we use in the actual commit)
3014 # $mergeinputs[]{Message} is a commit message to use
3015 # $mergeinputs[]{ReverseParents} if def specifies that parent
3016 # list should be in opposite order
3017 # Such an entry has no Commit or Info. It applies only when found
3018 # in the last entry. (This ugliness is to support making
3019 # identical imports to previous dgit versions.)
3021 my $lastpush_hash = git_get_ref(lrfetchref());
3022 printdebug "previous reference hash=$lastpush_hash\n";
3023 $lastpush_mergeinput = $lastpush_hash && {
3024 Commit => $lastpush_hash,
3025 Info => "dgit suite branch on dgit git server",
3028 my $lastfetch_hash = git_get_ref(lrref());
3029 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3030 my $lastfetch_mergeinput = $lastfetch_hash && {
3031 Commit => $lastfetch_hash,
3032 Info => "dgit client's archive history view",
3035 my $dsc_mergeinput = $dsc_hash && {
3036 Commit => $dsc_hash,
3037 Info => "Dgit field in .dsc from archive",
3041 my $del_lrfetchrefs = sub {
3044 printdebug "del_lrfetchrefs...\n";
3045 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3046 my $objid = $lrfetchrefs_d{$fullrefname};
3047 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3049 $gur ||= new IO::Handle;
3050 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3052 printf $gur "delete %s %s\n", $fullrefname, $objid;
3055 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3059 if (defined $dsc_hash) {
3060 ensure_we_have_orig();
3061 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3062 @mergeinputs = $dsc_mergeinput
3063 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3064 print STDERR <<END or die $!;
3066 Git commit in archive is behind the last version allegedly pushed/uploaded.
3067 Commit referred to by archive: $dsc_hash
3068 Last version pushed with dgit: $lastpush_hash
3071 @mergeinputs = ($lastpush_mergeinput);
3073 # Archive has .dsc which is not a descendant of the last dgit
3074 # push. This can happen if the archive moves .dscs about.
3075 # Just follow its lead.
3076 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3077 progress "archive .dsc names newer git commit";
3078 @mergeinputs = ($dsc_mergeinput);
3080 progress "archive .dsc names other git commit, fixing up";
3081 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3085 @mergeinputs = generate_commits_from_dsc();
3086 # We have just done an import. Now, our import algorithm might
3087 # have been improved. But even so we do not want to generate
3088 # a new different import of the same package. So if the
3089 # version numbers are the same, just use our existing version.
3090 # If the version numbers are different, the archive has changed
3091 # (perhaps, rewound).
3092 if ($lastfetch_mergeinput &&
3093 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3094 (mergeinfo_version $mergeinputs[0]) )) {
3095 @mergeinputs = ($lastfetch_mergeinput);
3097 } elsif ($lastpush_hash) {
3098 # only in git, not in the archive yet
3099 @mergeinputs = ($lastpush_mergeinput);
3100 print STDERR <<END or die $!;
3102 Package not found in the archive, but has allegedly been pushed using dgit.
3106 printdebug "nothing found!\n";
3107 if (defined $skew_warning_vsn) {
3108 print STDERR <<END or die $!;
3110 Warning: relevant archive skew detected.
3111 Archive allegedly contains $skew_warning_vsn
3112 But we were not able to obtain any version from the archive or git.
3116 unshift @end, $del_lrfetchrefs;
3120 if ($lastfetch_hash &&
3122 my $h = $_->{Commit};
3123 $h and is_fast_fwd($lastfetch_hash, $h);
3124 # If true, one of the existing parents of this commit
3125 # is a descendant of the $lastfetch_hash, so we'll
3126 # be ff from that automatically.
3130 push @mergeinputs, $lastfetch_mergeinput;
3133 printdebug "fetch mergeinfos:\n";
3134 foreach my $mi (@mergeinputs) {
3136 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3138 printdebug sprintf " ReverseParents=%d Message=%s",
3139 $mi->{ReverseParents}, $mi->{Message};
3143 my $compat_info= pop @mergeinputs
3144 if $mergeinputs[$#mergeinputs]{Message};
3146 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3149 if (@mergeinputs > 1) {
3151 my $tree_commit = $mergeinputs[0]{Commit};
3153 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3154 $tree =~ m/\n\n/; $tree = $`;
3155 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3158 # We use the changelog author of the package in question the
3159 # author of this pseudo-merge. This is (roughly) correct if
3160 # this commit is simply representing aa non-dgit upload.
3161 # (Roughly because it does not record sponsorship - but we
3162 # don't have sponsorship info because that's in the .changes,
3163 # which isn't in the archivw.)
3165 # But, it might be that we are representing archive history
3166 # updates (including in-archive copies). These are not really
3167 # the responsibility of the person who created the .dsc, but
3168 # there is no-one whose name we should better use. (The
3169 # author of the .dsc-named commit is clearly worse.)
3171 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3172 my $author = clogp_authline $useclogp;
3173 my $cversion = getfield $useclogp, 'Version';
3175 my $mcf = ".git/dgit/mergecommit";
3176 open MC, ">", $mcf or die "$mcf $!";
3177 print MC <<END or die $!;
3181 my @parents = grep { $_->{Commit} } @mergeinputs;
3182 @parents = reverse @parents if $compat_info->{ReverseParents};
3183 print MC <<END or die $! foreach @parents;
3187 print MC <<END or die $!;
3193 if (defined $compat_info->{Message}) {
3194 print MC $compat_info->{Message} or die $!;
3196 print MC <<END or die $!;
3197 Record $package ($cversion) in archive suite $csuite
3201 my $message_add_info = sub {
3203 my $mversion = mergeinfo_version $mi;
3204 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3208 $message_add_info->($mergeinputs[0]);
3209 print MC <<END or die $!;
3210 should be treated as descended from
3212 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3216 $hash = make_commit $mcf;
3218 $hash = $mergeinputs[0]{Commit};
3220 printdebug "fetch hash=$hash\n";
3223 my ($lasth, $what) = @_;
3224 return unless $lasth;
3225 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3228 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3230 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3232 fetch_from_archive_record_1($hash);
3234 if (defined $skew_warning_vsn) {
3236 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3237 my $gotclogp = commit_getclogp($hash);
3238 my $got_vsn = getfield $gotclogp, 'Version';
3239 printdebug "SKEW CHECK GOT $got_vsn\n";
3240 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3241 print STDERR <<END or die $!;
3243 Warning: archive skew detected. Using the available version:
3244 Archive allegedly contains $skew_warning_vsn
3245 We were able to obtain only $got_vsn
3251 if ($lastfetch_hash ne $hash) {
3252 fetch_from_archive_record_2($hash);
3255 lrfetchref_used lrfetchref();
3257 unshift @end, $del_lrfetchrefs;
3261 sub set_local_git_config ($$) {
3263 runcmd @git, qw(config), $k, $v;
3266 sub setup_mergechangelogs (;$) {
3268 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3270 my $driver = 'dpkg-mergechangelogs';
3271 my $cb = "merge.$driver";
3272 my $attrs = '.git/info/attributes';
3273 ensuredir '.git/info';
3275 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3276 if (!open ATTRS, "<", $attrs) {
3277 $!==ENOENT or die "$attrs: $!";
3281 next if m{^debian/changelog\s};
3282 print NATTRS $_, "\n" or die $!;
3284 ATTRS->error and die $!;
3287 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3290 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3291 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3293 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3296 sub setup_useremail (;$) {
3298 return unless $always || access_cfg_bool(1, 'setup-useremail');
3301 my ($k, $envvar) = @_;
3302 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3303 return unless defined $v;
3304 set_local_git_config "user.$k", $v;
3307 $setup->('email', 'DEBEMAIL');
3308 $setup->('name', 'DEBFULLNAME');
3311 sub ensure_setup_existing_tree () {
3312 my $k = "remote.$remotename.skipdefaultupdate";
3313 my $c = git_get_config $k;
3314 return if defined $c;
3315 set_local_git_config $k, 'true';
3318 sub setup_new_tree () {
3319 setup_mergechangelogs();
3323 sub multisuite_suite_child ($$$) {
3324 my ($tsuite, $merginputs, $fn) = @_;
3325 # in child, sets things up, calls $fn->(), and returns undef
3326 # in parent, returns canonical suite name for $tsuite
3327 my $canonsuitefh = IO::File::new_tmpfile;
3328 my $pid = fork // die $!;
3332 $us .= " [$isuite]";
3333 $debugprefix .= " ";
3334 progress "fetching $tsuite...";
3335 canonicalise_suite();
3336 print $canonsuitefh $csuite, "\n" or die $!;
3337 close $canonsuitefh or die $!;
3341 waitpid $pid,0 == $pid or die $!;
3342 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3343 seek $canonsuitefh,0,0 or die $!;
3344 local $csuite = <$canonsuitefh>;
3345 die $! unless defined $csuite && chomp $csuite;
3347 printdebug "multisuite $tsuite missing\n";
3350 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3351 push @$merginputs, {
3358 sub fork_for_multisuite ($) {
3359 my ($before_fetch_merge) = @_;
3360 # if nothing unusual, just returns ''
3363 # returns 0 to caller in child, to do first of the specified suites
3364 # in child, $csuite is not yet set
3366 # returns 1 to caller in parent, to finish up anything needed after
3367 # in parent, $csuite is set to canonicalised portmanteau
3369 my $org_isuite = $isuite;
3370 my @suites = split /\,/, $isuite;
3371 return '' unless @suites > 1;
3372 printdebug "fork_for_multisuite: @suites\n";
3376 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3378 return 0 unless defined $cbasesuite;
3380 fail "package $package missing in (base suite) $cbasesuite"
3381 unless @mergeinputs;
3383 my @csuites = ($cbasesuite);
3385 $before_fetch_merge->();
3387 foreach my $tsuite (@suites[1..$#suites]) {
3388 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3394 # xxx collecte the ref here
3396 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3397 push @csuites, $csubsuite;
3400 foreach my $mi (@mergeinputs) {
3401 my $ref = git_get_ref $mi->{Ref};
3402 die "$mi->{Ref} ?" unless length $ref;
3403 $mi->{Commit} = $ref;
3406 $csuite = join ",", @csuites;
3408 my $previous = git_get_ref lrref;
3410 unshift @mergeinputs, {
3411 Commit => $previous,
3412 Info => "local combined tracking branch",
3414 "archive seems to have rewound: local tracking branch is ahead!",
3418 foreach my $ix (0..$#mergeinputs) {
3419 $mergeinputs[$ix]{Index} = $ix;
3422 @mergeinputs = sort {
3423 -version_compare(mergeinfo_version $a,
3424 mergeinfo_version $b) # highest version first
3426 $a->{Index} <=> $b->{Index}; # earliest in spec first
3432 foreach my $mi (@mergeinputs) {
3433 printdebug "multisuite merge check $mi->{Info}\n";
3434 foreach my $previous (@needed) {
3435 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3436 printdebug "multisuite merge un-needed $previous->{Info}\n";
3440 printdebug "multisuite merge this-needed\n";
3441 $mi->{Character} = '+';
3444 $needed[0]{Character} = '*';
3446 my $output = $needed[0]{Commit};
3449 printdebug "multisuite merge nontrivial\n";
3450 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3452 my $commit = "tree $tree\n";
3453 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3454 "Input branches:\n";
3456 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3457 printdebug "multisuite merge include $mi->{Info}\n";
3458 $mi->{Character} //= ' ';
3459 $commit .= "parent $mi->{Commit}\n";
3460 $msg .= sprintf " %s %-25s %s\n",
3462 (mergeinfo_version $mi),
3465 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3467 " * marks the highest version branch, which choose to use\n".
3468 " + marks each branch which was not already an ancestor\n\n".
3469 "[dgit multi-suite $csuite]\n";
3471 "author $authline\n".
3472 "committer $authline\n\n";
3473 $output = make_commit_text $commit.$msg;
3474 printdebug "multisuite merge generated $output\n";
3477 fetch_from_archive_record_1($output);
3478 fetch_from_archive_record_2($output);
3480 progress "calculated combined tracking suite $csuite";
3485 sub clone_set_head () {
3486 open H, "> .git/HEAD" or die $!;
3487 print H "ref: ".lref()."\n" or die $!;
3490 sub clone_finish ($) {
3492 runcmd @git, qw(reset --hard), lrref();
3493 runcmd qw(bash -ec), <<'END';
3495 git ls-tree -r --name-only -z HEAD | \
3496 xargs -0r touch -h -r . --
3498 printdone "ready for work in $dstdir";
3503 badusage "dry run makes no sense with clone" unless act_local();
3505 my $multi_fetched = fork_for_multisuite(sub {
3506 printdebug "multi clone before fetch merge\n";
3509 if ($multi_fetched) {
3510 printdebug "multi clone after fetch merge\n";
3512 clone_finish($dstdir);
3515 printdebug "clone main body\n";
3517 canonicalise_suite();
3518 my $hasgit = check_for_git();
3519 mkdir $dstdir or fail "create \`$dstdir': $!";
3521 runcmd @git, qw(init -q);
3523 my $giturl = access_giturl(1);
3524 if (defined $giturl) {
3525 runcmd @git, qw(remote add), 'origin', $giturl;
3528 progress "fetching existing git history";
3530 runcmd_ordryrun_local @git, qw(fetch origin);
3532 progress "starting new git history";
3534 fetch_from_archive() or no_such_package;
3535 my $vcsgiturl = $dsc->{'Vcs-Git'};
3536 if (length $vcsgiturl) {
3537 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3538 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3541 clone_finish($dstdir);
3545 canonicalise_suite();
3546 if (check_for_git()) {
3549 fetch_from_archive() or no_such_package();
3550 printdone "fetched into ".lrref();
3554 my $multi_fetched = fork_for_multisuite(sub { });
3555 fetch() unless $multi_fetched; # parent
3556 return if $multi_fetched eq '0'; # child
3557 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3559 printdone "fetched to ".lrref()." and merged into HEAD";
3562 sub check_not_dirty () {
3563 foreach my $f (qw(local-options local-patch-header)) {
3564 if (stat_exists "debian/source/$f") {
3565 fail "git tree contains debian/source/$f";
3569 return if $ignoredirty;
3571 my @cmd = (@git, qw(diff --quiet HEAD));
3573 $!=0; $?=-1; system @cmd;
3576 fail "working tree is dirty (does not match HEAD)";
3582 sub commit_admin ($) {
3585 runcmd_ordryrun_local @git, qw(commit -m), $m;
3588 sub commit_quilty_patch () {
3589 my $output = cmdoutput @git, qw(status --porcelain);
3591 foreach my $l (split /\n/, $output) {
3592 next unless $l =~ m/\S/;
3593 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3597 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3599 progress "nothing quilty to commit, ok.";
3602 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3603 runcmd_ordryrun_local @git, qw(add -f), @adds;
3605 Commit Debian 3.0 (quilt) metadata
3607 [dgit ($our_version) quilt-fixup]
3611 sub get_source_format () {
3613 if (open F, "debian/source/options") {
3617 s/\s+$//; # ignore missing final newline
3619 my ($k, $v) = ($`, $'); #');
3620 $v =~ s/^"(.*)"$/$1/;
3626 F->error and die $!;
3629 die $! unless $!==&ENOENT;
3632 if (!open F, "debian/source/format") {
3633 die $! unless $!==&ENOENT;
3637 F->error and die $!;
3639 return ($_, \%options);
3642 sub madformat_wantfixup ($) {
3644 return 0 unless $format eq '3.0 (quilt)';
3645 our $quilt_mode_warned;
3646 if ($quilt_mode eq 'nocheck') {
3647 progress "Not doing any fixup of \`$format' due to".
3648 " ----no-quilt-fixup or --quilt=nocheck"
3649 unless $quilt_mode_warned++;
3652 progress "Format \`$format', need to check/update patch stack"
3653 unless $quilt_mode_warned++;
3657 sub maybe_split_brain_save ($$$) {
3658 my ($headref, $dgitview, $msg) = @_;
3659 # => message fragment "$saved" describing disposition of $dgitview
3660 return "commit id $dgitview" unless defined $split_brain_save;
3661 my @cmd = (shell_cmd "cd ../../../..",
3662 @git, qw(update-ref -m),
3663 "dgit --dgit-view-save $msg HEAD=$headref",
3664 $split_brain_save, $dgitview);
3666 return "and left in $split_brain_save";
3669 # An "infopair" is a tuple [ $thing, $what ]
3670 # (often $thing is a commit hash; $what is a description)
3672 sub infopair_cond_equal ($$) {
3674 $x->[0] eq $y->[0] or fail <<END;
3675 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3679 sub infopair_lrf_tag_lookup ($$) {
3680 my ($tagnames, $what) = @_;
3681 # $tagname may be an array ref
3682 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3683 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3684 foreach my $tagname (@tagnames) {
3685 my $lrefname = lrfetchrefs."/tags/$tagname";
3686 my $tagobj = $lrfetchrefs_f{$lrefname};
3687 next unless defined $tagobj;
3688 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3689 return [ git_rev_parse($tagobj), $what ];
3691 fail @tagnames==1 ? <<END : <<END;
3692 Wanted tag $what (@tagnames) on dgit server, but not found
3694 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3698 sub infopair_cond_ff ($$) {
3699 my ($anc,$desc) = @_;
3700 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3701 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3705 sub pseudomerge_version_check ($$) {
3706 my ($clogp, $archive_hash) = @_;
3708 my $arch_clogp = commit_getclogp $archive_hash;
3709 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3710 'version currently in archive' ];
3711 if (defined $overwrite_version) {
3712 if (length $overwrite_version) {
3713 infopair_cond_equal([ $overwrite_version,
3714 '--overwrite= version' ],
3717 my $v = $i_arch_v->[0];
3718 progress "Checking package changelog for archive version $v ...";
3720 my @xa = ("-f$v", "-t$v");
3721 my $vclogp = parsechangelog @xa;
3722 my $cv = [ (getfield $vclogp, 'Version'),
3723 "Version field from dpkg-parsechangelog @xa" ];
3724 infopair_cond_equal($i_arch_v, $cv);
3727 $@ =~ s/^dgit: //gm;
3729 "Perhaps debian/changelog does not mention $v ?";
3734 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3738 sub pseudomerge_make_commit ($$$$ $$) {
3739 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3740 $msg_cmd, $msg_msg) = @_;
3741 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3743 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3744 my $authline = clogp_authline $clogp;
3748 !defined $overwrite_version ? ""
3749 : !length $overwrite_version ? " --overwrite"
3750 : " --overwrite=".$overwrite_version;
3753 my $pmf = ".git/dgit/pseudomerge";
3754 open MC, ">", $pmf or die "$pmf $!";
3755 print MC <<END or die $!;
3758 parent $archive_hash
3768 return make_commit($pmf);
3771 sub splitbrain_pseudomerge ($$$$) {
3772 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3773 # => $merged_dgitview
3774 printdebug "splitbrain_pseudomerge...\n";
3776 # We: debian/PREVIOUS HEAD($maintview)
3777 # expect: o ----------------- o
3780 # a/d/PREVIOUS $dgitview
3783 # we do: `------------------ o
3787 return $dgitview unless defined $archive_hash;
3789 printdebug "splitbrain_pseudomerge...\n";
3791 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3793 if (!defined $overwrite_version) {
3794 progress "Checking that HEAD inciudes all changes in archive...";
3797 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3799 if (defined $overwrite_version) {
3801 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3802 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3803 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3804 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3805 my $i_archive = [ $archive_hash, "current archive contents" ];
3807 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3809 infopair_cond_equal($i_dgit, $i_archive);
3810 infopair_cond_ff($i_dep14, $i_dgit);
3811 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3815 $us: check failed (maybe --overwrite is needed, consult documentation)
3820 my $r = pseudomerge_make_commit
3821 $clogp, $dgitview, $archive_hash, $i_arch_v,
3822 "dgit --quilt=$quilt_mode",
3823 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3824 Declare fast forward from $i_arch_v->[0]
3826 Make fast forward from $i_arch_v->[0]
3829 maybe_split_brain_save $maintview, $r, "pseudomerge";
3831 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3835 sub plain_overwrite_pseudomerge ($$$) {
3836 my ($clogp, $head, $archive_hash) = @_;
3838 printdebug "plain_overwrite_pseudomerge...";
3840 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3842 return $head if is_fast_fwd $archive_hash, $head;
3844 my $m = "Declare fast forward from $i_arch_v->[0]";
3846 my $r = pseudomerge_make_commit
3847 $clogp, $head, $archive_hash, $i_arch_v,
3850 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3852 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3856 sub push_parse_changelog ($) {
3859 my $clogp = Dpkg::Control::Hash->new();
3860 $clogp->load($clogpfn) or die;
3862 my $clogpackage = getfield $clogp, 'Source';
3863 $package //= $clogpackage;
3864 fail "-p specified $package but changelog specified $clogpackage"
3865 unless $package eq $clogpackage;
3866 my $cversion = getfield $clogp, 'Version';
3868 if (!$we_are_initiator) {
3869 # rpush initiator can't do this because it doesn't have $isuite yet
3870 my $tag = debiantag($cversion, access_nomdistro);
3871 runcmd @git, qw(check-ref-format), $tag;
3874 my $dscfn = dscfn($cversion);
3876 return ($clogp, $cversion, $dscfn);
3879 sub push_parse_dsc ($$$) {
3880 my ($dscfn,$dscfnwhat, $cversion) = @_;
3881 $dsc = parsecontrol($dscfn,$dscfnwhat);
3882 my $dversion = getfield $dsc, 'Version';
3883 my $dscpackage = getfield $dsc, 'Source';
3884 ($dscpackage eq $package && $dversion eq $cversion) or
3885 fail "$dscfn is for $dscpackage $dversion".
3886 " but debian/changelog is for $package $cversion";
3889 sub push_tagwants ($$$$) {
3890 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3893 TagFn => \&debiantag,
3898 if (defined $maintviewhead) {
3900 TagFn => \&debiantag_maintview,
3901 Objid => $maintviewhead,
3902 TfSuffix => '-maintview',
3905 } elsif ($dodep14tag eq 'no' ? 0
3906 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3907 : $dodep14tag eq 'always'
3908 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3909 --dep14tag-always (or equivalent in config) means server must support
3910 both "new" and "maint" tag formats, but config says it doesn't.
3912 : die "$dodep14tag ?") {
3914 TagFn => \&debiantag_maintview,
3916 TfSuffix => '-dgit',
3920 foreach my $tw (@tagwants) {
3921 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3922 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3924 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3928 sub push_mktags ($$ $$ $) {
3930 $changesfile,$changesfilewhat,
3933 die unless $tagwants->[0]{View} eq 'dgit';
3935 my $declaredistro = access_nomdistro();
3936 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
3937 $dsc->{$ourdscfield[0]} = join " ",
3938 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
3940 $dsc->save("$dscfn.tmp") or die $!;
3942 my $changes = parsecontrol($changesfile,$changesfilewhat);
3943 foreach my $field (qw(Source Distribution Version)) {
3944 $changes->{$field} eq $clogp->{$field} or
3945 fail "changes field $field \`$changes->{$field}'".
3946 " does not match changelog \`$clogp->{$field}'";
3949 my $cversion = getfield $clogp, 'Version';
3950 my $clogsuite = getfield $clogp, 'Distribution';
3952 # We make the git tag by hand because (a) that makes it easier
3953 # to control the "tagger" (b) we can do remote signing
3954 my $authline = clogp_authline $clogp;
3955 my $delibs = join(" ", "",@deliberatelies);
3959 my $tfn = $tw->{Tfn};
3960 my $head = $tw->{Objid};
3961 my $tag = $tw->{Tag};
3963 open TO, '>', $tfn->('.tmp') or die $!;
3964 print TO <<END or die $!;
3971 if ($tw->{View} eq 'dgit') {
3972 print TO <<END or die $!;
3973 $package release $cversion for $clogsuite ($csuite) [dgit]
3974 [dgit distro=$declaredistro$delibs]
3976 foreach my $ref (sort keys %previously) {
3977 print TO <<END or die $!;
3978 [dgit previously:$ref=$previously{$ref}]
3981 } elsif ($tw->{View} eq 'maint') {
3982 print TO <<END or die $!;
3983 $package release $cversion for $clogsuite ($csuite)
3984 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3987 die Dumper($tw)."?";
3992 my $tagobjfn = $tfn->('.tmp');
3994 if (!defined $keyid) {
3995 $keyid = access_cfg('keyid','RETURN-UNDEF');
3997 if (!defined $keyid) {
3998 $keyid = getfield $clogp, 'Maintainer';
4000 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4001 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4002 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4003 push @sign_cmd, $tfn->('.tmp');
4004 runcmd_ordryrun @sign_cmd;
4006 $tagobjfn = $tfn->('.signed.tmp');
4007 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4008 $tfn->('.tmp'), $tfn->('.tmp.asc');
4014 my @r = map { $mktag->($_); } @$tagwants;
4018 sub sign_changes ($) {
4019 my ($changesfile) = @_;
4021 my @debsign_cmd = @debsign;
4022 push @debsign_cmd, "-k$keyid" if defined $keyid;
4023 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4024 push @debsign_cmd, $changesfile;
4025 runcmd_ordryrun @debsign_cmd;
4030 printdebug "actually entering push\n";
4032 supplementary_message(<<'END');
4033 Push failed, while checking state of the archive.
4034 You can retry the push, after fixing the problem, if you like.
4036 if (check_for_git()) {
4039 my $archive_hash = fetch_from_archive();
4040 if (!$archive_hash) {
4042 fail "package appears to be new in this suite;".
4043 " if this is intentional, use --new";
4046 supplementary_message(<<'END');
4047 Push failed, while preparing your push.
4048 You can retry the push, after fixing the problem, if you like.
4051 need_tagformat 'new', "quilt mode $quilt_mode"
4052 if quiltmode_splitbrain;
4056 access_giturl(); # check that success is vaguely likely
4057 rpush_handle_protovsn_bothends() if $we_are_initiator;
4060 my $clogpfn = ".git/dgit/changelog.822.tmp";
4061 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4063 responder_send_file('parsed-changelog', $clogpfn);
4065 my ($clogp, $cversion, $dscfn) =
4066 push_parse_changelog("$clogpfn");
4068 my $dscpath = "$buildproductsdir/$dscfn";
4069 stat_exists $dscpath or
4070 fail "looked for .dsc $dscpath, but $!;".
4071 " maybe you forgot to build";
4073 responder_send_file('dsc', $dscpath);
4075 push_parse_dsc($dscpath, $dscfn, $cversion);
4077 my $format = getfield $dsc, 'Format';
4078 printdebug "format $format\n";
4080 my $actualhead = git_rev_parse('HEAD');
4081 my $dgithead = $actualhead;
4082 my $maintviewhead = undef;
4084 my $upstreamversion = upstreamversion $clogp->{Version};
4086 if (madformat_wantfixup($format)) {
4087 # user might have not used dgit build, so maybe do this now:
4088 if (quiltmode_splitbrain()) {
4090 quilt_make_fake_dsc($upstreamversion);
4092 ($dgithead, $cachekey) =
4093 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4095 "--quilt=$quilt_mode but no cached dgit view:
4096 perhaps tree changed since dgit build[-source] ?";
4098 $dgithead = splitbrain_pseudomerge($clogp,
4099 $actualhead, $dgithead,
4101 $maintviewhead = $actualhead;
4102 changedir '../../../..';
4103 prep_ud(); # so _only_subdir() works, below
4105 commit_quilty_patch();
4109 if (defined $overwrite_version && !defined $maintviewhead) {
4110 $dgithead = plain_overwrite_pseudomerge($clogp,
4118 if ($archive_hash) {
4119 if (is_fast_fwd($archive_hash, $dgithead)) {
4121 } elsif (deliberately_not_fast_forward) {
4124 fail "dgit push: HEAD is not a descendant".
4125 " of the archive's version.\n".
4126 "To overwrite the archive's contents,".
4127 " pass --overwrite[=VERSION].\n".
4128 "To rewind history, if permitted by the archive,".
4129 " use --deliberately-not-fast-forward.";
4134 progress "checking that $dscfn corresponds to HEAD";
4135 runcmd qw(dpkg-source -x --),
4136 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4137 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4138 check_for_vendor_patches() if madformat($dsc->{format});
4139 changedir '../../../..';
4140 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4141 debugcmd "+",@diffcmd;
4143 my $r = system @diffcmd;
4146 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4148 HEAD specifies a different tree to $dscfn:
4150 Perhaps you forgot to build. Or perhaps there is a problem with your
4151 source tree (see dgit(7) for some hints). To see a full diff, run
4158 if (!$changesfile) {
4159 my $pat = changespat $cversion;
4160 my @cs = glob "$buildproductsdir/$pat";
4161 fail "failed to find unique changes file".
4162 " (looked for $pat in $buildproductsdir);".
4163 " perhaps you need to use dgit -C"
4165 ($changesfile) = @cs;
4167 $changesfile = "$buildproductsdir/$changesfile";
4170 # Check that changes and .dsc agree enough
4171 $changesfile =~ m{[^/]*$};
4172 my $changes = parsecontrol($changesfile,$&);
4173 files_compare_inputs($dsc, $changes)
4174 unless forceing [qw(dsc-changes-mismatch)];
4176 # Perhaps adjust .dsc to contain right set of origs
4177 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4179 unless forceing [qw(changes-origs-exactly)];
4181 # Checks complete, we're going to try and go ahead:
4183 responder_send_file('changes',$changesfile);
4184 responder_send_command("param head $dgithead");
4185 responder_send_command("param csuite $csuite");
4186 responder_send_command("param isuite $isuite");
4187 responder_send_command("param tagformat $tagformat");
4188 if (defined $maintviewhead) {
4189 die unless ($protovsn//4) >= 4;
4190 responder_send_command("param maint-view $maintviewhead");
4193 if (deliberately_not_fast_forward) {
4194 git_for_each_ref(lrfetchrefs, sub {
4195 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4196 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4197 responder_send_command("previously $rrefname=$objid");
4198 $previously{$rrefname} = $objid;
4202 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4206 supplementary_message(<<'END');
4207 Push failed, while signing the tag.
4208 You can retry the push, after fixing the problem, if you like.
4210 # If we manage to sign but fail to record it anywhere, it's fine.
4211 if ($we_are_responder) {
4212 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4213 responder_receive_files('signed-tag', @tagobjfns);
4215 @tagobjfns = push_mktags($clogp,$dscpath,
4216 $changesfile,$changesfile,
4219 supplementary_message(<<'END');
4220 Push failed, *after* signing the tag.
4221 If you want to try again, you should use a new version number.
4224 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4226 foreach my $tw (@tagwants) {
4227 my $tag = $tw->{Tag};
4228 my $tagobjfn = $tw->{TagObjFn};
4230 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4231 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4232 runcmd_ordryrun_local
4233 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4236 supplementary_message(<<'END');
4237 Push failed, while updating the remote git repository - see messages above.
4238 If you want to try again, you should use a new version number.
4240 if (!check_for_git()) {
4241 create_remote_git_repo();
4244 my @pushrefs = $forceflag.$dgithead.":".rrref();
4245 foreach my $tw (@tagwants) {
4246 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4249 runcmd_ordryrun @git,
4250 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4251 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4253 supplementary_message(<<'END');
4254 Push failed, while obtaining signatures on the .changes and .dsc.
4255 If it was just that the signature failed, you may try again by using
4256 debsign by hand to sign the changes
4258 and then dput to complete the upload.
4259 If you need to change the package, you must use a new version number.
4261 if ($we_are_responder) {
4262 my $dryrunsuffix = act_local() ? "" : ".tmp";
4263 responder_receive_files('signed-dsc-changes',
4264 "$dscpath$dryrunsuffix",
4265 "$changesfile$dryrunsuffix");
4268 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4270 progress "[new .dsc left in $dscpath.tmp]";
4272 sign_changes $changesfile;
4275 supplementary_message(<<END);
4276 Push failed, while uploading package(s) to the archive server.
4277 You can retry the upload of exactly these same files with dput of:
4279 If that .changes file is broken, you will need to use a new version
4280 number for your next attempt at the upload.
4282 my $host = access_cfg('upload-host','RETURN-UNDEF');
4283 my @hostarg = defined($host) ? ($host,) : ();
4284 runcmd_ordryrun @dput, @hostarg, $changesfile;
4285 printdone "pushed and uploaded $cversion";
4287 supplementary_message('');
4288 responder_send_command("complete");
4294 badusage "-p is not allowed with clone; specify as argument instead"
4295 if defined $package;
4298 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4299 ($package,$isuite) = @ARGV;
4300 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4301 ($package,$dstdir) = @ARGV;
4302 } elsif (@ARGV==3) {
4303 ($package,$isuite,$dstdir) = @ARGV;
4305 badusage "incorrect arguments to dgit clone";
4309 $dstdir ||= "$package";
4310 if (stat_exists $dstdir) {
4311 fail "$dstdir already exists";
4315 if ($rmonerror && !$dryrun_level) {
4316 $cwd_remove= getcwd();
4318 return unless defined $cwd_remove;
4319 if (!chdir "$cwd_remove") {
4320 return if $!==&ENOENT;
4321 die "chdir $cwd_remove: $!";
4323 printdebug "clone rmonerror removing $dstdir\n";
4325 rmtree($dstdir) or die "remove $dstdir: $!\n";
4326 } elsif (grep { $! == $_ }
4327 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4329 print STDERR "check whether to remove $dstdir: $!\n";
4335 $cwd_remove = undef;
4338 sub branchsuite () {
4339 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4340 if ($branch =~ m#$lbranch_re#o) {
4347 sub fetchpullargs () {
4348 if (!defined $package) {
4349 my $sourcep = parsecontrol('debian/control','debian/control');
4350 $package = getfield $sourcep, 'Source';
4353 $isuite = branchsuite();
4355 my $clogp = parsechangelog();
4356 my $clogsuite = getfield $clogp, 'Distribution';
4357 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4359 } elsif (@ARGV==1) {
4362 badusage "incorrect arguments to dgit fetch or dgit pull";
4370 my $multi_fetched = fork_for_multisuite(sub { });
4371 exit 0 if $multi_fetched;
4378 if (quiltmode_splitbrain()) {
4379 my ($format, $fopts) = get_source_format();
4380 madformat($format) and fail <<END
4381 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4389 badusage "-p is not allowed with dgit push" if defined $package;
4391 my $clogp = parsechangelog();
4392 $package = getfield $clogp, 'Source';
4395 } elsif (@ARGV==1) {
4396 ($specsuite) = (@ARGV);
4398 badusage "incorrect arguments to dgit push";
4400 $isuite = getfield $clogp, 'Distribution';
4403 local ($package) = $existing_package; # this is a hack
4404 canonicalise_suite();
4406 canonicalise_suite();
4408 if (defined $specsuite &&
4409 $specsuite ne $isuite &&
4410 $specsuite ne $csuite) {
4411 fail "dgit push: changelog specifies $isuite ($csuite)".
4412 " but command line specifies $specsuite";
4417 #---------- remote commands' implementation ----------
4419 sub cmd_remote_push_build_host {
4420 my ($nrargs) = shift @ARGV;
4421 my (@rargs) = @ARGV[0..$nrargs-1];
4422 @ARGV = @ARGV[$nrargs..$#ARGV];
4424 my ($dir,$vsnwant) = @rargs;
4425 # vsnwant is a comma-separated list; we report which we have
4426 # chosen in our ready response (so other end can tell if they
4429 $we_are_responder = 1;
4430 $us .= " (build host)";
4432 open PI, "<&STDIN" or die $!;
4433 open STDIN, "/dev/null" or die $!;
4434 open PO, ">&STDOUT" or die $!;
4436 open STDOUT, ">&STDERR" or die $!;
4440 ($protovsn) = grep {
4441 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4442 } @rpushprotovsn_support;
4444 fail "build host has dgit rpush protocol versions ".
4445 (join ",", @rpushprotovsn_support).
4446 " but invocation host has $vsnwant"
4447 unless defined $protovsn;
4449 responder_send_command("dgit-remote-push-ready $protovsn");
4454 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4455 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4456 # a good error message)
4458 sub rpush_handle_protovsn_bothends () {
4459 if ($protovsn < 4) {
4460 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4469 my $report = i_child_report();
4470 if (defined $report) {
4471 printdebug "($report)\n";
4472 } elsif ($i_child_pid) {
4473 printdebug "(killing build host child $i_child_pid)\n";
4474 kill 15, $i_child_pid;
4476 if (defined $i_tmp && !defined $initiator_tempdir) {
4478 eval { rmtree $i_tmp; };
4483 return unless forkcheck_mainprocess();
4488 my ($base,$selector,@args) = @_;
4489 $selector =~ s/\-/_/g;
4490 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4496 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4504 push @rargs, join ",", @rpushprotovsn_support;
4507 push @rdgit, @ropts;
4508 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4510 my @cmd = (@ssh, $host, shellquote @rdgit);
4513 $we_are_initiator=1;
4515 if (defined $initiator_tempdir) {
4516 rmtree $initiator_tempdir;
4517 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4518 $i_tmp = $initiator_tempdir;
4522 $i_child_pid = open2(\*RO, \*RI, @cmd);
4524 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4525 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4526 $supplementary_message = '' unless $protovsn >= 3;
4529 my ($icmd,$iargs) = initiator_expect {
4530 m/^(\S+)(?: (.*))?$/;
4533 i_method "i_resp", $icmd, $iargs;
4537 sub i_resp_progress ($) {
4539 my $msg = protocol_read_bytes \*RO, $rhs;
4543 sub i_resp_supplementary_message ($) {
4545 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4548 sub i_resp_complete {
4549 my $pid = $i_child_pid;
4550 $i_child_pid = undef; # prevents killing some other process with same pid
4551 printdebug "waiting for build host child $pid...\n";
4552 my $got = waitpid $pid, 0;
4553 die $! unless $got == $pid;
4554 die "build host child failed $?" if $?;
4557 printdebug "all done\n";
4561 sub i_resp_file ($) {
4563 my $localname = i_method "i_localname", $keyword;
4564 my $localpath = "$i_tmp/$localname";
4565 stat_exists $localpath and
4566 badproto \*RO, "file $keyword ($localpath) twice";
4567 protocol_receive_file \*RO, $localpath;
4568 i_method "i_file", $keyword;
4573 sub i_resp_param ($) {
4574 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4578 sub i_resp_previously ($) {
4579 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4580 or badproto \*RO, "bad previously spec";
4581 my $r = system qw(git check-ref-format), $1;
4582 die "bad previously ref spec ($r)" if $r;
4583 $previously{$1} = $2;
4588 sub i_resp_want ($) {
4590 die "$keyword ?" if $i_wanted{$keyword}++;
4592 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4593 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4594 die unless $isuite =~ m/^$suite_re$/;
4597 rpush_handle_protovsn_bothends();
4599 fail "rpush negotiated protocol version $protovsn".
4600 " which does not support quilt mode $quilt_mode"
4601 if quiltmode_splitbrain;
4603 my @localpaths = i_method "i_want", $keyword;
4604 printdebug "[[ $keyword @localpaths\n";
4605 foreach my $localpath (@localpaths) {
4606 protocol_send_file \*RI, $localpath;
4608 print RI "files-end\n" or die $!;
4611 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4613 sub i_localname_parsed_changelog {
4614 return "remote-changelog.822";
4616 sub i_file_parsed_changelog {
4617 ($i_clogp, $i_version, $i_dscfn) =
4618 push_parse_changelog "$i_tmp/remote-changelog.822";
4619 die if $i_dscfn =~ m#/|^\W#;
4622 sub i_localname_dsc {
4623 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4628 sub i_localname_changes {
4629 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4630 $i_changesfn = $i_dscfn;
4631 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4632 return $i_changesfn;
4634 sub i_file_changes { }
4636 sub i_want_signed_tag {
4637 printdebug Dumper(\%i_param, $i_dscfn);
4638 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4639 && defined $i_param{'csuite'}
4640 or badproto \*RO, "premature desire for signed-tag";
4641 my $head = $i_param{'head'};
4642 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4644 my $maintview = $i_param{'maint-view'};
4645 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4648 if ($protovsn >= 4) {
4649 my $p = $i_param{'tagformat'} // '<undef>';
4651 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4654 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4656 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4658 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4661 push_mktags $i_clogp, $i_dscfn,
4662 $i_changesfn, 'remote changes',
4666 sub i_want_signed_dsc_changes {
4667 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4668 sign_changes $i_changesfn;
4669 return ($i_dscfn, $i_changesfn);
4672 #---------- building etc. ----------
4678 #----- `3.0 (quilt)' handling -----
4680 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4682 sub quiltify_dpkg_commit ($$$;$) {
4683 my ($patchname,$author,$msg, $xinfo) = @_;
4687 my $descfn = ".git/dgit/quilt-description.tmp";
4688 open O, '>', $descfn or die "$descfn: $!";
4689 $msg =~ s/\n+/\n\n/;
4690 print O <<END or die $!;
4692 ${xinfo}Subject: $msg
4699 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4700 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4701 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4702 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4706 sub quiltify_trees_differ ($$;$$$) {
4707 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4708 # returns true iff the two tree objects differ other than in debian/
4709 # with $finegrained,
4710 # returns bitmask 01 - differ in upstream files except .gitignore
4711 # 02 - differ in .gitignore
4712 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4713 # is set for each modified .gitignore filename $fn
4714 # if $unrepres is defined, array ref to which is appeneded
4715 # a list of unrepresentable changes (removals of upstream files
4718 my @cmd = (@git, qw(diff-tree -z));
4719 push @cmd, qw(--name-only) unless $unrepres;
4720 push @cmd, qw(-r) if $finegrained || $unrepres;
4722 my $diffs= cmdoutput @cmd;
4725 foreach my $f (split /\0/, $diffs) {
4726 if ($unrepres && !@lmodes) {
4727 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4730 my ($oldmode,$newmode) = @lmodes;
4733 next if $f =~ m#^debian(?:/.*)?$#s;
4737 die "not a plain file\n"
4738 unless $newmode =~ m/^10\d{4}$/ ||
4739 $oldmode =~ m/^10\d{4}$/;
4740 if ($oldmode =~ m/[^0]/ &&
4741 $newmode =~ m/[^0]/) {
4742 die "mode changed\n" if $oldmode ne $newmode;
4744 die "non-default mode\n"
4745 unless $newmode =~ m/^100644$/ ||
4746 $oldmode =~ m/^100644$/;
4750 local $/="\n"; chomp $@;
4751 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4755 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4756 $r |= $isignore ? 02 : 01;
4757 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4759 printdebug "quiltify_trees_differ $x $y => $r\n";
4763 sub quiltify_tree_sentinelfiles ($) {
4764 # lists the `sentinel' files present in the tree
4766 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4767 qw(-- debian/rules debian/control);
4772 sub quiltify_splitbrain_needed () {
4773 if (!$split_brain) {
4774 progress "dgit view: changes are required...";
4775 runcmd @git, qw(checkout -q -b dgit-view);
4780 sub quiltify_splitbrain ($$$$$$) {
4781 my ($clogp, $unapplied, $headref, $diffbits,
4782 $editedignores, $cachekey) = @_;
4783 if ($quilt_mode !~ m/gbp|dpm/) {
4784 # treat .gitignore just like any other upstream file
4785 $diffbits = { %$diffbits };
4786 $_ = !!$_ foreach values %$diffbits;
4788 # We would like any commits we generate to be reproducible
4789 my @authline = clogp_authline($clogp);
4790 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4791 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4792 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4793 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4794 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4795 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4797 if ($quilt_mode =~ m/gbp|unapplied/ &&
4798 ($diffbits->{O2H} & 01)) {
4800 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4801 " but git tree differs from orig in upstream files.";
4802 if (!stat_exists "debian/patches") {
4804 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4808 if ($quilt_mode =~ m/dpm/ &&
4809 ($diffbits->{H2A} & 01)) {
4811 --quilt=$quilt_mode specified, implying patches-applied git tree
4812 but git tree differs from result of applying debian/patches to upstream
4815 if ($quilt_mode =~ m/gbp|unapplied/ &&
4816 ($diffbits->{O2A} & 01)) { # some patches
4817 quiltify_splitbrain_needed();
4818 progress "dgit view: creating patches-applied version using gbp pq";
4819 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4820 # gbp pq import creates a fresh branch; push back to dgit-view
4821 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4822 runcmd @git, qw(checkout -q dgit-view);
4824 if ($quilt_mode =~ m/gbp|dpm/ &&
4825 ($diffbits->{O2A} & 02)) {
4827 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4828 tool which does not create patches for changes to upstream
4829 .gitignores: but, such patches exist in debian/patches.
4832 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4833 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4834 quiltify_splitbrain_needed();
4835 progress "dgit view: creating patch to represent .gitignore changes";
4836 ensuredir "debian/patches";
4837 my $gipatch = "debian/patches/auto-gitignore";
4838 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4839 stat GIPATCH or die "$gipatch: $!";
4840 fail "$gipatch already exists; but want to create it".
4841 " to record .gitignore changes" if (stat _)[7];
4842 print GIPATCH <<END or die "$gipatch: $!";
4843 Subject: Update .gitignore from Debian packaging branch
4845 The Debian packaging git branch contains these updates to the upstream
4846 .gitignore file(s). This patch is autogenerated, to provide these
4847 updates to users of the official Debian archive view of the package.
4849 [dgit ($our_version) update-gitignore]
4852 close GIPATCH or die "$gipatch: $!";
4853 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4854 $unapplied, $headref, "--", sort keys %$editedignores;
4855 open SERIES, "+>>", "debian/patches/series" or die $!;
4856 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4858 defined read SERIES, $newline, 1 or die $!;
4859 print SERIES "\n" or die $! unless $newline eq "\n";
4860 print SERIES "auto-gitignore\n" or die $!;
4861 close SERIES or die $!;
4862 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4864 Commit patch to update .gitignore
4866 [dgit ($our_version) update-gitignore-quilt-fixup]
4870 my $dgitview = git_rev_parse 'HEAD';
4872 changedir '../../../..';
4873 # When we no longer need to support squeeze, use --create-reflog
4875 ensuredir ".git/logs/refs/dgit-intern";
4876 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4879 my $oldcache = git_get_ref "refs/$splitbraincache";
4880 if ($oldcache eq $dgitview) {
4881 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4882 # git update-ref doesn't always update, in this case. *sigh*
4883 my $dummy = make_commit_text <<END;
4886 author Dgit <dgit\@example.com> 1000000000 +0000
4887 committer Dgit <dgit\@example.com> 1000000000 +0000
4889 Dummy commit - do not use
4891 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4892 "refs/$splitbraincache", $dummy;
4894 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4897 changedir '.git/dgit/unpack/work';
4899 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4900 progress "dgit view: created ($saved)";
4903 sub quiltify ($$$$) {
4904 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4906 # Quilt patchification algorithm
4908 # We search backwards through the history of the main tree's HEAD
4909 # (T) looking for a start commit S whose tree object is identical
4910 # to to the patch tip tree (ie the tree corresponding to the
4911 # current dpkg-committed patch series). For these purposes
4912 # `identical' disregards anything in debian/ - this wrinkle is
4913 # necessary because dpkg-source treates debian/ specially.
4915 # We can only traverse edges where at most one of the ancestors'
4916 # trees differs (in changes outside in debian/). And we cannot
4917 # handle edges which change .pc/ or debian/patches. To avoid
4918 # going down a rathole we avoid traversing edges which introduce
4919 # debian/rules or debian/control. And we set a limit on the
4920 # number of edges we are willing to look at.
4922 # If we succeed, we walk forwards again. For each traversed edge
4923 # PC (with P parent, C child) (starting with P=S and ending with
4924 # C=T) to we do this:
4926 # - dpkg-source --commit with a patch name and message derived from C
4927 # After traversing PT, we git commit the changes which
4928 # should be contained within debian/patches.
4930 # The search for the path S..T is breadth-first. We maintain a
4931 # todo list containing search nodes. A search node identifies a
4932 # commit, and looks something like this:
4934 # Commit => $git_commit_id,
4935 # Child => $c, # or undef if P=T
4936 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4937 # Nontrivial => true iff $p..$c has relevant changes
4944 my %considered; # saves being exponential on some weird graphs
4946 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4949 my ($search,$whynot) = @_;
4950 printdebug " search NOT $search->{Commit} $whynot\n";
4951 $search->{Whynot} = $whynot;
4952 push @nots, $search;
4953 no warnings qw(exiting);
4962 my $c = shift @todo;
4963 next if $considered{$c->{Commit}}++;
4965 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4967 printdebug "quiltify investigate $c->{Commit}\n";
4970 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4971 printdebug " search finished hooray!\n";
4976 if ($quilt_mode eq 'nofix') {
4977 fail "quilt fixup required but quilt mode is \`nofix'\n".
4978 "HEAD commit $c->{Commit} differs from tree implied by ".
4979 " debian/patches (tree object $oldtiptree)";
4981 if ($quilt_mode eq 'smash') {
4982 printdebug " search quitting smash\n";
4986 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4987 $not->($c, "has $c_sentinels not $t_sentinels")
4988 if $c_sentinels ne $t_sentinels;
4990 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4991 $commitdata =~ m/\n\n/;
4993 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4994 @parents = map { { Commit => $_, Child => $c } } @parents;
4996 $not->($c, "root commit") if !@parents;
4998 foreach my $p (@parents) {
4999 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5001 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5002 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5004 foreach my $p (@parents) {
5005 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5007 my @cmd= (@git, qw(diff-tree -r --name-only),
5008 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5009 my $patchstackchange = cmdoutput @cmd;
5010 if (length $patchstackchange) {
5011 $patchstackchange =~ s/\n/,/g;
5012 $not->($p, "changed $patchstackchange");
5015 printdebug " search queue P=$p->{Commit} ",
5016 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5022 printdebug "quiltify want to smash\n";
5025 my $x = $_[0]{Commit};
5026 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5029 my $reportnot = sub {
5031 my $s = $abbrev->($notp);
5032 my $c = $notp->{Child};
5033 $s .= "..".$abbrev->($c) if $c;
5034 $s .= ": ".$notp->{Whynot};
5037 if ($quilt_mode eq 'linear') {
5038 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5039 foreach my $notp (@nots) {
5040 print STDERR "$us: ", $reportnot->($notp), "\n";
5042 print STDERR "$us: $_\n" foreach @$failsuggestion;
5043 fail "quilt fixup naive history linearisation failed.\n".
5044 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5045 } elsif ($quilt_mode eq 'smash') {
5046 } elsif ($quilt_mode eq 'auto') {
5047 progress "quilt fixup cannot be linear, smashing...";
5049 die "$quilt_mode ?";
5052 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5053 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5055 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5057 quiltify_dpkg_commit "auto-$version-$target-$time",
5058 (getfield $clogp, 'Maintainer'),
5059 "Automatically generated patch ($clogp->{Version})\n".
5060 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5064 progress "quiltify linearisation planning successful, executing...";
5066 for (my $p = $sref_S;
5067 my $c = $p->{Child};
5069 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5070 next unless $p->{Nontrivial};
5072 my $cc = $c->{Commit};
5074 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5075 $commitdata =~ m/\n\n/ or die "$c ?";
5078 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5081 my $commitdate = cmdoutput
5082 @git, qw(log -n1 --pretty=format:%aD), $cc;
5084 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5086 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5093 my $gbp_check_suitable = sub {
5098 die "contains unexpected slashes\n" if m{//} || m{/$};
5099 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5100 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5101 die "too long" if length > 200;
5103 return $_ unless $@;
5104 print STDERR "quiltifying commit $cc:".
5105 " ignoring/dropping Gbp-Pq $what: $@";
5109 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5111 (\S+) \s* \n //ixm) {
5112 $patchname = $gbp_check_suitable->($1, 'Name');
5114 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5116 (\S+) \s* \n //ixm) {
5117 $patchdir = $gbp_check_suitable->($1, 'Topic');
5122 if (!defined $patchname) {
5123 $patchname = $title;
5124 $patchname =~ s/[.:]$//;
5127 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5128 my $translitname = $converter->convert($patchname);
5129 die unless defined $translitname;
5130 $patchname = $translitname;
5133 "dgit: patch title transliteration error: $@"
5135 $patchname =~ y/ A-Z/-a-z/;
5136 $patchname =~ y/-a-z0-9_.+=~//cd;
5137 $patchname =~ s/^\W/x-$&/;
5138 $patchname = substr($patchname,0,40);
5140 if (!defined $patchdir) {
5143 if (length $patchdir) {
5144 $patchname = "$patchdir/$patchname";
5146 if ($patchname =~ m{^(.*)/}) {
5147 mkpath "debian/patches/$1";
5152 stat "debian/patches/$patchname$index";
5154 $!==ENOENT or die "$patchname$index $!";
5156 runcmd @git, qw(checkout -q), $cc;
5158 # We use the tip's changelog so that dpkg-source doesn't
5159 # produce complaining messages from dpkg-parsechangelog. None
5160 # of the information dpkg-source gets from the changelog is
5161 # actually relevant - it gets put into the original message
5162 # which dpkg-source provides our stunt editor, and then
5164 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5166 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5167 "Date: $commitdate\n".
5168 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5170 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5173 runcmd @git, qw(checkout -q master);
5176 sub build_maybe_quilt_fixup () {
5177 my ($format,$fopts) = get_source_format;
5178 return unless madformat_wantfixup $format;
5181 check_for_vendor_patches();
5183 if (quiltmode_splitbrain) {
5184 fail <<END unless access_cfg_tagformats_can_splitbrain;
5185 quilt mode $quilt_mode requires split view so server needs to support
5186 both "new" and "maint" tag formats, but config says it doesn't.
5190 my $clogp = parsechangelog();
5191 my $headref = git_rev_parse('HEAD');
5196 my $upstreamversion = upstreamversion $version;
5198 if ($fopts->{'single-debian-patch'}) {
5199 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5201 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5204 die 'bug' if $split_brain && !$need_split_build_invocation;
5206 changedir '../../../..';
5207 runcmd_ordryrun_local
5208 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5211 sub quilt_fixup_mkwork ($) {
5214 mkdir "work" or die $!;
5216 mktree_in_ud_here();
5217 runcmd @git, qw(reset -q --hard), $headref;
5220 sub quilt_fixup_linkorigs ($$) {
5221 my ($upstreamversion, $fn) = @_;
5222 # calls $fn->($leafname);
5224 foreach my $f (<../../../../*>) { #/){
5225 my $b=$f; $b =~ s{.*/}{};
5227 local ($debuglevel) = $debuglevel-1;
5228 printdebug "QF linkorigs $b, $f ?\n";
5230 next unless is_orig_file_of_vsn $b, $upstreamversion;
5231 printdebug "QF linkorigs $b, $f Y\n";
5232 link_ltarget $f, $b or die "$b $!";
5237 sub quilt_fixup_delete_pc () {
5238 runcmd @git, qw(rm -rqf .pc);
5240 Commit removal of .pc (quilt series tracking data)
5242 [dgit ($our_version) upgrade quilt-remove-pc]
5246 sub quilt_fixup_singlepatch ($$$) {
5247 my ($clogp, $headref, $upstreamversion) = @_;
5249 progress "starting quiltify (single-debian-patch)";
5251 # dpkg-source --commit generates new patches even if
5252 # single-debian-patch is in debian/source/options. In order to
5253 # get it to generate debian/patches/debian-changes, it is
5254 # necessary to build the source package.
5256 quilt_fixup_linkorigs($upstreamversion, sub { });
5257 quilt_fixup_mkwork($headref);
5259 rmtree("debian/patches");
5261 runcmd @dpkgsource, qw(-b .);
5263 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5264 rename srcfn("$upstreamversion", "/debian/patches"),
5265 "work/debian/patches";
5268 commit_quilty_patch();
5271 sub quilt_make_fake_dsc ($) {
5272 my ($upstreamversion) = @_;
5274 my $fakeversion="$upstreamversion-~~DGITFAKE";
5276 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5277 print $fakedsc <<END or die $!;
5280 Version: $fakeversion
5284 my $dscaddfile=sub {
5287 my $md = new Digest::MD5;
5289 my $fh = new IO::File $b, '<' or die "$b $!";
5294 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5297 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5299 my @files=qw(debian/source/format debian/rules
5300 debian/control debian/changelog);
5301 foreach my $maybe (qw(debian/patches debian/source/options
5302 debian/tests/control)) {
5303 next unless stat_exists "../../../$maybe";
5304 push @files, $maybe;
5307 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5308 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5310 $dscaddfile->($debtar);
5311 close $fakedsc or die $!;
5314 sub quilt_check_splitbrain_cache ($$) {
5315 my ($headref, $upstreamversion) = @_;
5316 # Called only if we are in (potentially) split brain mode.
5318 # Computes the cache key and looks in the cache.
5319 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5321 my $splitbrain_cachekey;
5324 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5325 # we look in the reflog of dgit-intern/quilt-cache
5326 # we look for an entry whose message is the key for the cache lookup
5327 my @cachekey = (qw(dgit), $our_version);
5328 push @cachekey, $upstreamversion;
5329 push @cachekey, $quilt_mode;
5330 push @cachekey, $headref;
5332 push @cachekey, hashfile('fake.dsc');
5334 my $srcshash = Digest::SHA->new(256);
5335 my %sfs = ( %INC, '$0(dgit)' => $0 );
5336 foreach my $sfk (sort keys %sfs) {
5337 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5338 $srcshash->add($sfk," ");
5339 $srcshash->add(hashfile($sfs{$sfk}));
5340 $srcshash->add("\n");
5342 push @cachekey, $srcshash->hexdigest();
5343 $splitbrain_cachekey = "@cachekey";
5345 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5347 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5348 debugcmd "|(probably)",@cmd;
5349 my $child = open GC, "-|"; defined $child or die $!;
5351 chdir '../../..' or die $!;
5352 if (!stat ".git/logs/refs/$splitbraincache") {
5353 $! == ENOENT or die $!;
5354 printdebug ">(no reflog)\n";
5361 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5362 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5365 quilt_fixup_mkwork($headref);
5366 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5367 if ($cachehit ne $headref) {
5368 progress "dgit view: found cached ($saved)";
5369 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5371 return ($cachehit, $splitbrain_cachekey);
5373 progress "dgit view: found cached, no changes required";
5374 return ($headref, $splitbrain_cachekey);
5376 die $! if GC->error;
5377 failedcmd unless close GC;
5379 printdebug "splitbrain cache miss\n";
5380 return (undef, $splitbrain_cachekey);
5383 sub quilt_fixup_multipatch ($$$) {
5384 my ($clogp, $headref, $upstreamversion) = @_;
5386 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5389 # - honour any existing .pc in case it has any strangeness
5390 # - determine the git commit corresponding to the tip of
5391 # the patch stack (if there is one)
5392 # - if there is such a git commit, convert each subsequent
5393 # git commit into a quilt patch with dpkg-source --commit
5394 # - otherwise convert all the differences in the tree into
5395 # a single git commit
5399 # Our git tree doesn't necessarily contain .pc. (Some versions of
5400 # dgit would include the .pc in the git tree.) If there isn't
5401 # one, we need to generate one by unpacking the patches that we
5404 # We first look for a .pc in the git tree. If there is one, we
5405 # will use it. (This is not the normal case.)
5407 # Otherwise need to regenerate .pc so that dpkg-source --commit
5408 # can work. We do this as follows:
5409 # 1. Collect all relevant .orig from parent directory
5410 # 2. Generate a debian.tar.gz out of
5411 # debian/{patches,rules,source/format,source/options}
5412 # 3. Generate a fake .dsc containing just these fields:
5413 # Format Source Version Files
5414 # 4. Extract the fake .dsc
5415 # Now the fake .dsc has a .pc directory.
5416 # (In fact we do this in every case, because in future we will
5417 # want to search for a good base commit for generating patches.)
5419 # Then we can actually do the dpkg-source --commit
5420 # 1. Make a new working tree with the same object
5421 # store as our main tree and check out the main
5423 # 2. Copy .pc from the fake's extraction, if necessary
5424 # 3. Run dpkg-source --commit
5425 # 4. If the result has changes to debian/, then
5426 # - git add them them
5427 # - git add .pc if we had a .pc in-tree
5429 # 5. If we had a .pc in-tree, delete it, and git commit
5430 # 6. Back in the main tree, fast forward to the new HEAD
5432 # Another situation we may have to cope with is gbp-style
5433 # patches-unapplied trees.
5435 # We would want to detect these, so we know to escape into
5436 # quilt_fixup_gbp. However, this is in general not possible.
5437 # Consider a package with a one patch which the dgit user reverts
5438 # (with git revert or the moral equivalent).
5440 # That is indistinguishable in contents from a patches-unapplied
5441 # tree. And looking at the history to distinguish them is not
5442 # useful because the user might have made a confusing-looking git
5443 # history structure (which ought to produce an error if dgit can't
5444 # cope, not a silent reintroduction of an unwanted patch).
5446 # So gbp users will have to pass an option. But we can usually
5447 # detect their failure to do so: if the tree is not a clean
5448 # patches-applied tree, quilt linearisation fails, but the tree
5449 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5450 # they want --quilt=unapplied.
5452 # To help detect this, when we are extracting the fake dsc, we
5453 # first extract it with --skip-patches, and then apply the patches
5454 # afterwards with dpkg-source --before-build. That lets us save a
5455 # tree object corresponding to .origs.
5457 my $splitbrain_cachekey;
5459 quilt_make_fake_dsc($upstreamversion);
5461 if (quiltmode_splitbrain()) {
5463 ($cachehit, $splitbrain_cachekey) =
5464 quilt_check_splitbrain_cache($headref, $upstreamversion);
5465 return if $cachehit;
5469 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5471 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5472 rename $fakexdir, "fake" or die "$fakexdir $!";
5476 remove_stray_gits("source package");
5477 mktree_in_ud_here();
5481 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5482 my $unapplied=git_add_write_tree();
5483 printdebug "fake orig tree object $unapplied\n";
5487 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5489 if (system @bbcmd) {
5490 failedcmd @bbcmd if $? < 0;
5492 failed to apply your git tree's patch stack (from debian/patches/) to
5493 the corresponding upstream tarball(s). Your source tree and .orig
5494 are probably too inconsistent. dgit can only fix up certain kinds of
5495 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5501 quilt_fixup_mkwork($headref);
5504 if (stat_exists ".pc") {
5506 progress "Tree already contains .pc - will use it then delete it.";
5509 rename '../fake/.pc','.pc' or die $!;
5512 changedir '../fake';
5514 my $oldtiptree=git_add_write_tree();
5515 printdebug "fake o+d/p tree object $unapplied\n";
5516 changedir '../work';
5519 # We calculate some guesswork now about what kind of tree this might
5520 # be. This is mostly for error reporting.
5526 # O = orig, without patches applied
5527 # A = "applied", ie orig with H's debian/patches applied
5528 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5529 \%editedignores, \@unrepres),
5530 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5531 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5535 foreach my $b (qw(01 02)) {
5536 foreach my $v (qw(O2H O2A H2A)) {
5537 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5540 printdebug "differences \@dl @dl.\n";
5543 "$us: base trees orig=%.20s o+d/p=%.20s",
5544 $unapplied, $oldtiptree;
5546 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5547 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5548 $dl[0], $dl[1], $dl[3], $dl[4],
5552 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5554 forceable_fail [qw(unrepresentable)], <<END;
5555 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5560 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5561 push @failsuggestion, "This might be a patches-unapplied branch.";
5562 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5563 push @failsuggestion, "This might be a patches-applied branch.";
5565 push @failsuggestion, "Maybe you need to specify one of".
5566 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5568 if (quiltmode_splitbrain()) {
5569 quiltify_splitbrain($clogp, $unapplied, $headref,
5570 $diffbits, \%editedignores,
5571 $splitbrain_cachekey);
5575 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5576 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5578 if (!open P, '>>', ".pc/applied-patches") {
5579 $!==&ENOENT or die $!;
5584 commit_quilty_patch();
5586 if ($mustdeletepc) {
5587 quilt_fixup_delete_pc();
5591 sub quilt_fixup_editor () {
5592 my $descfn = $ENV{$fakeeditorenv};
5593 my $editing = $ARGV[$#ARGV];
5594 open I1, '<', $descfn or die "$descfn: $!";
5595 open I2, '<', $editing or die "$editing: $!";
5596 unlink $editing or die "$editing: $!";
5597 open O, '>', $editing or die "$editing: $!";
5598 while (<I1>) { print O or die $!; } I1->error and die $!;
5601 $copying ||= m/^\-\-\- /;
5602 next unless $copying;
5605 I2->error and die $!;
5610 sub maybe_apply_patches_dirtily () {
5611 return unless $quilt_mode =~ m/gbp|unapplied/;
5612 print STDERR <<END or die $!;
5614 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5615 dgit: Have to apply the patches - making the tree dirty.
5616 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5619 $patches_applied_dirtily = 01;
5620 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5621 runcmd qw(dpkg-source --before-build .);
5624 sub maybe_unapply_patches_again () {
5625 progress "dgit: Unapplying patches again to tidy up the tree."
5626 if $patches_applied_dirtily;
5627 runcmd qw(dpkg-source --after-build .)
5628 if $patches_applied_dirtily & 01;
5630 if $patches_applied_dirtily & 02;
5631 $patches_applied_dirtily = 0;
5634 #----- other building -----
5636 our $clean_using_builder;
5637 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5638 # clean the tree before building (perhaps invoked indirectly by
5639 # whatever we are using to run the build), rather than separately
5640 # and explicitly by us.
5643 return if $clean_using_builder;
5644 if ($cleanmode eq 'dpkg-source') {
5645 maybe_apply_patches_dirtily();
5646 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5647 } elsif ($cleanmode eq 'dpkg-source-d') {
5648 maybe_apply_patches_dirtily();
5649 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5650 } elsif ($cleanmode eq 'git') {
5651 runcmd_ordryrun_local @git, qw(clean -xdf);
5652 } elsif ($cleanmode eq 'git-ff') {
5653 runcmd_ordryrun_local @git, qw(clean -xdff);
5654 } elsif ($cleanmode eq 'check') {
5655 my $leftovers = cmdoutput @git, qw(clean -xdn);
5656 if (length $leftovers) {
5657 print STDERR $leftovers, "\n" or die $!;
5658 fail "tree contains uncommitted files and --clean=check specified";
5660 } elsif ($cleanmode eq 'none') {
5667 badusage "clean takes no additional arguments" if @ARGV;
5670 maybe_unapply_patches_again();
5673 sub build_prep_early () {
5674 our $build_prep_early_done //= 0;
5675 return if $build_prep_early_done++;
5676 badusage "-p is not allowed when building" if defined $package;
5677 my $clogp = parsechangelog();
5678 $isuite = getfield $clogp, 'Distribution';
5679 $package = getfield $clogp, 'Source';
5680 $version = getfield $clogp, 'Version';
5688 build_maybe_quilt_fixup();
5690 my $pat = changespat $version;
5691 foreach my $f (glob "$buildproductsdir/$pat") {
5693 unlink $f or fail "remove old changes file $f: $!";
5695 progress "would remove $f";
5701 sub changesopts_initial () {
5702 my @opts =@changesopts[1..$#changesopts];
5705 sub changesopts_version () {
5706 if (!defined $changes_since_version) {
5707 my @vsns = archive_query('archive_query');
5708 my @quirk = access_quirk();
5709 if ($quirk[0] eq 'backports') {
5710 local $isuite = $quirk[2];
5712 canonicalise_suite();
5713 push @vsns, archive_query('archive_query');
5716 @vsns = map { $_->[0] } @vsns;
5717 @vsns = sort { -version_compare($a, $b) } @vsns;
5718 $changes_since_version = $vsns[0];
5719 progress "changelog will contain changes since $vsns[0]";
5721 $changes_since_version = '_';
5722 progress "package seems new, not specifying -v<version>";
5725 if ($changes_since_version ne '_') {
5726 return ("-v$changes_since_version");
5732 sub changesopts () {
5733 return (changesopts_initial(), changesopts_version());
5736 sub massage_dbp_args ($;$) {
5737 my ($cmd,$xargs) = @_;
5740 # - if we're going to split the source build out so we can
5741 # do strange things to it, massage the arguments to dpkg-buildpackage
5742 # so that the main build doessn't build source (or add an argument
5743 # to stop it building source by default).
5745 # - add -nc to stop dpkg-source cleaning the source tree,
5746 # unless we're not doing a split build and want dpkg-source
5747 # as cleanmode, in which case we can do nothing
5750 # 0 - source will NOT need to be built separately by caller
5751 # +1 - source will need to be built separately by caller
5752 # +2 - source will need to be built separately by caller AND
5753 # dpkg-buildpackage should not in fact be run at all!
5754 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5755 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5756 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5757 $clean_using_builder = 1;
5760 # -nc has the side effect of specifying -b if nothing else specified
5761 # and some combinations of -S, -b, et al, are errors, rather than
5762 # later simply overriding earlie. So we need to:
5763 # - search the command line for these options
5764 # - pick the last one
5765 # - perhaps add our own as a default
5766 # - perhaps adjust it to the corresponding non-source-building version
5768 foreach my $l ($cmd, $xargs) {
5770 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5773 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5775 if ($need_split_build_invocation) {
5776 printdebug "massage split $dmode.\n";
5777 $r = $dmode =~ m/[S]/ ? +2 :
5778 $dmode =~ y/gGF/ABb/ ? +1 :
5779 $dmode =~ m/[ABb]/ ? 0 :
5782 printdebug "massage done $r $dmode.\n";
5784 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5790 my $wasdir = must_getcwd();
5796 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5797 my ($msg_if_onlyone) = @_;
5798 # If there is only one .changes file, fail with $msg_if_onlyone,
5799 # or if that is undef, be a no-op.
5800 # Returns the changes file to report to the user.
5801 my $pat = changespat $version;
5802 my @changesfiles = glob $pat;
5803 @changesfiles = sort {
5804 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5808 if (@changesfiles==1) {
5809 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5810 only one changes file from build (@changesfiles)
5812 $result = $changesfiles[0];
5813 } elsif (@changesfiles==2) {
5814 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5815 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5816 fail "$l found in binaries changes file $binchanges"
5819 runcmd_ordryrun_local @mergechanges, @changesfiles;
5820 my $multichanges = changespat $version,'multi';
5822 stat_exists $multichanges or fail "$multichanges: $!";
5823 foreach my $cf (glob $pat) {
5824 next if $cf eq $multichanges;
5825 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5828 $result = $multichanges;
5830 fail "wrong number of different changes files (@changesfiles)";
5832 printdone "build successful, results in $result\n" or die $!;
5835 sub midbuild_checkchanges () {
5836 my $pat = changespat $version;
5837 return if $rmchanges;
5838 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5839 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5841 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5842 Suggest you delete @unwanted.
5847 sub midbuild_checkchanges_vanilla ($) {
5849 midbuild_checkchanges() if $wantsrc == 1;
5852 sub postbuild_mergechanges_vanilla ($) {
5854 if ($wantsrc == 1) {
5856 postbuild_mergechanges(undef);
5859 printdone "build successful\n";
5865 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5866 my $wantsrc = massage_dbp_args \@dbp;
5869 midbuild_checkchanges_vanilla $wantsrc;
5874 push @dbp, changesopts_version();
5875 maybe_apply_patches_dirtily();
5876 runcmd_ordryrun_local @dbp;
5878 maybe_unapply_patches_again();
5879 postbuild_mergechanges_vanilla $wantsrc;
5883 $quilt_mode //= 'gbp';
5889 # gbp can make .origs out of thin air. In my tests it does this
5890 # even for a 1.0 format package, with no origs present. So I
5891 # guess it keys off just the version number. We don't know
5892 # exactly what .origs ought to exist, but let's assume that we
5893 # should run gbp if: the version has an upstream part and the main
5895 my $upstreamversion = upstreamversion $version;
5896 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5897 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5899 if ($gbp_make_orig) {
5901 $cleanmode = 'none'; # don't do it again
5902 $need_split_build_invocation = 1;
5905 my @dbp = @dpkgbuildpackage;
5907 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5909 if (!length $gbp_build[0]) {
5910 if (length executable_on_path('git-buildpackage')) {
5911 $gbp_build[0] = qw(git-buildpackage);
5913 $gbp_build[0] = 'gbp buildpackage';
5916 my @cmd = opts_opt_multi_cmd @gbp_build;
5918 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5920 if ($gbp_make_orig) {
5921 ensuredir '.git/dgit';
5922 my $ok = '.git/dgit/origs-gen-ok';
5923 unlink $ok or $!==&ENOENT or die $!;
5924 my @origs_cmd = @cmd;
5925 push @origs_cmd, qw(--git-cleaner=true);
5926 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5927 push @origs_cmd, @ARGV;
5929 debugcmd @origs_cmd;
5931 do { local $!; stat_exists $ok; }
5932 or failedcmd @origs_cmd;
5934 dryrun_report @origs_cmd;
5940 midbuild_checkchanges_vanilla $wantsrc;
5942 if (!$clean_using_builder) {
5943 push @cmd, '--git-cleaner=true';
5947 maybe_unapply_patches_again();
5949 push @cmd, changesopts();
5950 runcmd_ordryrun_local @cmd, @ARGV;
5952 postbuild_mergechanges_vanilla $wantsrc;
5954 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5958 my $our_cleanmode = $cleanmode;
5959 if ($need_split_build_invocation) {
5960 # Pretend that clean is being done some other way. This
5961 # forces us not to try to use dpkg-buildpackage to clean and
5962 # build source all in one go; and instead we run dpkg-source
5963 # (and build_prep() will do the clean since $clean_using_builder
5965 $our_cleanmode = 'ELSEWHERE';
5967 if ($our_cleanmode =~ m/^dpkg-source/) {
5968 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5969 $clean_using_builder = 1;
5972 $sourcechanges = changespat $version,'source';
5974 unlink "../$sourcechanges" or $!==ENOENT
5975 or fail "remove $sourcechanges: $!";
5977 $dscfn = dscfn($version);
5978 if ($our_cleanmode eq 'dpkg-source') {
5979 maybe_apply_patches_dirtily();
5980 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5982 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5983 maybe_apply_patches_dirtily();
5984 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5987 my @cmd = (@dpkgsource, qw(-b --));
5990 runcmd_ordryrun_local @cmd, "work";
5991 my @udfiles = <${package}_*>;
5992 changedir "../../..";
5993 foreach my $f (@udfiles) {
5994 printdebug "source copy, found $f\n";
5997 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5998 $f eq srcfn($version, $&));
5999 printdebug "source copy, found $f - renaming\n";
6000 rename "$ud/$f", "../$f" or $!==ENOENT
6001 or fail "put in place new source file ($f): $!";
6004 my $pwd = must_getcwd();
6005 my $leafdir = basename $pwd;
6007 runcmd_ordryrun_local @cmd, $leafdir;
6010 runcmd_ordryrun_local qw(sh -ec),
6011 'exec >$1; shift; exec "$@"','x',
6012 "../$sourcechanges",
6013 @dpkggenchanges, qw(-S), changesopts();
6017 sub cmd_build_source {
6019 badusage "build-source takes no additional arguments" if @ARGV;
6021 maybe_unapply_patches_again();
6022 printdone "source built, results in $dscfn and $sourcechanges";
6027 midbuild_checkchanges();
6030 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6031 stat_exists $sourcechanges
6032 or fail "$sourcechanges (in parent directory): $!";
6034 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6036 maybe_unapply_patches_again();
6038 postbuild_mergechanges(<<END);
6039 perhaps you need to pass -A ? (sbuild's default is to build only
6040 arch-specific binaries; dgit 1.4 used to override that.)
6045 sub cmd_quilt_fixup {
6046 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6049 build_maybe_quilt_fixup();
6052 sub cmd_import_dsc {
6056 last unless $ARGV[0] =~ m/^-/;
6059 if (m/^--require-valid-signature$/) {
6062 badusage "unknown dgit import-dsc sub-option \`$_'";
6066 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6067 my ($dscfn, $dstbranch) = @ARGV;
6069 badusage "dry run makes no sense with import-dsc" unless act_local();
6071 my $force = $dstbranch =~ s/^\+// ? +1 :
6072 $dstbranch =~ s/^\.\.// ? -1 :
6074 my $info = $force ? " $&" : '';
6075 $info = "$dscfn$info";
6077 my $specbranch = $dstbranch;
6078 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6079 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6081 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6082 my $chead = cmdoutput_errok @symcmd;
6083 defined $chead or $?==256 or failedcmd @symcmd;
6085 fail "$dstbranch is checked out - will not update it"
6086 if defined $chead and $chead eq $dstbranch;
6088 my $oldhash = git_get_ref $dstbranch;
6090 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6091 $dscdata = do { local $/ = undef; <D>; };
6092 D->error and fail "read $dscfn: $!";
6095 # we don't normally need this so import it here
6096 use Dpkg::Source::Package;
6097 my $dp = new Dpkg::Source::Package filename => $dscfn,
6098 require_valid_signature => $needsig;
6100 local $SIG{__WARN__} = sub {
6102 return unless $needsig;
6103 fail "import-dsc signature check failed";
6105 if (!$dp->is_signed()) {
6106 warn "$us: warning: importing unsigned .dsc\n";
6108 my $r = $dp->check_signature();
6109 die "->check_signature => $r" if $needsig && $r;
6115 $package = getfield $dsc, 'Source';
6117 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6118 unless forceing [qw(import-dsc-with-dgit-field)];
6119 parse_dsc_field_def_dsc_distro();
6121 $isuite = 'DGIT-IMPORT-DSC';
6122 $idistro //= $dsc_distro;
6126 if (defined $dsc_hash) {
6127 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6128 resolve_dsc_field_commit undef, undef;
6130 if (defined $dsc_hash) {
6131 my @cmd = (qw(sh -ec),
6132 "echo $dsc_hash | git cat-file --batch-check");
6133 my $objgot = cmdoutput @cmd;
6134 if ($objgot =~ m#^\w+ missing\b#) {
6136 .dsc contains Dgit field referring to object $dsc_hash
6137 Your git tree does not have that object. Try `git fetch' from a
6138 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6141 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6143 progress "Not fast forward, forced update.";
6145 fail "Not fast forward to $dsc_hash";
6148 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
6149 $dstbranch, $dsc_hash);
6151 progress "dgit: import-dsc updated git ref $dstbranch";
6156 Branch $dstbranch already exists
6157 Specify ..$specbranch for a pseudo-merge, binding in existing history
6158 Specify +$specbranch to overwrite, discarding existing history
6160 if $oldhash && !$force;
6162 my @dfi = dsc_files_info();
6163 foreach my $fi (@dfi) {
6164 my $f = $fi->{Filename};
6166 next if lstat $here;
6167 fail "stat $here: $!" unless $! == ENOENT;
6169 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6171 } elsif ($dscfn =~ m#^/#) {
6174 fail "cannot import $dscfn which seems to be inside working tree!";
6176 $there =~ s#/+[^/]+$## or
6177 fail "cannot import $dscfn which seems to not have a basename";
6179 symlink $there, $here or fail "symlink $there to $here: $!";
6180 progress "made symlink $here -> $there";
6181 # print STDERR Dumper($fi);
6183 my @mergeinputs = generate_commits_from_dsc();
6184 die unless @mergeinputs == 1;
6186 my $newhash = $mergeinputs[0]{Commit};
6190 progress "Import, forced update - synthetic orphan git history.";
6191 } elsif ($force < 0) {
6192 progress "Import, merging.";
6193 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6194 my $version = getfield $dsc, 'Version';
6195 my $clogp = commit_getclogp $newhash;
6196 my $authline = clogp_authline $clogp;
6197 $newhash = make_commit_text <<END;
6204 Merge $package ($version) import into $dstbranch
6207 die; # caught earlier
6211 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
6212 $dstbranch, $newhash);
6214 progress "dgit: import-dsc results are in in git ref $dstbranch";
6217 sub cmd_archive_api_query {
6218 badusage "need only 1 subpath argument" unless @ARGV==1;
6219 my ($subpath) = @ARGV;
6220 my @cmd = archive_api_query_cmd($subpath);
6223 exec @cmd or fail "exec curl: $!\n";
6226 sub cmd_clone_dgit_repos_server {
6227 badusage "need destination argument" unless @ARGV==1;
6228 my ($destdir) = @ARGV;
6229 $package = '_dgit-repos-server';
6230 local $access_forpush = 0;
6231 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6233 exec @cmd or fail "exec git clone: $!\n";
6236 sub cmd_print_dgit_repos_server_source_url {
6237 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6239 $package = '_dgit-repos-server';
6240 local $access_forpush = 0;
6241 my $url = access_giturl();
6242 print $url, "\n" or die $!;
6245 sub cmd_setup_mergechangelogs {
6246 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6247 setup_mergechangelogs(1);
6250 sub cmd_setup_useremail {
6251 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6255 sub cmd_setup_new_tree {
6256 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6260 #---------- argument parsing and main program ----------
6263 print "dgit version $our_version\n" or die $!;
6267 our (%valopts_long, %valopts_short);
6268 our (%funcopts_long);
6270 our (@modeopt_cfgs);
6272 sub defvalopt ($$$$) {
6273 my ($long,$short,$val_re,$how) = @_;
6274 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6275 $valopts_long{$long} = $oi;
6276 $valopts_short{$short} = $oi;
6277 # $how subref should:
6278 # do whatever assignemnt or thing it likes with $_[0]
6279 # if the option should not be passed on to remote, @rvalopts=()
6280 # or $how can be a scalar ref, meaning simply assign the value
6283 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6284 defvalopt '--distro', '-d', '.+', \$idistro;
6285 defvalopt '', '-k', '.+', \$keyid;
6286 defvalopt '--existing-package','', '.*', \$existing_package;
6287 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6288 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6289 defvalopt '--package', '-p', $package_re, \$package;
6290 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6292 defvalopt '', '-C', '.+', sub {
6293 ($changesfile) = (@_);
6294 if ($changesfile =~ s#^(.*)/##) {
6295 $buildproductsdir = $1;
6299 defvalopt '--initiator-tempdir','','.*', sub {
6300 ($initiator_tempdir) = (@_);
6301 $initiator_tempdir =~ m#^/# or
6302 badusage "--initiator-tempdir must be used specify an".
6303 " absolute, not relative, directory."
6306 sub defoptmodes ($@) {
6307 my ($varref, $cfgkey, $default, %optmap) = @_;
6309 while (my ($opt,$val) = each %optmap) {
6310 $funcopts_long{$opt} = sub { $$varref = $val; };
6311 $permit{$val} = $val;
6313 push @modeopt_cfgs, {
6316 Default => $default,
6321 defoptmodes \$dodep14tag, qw( dep14tag want
6324 --always-dep14tag always );
6329 if (defined $ENV{'DGIT_SSH'}) {
6330 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6331 } elsif (defined $ENV{'GIT_SSH'}) {
6332 @ssh = ($ENV{'GIT_SSH'});
6340 if (!defined $val) {
6341 badusage "$what needs a value" unless @ARGV;
6343 push @rvalopts, $val;
6345 badusage "bad value \`$val' for $what" unless
6346 $val =~ m/^$oi->{Re}$(?!\n)/s;
6347 my $how = $oi->{How};
6348 if (ref($how) eq 'SCALAR') {
6353 push @ropts, @rvalopts;
6357 last unless $ARGV[0] =~ m/^-/;
6361 if (m/^--dry-run$/) {
6364 } elsif (m/^--damp-run$/) {
6367 } elsif (m/^--no-sign$/) {
6370 } elsif (m/^--help$/) {
6372 } elsif (m/^--version$/) {
6374 } elsif (m/^--new$/) {
6377 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6378 ($om = $opts_opt_map{$1}) &&
6382 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6383 !$opts_opt_cmdonly{$1} &&
6384 ($om = $opts_opt_map{$1})) {
6387 } elsif (m/^--(gbp|dpm)$/s) {
6388 push @ropts, "--quilt=$1";
6390 } elsif (m/^--ignore-dirty$/s) {
6393 } elsif (m/^--no-quilt-fixup$/s) {
6395 $quilt_mode = 'nocheck';
6396 } elsif (m/^--no-rm-on-error$/s) {
6399 } elsif (m/^--no-chase-dsc-distro$/s) {
6401 $chase_dsc_distro = 0;
6402 } elsif (m/^--overwrite$/s) {
6404 $overwrite_version = '';
6405 } elsif (m/^--overwrite=(.+)$/s) {
6407 $overwrite_version = $1;
6408 } elsif (m/^--delayed=(\d+)$/s) {
6411 } elsif (m/^--dgit-view-save=(.+)$/s) {
6413 $split_brain_save = $1;
6414 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6415 } elsif (m/^--(no-)?rm-old-changes$/s) {
6418 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6420 push @deliberatelies, $&;
6421 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6425 } elsif (m/^--force-/) {
6427 "$us: warning: ignoring unknown force option $_\n";
6429 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6430 # undocumented, for testing
6432 $tagformat_want = [ $1, 'command line', 1 ];
6433 # 1 menas overrides distro configuration
6434 } elsif (m/^--always-split-source-build$/s) {
6435 # undocumented, for testing
6437 $need_split_build_invocation = 1;
6438 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6439 # undocumented, for testing
6441 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6442 # ^ it's supposed to be an array ref
6443 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6444 $val = $2 ? $' : undef; #';
6445 $valopt->($oi->{Long});
6446 } elsif ($funcopts_long{$_}) {
6448 $funcopts_long{$_}();
6450 badusage "unknown long option \`$_'";
6457 } elsif (s/^-L/-/) {
6460 } elsif (s/^-h/-/) {
6462 } elsif (s/^-D/-/) {
6466 } elsif (s/^-N/-/) {
6471 push @changesopts, $_;
6473 } elsif (s/^-wn$//s) {
6475 $cleanmode = 'none';
6476 } elsif (s/^-wg$//s) {
6479 } elsif (s/^-wgf$//s) {
6481 $cleanmode = 'git-ff';
6482 } elsif (s/^-wd$//s) {
6484 $cleanmode = 'dpkg-source';
6485 } elsif (s/^-wdd$//s) {
6487 $cleanmode = 'dpkg-source-d';
6488 } elsif (s/^-wc$//s) {
6490 $cleanmode = 'check';
6491 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6492 push @git, '-c', $&;
6493 $gitcfgs{cmdline}{$1} = [ $2 ];
6494 } elsif (s/^-c([^=]+)$//s) {
6495 push @git, '-c', $&;
6496 $gitcfgs{cmdline}{$1} = [ 'true' ];
6497 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6499 $val = undef unless length $val;
6500 $valopt->($oi->{Short});
6503 badusage "unknown short option \`$_'";
6510 sub check_env_sanity () {
6511 my $blocked = new POSIX::SigSet;
6512 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6515 foreach my $name (qw(PIPE CHLD)) {
6516 my $signame = "SIG$name";
6517 my $signum = eval "POSIX::$signame" // die;
6518 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6519 die "$signame is set to something other than SIG_DFL\n";
6520 $blocked->ismember($signum) and
6521 die "$signame is blocked\n";
6527 On entry to dgit, $@
6528 This is a bug produced by something in in your execution environment.
6534 sub parseopts_late_defaults () {
6535 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6536 if defined $idistro;
6537 $isuite //= cfg('dgit.default.default-suite');
6539 foreach my $k (keys %opts_opt_map) {
6540 my $om = $opts_opt_map{$k};
6542 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6544 badcfg "cannot set command for $k"
6545 unless length $om->[0];
6549 foreach my $c (access_cfg_cfgs("opts-$k")) {
6551 map { $_ ? @$_ : () }
6552 map { $gitcfgs{$_}{$c} }
6553 reverse @gitcfgsources;
6554 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6555 "\n" if $debuglevel >= 4;
6557 badcfg "cannot configure options for $k"
6558 if $opts_opt_cmdonly{$k};
6559 my $insertpos = $opts_cfg_insertpos{$k};
6560 @$om = ( @$om[0..$insertpos-1],
6562 @$om[$insertpos..$#$om] );
6566 if (!defined $rmchanges) {
6567 local $access_forpush;
6568 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6571 if (!defined $quilt_mode) {
6572 local $access_forpush;
6573 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6574 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6576 $quilt_mode =~ m/^($quilt_modes_re)$/
6577 or badcfg "unknown quilt-mode \`$quilt_mode'";
6581 foreach my $moc (@modeopt_cfgs) {
6582 local $access_forpush;
6583 my $vr = $moc->{Var};
6584 next if defined $$vr;
6585 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6586 my $v = $moc->{Vals}{$$vr};
6587 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6591 $need_split_build_invocation ||= quiltmode_splitbrain();
6593 if (!defined $cleanmode) {
6594 local $access_forpush;
6595 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6596 $cleanmode //= 'dpkg-source';
6598 badcfg "unknown clean-mode \`$cleanmode'" unless
6599 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6603 if ($ENV{$fakeeditorenv}) {
6605 quilt_fixup_editor();
6612 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6613 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6614 if $dryrun_level == 1;
6616 print STDERR $helpmsg or die $!;
6619 my $cmd = shift @ARGV;
6622 my $pre_fn = ${*::}{"pre_$cmd"};
6623 $pre_fn->() if $pre_fn;
6625 my $fn = ${*::}{"cmd_$cmd"};
6626 $fn or badusage "unknown operation $cmd";