3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::Util qw(any);
38 use List::MoreUtils qw(pairwise);
39 use Text::Glob qw(match_glob);
40 use Fcntl qw(:DEFAULT :flock);
45 our $our_version = 'UNRELEASED'; ###substituted###
46 our $absurdity = undef; ###substituted###
48 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
57 our $dryrun_level = 0;
59 our $buildproductsdir = '..';
65 our $existing_package = 'dpkg';
67 our $changes_since_version;
69 our $overwrite_version; # undef: not specified; '': check changelog
71 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
73 our $split_brain_save;
74 our $we_are_responder;
75 our $we_are_initiator;
76 our $initiator_tempdir;
77 our $patches_applied_dirtily = 00;
81 our $chase_dsc_distro=1;
83 our %forceopts = map { $_=>0 }
84 qw(unrepresentable unsupported-source-format
85 dsc-changes-mismatch changes-origs-exactly
86 import-gitapply-absurd
87 import-gitapply-no-absurd
88 import-dsc-with-dgit-field);
90 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
92 our $suite_re = '[-+.0-9a-z]+';
93 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
94 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
95 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
96 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
98 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
99 our $splitbraincache = 'dgit-intern/quilt-cache';
100 our $rewritemap = 'dgit-rewrite/map';
102 our (@git) = qw(git);
103 our (@dget) = qw(dget);
104 our (@curl) = qw(curl);
105 our (@dput) = qw(dput);
106 our (@debsign) = qw(debsign);
107 our (@gpg) = qw(gpg);
108 our (@sbuild) = qw(sbuild);
110 our (@dgit) = qw(dgit);
111 our (@aptget) = qw(apt-get);
112 our (@aptcache) = qw(apt-cache);
113 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
114 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
115 our (@dpkggenchanges) = qw(dpkg-genchanges);
116 our (@mergechanges) = qw(mergechanges -f);
117 our (@gbp_build) = ('');
118 our (@gbp_pq) = ('gbp pq');
119 our (@changesopts) = ('');
121 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
124 'debsign' => \@debsign,
126 'sbuild' => \@sbuild,
130 'apt-get' => \@aptget,
131 'apt-cache' => \@aptcache,
132 'dpkg-source' => \@dpkgsource,
133 'dpkg-buildpackage' => \@dpkgbuildpackage,
134 'dpkg-genchanges' => \@dpkggenchanges,
135 'gbp-build' => \@gbp_build,
136 'gbp-pq' => \@gbp_pq,
137 'ch' => \@changesopts,
138 'mergechanges' => \@mergechanges);
140 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
141 our %opts_cfg_insertpos = map {
143 scalar @{ $opts_opt_map{$_} }
144 } keys %opts_opt_map;
146 sub parseopts_late_defaults();
152 our $supplementary_message = '';
153 our $need_split_build_invocation = 0;
154 our $split_brain = 0;
158 return unless forkcheck_mainprocess();
159 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
162 our $remotename = 'dgit';
163 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
167 if (!defined $absurdity) {
169 $absurdity =~ s{/[^/]+$}{/absurd} or die;
173 my ($v,$distro) = @_;
174 return $tagformatfn->($v, $distro);
177 sub debiantag_maintview ($$) {
178 my ($v,$distro) = @_;
179 return "$distro/".dep14_version_mangle $v;
182 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
184 sub lbranch () { return "$branchprefix/$csuite"; }
185 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
186 sub lref () { return "refs/heads/".lbranch(); }
187 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
188 sub rrref () { return server_ref($csuite); }
198 return "${package}_".(stripepoch $vsn).$sfx
203 return srcfn($vsn,".dsc");
206 sub changespat ($;$) {
207 my ($vsn, $arch) = @_;
208 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
211 sub upstreamversion ($) {
223 return unless forkcheck_mainprocess();
224 foreach my $f (@end) {
226 print STDERR "$us: cleanup: $@" if length $@;
230 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
232 sub forceable_fail ($$) {
233 my ($forceoptsl, $msg) = @_;
234 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
235 print STDERR "warning: overriding problem due to --force:\n". $msg;
239 my ($forceoptsl) = @_;
240 my @got = grep { $forceopts{$_} } @$forceoptsl;
241 return 0 unless @got;
243 "warning: skipping checks or functionality due to --force-$got[0]\n";
246 sub no_such_package () {
247 print STDERR "$us: package $package does not exist in suite $isuite\n";
253 printdebug "CD $newdir\n";
254 chdir $newdir or confess "chdir: $newdir: $!";
257 sub deliberately ($) {
259 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
262 sub deliberately_not_fast_forward () {
263 foreach (qw(not-fast-forward fresh-repo)) {
264 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
268 sub quiltmode_splitbrain () {
269 $quilt_mode =~ m/gbp|dpm|unapplied/;
272 sub opts_opt_multi_cmd {
274 push @cmd, split /\s+/, shift @_;
280 return opts_opt_multi_cmd @gbp_pq;
283 #---------- remote protocol support, common ----------
285 # remote push initiator/responder protocol:
286 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
287 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
288 # < dgit-remote-push-ready <actual-proto-vsn>
295 # > supplementary-message NBYTES # $protovsn >= 3
300 # > file parsed-changelog
301 # [indicates that output of dpkg-parsechangelog follows]
302 # > data-block NBYTES
303 # > [NBYTES bytes of data (no newline)]
304 # [maybe some more blocks]
313 # > param head DGIT-VIEW-HEAD
314 # > param csuite SUITE
315 # > param tagformat old|new
316 # > param maint-view MAINT-VIEW-HEAD
318 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
319 # # goes into tag, for replay prevention
322 # [indicates that signed tag is wanted]
323 # < data-block NBYTES
324 # < [NBYTES bytes of data (no newline)]
325 # [maybe some more blocks]
329 # > want signed-dsc-changes
330 # < data-block NBYTES [transfer of signed dsc]
332 # < data-block NBYTES [transfer of signed changes]
340 sub i_child_report () {
341 # Sees if our child has died, and reap it if so. Returns a string
342 # describing how it died if it failed, or undef otherwise.
343 return undef unless $i_child_pid;
344 my $got = waitpid $i_child_pid, WNOHANG;
345 return undef if $got <= 0;
346 die unless $got == $i_child_pid;
347 $i_child_pid = undef;
348 return undef unless $?;
349 return "build host child ".waitstatusmsg();
354 fail "connection lost: $!" if $fh->error;
355 fail "protocol violation; $m not expected";
358 sub badproto_badread ($$) {
360 fail "connection lost: $!" if $!;
361 my $report = i_child_report();
362 fail $report if defined $report;
363 badproto $fh, "eof (reading $wh)";
366 sub protocol_expect (&$) {
367 my ($match, $fh) = @_;
370 defined && chomp or badproto_badread $fh, "protocol message";
378 badproto $fh, "\`$_'";
381 sub protocol_send_file ($$) {
382 my ($fh, $ourfn) = @_;
383 open PF, "<", $ourfn or die "$ourfn: $!";
386 my $got = read PF, $d, 65536;
387 die "$ourfn: $!" unless defined $got;
389 print $fh "data-block ".length($d)."\n" or die $!;
390 print $fh $d or die $!;
392 PF->error and die "$ourfn $!";
393 print $fh "data-end\n" or die $!;
397 sub protocol_read_bytes ($$) {
398 my ($fh, $nbytes) = @_;
399 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
401 my $got = read $fh, $d, $nbytes;
402 $got==$nbytes or badproto_badread $fh, "data block";
406 sub protocol_receive_file ($$) {
407 my ($fh, $ourfn) = @_;
408 printdebug "() $ourfn\n";
409 open PF, ">", $ourfn or die "$ourfn: $!";
411 my ($y,$l) = protocol_expect {
412 m/^data-block (.*)$/ ? (1,$1) :
413 m/^data-end$/ ? (0,) :
417 my $d = protocol_read_bytes $fh, $l;
418 print PF $d or die $!;
423 #---------- remote protocol support, responder ----------
425 sub responder_send_command ($) {
427 return unless $we_are_responder;
428 # called even without $we_are_responder
429 printdebug ">> $command\n";
430 print PO $command, "\n" or die $!;
433 sub responder_send_file ($$) {
434 my ($keyword, $ourfn) = @_;
435 return unless $we_are_responder;
436 printdebug "]] $keyword $ourfn\n";
437 responder_send_command "file $keyword";
438 protocol_send_file \*PO, $ourfn;
441 sub responder_receive_files ($@) {
442 my ($keyword, @ourfns) = @_;
443 die unless $we_are_responder;
444 printdebug "[[ $keyword @ourfns\n";
445 responder_send_command "want $keyword";
446 foreach my $fn (@ourfns) {
447 protocol_receive_file \*PI, $fn;
450 protocol_expect { m/^files-end$/ } \*PI;
453 #---------- remote protocol support, initiator ----------
455 sub initiator_expect (&) {
457 protocol_expect { &$match } \*RO;
460 #---------- end remote code ----------
463 if ($we_are_responder) {
465 responder_send_command "progress ".length($m) or die $!;
466 print PO $m or die $!;
476 $ua = LWP::UserAgent->new();
480 progress "downloading $what...";
481 my $r = $ua->get(@_) or die $!;
482 return undef if $r->code == 404;
483 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
484 return $r->decoded_content(charset => 'none');
487 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
492 failedcmd @_ if system @_;
495 sub act_local () { return $dryrun_level <= 1; }
496 sub act_scary () { return !$dryrun_level; }
499 if (!$dryrun_level) {
500 progress "$us ok: @_";
502 progress "would be ok: @_ (but dry run only)";
507 printcmd(\*STDERR,$debugprefix."#",@_);
510 sub runcmd_ordryrun {
518 sub runcmd_ordryrun_local {
527 my ($first_shell, @cmd) = @_;
528 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
531 our $helpmsg = <<END;
533 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
534 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
535 dgit [dgit-opts] build [dpkg-buildpackage-opts]
536 dgit [dgit-opts] sbuild [sbuild-opts]
537 dgit [dgit-opts] push [dgit-opts] [suite]
538 dgit [dgit-opts] rpush build-host:build-dir ...
539 important dgit options:
540 -k<keyid> sign tag and package with <keyid> instead of default
541 --dry-run -n do not change anything, but go through the motions
542 --damp-run -L like --dry-run but make local changes, without signing
543 --new -N allow introducing a new package
544 --debug -D increase debug level
545 -c<name>=<value> set git config option (used directly by dgit too)
548 our $later_warning_msg = <<END;
549 Perhaps the upload is stuck in incoming. Using the version from git.
553 print STDERR "$us: @_\n", $helpmsg or die $!;
558 @ARGV or badusage "too few arguments";
559 return scalar shift @ARGV;
563 print $helpmsg or die $!;
567 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
569 our %defcfg = ('dgit.default.distro' => 'debian',
570 'dgit.default.default-suite' => 'unstable',
571 'dgit.default.old-dsc-distro' => 'debian',
572 'dgit-suite.*-security.distro' => 'debian-security',
573 'dgit.default.username' => '',
574 'dgit.default.archive-query-default-component' => 'main',
575 'dgit.default.ssh' => 'ssh',
576 'dgit.default.archive-query' => 'madison:',
577 'dgit.default.sshpsql-dbname' => 'service=projectb',
578 'dgit.default.aptget-components' => 'main',
579 'dgit.default.dgit-tag-format' => 'new,old,maint',
580 'dgit.dsc-url-proto-ok.http' => 'true',
581 'dgit.dsc-url-proto-ok.https' => 'true',
582 'dgit.dsc-url-proto-ok.git' => 'true',
583 'dgit.default.dsc-url-proto-ok' => 'false',
584 # old means "repo server accepts pushes with old dgit tags"
585 # new means "repo server accepts pushes with new dgit tags"
586 # maint means "repo server accepts split brain pushes"
587 # hist means "repo server may have old pushes without new tag"
588 # ("hist" is implied by "old")
589 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
590 'dgit-distro.debian.git-check' => 'url',
591 'dgit-distro.debian.git-check-suffix' => '/info/refs',
592 'dgit-distro.debian.new-private-pushers' => 't',
593 'dgit-distro.debian/push.git-url' => '',
594 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
595 'dgit-distro.debian/push.git-user-force' => 'dgit',
596 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
597 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
598 'dgit-distro.debian/push.git-create' => 'true',
599 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
600 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
601 # 'dgit-distro.debian.archive-query-tls-key',
602 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
603 # ^ this does not work because curl is broken nowadays
604 # Fixing #790093 properly will involve providing providing the key
605 # in some pacagke and maybe updating these paths.
607 # 'dgit-distro.debian.archive-query-tls-curl-args',
608 # '--ca-path=/etc/ssl/ca-debian',
609 # ^ this is a workaround but works (only) on DSA-administered machines
610 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
611 'dgit-distro.debian.git-url-suffix' => '',
612 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
613 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
614 'dgit-distro.debian-security.archive-query' => 'aptget:',
615 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
616 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
617 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
618 'dgit-distro.debian-security.nominal-distro' => 'debian',
619 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
620 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
621 'dgit-distro.ubuntu.git-check' => 'false',
622 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
623 'dgit-distro.test-dummy.ssh' => "$td/ssh",
624 'dgit-distro.test-dummy.username' => "alice",
625 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
626 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
627 'dgit-distro.test-dummy.git-url' => "$td/git",
628 'dgit-distro.test-dummy.git-host' => "git",
629 'dgit-distro.test-dummy.git-path' => "$td/git",
630 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
631 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
632 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
633 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
637 our @gitcfgsources = qw(cmdline local global system);
639 sub git_slurp_config () {
640 local ($debuglevel) = $debuglevel-2;
643 # This algoritm is a bit subtle, but this is needed so that for
644 # options which we want to be single-valued, we allow the
645 # different config sources to override properly. See #835858.
646 foreach my $src (@gitcfgsources) {
647 next if $src eq 'cmdline';
648 # we do this ourselves since git doesn't handle it
650 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
653 open GITS, "-|", @cmd or die $!;
656 printdebug "=> ", (messagequote $_), "\n";
658 push @{ $gitcfgs{$src}{$`} }, $'; #';
662 or ($!==0 && $?==256)
667 sub git_get_config ($) {
669 foreach my $src (@gitcfgsources) {
670 my $l = $gitcfgs{$src}{$c};
671 croak "$l $c" if $l && !ref $l;
672 printdebug"C $c ".(defined $l ?
673 join " ", map { messagequote "'$_'" } @$l :
677 @$l==1 or badcfg "multiple values for $c".
678 " (in $src git config)" if @$l > 1;
686 return undef if $c =~ /RETURN-UNDEF/;
687 printdebug "C? $c\n" if $debuglevel >= 5;
688 my $v = git_get_config($c);
689 return $v if defined $v;
690 my $dv = $defcfg{$c};
692 printdebug "CD $c $dv\n" if $debuglevel >= 4;
696 badcfg "need value for one of: @_\n".
697 "$us: distro or suite appears not to be (properly) supported";
700 sub access_basedistro__noalias () {
701 if (defined $idistro) {
704 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
705 return $def if defined $def;
706 foreach my $src (@gitcfgsources, 'internal') {
707 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
709 foreach my $k (keys %$kl) {
710 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
712 next unless match_glob $dpat, $isuite;
716 return cfg("dgit.default.distro");
720 sub access_basedistro () {
721 my $noalias = access_basedistro__noalias();
722 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
723 return $canon // $noalias;
726 sub access_nomdistro () {
727 my $base = access_basedistro();
728 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
729 $r =~ m/^$distro_re$/ or badcfg
730 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
734 sub access_quirk () {
735 # returns (quirk name, distro to use instead or undef, quirk-specific info)
736 my $basedistro = access_basedistro();
737 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
739 if (defined $backports_quirk) {
740 my $re = $backports_quirk;
741 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
743 $re =~ s/\%/([-0-9a-z_]+)/
744 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
745 if ($isuite =~ m/^$re$/) {
746 return ('backports',"$basedistro-backports",$1);
749 return ('none',undef);
754 sub parse_cfg_bool ($$$) {
755 my ($what,$def,$v) = @_;
758 $v =~ m/^[ty1]/ ? 1 :
759 $v =~ m/^[fn0]/ ? 0 :
760 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
763 sub access_forpush_config () {
764 my $d = access_basedistro();
768 parse_cfg_bool('new-private-pushers', 0,
769 cfg("dgit-distro.$d.new-private-pushers",
772 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
775 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
776 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
777 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
778 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
781 sub access_forpush () {
782 $access_forpush //= access_forpush_config();
783 return $access_forpush;
787 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
788 badcfg "pushing but distro is configured readonly"
789 if access_forpush_config() eq '0';
791 $supplementary_message = <<'END' unless $we_are_responder;
792 Push failed, before we got started.
793 You can retry the push, after fixing the problem, if you like.
795 parseopts_late_defaults();
799 parseopts_late_defaults();
802 sub supplementary_message ($) {
804 if (!$we_are_responder) {
805 $supplementary_message = $msg;
807 } elsif ($protovsn >= 3) {
808 responder_send_command "supplementary-message ".length($msg)
810 print PO $msg or die $!;
814 sub access_distros () {
815 # Returns list of distros to try, in order
818 # 0. `instead of' distro name(s) we have been pointed to
819 # 1. the access_quirk distro, if any
820 # 2a. the user's specified distro, or failing that } basedistro
821 # 2b. the distro calculated from the suite }
822 my @l = access_basedistro();
824 my (undef,$quirkdistro) = access_quirk();
825 unshift @l, $quirkdistro;
826 unshift @l, $instead_distro;
827 @l = grep { defined } @l;
829 push @l, access_nomdistro();
831 if (access_forpush()) {
832 @l = map { ("$_/push", $_) } @l;
837 sub access_cfg_cfgs (@) {
840 # The nesting of these loops determines the search order. We put
841 # the key loop on the outside so that we search all the distros
842 # for each key, before going on to the next key. That means that
843 # if access_cfg is called with a more specific, and then a less
844 # specific, key, an earlier distro can override the less specific
845 # without necessarily overriding any more specific keys. (If the
846 # distro wants to override the more specific keys it can simply do
847 # so; whereas if we did the loop the other way around, it would be
848 # impossible to for an earlier distro to override a less specific
849 # key but not the more specific ones without restating the unknown
850 # values of the more specific keys.
853 # We have to deal with RETURN-UNDEF specially, so that we don't
854 # terminate the search prematurely.
856 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
859 foreach my $d (access_distros()) {
860 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
862 push @cfgs, map { "dgit.default.$_" } @realkeys;
869 my (@cfgs) = access_cfg_cfgs(@keys);
870 my $value = cfg(@cfgs);
874 sub access_cfg_bool ($$) {
875 my ($def, @keys) = @_;
876 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
879 sub string_to_ssh ($) {
881 if ($spec =~ m/\s/) {
882 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
888 sub access_cfg_ssh () {
889 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
890 if (!defined $gitssh) {
893 return string_to_ssh $gitssh;
897 sub access_runeinfo ($) {
899 return ": dgit ".access_basedistro()." $info ;";
902 sub access_someuserhost ($) {
904 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
905 defined($user) && length($user) or
906 $user = access_cfg("$some-user",'username');
907 my $host = access_cfg("$some-host");
908 return length($user) ? "$user\@$host" : $host;
911 sub access_gituserhost () {
912 return access_someuserhost('git');
915 sub access_giturl (;$) {
917 my $url = access_cfg('git-url','RETURN-UNDEF');
920 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
921 return undef unless defined $proto;
924 access_gituserhost().
925 access_cfg('git-path');
927 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
930 return "$url/$package$suffix";
933 sub parsecontrolfh ($$;$) {
934 my ($fh, $desc, $allowsigned) = @_;
935 our $dpkgcontrolhash_noissigned;
938 my %opts = ('name' => $desc);
939 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
940 $c = Dpkg::Control::Hash->new(%opts);
941 $c->parse($fh,$desc) or die "parsing of $desc failed";
942 last if $allowsigned;
943 last if $dpkgcontrolhash_noissigned;
944 my $issigned= $c->get_option('is_pgp_signed');
945 if (!defined $issigned) {
946 $dpkgcontrolhash_noissigned= 1;
947 seek $fh, 0,0 or die "seek $desc: $!";
948 } elsif ($issigned) {
949 fail "control file $desc is (already) PGP-signed. ".
950 " Note that dgit push needs to modify the .dsc and then".
951 " do the signature itself";
960 my ($file, $desc, $allowsigned) = @_;
961 my $fh = new IO::Handle;
962 open $fh, '<', $file or die "$file: $!";
963 my $c = parsecontrolfh($fh,$desc,$allowsigned);
964 $fh->error and die $!;
970 my ($dctrl,$field) = @_;
971 my $v = $dctrl->{$field};
972 return $v if defined $v;
973 fail "missing field $field in ".$dctrl->get_option('name');
977 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
978 my $p = new IO::Handle;
979 my @cmd = (qw(dpkg-parsechangelog), @_);
980 open $p, '-|', @cmd or die $!;
982 $?=0; $!=0; close $p or failedcmd @cmd;
986 sub commit_getclogp ($) {
987 # Returns the parsed changelog hashref for a particular commit
989 our %commit_getclogp_memo;
990 my $memo = $commit_getclogp_memo{$objid};
991 return $memo if $memo;
993 my $mclog = ".git/dgit/clog-$objid";
994 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
995 "$objid:debian/changelog";
996 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1001 defined $d or fail "getcwd failed: $!";
1005 sub parse_dscdata () {
1006 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1007 printdebug Dumper($dscdata) if $debuglevel>1;
1008 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1009 printdebug Dumper($dsc) if $debuglevel>1;
1014 sub archive_query ($;@) {
1015 my ($method) = shift @_;
1016 fail "this operation does not support multiple comma-separated suites"
1018 my $query = access_cfg('archive-query','RETURN-UNDEF');
1019 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1022 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1025 sub archive_query_prepend_mirror {
1026 my $m = access_cfg('mirror');
1027 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1030 sub pool_dsc_subpath ($$) {
1031 my ($vsn,$component) = @_; # $package is implict arg
1032 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1033 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1036 sub cfg_apply_map ($$$) {
1037 my ($varref, $what, $mapspec) = @_;
1038 return unless $mapspec;
1040 printdebug "config $what EVAL{ $mapspec; }\n";
1042 eval "package Dgit::Config; $mapspec;";
1047 #---------- `ftpmasterapi' archive query method (nascent) ----------
1049 sub archive_api_query_cmd ($) {
1051 my @cmd = (@curl, qw(-sS));
1052 my $url = access_cfg('archive-query-url');
1053 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1055 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1056 foreach my $key (split /\:/, $keys) {
1057 $key =~ s/\%HOST\%/$host/g;
1059 fail "for $url: stat $key: $!" unless $!==ENOENT;
1062 fail "config requested specific TLS key but do not know".
1063 " how to get curl to use exactly that EE key ($key)";
1064 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1065 # # Sadly the above line does not work because of changes
1066 # # to gnutls. The real fix for #790093 may involve
1067 # # new curl options.
1070 # Fixing #790093 properly will involve providing a value
1071 # for this on clients.
1072 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1073 push @cmd, split / /, $kargs if defined $kargs;
1075 push @cmd, $url.$subpath;
1079 sub api_query ($$;$) {
1081 my ($data, $subpath, $ok404) = @_;
1082 badcfg "ftpmasterapi archive query method takes no data part"
1084 my @cmd = archive_api_query_cmd($subpath);
1085 my $url = $cmd[$#cmd];
1086 push @cmd, qw(-w %{http_code});
1087 my $json = cmdoutput @cmd;
1088 unless ($json =~ s/\d+\d+\d$//) {
1089 failedcmd_report_cmd undef, @cmd;
1090 fail "curl failed to print 3-digit HTTP code";
1093 return undef if $code eq '404' && $ok404;
1094 fail "fetch of $url gave HTTP code $code"
1095 unless $url =~ m#^file://# or $code =~ m/^2/;
1096 return decode_json($json);
1099 sub canonicalise_suite_ftpmasterapi {
1100 my ($proto,$data) = @_;
1101 my $suites = api_query($data, 'suites');
1103 foreach my $entry (@$suites) {
1105 my $v = $entry->{$_};
1106 defined $v && $v eq $isuite;
1107 } qw(codename name);
1108 push @matched, $entry;
1110 fail "unknown suite $isuite" unless @matched;
1113 @matched==1 or die "multiple matches for suite $isuite\n";
1114 $cn = "$matched[0]{codename}";
1115 defined $cn or die "suite $isuite info has no codename\n";
1116 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1118 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1123 sub archive_query_ftpmasterapi {
1124 my ($proto,$data) = @_;
1125 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1127 my $digester = Digest::SHA->new(256);
1128 foreach my $entry (@$info) {
1130 my $vsn = "$entry->{version}";
1131 my ($ok,$msg) = version_check $vsn;
1132 die "bad version: $msg\n" unless $ok;
1133 my $component = "$entry->{component}";
1134 $component =~ m/^$component_re$/ or die "bad component";
1135 my $filename = "$entry->{filename}";
1136 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1137 or die "bad filename";
1138 my $sha256sum = "$entry->{sha256sum}";
1139 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1140 push @rows, [ $vsn, "/pool/$component/$filename",
1141 $digester, $sha256sum ];
1143 die "bad ftpmaster api response: $@\n".Dumper($entry)
1146 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1147 return archive_query_prepend_mirror @rows;
1150 sub file_in_archive_ftpmasterapi {
1151 my ($proto,$data,$filename) = @_;
1152 my $pat = $filename;
1155 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1156 my $info = api_query($data, "file_in_archive/$pat", 1);
1159 #---------- `aptget' archive query method ----------
1162 our $aptget_releasefile;
1163 our $aptget_configpath;
1165 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1166 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1168 sub aptget_cache_clean {
1169 runcmd_ordryrun_local qw(sh -ec),
1170 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1174 sub aptget_lock_acquire () {
1175 my $lockfile = "$aptget_base/lock";
1176 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1177 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1180 sub aptget_prep ($) {
1182 return if defined $aptget_base;
1184 badcfg "aptget archive query method takes no data part"
1187 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1190 ensuredir "$cache/dgit";
1192 access_cfg('aptget-cachekey','RETURN-UNDEF')
1193 // access_nomdistro();
1195 $aptget_base = "$cache/dgit/aptget";
1196 ensuredir $aptget_base;
1198 my $quoted_base = $aptget_base;
1199 die "$quoted_base contains bad chars, cannot continue"
1200 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1202 ensuredir $aptget_base;
1204 aptget_lock_acquire();
1206 aptget_cache_clean();
1208 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1209 my $sourceslist = "source.list#$cachekey";
1211 my $aptsuites = $isuite;
1212 cfg_apply_map(\$aptsuites, 'suite map',
1213 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1215 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1216 printf SRCS "deb-src %s %s %s\n",
1217 access_cfg('mirror'),
1219 access_cfg('aptget-components')
1222 ensuredir "$aptget_base/cache";
1223 ensuredir "$aptget_base/lists";
1225 open CONF, ">", $aptget_configpath or die $!;
1227 Debug::NoLocking "true";
1228 APT::Get::List-Cleanup "false";
1229 #clear APT::Update::Post-Invoke-Success;
1230 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1231 Dir::State::Lists "$quoted_base/lists";
1232 Dir::Etc::preferences "$quoted_base/preferences";
1233 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1234 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1237 foreach my $key (qw(
1240 Dir::Cache::Archives
1241 Dir::Etc::SourceParts
1242 Dir::Etc::preferencesparts
1244 ensuredir "$aptget_base/$key";
1245 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1248 my $oldatime = (time // die $!) - 1;
1249 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1250 next unless stat_exists $oldlist;
1251 my ($mtime) = (stat _)[9];
1252 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1255 runcmd_ordryrun_local aptget_aptget(), qw(update);
1258 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1259 next unless stat_exists $oldlist;
1260 my ($atime) = (stat _)[8];
1261 next if $atime == $oldatime;
1262 push @releasefiles, $oldlist;
1264 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1265 @releasefiles = @inreleasefiles if @inreleasefiles;
1266 die "apt updated wrong number of Release files (@releasefiles), erk"
1267 unless @releasefiles == 1;
1269 ($aptget_releasefile) = @releasefiles;
1272 sub canonicalise_suite_aptget {
1273 my ($proto,$data) = @_;
1276 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1278 foreach my $name (qw(Codename Suite)) {
1279 my $val = $release->{$name};
1281 printdebug "release file $name: $val\n";
1282 $val =~ m/^$suite_re$/o or fail
1283 "Release file ($aptget_releasefile) specifies intolerable $name";
1284 cfg_apply_map(\$val, 'suite rmap',
1285 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1292 sub archive_query_aptget {
1293 my ($proto,$data) = @_;
1296 ensuredir "$aptget_base/source";
1297 foreach my $old (<$aptget_base/source/*.dsc>) {
1298 unlink $old or die "$old: $!";
1301 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1302 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1303 # avoids apt-get source failing with ambiguous error code
1305 runcmd_ordryrun_local
1306 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1307 aptget_aptget(), qw(--download-only --only-source source), $package;
1309 my @dscs = <$aptget_base/source/*.dsc>;
1310 fail "apt-get source did not produce a .dsc" unless @dscs;
1311 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1313 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1316 my $uri = "file://". uri_escape $dscs[0];
1317 $uri =~ s{\%2f}{/}gi;
1318 return [ (getfield $pre_dsc, 'Version'), $uri ];
1321 #---------- `dummyapicat' archive query method ----------
1323 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1324 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1326 sub file_in_archive_dummycatapi ($$$) {
1327 my ($proto,$data,$filename) = @_;
1328 my $mirror = access_cfg('mirror');
1329 $mirror =~ s#^file://#/# or die "$mirror ?";
1331 my @cmd = (qw(sh -ec), '
1333 find -name "$2" -print0 |
1335 ', qw(x), $mirror, $filename);
1336 debugcmd "-|", @cmd;
1337 open FIA, "-|", @cmd or die $!;
1340 printdebug "| $_\n";
1341 m/^(\w+) (\S+)$/ or die "$_ ?";
1342 push @out, { sha256sum => $1, filename => $2 };
1344 close FIA or die failedcmd @cmd;
1348 #---------- `madison' archive query method ----------
1350 sub archive_query_madison {
1351 return archive_query_prepend_mirror
1352 map { [ @$_[0..1] ] } madison_get_parse(@_);
1355 sub madison_get_parse {
1356 my ($proto,$data) = @_;
1357 die unless $proto eq 'madison';
1358 if (!length $data) {
1359 $data= access_cfg('madison-distro','RETURN-UNDEF');
1360 $data //= access_basedistro();
1362 $rmad{$proto,$data,$package} ||= cmdoutput
1363 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1364 my $rmad = $rmad{$proto,$data,$package};
1367 foreach my $l (split /\n/, $rmad) {
1368 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1369 \s*( [^ \t|]+ )\s* \|
1370 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1371 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1372 $1 eq $package or die "$rmad $package ?";
1379 $component = access_cfg('archive-query-default-component');
1381 $5 eq 'source' or die "$rmad ?";
1382 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1384 return sort { -version_compare($a->[0],$b->[0]); } @out;
1387 sub canonicalise_suite_madison {
1388 # madison canonicalises for us
1389 my @r = madison_get_parse(@_);
1391 "unable to canonicalise suite using package $package".
1392 " which does not appear to exist in suite $isuite;".
1393 " --existing-package may help";
1397 sub file_in_archive_madison { return undef; }
1399 #---------- `sshpsql' archive query method ----------
1402 my ($data,$runeinfo,$sql) = @_;
1403 if (!length $data) {
1404 $data= access_someuserhost('sshpsql').':'.
1405 access_cfg('sshpsql-dbname');
1407 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1408 my ($userhost,$dbname) = ($`,$'); #';
1410 my @cmd = (access_cfg_ssh, $userhost,
1411 access_runeinfo("ssh-psql $runeinfo").
1412 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1413 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1415 open P, "-|", @cmd or die $!;
1418 printdebug(">|$_|\n");
1421 $!=0; $?=0; close P or failedcmd @cmd;
1423 my $nrows = pop @rows;
1424 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1425 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1426 @rows = map { [ split /\|/, $_ ] } @rows;
1427 my $ncols = scalar @{ shift @rows };
1428 die if grep { scalar @$_ != $ncols } @rows;
1432 sub sql_injection_check {
1433 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1436 sub archive_query_sshpsql ($$) {
1437 my ($proto,$data) = @_;
1438 sql_injection_check $isuite, $package;
1439 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1440 SELECT source.version, component.name, files.filename, files.sha256sum
1442 JOIN src_associations ON source.id = src_associations.source
1443 JOIN suite ON suite.id = src_associations.suite
1444 JOIN dsc_files ON dsc_files.source = source.id
1445 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1446 JOIN component ON component.id = files_archive_map.component_id
1447 JOIN files ON files.id = dsc_files.file
1448 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1449 AND source.source='$package'
1450 AND files.filename LIKE '%.dsc';
1452 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1453 my $digester = Digest::SHA->new(256);
1455 my ($vsn,$component,$filename,$sha256sum) = @$_;
1456 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1458 return archive_query_prepend_mirror @rows;
1461 sub canonicalise_suite_sshpsql ($$) {
1462 my ($proto,$data) = @_;
1463 sql_injection_check $isuite;
1464 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1465 SELECT suite.codename
1466 FROM suite where suite_name='$isuite' or codename='$isuite';
1468 @rows = map { $_->[0] } @rows;
1469 fail "unknown suite $isuite" unless @rows;
1470 die "ambiguous $isuite: @rows ?" if @rows>1;
1474 sub file_in_archive_sshpsql ($$$) { return undef; }
1476 #---------- `dummycat' archive query method ----------
1478 sub canonicalise_suite_dummycat ($$) {
1479 my ($proto,$data) = @_;
1480 my $dpath = "$data/suite.$isuite";
1481 if (!open C, "<", $dpath) {
1482 $!==ENOENT or die "$dpath: $!";
1483 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1487 chomp or die "$dpath: $!";
1489 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1493 sub archive_query_dummycat ($$) {
1494 my ($proto,$data) = @_;
1495 canonicalise_suite();
1496 my $dpath = "$data/package.$csuite.$package";
1497 if (!open C, "<", $dpath) {
1498 $!==ENOENT or die "$dpath: $!";
1499 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1507 printdebug "dummycat query $csuite $package $dpath | $_\n";
1508 my @row = split /\s+/, $_;
1509 @row==2 or die "$dpath: $_ ?";
1512 C->error and die "$dpath: $!";
1514 return archive_query_prepend_mirror
1515 sort { -version_compare($a->[0],$b->[0]); } @rows;
1518 sub file_in_archive_dummycat () { return undef; }
1520 #---------- tag format handling ----------
1522 sub access_cfg_tagformats () {
1523 split /\,/, access_cfg('dgit-tag-format');
1526 sub access_cfg_tagformats_can_splitbrain () {
1527 my %y = map { $_ => 1 } access_cfg_tagformats;
1528 foreach my $needtf (qw(new maint)) {
1529 next if $y{$needtf};
1535 sub need_tagformat ($$) {
1536 my ($fmt, $why) = @_;
1537 fail "need to use tag format $fmt ($why) but also need".
1538 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1539 " - no way to proceed"
1540 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1541 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1544 sub select_tagformat () {
1546 return if $tagformatfn && !$tagformat_want;
1547 die 'bug' if $tagformatfn && $tagformat_want;
1548 # ... $tagformat_want assigned after previous select_tagformat
1550 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1551 printdebug "select_tagformat supported @supported\n";
1553 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1554 printdebug "select_tagformat specified @$tagformat_want\n";
1556 my ($fmt,$why,$override) = @$tagformat_want;
1558 fail "target distro supports tag formats @supported".
1559 " but have to use $fmt ($why)"
1561 or grep { $_ eq $fmt } @supported;
1563 $tagformat_want = undef;
1565 $tagformatfn = ${*::}{"debiantag_$fmt"};
1567 fail "trying to use unknown tag format \`$fmt' ($why) !"
1568 unless $tagformatfn;
1571 #---------- archive query entrypoints and rest of program ----------
1573 sub canonicalise_suite () {
1574 return if defined $csuite;
1575 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1576 $csuite = archive_query('canonicalise_suite');
1577 if ($isuite ne $csuite) {
1578 progress "canonical suite name for $isuite is $csuite";
1580 progress "canonical suite name is $csuite";
1584 sub get_archive_dsc () {
1585 canonicalise_suite();
1586 my @vsns = archive_query('archive_query');
1587 foreach my $vinfo (@vsns) {
1588 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1589 $dscurl = $vsn_dscurl;
1590 $dscdata = url_get($dscurl);
1592 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1597 $digester->add($dscdata);
1598 my $got = $digester->hexdigest();
1600 fail "$dscurl has hash $got but".
1601 " archive told us to expect $digest";
1604 my $fmt = getfield $dsc, 'Format';
1605 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1606 "unsupported source format $fmt, sorry";
1608 $dsc_checked = !!$digester;
1609 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1613 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1616 sub check_for_git ();
1617 sub check_for_git () {
1619 my $how = access_cfg('git-check');
1620 if ($how eq 'ssh-cmd') {
1622 (access_cfg_ssh, access_gituserhost(),
1623 access_runeinfo("git-check $package").
1624 " set -e; cd ".access_cfg('git-path').";".
1625 " if test -d $package.git; then echo 1; else echo 0; fi");
1626 my $r= cmdoutput @cmd;
1627 if (defined $r and $r =~ m/^divert (\w+)$/) {
1629 my ($usedistro,) = access_distros();
1630 # NB that if we are pushing, $usedistro will be $distro/push
1631 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1632 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1633 progress "diverting to $divert (using config for $instead_distro)";
1634 return check_for_git();
1636 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1638 } elsif ($how eq 'url') {
1639 my $prefix = access_cfg('git-check-url','git-url');
1640 my $suffix = access_cfg('git-check-suffix','git-suffix',
1641 'RETURN-UNDEF') // '.git';
1642 my $url = "$prefix/$package$suffix";
1643 my @cmd = (@curl, qw(-sS -I), $url);
1644 my $result = cmdoutput @cmd;
1645 $result =~ s/^\S+ 200 .*\n\r?\n//;
1646 # curl -sS -I with https_proxy prints
1647 # HTTP/1.0 200 Connection established
1648 $result =~ m/^\S+ (404|200) /s or
1649 fail "unexpected results from git check query - ".
1650 Dumper($prefix, $result);
1652 if ($code eq '404') {
1654 } elsif ($code eq '200') {
1659 } elsif ($how eq 'true') {
1661 } elsif ($how eq 'false') {
1664 badcfg "unknown git-check \`$how'";
1668 sub create_remote_git_repo () {
1669 my $how = access_cfg('git-create');
1670 if ($how eq 'ssh-cmd') {
1672 (access_cfg_ssh, access_gituserhost(),
1673 access_runeinfo("git-create $package").
1674 "set -e; cd ".access_cfg('git-path').";".
1675 " cp -a _template $package.git");
1676 } elsif ($how eq 'true') {
1679 badcfg "unknown git-create \`$how'";
1683 our ($dsc_hash,$lastpush_mergeinput);
1684 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1686 our $ud = '.git/dgit/unpack';
1696 sub mktree_in_ud_here () {
1697 runcmd qw(git init -q);
1698 runcmd qw(git config gc.auto 0);
1699 rmtree('.git/objects');
1700 symlink '../../../../objects','.git/objects' or die $!;
1703 sub git_write_tree () {
1704 my $tree = cmdoutput @git, qw(write-tree);
1705 $tree =~ m/^\w+$/ or die "$tree ?";
1709 sub git_add_write_tree () {
1710 runcmd @git, qw(add -Af .);
1711 return git_write_tree();
1714 sub remove_stray_gits ($) {
1716 my @gitscmd = qw(find -name .git -prune -print0);
1717 debugcmd "|",@gitscmd;
1718 open GITS, "-|", @gitscmd or die $!;
1723 print STDERR "$us: warning: removing from $what: ",
1724 (messagequote $_), "\n";
1728 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1731 sub mktree_in_ud_from_only_subdir ($;$) {
1732 my ($what,$raw) = @_;
1734 # changes into the subdir
1736 die "expected one subdir but found @dirs ?" unless @dirs==1;
1737 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1741 remove_stray_gits($what);
1742 mktree_in_ud_here();
1744 my ($format, $fopts) = get_source_format();
1745 if (madformat($format)) {
1750 my $tree=git_add_write_tree();
1751 return ($tree,$dir);
1754 our @files_csum_info_fields =
1755 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1756 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1757 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1759 sub dsc_files_info () {
1760 foreach my $csumi (@files_csum_info_fields) {
1761 my ($fname, $module, $method) = @$csumi;
1762 my $field = $dsc->{$fname};
1763 next unless defined $field;
1764 eval "use $module; 1;" or die $@;
1766 foreach (split /\n/, $field) {
1768 m/^(\w+) (\d+) (\S+)$/ or
1769 fail "could not parse .dsc $fname line \`$_'";
1770 my $digester = eval "$module"."->$method;" or die $@;
1775 Digester => $digester,
1780 fail "missing any supported Checksums-* or Files field in ".
1781 $dsc->get_option('name');
1785 map { $_->{Filename} } dsc_files_info();
1788 sub files_compare_inputs (@) {
1793 my $showinputs = sub {
1794 return join "; ", map { $_->get_option('name') } @$inputs;
1797 foreach my $in (@$inputs) {
1799 my $in_name = $in->get_option('name');
1801 printdebug "files_compare_inputs $in_name\n";
1803 foreach my $csumi (@files_csum_info_fields) {
1804 my ($fname) = @$csumi;
1805 printdebug "files_compare_inputs $in_name $fname\n";
1807 my $field = $in->{$fname};
1808 next unless defined $field;
1811 foreach (split /\n/, $field) {
1814 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1815 fail "could not parse $in_name $fname line \`$_'";
1817 printdebug "files_compare_inputs $in_name $fname $f\n";
1821 my $re = \ $record{$f}{$fname};
1823 $fchecked{$f}{$in_name} = 1;
1825 fail "hash or size of $f varies in $fname fields".
1826 " (between: ".$showinputs->().")";
1831 @files = sort @files;
1832 $expected_files //= \@files;
1833 "@$expected_files" eq "@files" or
1834 fail "file list in $in_name varies between hash fields!";
1837 fail "$in_name has no files list field(s)";
1839 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1842 grep { keys %$_ == @$inputs-1 } values %fchecked
1843 or fail "no file appears in all file lists".
1844 " (looked in: ".$showinputs->().")";
1847 sub is_orig_file_in_dsc ($$) {
1848 my ($f, $dsc_files_info) = @_;
1849 return 0 if @$dsc_files_info <= 1;
1850 # One file means no origs, and the filename doesn't have a "what
1851 # part of dsc" component. (Consider versions ending `.orig'.)
1852 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1856 sub is_orig_file_of_vsn ($$) {
1857 my ($f, $upstreamvsn) = @_;
1858 my $base = srcfn $upstreamvsn, '';
1859 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1863 sub changes_update_origs_from_dsc ($$$$) {
1864 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1866 printdebug "checking origs needed ($upstreamvsn)...\n";
1867 $_ = getfield $changes, 'Files';
1868 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1869 fail "cannot find section/priority from .changes Files field";
1870 my $placementinfo = $1;
1872 printdebug "checking origs needed placement '$placementinfo'...\n";
1873 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1874 $l =~ m/\S+$/ or next;
1876 printdebug "origs $file | $l\n";
1877 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1878 printdebug "origs $file is_orig\n";
1879 my $have = archive_query('file_in_archive', $file);
1880 if (!defined $have) {
1882 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1888 printdebug "origs $file \$#\$have=$#$have\n";
1889 foreach my $h (@$have) {
1892 foreach my $csumi (@files_csum_info_fields) {
1893 my ($fname, $module, $method, $archivefield) = @$csumi;
1894 next unless defined $h->{$archivefield};
1895 $_ = $dsc->{$fname};
1896 next unless defined;
1897 m/^(\w+) .* \Q$file\E$/m or
1898 fail ".dsc $fname missing entry for $file";
1899 if ($h->{$archivefield} eq $1) {
1903 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1906 die "$file ".Dumper($h)." ?!" if $same && @differ;
1909 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1912 printdebug "origs $file f.same=$found_same".
1913 " #f._differ=$#found_differ\n";
1914 if (@found_differ && !$found_same) {
1916 "archive contains $file with different checksum",
1919 # Now we edit the changes file to add or remove it
1920 foreach my $csumi (@files_csum_info_fields) {
1921 my ($fname, $module, $method, $archivefield) = @$csumi;
1922 next unless defined $changes->{$fname};
1924 # in archive, delete from .changes if it's there
1925 $changed{$file} = "removed" if
1926 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1927 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1928 # not in archive, but it's here in the .changes
1930 my $dsc_data = getfield $dsc, $fname;
1931 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1933 $extra =~ s/ \d+ /$&$placementinfo /
1934 or die "$fname $extra >$dsc_data< ?"
1935 if $fname eq 'Files';
1936 $changes->{$fname} .= "\n". $extra;
1937 $changed{$file} = "added";
1942 foreach my $file (keys %changed) {
1944 "edited .changes for archive .orig contents: %s %s",
1945 $changed{$file}, $file;
1947 my $chtmp = "$changesfile.tmp";
1948 $changes->save($chtmp);
1950 rename $chtmp,$changesfile or die "$changesfile $!";
1952 progress "[new .changes left in $changesfile]";
1955 progress "$changesfile already has appropriate .orig(s) (if any)";
1959 sub make_commit ($) {
1961 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1964 sub make_commit_text ($) {
1967 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1969 print Dumper($text) if $debuglevel > 1;
1970 my $child = open2($out, $in, @cmd) or die $!;
1973 print $in $text or die $!;
1974 close $in or die $!;
1976 $h =~ m/^\w+$/ or die;
1978 printdebug "=> $h\n";
1981 waitpid $child, 0 == $child or die "$child $!";
1982 $? and failedcmd @cmd;
1986 sub clogp_authline ($) {
1988 my $author = getfield $clogp, 'Maintainer';
1989 $author =~ s#,.*##ms;
1990 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1991 my $authline = "$author $date";
1992 $authline =~ m/$git_authline_re/o or
1993 fail "unexpected commit author line format \`$authline'".
1994 " (was generated from changelog Maintainer field)";
1995 return ($1,$2,$3) if wantarray;
1999 sub vendor_patches_distro ($$) {
2000 my ($checkdistro, $what) = @_;
2001 return unless defined $checkdistro;
2003 my $series = "debian/patches/\L$checkdistro\E.series";
2004 printdebug "checking for vendor-specific $series ($what)\n";
2006 if (!open SERIES, "<", $series) {
2007 die "$series $!" unless $!==ENOENT;
2016 Unfortunately, this source package uses a feature of dpkg-source where
2017 the same source package unpacks to different source code on different
2018 distros. dgit cannot safely operate on such packages on affected
2019 distros, because the meaning of source packages is not stable.
2021 Please ask the distro/maintainer to remove the distro-specific series
2022 files and use a different technique (if necessary, uploading actually
2023 different packages, if different distros are supposed to have
2027 fail "Found active distro-specific series file for".
2028 " $checkdistro ($what): $series, cannot continue";
2030 die "$series $!" if SERIES->error;
2034 sub check_for_vendor_patches () {
2035 # This dpkg-source feature doesn't seem to be documented anywhere!
2036 # But it can be found in the changelog (reformatted):
2038 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2039 # Author: Raphael Hertzog <hertzog@debian.org>
2040 # Date: Sun Oct 3 09:36:48 2010 +0200
2042 # dpkg-source: correctly create .pc/.quilt_series with alternate
2045 # If you have debian/patches/ubuntu.series and you were
2046 # unpacking the source package on ubuntu, quilt was still
2047 # directed to debian/patches/series instead of
2048 # debian/patches/ubuntu.series.
2050 # debian/changelog | 3 +++
2051 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2052 # 2 files changed, 6 insertions(+), 1 deletion(-)
2055 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2056 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2057 "Dpkg::Vendor \`current vendor'");
2058 vendor_patches_distro(access_basedistro(),
2059 "(base) distro being accessed");
2060 vendor_patches_distro(access_nomdistro(),
2061 "(nominal) distro being accessed");
2064 sub generate_commits_from_dsc () {
2065 # See big comment in fetch_from_archive, below.
2066 # See also README.dsc-import.
2070 my @dfi = dsc_files_info();
2071 foreach my $fi (@dfi) {
2072 my $f = $fi->{Filename};
2073 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2074 my $upper_f = "../../../../$f";
2076 printdebug "considering reusing $f: ";
2078 if (link_ltarget "$upper_f,fetch", $f) {
2079 printdebug "linked (using ...,fetch).\n";
2080 } elsif ((printdebug "($!) "),
2082 fail "accessing ../$f,fetch: $!";
2083 } elsif (link_ltarget $upper_f, $f) {
2084 printdebug "linked.\n";
2085 } elsif ((printdebug "($!) "),
2087 fail "accessing ../$f: $!";
2089 printdebug "absent.\n";
2093 complete_file_from_dsc('.', $fi, \$refetched)
2096 printdebug "considering saving $f: ";
2098 if (link $f, $upper_f) {
2099 printdebug "linked.\n";
2100 } elsif ((printdebug "($!) "),
2102 fail "saving ../$f: $!";
2103 } elsif (!$refetched) {
2104 printdebug "no need.\n";
2105 } elsif (link $f, "$upper_f,fetch") {
2106 printdebug "linked (using ...,fetch).\n";
2107 } elsif ((printdebug "($!) "),
2109 fail "saving ../$f,fetch: $!";
2111 printdebug "cannot.\n";
2115 # We unpack and record the orig tarballs first, so that we only
2116 # need disk space for one private copy of the unpacked source.
2117 # But we can't make them into commits until we have the metadata
2118 # from the debian/changelog, so we record the tree objects now and
2119 # make them into commits later.
2121 my $upstreamv = upstreamversion $dsc->{version};
2122 my $orig_f_base = srcfn $upstreamv, '';
2124 foreach my $fi (@dfi) {
2125 # We actually import, and record as a commit, every tarball
2126 # (unless there is only one file, in which case there seems
2129 my $f = $fi->{Filename};
2130 printdebug "import considering $f ";
2131 (printdebug "only one dfi\n"), next if @dfi == 1;
2132 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2133 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2137 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2139 printdebug "Y ", (join ' ', map { $_//"(none)" }
2140 $compr_ext, $orig_f_part
2143 my $input = new IO::File $f, '<' or die "$f $!";
2147 if (defined $compr_ext) {
2149 Dpkg::Compression::compression_guess_from_filename $f;
2150 fail "Dpkg::Compression cannot handle file $f in source package"
2151 if defined $compr_ext && !defined $cname;
2153 new Dpkg::Compression::Process compression => $cname;
2154 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2155 my $compr_fh = new IO::Handle;
2156 my $compr_pid = open $compr_fh, "-|" // die $!;
2158 open STDIN, "<&", $input or die $!;
2160 die "dgit (child): exec $compr_cmd[0]: $!\n";
2165 rmtree "_unpack-tar";
2166 mkdir "_unpack-tar" or die $!;
2167 my @tarcmd = qw(tar -x -f -
2168 --no-same-owner --no-same-permissions
2169 --no-acls --no-xattrs --no-selinux);
2170 my $tar_pid = fork // die $!;
2172 chdir "_unpack-tar" or die $!;
2173 open STDIN, "<&", $input or die $!;
2175 die "dgit (child): exec $tarcmd[0]: $!";
2177 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2178 !$? or failedcmd @tarcmd;
2181 (@compr_cmd ? failedcmd @compr_cmd
2183 # finally, we have the results in "tarball", but maybe
2184 # with the wrong permissions
2186 runcmd qw(chmod -R +rwX _unpack-tar);
2187 changedir "_unpack-tar";
2188 remove_stray_gits($f);
2189 mktree_in_ud_here();
2191 my ($tree) = git_add_write_tree();
2192 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2193 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2195 printdebug "one subtree $1\n";
2197 printdebug "multiple subtrees\n";
2200 rmtree "_unpack-tar";
2202 my $ent = [ $f, $tree ];
2204 Orig => !!$orig_f_part,
2205 Sort => (!$orig_f_part ? 2 :
2206 $orig_f_part =~ m/-/g ? 1 :
2214 # put any without "_" first (spec is not clear whether files
2215 # are always in the usual order). Tarballs without "_" are
2216 # the main orig or the debian tarball.
2217 $a->{Sort} <=> $b->{Sort} or
2221 my $any_orig = grep { $_->{Orig} } @tartrees;
2223 my $dscfn = "$package.dsc";
2225 my $treeimporthow = 'package';
2227 open D, ">", $dscfn or die "$dscfn: $!";
2228 print D $dscdata or die "$dscfn: $!";
2229 close D or die "$dscfn: $!";
2230 my @cmd = qw(dpkg-source);
2231 push @cmd, '--no-check' if $dsc_checked;
2232 if (madformat $dsc->{format}) {
2233 push @cmd, '--skip-patches';
2234 $treeimporthow = 'unpatched';
2236 push @cmd, qw(-x --), $dscfn;
2239 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2240 if (madformat $dsc->{format}) {
2241 check_for_vendor_patches();
2245 if (madformat $dsc->{format}) {
2246 my @pcmd = qw(dpkg-source --before-build .);
2247 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2249 $dappliedtree = git_add_write_tree();
2252 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2253 debugcmd "|",@clogcmd;
2254 open CLOGS, "-|", @clogcmd or die $!;
2259 printdebug "import clog search...\n";
2262 my $stanzatext = do { local $/=""; <CLOGS>; };
2263 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2264 last if !defined $stanzatext;
2266 my $desc = "package changelog, entry no.$.";
2267 open my $stanzafh, "<", \$stanzatext or die;
2268 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2269 $clogp //= $thisstanza;
2271 printdebug "import clog $thisstanza->{version} $desc...\n";
2273 last if !$any_orig; # we don't need $r1clogp
2275 # We look for the first (most recent) changelog entry whose
2276 # version number is lower than the upstream version of this
2277 # package. Then the last (least recent) previous changelog
2278 # entry is treated as the one which introduced this upstream
2279 # version and used for the synthetic commits for the upstream
2282 # One might think that a more sophisticated algorithm would be
2283 # necessary. But: we do not want to scan the whole changelog
2284 # file. Stopping when we see an earlier version, which
2285 # necessarily then is an earlier upstream version, is the only
2286 # realistic way to do that. Then, either the earliest
2287 # changelog entry we have seen so far is indeed the earliest
2288 # upload of this upstream version; or there are only changelog
2289 # entries relating to later upstream versions (which is not
2290 # possible unless the changelog and .dsc disagree about the
2291 # version). Then it remains to choose between the physically
2292 # last entry in the file, and the one with the lowest version
2293 # number. If these are not the same, we guess that the
2294 # versions were created in a non-monotic order rather than
2295 # that the changelog entries have been misordered.
2297 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2299 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2300 $r1clogp = $thisstanza;
2302 printdebug "import clog $r1clogp->{version} becomes r1\n";
2304 die $! if CLOGS->error;
2305 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2307 $clogp or fail "package changelog has no entries!";
2309 my $authline = clogp_authline $clogp;
2310 my $changes = getfield $clogp, 'Changes';
2311 my $cversion = getfield $clogp, 'Version';
2314 $r1clogp //= $clogp; # maybe there's only one entry;
2315 my $r1authline = clogp_authline $r1clogp;
2316 # Strictly, r1authline might now be wrong if it's going to be
2317 # unused because !$any_orig. Whatever.
2319 printdebug "import tartrees authline $authline\n";
2320 printdebug "import tartrees r1authline $r1authline\n";
2322 foreach my $tt (@tartrees) {
2323 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2325 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2328 committer $r1authline
2332 [dgit import orig $tt->{F}]
2340 [dgit import tarball $package $cversion $tt->{F}]
2345 printdebug "import main commit\n";
2347 open C, ">../commit.tmp" or die $!;
2348 print C <<END or die $!;
2351 print C <<END or die $! foreach @tartrees;
2354 print C <<END or die $!;
2360 [dgit import $treeimporthow $package $cversion]
2364 my $rawimport_hash = make_commit qw(../commit.tmp);
2366 if (madformat $dsc->{format}) {
2367 printdebug "import apply patches...\n";
2369 # regularise the state of the working tree so that
2370 # the checkout of $rawimport_hash works nicely.
2371 my $dappliedcommit = make_commit_text(<<END);
2378 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2380 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2382 # We need the answers to be reproducible
2383 my @authline = clogp_authline($clogp);
2384 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2385 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2386 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2387 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2388 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2389 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2391 my $path = $ENV{PATH} or die;
2393 foreach my $use_absurd (qw(0 1)) {
2394 runcmd @git, qw(checkout -q unpa);
2395 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2396 local $ENV{PATH} = $path;
2399 progress "warning: $@";
2400 $path = "$absurdity:$path";
2401 progress "$us: trying slow absurd-git-apply...";
2402 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2407 die "forbid absurd git-apply\n" if $use_absurd
2408 && forceing [qw(import-gitapply-no-absurd)];
2409 die "only absurd git-apply!\n" if !$use_absurd
2410 && forceing [qw(import-gitapply-absurd)];
2412 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2413 local $ENV{PATH} = $path if $use_absurd;
2415 my @showcmd = (gbp_pq, qw(import));
2416 my @realcmd = shell_cmd
2417 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2418 debugcmd "+",@realcmd;
2419 if (system @realcmd) {
2420 die +(shellquote @showcmd).
2422 failedcmd_waitstatus()."\n";
2425 my $gapplied = git_rev_parse('HEAD');
2426 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2427 $gappliedtree eq $dappliedtree or
2429 gbp-pq import and dpkg-source disagree!
2430 gbp-pq import gave commit $gapplied
2431 gbp-pq import gave tree $gappliedtree
2432 dpkg-source --before-build gave tree $dappliedtree
2434 $rawimport_hash = $gapplied;
2439 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2444 progress "synthesised git commit from .dsc $cversion";
2446 my $rawimport_mergeinput = {
2447 Commit => $rawimport_hash,
2448 Info => "Import of source package",
2450 my @output = ($rawimport_mergeinput);
2452 if ($lastpush_mergeinput) {
2453 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2454 my $oversion = getfield $oldclogp, 'Version';
2456 version_compare($oversion, $cversion);
2458 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2459 { Message => <<END, ReverseParents => 1 });
2460 Record $package ($cversion) in archive suite $csuite
2462 } elsif ($vcmp > 0) {
2463 print STDERR <<END or die $!;
2465 Version actually in archive: $cversion (older)
2466 Last version pushed with dgit: $oversion (newer or same)
2469 @output = $lastpush_mergeinput;
2471 # Same version. Use what's in the server git branch,
2472 # discarding our own import. (This could happen if the
2473 # server automatically imports all packages into git.)
2474 @output = $lastpush_mergeinput;
2477 changedir '../../../..';
2482 sub complete_file_from_dsc ($$;$) {
2483 our ($dstdir, $fi, $refetched) = @_;
2484 # Ensures that we have, in $dstdir, the file $fi, with the correct
2485 # contents. (Downloading it from alongside $dscurl if necessary.)
2486 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2487 # and will set $$refetched=1 if it did so (or tried to).
2489 my $f = $fi->{Filename};
2490 my $tf = "$dstdir/$f";
2494 my $checkhash = sub {
2495 open F, "<", "$tf" or die "$tf: $!";
2496 $fi->{Digester}->reset();
2497 $fi->{Digester}->addfile(*F);
2498 F->error and die $!;
2499 my $got = $fi->{Digester}->hexdigest();
2500 return $got eq $fi->{Hash};
2503 if (stat_exists $tf) {
2504 if ($checkhash->()) {
2505 progress "using existing $f";
2509 fail "file $f has hash $got but .dsc".
2510 " demands hash $fi->{Hash} ".
2511 "(perhaps you should delete this file?)";
2513 progress "need to fetch correct version of $f";
2514 unlink $tf or die "$tf $!";
2517 printdebug "$tf does not exist, need to fetch\n";
2521 $furl =~ s{/[^/]+$}{};
2523 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2524 die "$f ?" if $f =~ m#/#;
2525 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2526 return 0 if !act_local();
2529 fail "file $f has hash $got but .dsc".
2530 " demands hash $fi->{Hash} ".
2531 "(got wrong file from archive!)";
2536 sub ensure_we_have_orig () {
2537 my @dfi = dsc_files_info();
2538 foreach my $fi (@dfi) {
2539 my $f = $fi->{Filename};
2540 next unless is_orig_file_in_dsc($f, \@dfi);
2541 complete_file_from_dsc('..', $fi)
2546 #---------- git fetch ----------
2548 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2549 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2551 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2552 # locally fetched refs because they have unhelpful names and clutter
2553 # up gitk etc. So we track whether we have "used up" head ref (ie,
2554 # whether we have made another local ref which refers to this object).
2556 # (If we deleted them unconditionally, then we might end up
2557 # re-fetching the same git objects each time dgit fetch was run.)
2559 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2560 # in git_fetch_us to fetch the refs in question, and possibly a call
2561 # to lrfetchref_used.
2563 our (%lrfetchrefs_f, %lrfetchrefs_d);
2564 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2566 sub lrfetchref_used ($) {
2567 my ($fullrefname) = @_;
2568 my $objid = $lrfetchrefs_f{$fullrefname};
2569 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2572 sub git_lrfetch_sane {
2573 my ($supplementary, @specs) = @_;
2574 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2575 # at least as regards @specs. Also leave the results in
2576 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2577 # able to clean these up.
2579 # With $supplementary==1, @specs must not contain wildcards
2580 # and we add to our previous fetches (non-atomically).
2582 # This is rather miserable:
2583 # When git fetch --prune is passed a fetchspec ending with a *,
2584 # it does a plausible thing. If there is no * then:
2585 # - it matches subpaths too, even if the supplied refspec
2586 # starts refs, and behaves completely madly if the source
2587 # has refs/refs/something. (See, for example, Debian #NNNN.)
2588 # - if there is no matching remote ref, it bombs out the whole
2590 # We want to fetch a fixed ref, and we don't know in advance
2591 # if it exists, so this is not suitable.
2593 # Our workaround is to use git ls-remote. git ls-remote has its
2594 # own qairks. Notably, it has the absurd multi-tail-matching
2595 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2596 # refs/refs/foo etc.
2598 # Also, we want an idempotent snapshot, but we have to make two
2599 # calls to the remote: one to git ls-remote and to git fetch. The
2600 # solution is use git ls-remote to obtain a target state, and
2601 # git fetch to try to generate it. If we don't manage to generate
2602 # the target state, we try again.
2604 my $url = access_giturl();
2606 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2608 my $specre = join '|', map {
2611 my $wildcard = $x =~ s/\\\*$/.*/;
2612 die if $wildcard && $supplementary;
2615 printdebug "git_lrfetch_sane specre=$specre\n";
2616 my $wanted_rref = sub {
2618 return m/^(?:$specre)$/;
2621 my $fetch_iteration = 0;
2624 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2625 if (++$fetch_iteration > 10) {
2626 fail "too many iterations trying to get sane fetch!";
2629 my @look = map { "refs/$_" } @specs;
2630 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2634 open GITLS, "-|", @lcmd or die $!;
2636 printdebug "=> ", $_;
2637 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2638 my ($objid,$rrefname) = ($1,$2);
2639 if (!$wanted_rref->($rrefname)) {
2641 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2645 $wantr{$rrefname} = $objid;
2648 close GITLS or failedcmd @lcmd;
2650 # OK, now %want is exactly what we want for refs in @specs
2652 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2653 "+refs/$_:".lrfetchrefs."/$_";
2656 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2658 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2659 runcmd_ordryrun_local @fcmd if @fspecs;
2661 if (!$supplementary) {
2662 %lrfetchrefs_f = ();
2666 git_for_each_ref(lrfetchrefs, sub {
2667 my ($objid,$objtype,$lrefname,$reftail) = @_;
2668 $lrfetchrefs_f{$lrefname} = $objid;
2669 $objgot{$objid} = 1;
2672 if ($supplementary) {
2676 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2677 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2678 if (!exists $wantr{$rrefname}) {
2679 if ($wanted_rref->($rrefname)) {
2681 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2685 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2688 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2689 delete $lrfetchrefs_f{$lrefname};
2693 foreach my $rrefname (sort keys %wantr) {
2694 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2695 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2696 my $want = $wantr{$rrefname};
2697 next if $got eq $want;
2698 if (!defined $objgot{$want}) {
2700 warning: git ls-remote suggests we want $lrefname
2701 warning: and it should refer to $want
2702 warning: but git fetch didn't fetch that object to any relevant ref.
2703 warning: This may be due to a race with someone updating the server.
2704 warning: Will try again...
2706 next FETCH_ITERATION;
2709 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2711 runcmd_ordryrun_local @git, qw(update-ref -m),
2712 "dgit fetch git fetch fixup", $lrefname, $want;
2713 $lrfetchrefs_f{$lrefname} = $want;
2718 if (defined $csuite) {
2719 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2720 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2721 my ($objid,$objtype,$lrefname,$reftail) = @_;
2722 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2723 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2727 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2728 Dumper(\%lrfetchrefs_f);
2731 sub git_fetch_us () {
2732 # Want to fetch only what we are going to use, unless
2733 # deliberately-not-ff, in which case we must fetch everything.
2735 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2737 (quiltmode_splitbrain
2738 ? (map { $_->('*',access_nomdistro) }
2739 \&debiantag_new, \&debiantag_maintview)
2740 : debiantags('*',access_nomdistro));
2741 push @specs, server_branch($csuite);
2742 push @specs, $rewritemap;
2743 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2745 git_lrfetch_sane 0, @specs;
2748 my @tagpats = debiantags('*',access_nomdistro);
2750 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2751 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2752 printdebug "currently $fullrefname=$objid\n";
2753 $here{$fullrefname} = $objid;
2755 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2756 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2757 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2758 printdebug "offered $lref=$objid\n";
2759 if (!defined $here{$lref}) {
2760 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2761 runcmd_ordryrun_local @upd;
2762 lrfetchref_used $fullrefname;
2763 } elsif ($here{$lref} eq $objid) {
2764 lrfetchref_used $fullrefname;
2767 "Not updating $lref from $here{$lref} to $objid.\n";
2772 #---------- dsc and archive handling ----------
2774 sub mergeinfo_getclogp ($) {
2775 # Ensures thit $mi->{Clogp} exists and returns it
2777 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2780 sub mergeinfo_version ($) {
2781 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2784 sub fetch_from_archive_record_1 ($) {
2786 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2787 'DGIT_ARCHIVE', $hash;
2788 cmdoutput @git, qw(log -n2), $hash;
2789 # ... gives git a chance to complain if our commit is malformed
2792 sub fetch_from_archive_record_2 ($) {
2794 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2798 dryrun_report @upd_cmd;
2802 sub parse_dsc_field ($$) {
2803 my ($dsc, $what) = @_;
2805 foreach my $field (@ourdscfield) {
2806 $f = $dsc->{$field};
2810 my $def_dsc_distro = sub {
2811 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2812 dgit.default.distro);
2816 progress "$what: NO git hash";
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 $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)];
6120 if (defined $dsc_hash) {
6121 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6122 resolve_dsc_field_commit undef, undef;
6124 if (defined $dsc_hash) {
6125 my @cmd = (qw(sh -ec),
6126 "echo $dsc_hash | git cat-file --batch-check");
6127 my $objgot = cmdoutput @cmd;
6128 if ($objgot =~ m#^\w+ missing\b#) {
6130 .dsc contains Dgit field referring to object $dsc_hash
6131 Your git tree does not have that object. Try `git fetch' from a
6132 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6135 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6137 progress "Not fast forward, forced update.";
6139 fail "Not fast forward to $dsc_hash";
6142 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
6143 $dstbranch, $dsc_hash);
6145 progress "dgit: import-dsc updated git ref $dstbranch";
6150 Branch $dstbranch already exists
6151 Specify ..$specbranch for a pseudo-merge, binding in existing history
6152 Specify +$specbranch to overwrite, discarding existing history
6154 if $oldhash && !$force;
6158 my @dfi = dsc_files_info();
6159 foreach my $fi (@dfi) {
6160 my $f = $fi->{Filename};
6162 next if lstat $here;
6163 fail "stat $here: $!" unless $! == ENOENT;
6165 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6167 } elsif ($dscfn =~ m#^/#) {
6170 fail "cannot import $dscfn which seems to be inside working tree!";
6172 $there =~ s#/+[^/]+$## or
6173 fail "cannot import $dscfn which seems to not have a basename";
6175 symlink $there, $here or fail "symlink $there to $here: $!";
6176 progress "made symlink $here -> $there";
6177 # print STDERR Dumper($fi);
6179 my @mergeinputs = generate_commits_from_dsc();
6180 die unless @mergeinputs == 1;
6182 my $newhash = $mergeinputs[0]{Commit};
6186 progress "Import, forced update - synthetic orphan git history.";
6187 } elsif ($force < 0) {
6188 progress "Import, merging.";
6189 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6190 my $version = getfield $dsc, 'Version';
6191 my $clogp = commit_getclogp $newhash;
6192 my $authline = clogp_authline $clogp;
6193 $newhash = make_commit_text <<END;
6200 Merge $package ($version) import into $dstbranch
6203 die; # caught earlier
6207 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
6208 $dstbranch, $newhash);
6210 progress "dgit: import-dsc results are in in git ref $dstbranch";
6213 sub cmd_archive_api_query {
6214 badusage "need only 1 subpath argument" unless @ARGV==1;
6215 my ($subpath) = @ARGV;
6216 my @cmd = archive_api_query_cmd($subpath);
6219 exec @cmd or fail "exec curl: $!\n";
6222 sub cmd_clone_dgit_repos_server {
6223 badusage "need destination argument" unless @ARGV==1;
6224 my ($destdir) = @ARGV;
6225 $package = '_dgit-repos-server';
6226 local $access_forpush = 0;
6227 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6229 exec @cmd or fail "exec git clone: $!\n";
6232 sub cmd_print_dgit_repos_server_source_url {
6233 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6235 $package = '_dgit-repos-server';
6236 local $access_forpush = 0;
6237 my $url = access_giturl();
6238 print $url, "\n" or die $!;
6241 sub cmd_setup_mergechangelogs {
6242 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6243 setup_mergechangelogs(1);
6246 sub cmd_setup_useremail {
6247 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6251 sub cmd_setup_new_tree {
6252 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6256 #---------- argument parsing and main program ----------
6259 print "dgit version $our_version\n" or die $!;
6263 our (%valopts_long, %valopts_short);
6264 our (%funcopts_long);
6266 our (@modeopt_cfgs);
6268 sub defvalopt ($$$$) {
6269 my ($long,$short,$val_re,$how) = @_;
6270 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6271 $valopts_long{$long} = $oi;
6272 $valopts_short{$short} = $oi;
6273 # $how subref should:
6274 # do whatever assignemnt or thing it likes with $_[0]
6275 # if the option should not be passed on to remote, @rvalopts=()
6276 # or $how can be a scalar ref, meaning simply assign the value
6279 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6280 defvalopt '--distro', '-d', '.+', \$idistro;
6281 defvalopt '', '-k', '.+', \$keyid;
6282 defvalopt '--existing-package','', '.*', \$existing_package;
6283 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6284 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6285 defvalopt '--package', '-p', $package_re, \$package;
6286 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6288 defvalopt '', '-C', '.+', sub {
6289 ($changesfile) = (@_);
6290 if ($changesfile =~ s#^(.*)/##) {
6291 $buildproductsdir = $1;
6295 defvalopt '--initiator-tempdir','','.*', sub {
6296 ($initiator_tempdir) = (@_);
6297 $initiator_tempdir =~ m#^/# or
6298 badusage "--initiator-tempdir must be used specify an".
6299 " absolute, not relative, directory."
6302 sub defoptmodes ($@) {
6303 my ($varref, $cfgkey, $default, %optmap) = @_;
6305 while (my ($opt,$val) = each %optmap) {
6306 $funcopts_long{$opt} = sub { $$varref = $val; };
6307 $permit{$val} = $val;
6309 push @modeopt_cfgs, {
6312 Default => $default,
6317 defoptmodes \$dodep14tag, qw( dep14tag want
6320 --always-dep14tag always );
6325 if (defined $ENV{'DGIT_SSH'}) {
6326 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6327 } elsif (defined $ENV{'GIT_SSH'}) {
6328 @ssh = ($ENV{'GIT_SSH'});
6336 if (!defined $val) {
6337 badusage "$what needs a value" unless @ARGV;
6339 push @rvalopts, $val;
6341 badusage "bad value \`$val' for $what" unless
6342 $val =~ m/^$oi->{Re}$(?!\n)/s;
6343 my $how = $oi->{How};
6344 if (ref($how) eq 'SCALAR') {
6349 push @ropts, @rvalopts;
6353 last unless $ARGV[0] =~ m/^-/;
6357 if (m/^--dry-run$/) {
6360 } elsif (m/^--damp-run$/) {
6363 } elsif (m/^--no-sign$/) {
6366 } elsif (m/^--help$/) {
6368 } elsif (m/^--version$/) {
6370 } elsif (m/^--new$/) {
6373 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6374 ($om = $opts_opt_map{$1}) &&
6378 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6379 !$opts_opt_cmdonly{$1} &&
6380 ($om = $opts_opt_map{$1})) {
6383 } elsif (m/^--(gbp|dpm)$/s) {
6384 push @ropts, "--quilt=$1";
6386 } elsif (m/^--ignore-dirty$/s) {
6389 } elsif (m/^--no-quilt-fixup$/s) {
6391 $quilt_mode = 'nocheck';
6392 } elsif (m/^--no-rm-on-error$/s) {
6395 } elsif (m/^--no-chase-dsc-distro$/s) {
6397 $chase_dsc_distro = 0;
6398 } elsif (m/^--overwrite$/s) {
6400 $overwrite_version = '';
6401 } elsif (m/^--overwrite=(.+)$/s) {
6403 $overwrite_version = $1;
6404 } elsif (m/^--delayed=(\d+)$/s) {
6407 } elsif (m/^--dgit-view-save=(.+)$/s) {
6409 $split_brain_save = $1;
6410 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6411 } elsif (m/^--(no-)?rm-old-changes$/s) {
6414 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6416 push @deliberatelies, $&;
6417 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6421 } elsif (m/^--force-/) {
6423 "$us: warning: ignoring unknown force option $_\n";
6425 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6426 # undocumented, for testing
6428 $tagformat_want = [ $1, 'command line', 1 ];
6429 # 1 menas overrides distro configuration
6430 } elsif (m/^--always-split-source-build$/s) {
6431 # undocumented, for testing
6433 $need_split_build_invocation = 1;
6434 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6435 # undocumented, for testing
6437 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6438 # ^ it's supposed to be an array ref
6439 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6440 $val = $2 ? $' : undef; #';
6441 $valopt->($oi->{Long});
6442 } elsif ($funcopts_long{$_}) {
6444 $funcopts_long{$_}();
6446 badusage "unknown long option \`$_'";
6453 } elsif (s/^-L/-/) {
6456 } elsif (s/^-h/-/) {
6458 } elsif (s/^-D/-/) {
6462 } elsif (s/^-N/-/) {
6467 push @changesopts, $_;
6469 } elsif (s/^-wn$//s) {
6471 $cleanmode = 'none';
6472 } elsif (s/^-wg$//s) {
6475 } elsif (s/^-wgf$//s) {
6477 $cleanmode = 'git-ff';
6478 } elsif (s/^-wd$//s) {
6480 $cleanmode = 'dpkg-source';
6481 } elsif (s/^-wdd$//s) {
6483 $cleanmode = 'dpkg-source-d';
6484 } elsif (s/^-wc$//s) {
6486 $cleanmode = 'check';
6487 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6488 push @git, '-c', $&;
6489 $gitcfgs{cmdline}{$1} = [ $2 ];
6490 } elsif (s/^-c([^=]+)$//s) {
6491 push @git, '-c', $&;
6492 $gitcfgs{cmdline}{$1} = [ 'true' ];
6493 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6495 $val = undef unless length $val;
6496 $valopt->($oi->{Short});
6499 badusage "unknown short option \`$_'";
6506 sub check_env_sanity () {
6507 my $blocked = new POSIX::SigSet;
6508 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6511 foreach my $name (qw(PIPE CHLD)) {
6512 my $signame = "SIG$name";
6513 my $signum = eval "POSIX::$signame" // die;
6514 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6515 die "$signame is set to something other than SIG_DFL\n";
6516 $blocked->ismember($signum) and
6517 die "$signame is blocked\n";
6523 On entry to dgit, $@
6524 This is a bug produced by something in in your execution environment.
6530 sub parseopts_late_defaults () {
6531 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6532 if defined $idistro;
6533 $isuite //= cfg('dgit.default.default-suite');
6535 foreach my $k (keys %opts_opt_map) {
6536 my $om = $opts_opt_map{$k};
6538 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6540 badcfg "cannot set command for $k"
6541 unless length $om->[0];
6545 foreach my $c (access_cfg_cfgs("opts-$k")) {
6547 map { $_ ? @$_ : () }
6548 map { $gitcfgs{$_}{$c} }
6549 reverse @gitcfgsources;
6550 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6551 "\n" if $debuglevel >= 4;
6553 badcfg "cannot configure options for $k"
6554 if $opts_opt_cmdonly{$k};
6555 my $insertpos = $opts_cfg_insertpos{$k};
6556 @$om = ( @$om[0..$insertpos-1],
6558 @$om[$insertpos..$#$om] );
6562 if (!defined $rmchanges) {
6563 local $access_forpush;
6564 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6567 if (!defined $quilt_mode) {
6568 local $access_forpush;
6569 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6570 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6572 $quilt_mode =~ m/^($quilt_modes_re)$/
6573 or badcfg "unknown quilt-mode \`$quilt_mode'";
6577 foreach my $moc (@modeopt_cfgs) {
6578 local $access_forpush;
6579 my $vr = $moc->{Var};
6580 next if defined $$vr;
6581 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6582 my $v = $moc->{Vals}{$$vr};
6583 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6587 $need_split_build_invocation ||= quiltmode_splitbrain();
6589 if (!defined $cleanmode) {
6590 local $access_forpush;
6591 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6592 $cleanmode //= 'dpkg-source';
6594 badcfg "unknown clean-mode \`$cleanmode'" unless
6595 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6599 if ($ENV{$fakeeditorenv}) {
6601 quilt_fixup_editor();
6608 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6609 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6610 if $dryrun_level == 1;
6612 print STDERR $helpmsg or die $!;
6615 my $cmd = shift @ARGV;
6618 my $pre_fn = ${*::}{"pre_$cmd"};
6619 $pre_fn->() if $pre_fn;
6621 my $fn = ${*::}{"cmd_$cmd"};
6622 $fn or badusage "unknown operation $cmd";