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 $dodep14tag_re = 'want|no|always';
74 our $split_brain_save;
75 our $we_are_responder;
76 our $we_are_initiator;
77 our $initiator_tempdir;
78 our $patches_applied_dirtily = 00;
82 our $chase_dsc_distro=1;
84 our %forceopts = map { $_=>0 }
85 qw(unrepresentable unsupported-source-format
86 dsc-changes-mismatch changes-origs-exactly
87 import-gitapply-absurd
88 import-gitapply-no-absurd
89 import-dsc-with-dgit-field);
91 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
93 our $suite_re = '[-+.0-9a-z]+';
94 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
95 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
96 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
97 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
99 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
100 our $splitbraincache = 'dgit-intern/quilt-cache';
101 our $rewritemap = 'dgit-rewrite/map';
103 our (@git) = qw(git);
104 our (@dget) = qw(dget);
105 our (@curl) = qw(curl);
106 our (@dput) = qw(dput);
107 our (@debsign) = qw(debsign);
108 our (@gpg) = qw(gpg);
109 our (@sbuild) = qw(sbuild);
111 our (@dgit) = qw(dgit);
112 our (@aptget) = qw(apt-get);
113 our (@aptcache) = qw(apt-cache);
114 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
115 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
116 our (@dpkggenchanges) = qw(dpkg-genchanges);
117 our (@mergechanges) = qw(mergechanges -f);
118 our (@gbp_build) = ('');
119 our (@gbp_pq) = ('gbp pq');
120 our (@changesopts) = ('');
122 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
125 'debsign' => \@debsign,
127 'sbuild' => \@sbuild,
131 'apt-get' => \@aptget,
132 'apt-cache' => \@aptcache,
133 'dpkg-source' => \@dpkgsource,
134 'dpkg-buildpackage' => \@dpkgbuildpackage,
135 'dpkg-genchanges' => \@dpkggenchanges,
136 'gbp-build' => \@gbp_build,
137 'gbp-pq' => \@gbp_pq,
138 'ch' => \@changesopts,
139 'mergechanges' => \@mergechanges);
141 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
142 our %opts_cfg_insertpos = map {
144 scalar @{ $opts_opt_map{$_} }
145 } keys %opts_opt_map;
147 sub parseopts_late_defaults();
153 our $supplementary_message = '';
154 our $need_split_build_invocation = 0;
155 our $split_brain = 0;
159 return unless forkcheck_mainprocess();
160 print STDERR "! $_\n" foreach $supplementary_message =~ m/^.+$/mg;
163 our $remotename = 'dgit';
164 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
168 if (!defined $absurdity) {
170 $absurdity =~ s{/[^/]+$}{/absurd} or die;
174 my ($v,$distro) = @_;
175 return $tagformatfn->($v, $distro);
178 sub debiantag_maintview ($$) {
179 my ($v,$distro) = @_;
180 return "$distro/".dep14_version_mangle $v;
183 sub madformat ($) { $_[0] eq '3.0 (quilt)' }
185 sub lbranch () { return "$branchprefix/$csuite"; }
186 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
187 sub lref () { return "refs/heads/".lbranch(); }
188 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
189 sub rrref () { return server_ref($csuite); }
199 return "${package}_".(stripepoch $vsn).$sfx
204 return srcfn($vsn,".dsc");
207 sub changespat ($;$) {
208 my ($vsn, $arch) = @_;
209 return "${package}_".(stripepoch $vsn)."_".($arch//'*').".changes";
212 sub upstreamversion ($) {
224 return unless forkcheck_mainprocess();
225 foreach my $f (@end) {
227 print STDERR "$us: cleanup: $@" if length $@;
231 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
233 sub forceable_fail ($$) {
234 my ($forceoptsl, $msg) = @_;
235 fail $msg unless grep { $forceopts{$_} } @$forceoptsl;
236 print STDERR "warning: overriding problem due to --force:\n". $msg;
240 my ($forceoptsl) = @_;
241 my @got = grep { $forceopts{$_} } @$forceoptsl;
242 return 0 unless @got;
244 "warning: skipping checks or functionality due to --force-$got[0]\n";
247 sub no_such_package () {
248 print STDERR "$us: package $package does not exist in suite $isuite\n";
254 printdebug "CD $newdir\n";
255 chdir $newdir or confess "chdir: $newdir: $!";
258 sub deliberately ($) {
260 return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
263 sub deliberately_not_fast_forward () {
264 foreach (qw(not-fast-forward fresh-repo)) {
265 return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
269 sub quiltmode_splitbrain () {
270 $quilt_mode =~ m/gbp|dpm|unapplied/;
273 sub opts_opt_multi_cmd {
275 push @cmd, split /\s+/, shift @_;
281 return opts_opt_multi_cmd @gbp_pq;
284 #---------- remote protocol support, common ----------
286 # remote push initiator/responder protocol:
287 # $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>...
288 # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ...
289 # < dgit-remote-push-ready <actual-proto-vsn>
296 # > supplementary-message NBYTES # $protovsn >= 3
301 # > file parsed-changelog
302 # [indicates that output of dpkg-parsechangelog follows]
303 # > data-block NBYTES
304 # > [NBYTES bytes of data (no newline)]
305 # [maybe some more blocks]
314 # > param head DGIT-VIEW-HEAD
315 # > param csuite SUITE
316 # > param tagformat old|new
317 # > param maint-view MAINT-VIEW-HEAD
319 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
320 # # goes into tag, for replay prevention
323 # [indicates that signed tag is wanted]
324 # < data-block NBYTES
325 # < [NBYTES bytes of data (no newline)]
326 # [maybe some more blocks]
330 # > want signed-dsc-changes
331 # < data-block NBYTES [transfer of signed dsc]
333 # < data-block NBYTES [transfer of signed changes]
341 sub i_child_report () {
342 # Sees if our child has died, and reap it if so. Returns a string
343 # describing how it died if it failed, or undef otherwise.
344 return undef unless $i_child_pid;
345 my $got = waitpid $i_child_pid, WNOHANG;
346 return undef if $got <= 0;
347 die unless $got == $i_child_pid;
348 $i_child_pid = undef;
349 return undef unless $?;
350 return "build host child ".waitstatusmsg();
355 fail "connection lost: $!" if $fh->error;
356 fail "protocol violation; $m not expected";
359 sub badproto_badread ($$) {
361 fail "connection lost: $!" if $!;
362 my $report = i_child_report();
363 fail $report if defined $report;
364 badproto $fh, "eof (reading $wh)";
367 sub protocol_expect (&$) {
368 my ($match, $fh) = @_;
371 defined && chomp or badproto_badread $fh, "protocol message";
379 badproto $fh, "\`$_'";
382 sub protocol_send_file ($$) {
383 my ($fh, $ourfn) = @_;
384 open PF, "<", $ourfn or die "$ourfn: $!";
387 my $got = read PF, $d, 65536;
388 die "$ourfn: $!" unless defined $got;
390 print $fh "data-block ".length($d)."\n" or die $!;
391 print $fh $d or die $!;
393 PF->error and die "$ourfn $!";
394 print $fh "data-end\n" or die $!;
398 sub protocol_read_bytes ($$) {
399 my ($fh, $nbytes) = @_;
400 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
402 my $got = read $fh, $d, $nbytes;
403 $got==$nbytes or badproto_badread $fh, "data block";
407 sub protocol_receive_file ($$) {
408 my ($fh, $ourfn) = @_;
409 printdebug "() $ourfn\n";
410 open PF, ">", $ourfn or die "$ourfn: $!";
412 my ($y,$l) = protocol_expect {
413 m/^data-block (.*)$/ ? (1,$1) :
414 m/^data-end$/ ? (0,) :
418 my $d = protocol_read_bytes $fh, $l;
419 print PF $d or die $!;
424 #---------- remote protocol support, responder ----------
426 sub responder_send_command ($) {
428 return unless $we_are_responder;
429 # called even without $we_are_responder
430 printdebug ">> $command\n";
431 print PO $command, "\n" or die $!;
434 sub responder_send_file ($$) {
435 my ($keyword, $ourfn) = @_;
436 return unless $we_are_responder;
437 printdebug "]] $keyword $ourfn\n";
438 responder_send_command "file $keyword";
439 protocol_send_file \*PO, $ourfn;
442 sub responder_receive_files ($@) {
443 my ($keyword, @ourfns) = @_;
444 die unless $we_are_responder;
445 printdebug "[[ $keyword @ourfns\n";
446 responder_send_command "want $keyword";
447 foreach my $fn (@ourfns) {
448 protocol_receive_file \*PI, $fn;
451 protocol_expect { m/^files-end$/ } \*PI;
454 #---------- remote protocol support, initiator ----------
456 sub initiator_expect (&) {
458 protocol_expect { &$match } \*RO;
461 #---------- end remote code ----------
464 if ($we_are_responder) {
466 responder_send_command "progress ".length($m) or die $!;
467 print PO $m or die $!;
477 $ua = LWP::UserAgent->new();
481 progress "downloading $what...";
482 my $r = $ua->get(@_) or die $!;
483 return undef if $r->code == 404;
484 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
485 return $r->decoded_content(charset => 'none');
488 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
493 failedcmd @_ if system @_;
496 sub act_local () { return $dryrun_level <= 1; }
497 sub act_scary () { return !$dryrun_level; }
500 if (!$dryrun_level) {
501 progress "$us ok: @_";
503 progress "would be ok: @_ (but dry run only)";
508 printcmd(\*STDERR,$debugprefix."#",@_);
511 sub runcmd_ordryrun {
519 sub runcmd_ordryrun_local {
528 my ($first_shell, @cmd) = @_;
529 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
532 our $helpmsg = <<END;
534 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
535 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
536 dgit [dgit-opts] build [dpkg-buildpackage-opts]
537 dgit [dgit-opts] sbuild [sbuild-opts]
538 dgit [dgit-opts] push [dgit-opts] [suite]
539 dgit [dgit-opts] rpush build-host:build-dir ...
540 important dgit options:
541 -k<keyid> sign tag and package with <keyid> instead of default
542 --dry-run -n do not change anything, but go through the motions
543 --damp-run -L like --dry-run but make local changes, without signing
544 --new -N allow introducing a new package
545 --debug -D increase debug level
546 -c<name>=<value> set git config option (used directly by dgit too)
549 our $later_warning_msg = <<END;
550 Perhaps the upload is stuck in incoming. Using the version from git.
554 print STDERR "$us: @_\n", $helpmsg or die $!;
559 @ARGV or badusage "too few arguments";
560 return scalar shift @ARGV;
564 print $helpmsg or die $!;
568 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
570 our %defcfg = ('dgit.default.distro' => 'debian',
571 'dgit.default.default-suite' => 'unstable',
572 'dgit.default.old-dsc-distro' => 'debian',
573 'dgit-suite.*-security.distro' => 'debian-security',
574 'dgit.default.username' => '',
575 'dgit.default.archive-query-default-component' => 'main',
576 'dgit.default.ssh' => 'ssh',
577 'dgit.default.archive-query' => 'madison:',
578 'dgit.default.sshpsql-dbname' => 'service=projectb',
579 'dgit.default.aptget-components' => 'main',
580 'dgit.default.dgit-tag-format' => 'new,old,maint',
581 'dgit.dsc-url-proto-ok.http' => 'true',
582 'dgit.dsc-url-proto-ok.https' => 'true',
583 'dgit.dsc-url-proto-ok.git' => 'true',
584 'dgit.default.dsc-url-proto-ok' => 'false',
585 # old means "repo server accepts pushes with old dgit tags"
586 # new means "repo server accepts pushes with new dgit tags"
587 # maint means "repo server accepts split brain pushes"
588 # hist means "repo server may have old pushes without new tag"
589 # ("hist" is implied by "old")
590 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
591 'dgit-distro.debian.git-check' => 'url',
592 'dgit-distro.debian.git-check-suffix' => '/info/refs',
593 'dgit-distro.debian.new-private-pushers' => 't',
594 'dgit-distro.debian/push.git-url' => '',
595 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
596 'dgit-distro.debian/push.git-user-force' => 'dgit',
597 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
598 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
599 'dgit-distro.debian/push.git-create' => 'true',
600 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
601 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
602 # 'dgit-distro.debian.archive-query-tls-key',
603 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
604 # ^ this does not work because curl is broken nowadays
605 # Fixing #790093 properly will involve providing providing the key
606 # in some pacagke and maybe updating these paths.
608 # 'dgit-distro.debian.archive-query-tls-curl-args',
609 # '--ca-path=/etc/ssl/ca-debian',
610 # ^ this is a workaround but works (only) on DSA-administered machines
611 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
612 'dgit-distro.debian.git-url-suffix' => '',
613 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
614 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
615 'dgit-distro.debian-security.archive-query' => 'aptget:',
616 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
617 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
618 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
619 'dgit-distro.debian-security.nominal-distro' => 'debian',
620 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
621 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
622 'dgit-distro.ubuntu.git-check' => 'false',
623 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
624 'dgit-distro.test-dummy.ssh' => "$td/ssh",
625 'dgit-distro.test-dummy.username' => "alice",
626 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
627 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
628 'dgit-distro.test-dummy.git-url' => "$td/git",
629 'dgit-distro.test-dummy.git-host' => "git",
630 'dgit-distro.test-dummy.git-path' => "$td/git",
631 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
632 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
633 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
634 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
638 our @gitcfgsources = qw(cmdline local global system);
640 sub git_slurp_config () {
641 local ($debuglevel) = $debuglevel-2;
644 # This algoritm is a bit subtle, but this is needed so that for
645 # options which we want to be single-valued, we allow the
646 # different config sources to override properly. See #835858.
647 foreach my $src (@gitcfgsources) {
648 next if $src eq 'cmdline';
649 # we do this ourselves since git doesn't handle it
651 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
654 open GITS, "-|", @cmd or die $!;
657 printdebug "=> ", (messagequote $_), "\n";
659 push @{ $gitcfgs{$src}{$`} }, $'; #';
663 or ($!==0 && $?==256)
668 sub git_get_config ($) {
670 foreach my $src (@gitcfgsources) {
671 my $l = $gitcfgs{$src}{$c};
672 croak "$l $c" if $l && !ref $l;
673 printdebug"C $c ".(defined $l ?
674 join " ", map { messagequote "'$_'" } @$l :
678 @$l==1 or badcfg "multiple values for $c".
679 " (in $src git config)" if @$l > 1;
687 return undef if $c =~ /RETURN-UNDEF/;
688 printdebug "C? $c\n" if $debuglevel >= 5;
689 my $v = git_get_config($c);
690 return $v if defined $v;
691 my $dv = $defcfg{$c};
693 printdebug "CD $c $dv\n" if $debuglevel >= 4;
697 badcfg "need value for one of: @_\n".
698 "$us: distro or suite appears not to be (properly) supported";
701 sub access_basedistro__noalias () {
702 if (defined $idistro) {
705 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
706 return $def if defined $def;
707 foreach my $src (@gitcfgsources, 'internal') {
708 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
710 foreach my $k (keys %$kl) {
711 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
713 next unless match_glob $dpat, $isuite;
717 return cfg("dgit.default.distro");
721 sub access_basedistro () {
722 my $noalias = access_basedistro__noalias();
723 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
724 return $canon // $noalias;
727 sub access_nomdistro () {
728 my $base = access_basedistro();
729 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
730 $r =~ m/^$distro_re$/ or badcfg
731 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
735 sub access_quirk () {
736 # returns (quirk name, distro to use instead or undef, quirk-specific info)
737 my $basedistro = access_basedistro();
738 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
740 if (defined $backports_quirk) {
741 my $re = $backports_quirk;
742 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
744 $re =~ s/\%/([-0-9a-z_]+)/
745 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
746 if ($isuite =~ m/^$re$/) {
747 return ('backports',"$basedistro-backports",$1);
750 return ('none',undef);
755 sub parse_cfg_bool ($$$) {
756 my ($what,$def,$v) = @_;
759 $v =~ m/^[ty1]/ ? 1 :
760 $v =~ m/^[fn0]/ ? 0 :
761 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
764 sub access_forpush_config () {
765 my $d = access_basedistro();
769 parse_cfg_bool('new-private-pushers', 0,
770 cfg("dgit-distro.$d.new-private-pushers",
773 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
776 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
777 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
778 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
779 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
782 sub access_forpush () {
783 $access_forpush //= access_forpush_config();
784 return $access_forpush;
788 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
789 badcfg "pushing but distro is configured readonly"
790 if access_forpush_config() eq '0';
792 $supplementary_message = <<'END' unless $we_are_responder;
793 Push failed, before we got started.
794 You can retry the push, after fixing the problem, if you like.
796 parseopts_late_defaults();
800 parseopts_late_defaults();
803 sub supplementary_message ($) {
805 if (!$we_are_responder) {
806 $supplementary_message = $msg;
808 } elsif ($protovsn >= 3) {
809 responder_send_command "supplementary-message ".length($msg)
811 print PO $msg or die $!;
815 sub access_distros () {
816 # Returns list of distros to try, in order
819 # 0. `instead of' distro name(s) we have been pointed to
820 # 1. the access_quirk distro, if any
821 # 2a. the user's specified distro, or failing that } basedistro
822 # 2b. the distro calculated from the suite }
823 my @l = access_basedistro();
825 my (undef,$quirkdistro) = access_quirk();
826 unshift @l, $quirkdistro;
827 unshift @l, $instead_distro;
828 @l = grep { defined } @l;
830 push @l, access_nomdistro();
832 if (access_forpush()) {
833 @l = map { ("$_/push", $_) } @l;
838 sub access_cfg_cfgs (@) {
841 # The nesting of these loops determines the search order. We put
842 # the key loop on the outside so that we search all the distros
843 # for each key, before going on to the next key. That means that
844 # if access_cfg is called with a more specific, and then a less
845 # specific, key, an earlier distro can override the less specific
846 # without necessarily overriding any more specific keys. (If the
847 # distro wants to override the more specific keys it can simply do
848 # so; whereas if we did the loop the other way around, it would be
849 # impossible to for an earlier distro to override a less specific
850 # key but not the more specific ones without restating the unknown
851 # values of the more specific keys.
854 # We have to deal with RETURN-UNDEF specially, so that we don't
855 # terminate the search prematurely.
857 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
860 foreach my $d (access_distros()) {
861 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
863 push @cfgs, map { "dgit.default.$_" } @realkeys;
870 my (@cfgs) = access_cfg_cfgs(@keys);
871 my $value = cfg(@cfgs);
875 sub access_cfg_bool ($$) {
876 my ($def, @keys) = @_;
877 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
880 sub string_to_ssh ($) {
882 if ($spec =~ m/\s/) {
883 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
889 sub access_cfg_ssh () {
890 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
891 if (!defined $gitssh) {
894 return string_to_ssh $gitssh;
898 sub access_runeinfo ($) {
900 return ": dgit ".access_basedistro()." $info ;";
903 sub access_someuserhost ($) {
905 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
906 defined($user) && length($user) or
907 $user = access_cfg("$some-user",'username');
908 my $host = access_cfg("$some-host");
909 return length($user) ? "$user\@$host" : $host;
912 sub access_gituserhost () {
913 return access_someuserhost('git');
916 sub access_giturl (;$) {
918 my $url = access_cfg('git-url','RETURN-UNDEF');
921 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
922 return undef unless defined $proto;
925 access_gituserhost().
926 access_cfg('git-path');
928 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
931 return "$url/$package$suffix";
934 sub parsecontrolfh ($$;$) {
935 my ($fh, $desc, $allowsigned) = @_;
936 our $dpkgcontrolhash_noissigned;
939 my %opts = ('name' => $desc);
940 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
941 $c = Dpkg::Control::Hash->new(%opts);
942 $c->parse($fh,$desc) or die "parsing of $desc failed";
943 last if $allowsigned;
944 last if $dpkgcontrolhash_noissigned;
945 my $issigned= $c->get_option('is_pgp_signed');
946 if (!defined $issigned) {
947 $dpkgcontrolhash_noissigned= 1;
948 seek $fh, 0,0 or die "seek $desc: $!";
949 } elsif ($issigned) {
950 fail "control file $desc is (already) PGP-signed. ".
951 " Note that dgit push needs to modify the .dsc and then".
952 " do the signature itself";
961 my ($file, $desc, $allowsigned) = @_;
962 my $fh = new IO::Handle;
963 open $fh, '<', $file or die "$file: $!";
964 my $c = parsecontrolfh($fh,$desc,$allowsigned);
965 $fh->error and die $!;
971 my ($dctrl,$field) = @_;
972 my $v = $dctrl->{$field};
973 return $v if defined $v;
974 fail "missing field $field in ".$dctrl->get_option('name');
978 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
979 my $p = new IO::Handle;
980 my @cmd = (qw(dpkg-parsechangelog), @_);
981 open $p, '-|', @cmd or die $!;
983 $?=0; $!=0; close $p or failedcmd @cmd;
987 sub commit_getclogp ($) {
988 # Returns the parsed changelog hashref for a particular commit
990 our %commit_getclogp_memo;
991 my $memo = $commit_getclogp_memo{$objid};
992 return $memo if $memo;
994 my $mclog = ".git/dgit/clog-$objid";
995 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
996 "$objid:debian/changelog";
997 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1000 sub must_getcwd () {
1002 defined $d or fail "getcwd failed: $!";
1006 sub parse_dscdata () {
1007 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1008 printdebug Dumper($dscdata) if $debuglevel>1;
1009 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1010 printdebug Dumper($dsc) if $debuglevel>1;
1015 sub archive_query ($;@) {
1016 my ($method) = shift @_;
1017 fail "this operation does not support multiple comma-separated suites"
1019 my $query = access_cfg('archive-query','RETURN-UNDEF');
1020 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1023 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1026 sub archive_query_prepend_mirror {
1027 my $m = access_cfg('mirror');
1028 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1031 sub pool_dsc_subpath ($$) {
1032 my ($vsn,$component) = @_; # $package is implict arg
1033 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1034 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1037 sub cfg_apply_map ($$$) {
1038 my ($varref, $what, $mapspec) = @_;
1039 return unless $mapspec;
1041 printdebug "config $what EVAL{ $mapspec; }\n";
1043 eval "package Dgit::Config; $mapspec;";
1048 #---------- `ftpmasterapi' archive query method (nascent) ----------
1050 sub archive_api_query_cmd ($) {
1052 my @cmd = (@curl, qw(-sS));
1053 my $url = access_cfg('archive-query-url');
1054 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1056 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1057 foreach my $key (split /\:/, $keys) {
1058 $key =~ s/\%HOST\%/$host/g;
1060 fail "for $url: stat $key: $!" unless $!==ENOENT;
1063 fail "config requested specific TLS key but do not know".
1064 " how to get curl to use exactly that EE key ($key)";
1065 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1066 # # Sadly the above line does not work because of changes
1067 # # to gnutls. The real fix for #790093 may involve
1068 # # new curl options.
1071 # Fixing #790093 properly will involve providing a value
1072 # for this on clients.
1073 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1074 push @cmd, split / /, $kargs if defined $kargs;
1076 push @cmd, $url.$subpath;
1080 sub api_query ($$;$) {
1082 my ($data, $subpath, $ok404) = @_;
1083 badcfg "ftpmasterapi archive query method takes no data part"
1085 my @cmd = archive_api_query_cmd($subpath);
1086 my $url = $cmd[$#cmd];
1087 push @cmd, qw(-w %{http_code});
1088 my $json = cmdoutput @cmd;
1089 unless ($json =~ s/\d+\d+\d$//) {
1090 failedcmd_report_cmd undef, @cmd;
1091 fail "curl failed to print 3-digit HTTP code";
1094 return undef if $code eq '404' && $ok404;
1095 fail "fetch of $url gave HTTP code $code"
1096 unless $url =~ m#^file://# or $code =~ m/^2/;
1097 return decode_json($json);
1100 sub canonicalise_suite_ftpmasterapi {
1101 my ($proto,$data) = @_;
1102 my $suites = api_query($data, 'suites');
1104 foreach my $entry (@$suites) {
1106 my $v = $entry->{$_};
1107 defined $v && $v eq $isuite;
1108 } qw(codename name);
1109 push @matched, $entry;
1111 fail "unknown suite $isuite" unless @matched;
1114 @matched==1 or die "multiple matches for suite $isuite\n";
1115 $cn = "$matched[0]{codename}";
1116 defined $cn or die "suite $isuite info has no codename\n";
1117 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1119 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1124 sub archive_query_ftpmasterapi {
1125 my ($proto,$data) = @_;
1126 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1128 my $digester = Digest::SHA->new(256);
1129 foreach my $entry (@$info) {
1131 my $vsn = "$entry->{version}";
1132 my ($ok,$msg) = version_check $vsn;
1133 die "bad version: $msg\n" unless $ok;
1134 my $component = "$entry->{component}";
1135 $component =~ m/^$component_re$/ or die "bad component";
1136 my $filename = "$entry->{filename}";
1137 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1138 or die "bad filename";
1139 my $sha256sum = "$entry->{sha256sum}";
1140 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1141 push @rows, [ $vsn, "/pool/$component/$filename",
1142 $digester, $sha256sum ];
1144 die "bad ftpmaster api response: $@\n".Dumper($entry)
1147 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1148 return archive_query_prepend_mirror @rows;
1151 sub file_in_archive_ftpmasterapi {
1152 my ($proto,$data,$filename) = @_;
1153 my $pat = $filename;
1156 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1157 my $info = api_query($data, "file_in_archive/$pat", 1);
1160 #---------- `aptget' archive query method ----------
1163 our $aptget_releasefile;
1164 our $aptget_configpath;
1166 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1167 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1169 sub aptget_cache_clean {
1170 runcmd_ordryrun_local qw(sh -ec),
1171 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1175 sub aptget_lock_acquire () {
1176 my $lockfile = "$aptget_base/lock";
1177 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1178 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1181 sub aptget_prep ($) {
1183 return if defined $aptget_base;
1185 badcfg "aptget archive query method takes no data part"
1188 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1191 ensuredir "$cache/dgit";
1193 access_cfg('aptget-cachekey','RETURN-UNDEF')
1194 // access_nomdistro();
1196 $aptget_base = "$cache/dgit/aptget";
1197 ensuredir $aptget_base;
1199 my $quoted_base = $aptget_base;
1200 die "$quoted_base contains bad chars, cannot continue"
1201 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1203 ensuredir $aptget_base;
1205 aptget_lock_acquire();
1207 aptget_cache_clean();
1209 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1210 my $sourceslist = "source.list#$cachekey";
1212 my $aptsuites = $isuite;
1213 cfg_apply_map(\$aptsuites, 'suite map',
1214 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1216 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1217 printf SRCS "deb-src %s %s %s\n",
1218 access_cfg('mirror'),
1220 access_cfg('aptget-components')
1223 ensuredir "$aptget_base/cache";
1224 ensuredir "$aptget_base/lists";
1226 open CONF, ">", $aptget_configpath or die $!;
1228 Debug::NoLocking "true";
1229 APT::Get::List-Cleanup "false";
1230 #clear APT::Update::Post-Invoke-Success;
1231 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1232 Dir::State::Lists "$quoted_base/lists";
1233 Dir::Etc::preferences "$quoted_base/preferences";
1234 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1235 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1238 foreach my $key (qw(
1241 Dir::Cache::Archives
1242 Dir::Etc::SourceParts
1243 Dir::Etc::preferencesparts
1245 ensuredir "$aptget_base/$key";
1246 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1249 my $oldatime = (time // die $!) - 1;
1250 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1251 next unless stat_exists $oldlist;
1252 my ($mtime) = (stat _)[9];
1253 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1256 runcmd_ordryrun_local aptget_aptget(), qw(update);
1259 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1260 next unless stat_exists $oldlist;
1261 my ($atime) = (stat _)[8];
1262 next if $atime == $oldatime;
1263 push @releasefiles, $oldlist;
1265 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1266 @releasefiles = @inreleasefiles if @inreleasefiles;
1267 die "apt updated wrong number of Release files (@releasefiles), erk"
1268 unless @releasefiles == 1;
1270 ($aptget_releasefile) = @releasefiles;
1273 sub canonicalise_suite_aptget {
1274 my ($proto,$data) = @_;
1277 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1279 foreach my $name (qw(Codename Suite)) {
1280 my $val = $release->{$name};
1282 printdebug "release file $name: $val\n";
1283 $val =~ m/^$suite_re$/o or fail
1284 "Release file ($aptget_releasefile) specifies intolerable $name";
1285 cfg_apply_map(\$val, 'suite rmap',
1286 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1293 sub archive_query_aptget {
1294 my ($proto,$data) = @_;
1297 ensuredir "$aptget_base/source";
1298 foreach my $old (<$aptget_base/source/*.dsc>) {
1299 unlink $old or die "$old: $!";
1302 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1303 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1304 # avoids apt-get source failing with ambiguous error code
1306 runcmd_ordryrun_local
1307 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1308 aptget_aptget(), qw(--download-only --only-source source), $package;
1310 my @dscs = <$aptget_base/source/*.dsc>;
1311 fail "apt-get source did not produce a .dsc" unless @dscs;
1312 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1314 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1317 my $uri = "file://". uri_escape $dscs[0];
1318 $uri =~ s{\%2f}{/}gi;
1319 return [ (getfield $pre_dsc, 'Version'), $uri ];
1322 #---------- `dummyapicat' archive query method ----------
1324 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1325 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1327 sub file_in_archive_dummycatapi ($$$) {
1328 my ($proto,$data,$filename) = @_;
1329 my $mirror = access_cfg('mirror');
1330 $mirror =~ s#^file://#/# or die "$mirror ?";
1332 my @cmd = (qw(sh -ec), '
1334 find -name "$2" -print0 |
1336 ', qw(x), $mirror, $filename);
1337 debugcmd "-|", @cmd;
1338 open FIA, "-|", @cmd or die $!;
1341 printdebug "| $_\n";
1342 m/^(\w+) (\S+)$/ or die "$_ ?";
1343 push @out, { sha256sum => $1, filename => $2 };
1345 close FIA or die failedcmd @cmd;
1349 #---------- `madison' archive query method ----------
1351 sub archive_query_madison {
1352 return archive_query_prepend_mirror
1353 map { [ @$_[0..1] ] } madison_get_parse(@_);
1356 sub madison_get_parse {
1357 my ($proto,$data) = @_;
1358 die unless $proto eq 'madison';
1359 if (!length $data) {
1360 $data= access_cfg('madison-distro','RETURN-UNDEF');
1361 $data //= access_basedistro();
1363 $rmad{$proto,$data,$package} ||= cmdoutput
1364 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1365 my $rmad = $rmad{$proto,$data,$package};
1368 foreach my $l (split /\n/, $rmad) {
1369 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1370 \s*( [^ \t|]+ )\s* \|
1371 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1372 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1373 $1 eq $package or die "$rmad $package ?";
1380 $component = access_cfg('archive-query-default-component');
1382 $5 eq 'source' or die "$rmad ?";
1383 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1385 return sort { -version_compare($a->[0],$b->[0]); } @out;
1388 sub canonicalise_suite_madison {
1389 # madison canonicalises for us
1390 my @r = madison_get_parse(@_);
1392 "unable to canonicalise suite using package $package".
1393 " which does not appear to exist in suite $isuite;".
1394 " --existing-package may help";
1398 sub file_in_archive_madison { return undef; }
1400 #---------- `sshpsql' archive query method ----------
1403 my ($data,$runeinfo,$sql) = @_;
1404 if (!length $data) {
1405 $data= access_someuserhost('sshpsql').':'.
1406 access_cfg('sshpsql-dbname');
1408 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1409 my ($userhost,$dbname) = ($`,$'); #';
1411 my @cmd = (access_cfg_ssh, $userhost,
1412 access_runeinfo("ssh-psql $runeinfo").
1413 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1414 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1416 open P, "-|", @cmd or die $!;
1419 printdebug(">|$_|\n");
1422 $!=0; $?=0; close P or failedcmd @cmd;
1424 my $nrows = pop @rows;
1425 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1426 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1427 @rows = map { [ split /\|/, $_ ] } @rows;
1428 my $ncols = scalar @{ shift @rows };
1429 die if grep { scalar @$_ != $ncols } @rows;
1433 sub sql_injection_check {
1434 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1437 sub archive_query_sshpsql ($$) {
1438 my ($proto,$data) = @_;
1439 sql_injection_check $isuite, $package;
1440 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1441 SELECT source.version, component.name, files.filename, files.sha256sum
1443 JOIN src_associations ON source.id = src_associations.source
1444 JOIN suite ON suite.id = src_associations.suite
1445 JOIN dsc_files ON dsc_files.source = source.id
1446 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1447 JOIN component ON component.id = files_archive_map.component_id
1448 JOIN files ON files.id = dsc_files.file
1449 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1450 AND source.source='$package'
1451 AND files.filename LIKE '%.dsc';
1453 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1454 my $digester = Digest::SHA->new(256);
1456 my ($vsn,$component,$filename,$sha256sum) = @$_;
1457 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1459 return archive_query_prepend_mirror @rows;
1462 sub canonicalise_suite_sshpsql ($$) {
1463 my ($proto,$data) = @_;
1464 sql_injection_check $isuite;
1465 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1466 SELECT suite.codename
1467 FROM suite where suite_name='$isuite' or codename='$isuite';
1469 @rows = map { $_->[0] } @rows;
1470 fail "unknown suite $isuite" unless @rows;
1471 die "ambiguous $isuite: @rows ?" if @rows>1;
1475 sub file_in_archive_sshpsql ($$$) { return undef; }
1477 #---------- `dummycat' archive query method ----------
1479 sub canonicalise_suite_dummycat ($$) {
1480 my ($proto,$data) = @_;
1481 my $dpath = "$data/suite.$isuite";
1482 if (!open C, "<", $dpath) {
1483 $!==ENOENT or die "$dpath: $!";
1484 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1488 chomp or die "$dpath: $!";
1490 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1494 sub archive_query_dummycat ($$) {
1495 my ($proto,$data) = @_;
1496 canonicalise_suite();
1497 my $dpath = "$data/package.$csuite.$package";
1498 if (!open C, "<", $dpath) {
1499 $!==ENOENT or die "$dpath: $!";
1500 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1508 printdebug "dummycat query $csuite $package $dpath | $_\n";
1509 my @row = split /\s+/, $_;
1510 @row==2 or die "$dpath: $_ ?";
1513 C->error and die "$dpath: $!";
1515 return archive_query_prepend_mirror
1516 sort { -version_compare($a->[0],$b->[0]); } @rows;
1519 sub file_in_archive_dummycat () { return undef; }
1521 #---------- tag format handling ----------
1523 sub access_cfg_tagformats () {
1524 split /\,/, access_cfg('dgit-tag-format');
1527 sub access_cfg_tagformats_can_splitbrain () {
1528 my %y = map { $_ => 1 } access_cfg_tagformats;
1529 foreach my $needtf (qw(new maint)) {
1530 next if $y{$needtf};
1536 sub need_tagformat ($$) {
1537 my ($fmt, $why) = @_;
1538 fail "need to use tag format $fmt ($why) but also need".
1539 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1540 " - no way to proceed"
1541 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1542 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1545 sub select_tagformat () {
1547 return if $tagformatfn && !$tagformat_want;
1548 die 'bug' if $tagformatfn && $tagformat_want;
1549 # ... $tagformat_want assigned after previous select_tagformat
1551 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1552 printdebug "select_tagformat supported @supported\n";
1554 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1555 printdebug "select_tagformat specified @$tagformat_want\n";
1557 my ($fmt,$why,$override) = @$tagformat_want;
1559 fail "target distro supports tag formats @supported".
1560 " but have to use $fmt ($why)"
1562 or grep { $_ eq $fmt } @supported;
1564 $tagformat_want = undef;
1566 $tagformatfn = ${*::}{"debiantag_$fmt"};
1568 fail "trying to use unknown tag format \`$fmt' ($why) !"
1569 unless $tagformatfn;
1572 #---------- archive query entrypoints and rest of program ----------
1574 sub canonicalise_suite () {
1575 return if defined $csuite;
1576 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1577 $csuite = archive_query('canonicalise_suite');
1578 if ($isuite ne $csuite) {
1579 progress "canonical suite name for $isuite is $csuite";
1581 progress "canonical suite name is $csuite";
1585 sub get_archive_dsc () {
1586 canonicalise_suite();
1587 my @vsns = archive_query('archive_query');
1588 foreach my $vinfo (@vsns) {
1589 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1590 $dscurl = $vsn_dscurl;
1591 $dscdata = url_get($dscurl);
1593 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1598 $digester->add($dscdata);
1599 my $got = $digester->hexdigest();
1601 fail "$dscurl has hash $got but".
1602 " archive told us to expect $digest";
1605 my $fmt = getfield $dsc, 'Format';
1606 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1607 "unsupported source format $fmt, sorry";
1609 $dsc_checked = !!$digester;
1610 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1614 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1617 sub check_for_git ();
1618 sub check_for_git () {
1620 my $how = access_cfg('git-check');
1621 if ($how eq 'ssh-cmd') {
1623 (access_cfg_ssh, access_gituserhost(),
1624 access_runeinfo("git-check $package").
1625 " set -e; cd ".access_cfg('git-path').";".
1626 " if test -d $package.git; then echo 1; else echo 0; fi");
1627 my $r= cmdoutput @cmd;
1628 if (defined $r and $r =~ m/^divert (\w+)$/) {
1630 my ($usedistro,) = access_distros();
1631 # NB that if we are pushing, $usedistro will be $distro/push
1632 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1633 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1634 progress "diverting to $divert (using config for $instead_distro)";
1635 return check_for_git();
1637 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1639 } elsif ($how eq 'url') {
1640 my $prefix = access_cfg('git-check-url','git-url');
1641 my $suffix = access_cfg('git-check-suffix','git-suffix',
1642 'RETURN-UNDEF') // '.git';
1643 my $url = "$prefix/$package$suffix";
1644 my @cmd = (@curl, qw(-sS -I), $url);
1645 my $result = cmdoutput @cmd;
1646 $result =~ s/^\S+ 200 .*\n\r?\n//;
1647 # curl -sS -I with https_proxy prints
1648 # HTTP/1.0 200 Connection established
1649 $result =~ m/^\S+ (404|200) /s or
1650 fail "unexpected results from git check query - ".
1651 Dumper($prefix, $result);
1653 if ($code eq '404') {
1655 } elsif ($code eq '200') {
1660 } elsif ($how eq 'true') {
1662 } elsif ($how eq 'false') {
1665 badcfg "unknown git-check \`$how'";
1669 sub create_remote_git_repo () {
1670 my $how = access_cfg('git-create');
1671 if ($how eq 'ssh-cmd') {
1673 (access_cfg_ssh, access_gituserhost(),
1674 access_runeinfo("git-create $package").
1675 "set -e; cd ".access_cfg('git-path').";".
1676 " cp -a _template $package.git");
1677 } elsif ($how eq 'true') {
1680 badcfg "unknown git-create \`$how'";
1684 our ($dsc_hash,$lastpush_mergeinput);
1685 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1687 our $ud = '.git/dgit/unpack';
1697 sub mktree_in_ud_here () {
1698 runcmd qw(git init -q);
1699 runcmd qw(git config gc.auto 0);
1700 rmtree('.git/objects');
1701 symlink '../../../../objects','.git/objects' or die $!;
1704 sub git_write_tree () {
1705 my $tree = cmdoutput @git, qw(write-tree);
1706 $tree =~ m/^\w+$/ or die "$tree ?";
1710 sub git_add_write_tree () {
1711 runcmd @git, qw(add -Af .);
1712 return git_write_tree();
1715 sub remove_stray_gits ($) {
1717 my @gitscmd = qw(find -name .git -prune -print0);
1718 debugcmd "|",@gitscmd;
1719 open GITS, "-|", @gitscmd or die $!;
1724 print STDERR "$us: warning: removing from $what: ",
1725 (messagequote $_), "\n";
1729 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1732 sub mktree_in_ud_from_only_subdir ($;$) {
1733 my ($what,$raw) = @_;
1735 # changes into the subdir
1737 die "expected one subdir but found @dirs ?" unless @dirs==1;
1738 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1742 remove_stray_gits($what);
1743 mktree_in_ud_here();
1745 my ($format, $fopts) = get_source_format();
1746 if (madformat($format)) {
1751 my $tree=git_add_write_tree();
1752 return ($tree,$dir);
1755 our @files_csum_info_fields =
1756 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1757 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1758 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1760 sub dsc_files_info () {
1761 foreach my $csumi (@files_csum_info_fields) {
1762 my ($fname, $module, $method) = @$csumi;
1763 my $field = $dsc->{$fname};
1764 next unless defined $field;
1765 eval "use $module; 1;" or die $@;
1767 foreach (split /\n/, $field) {
1769 m/^(\w+) (\d+) (\S+)$/ or
1770 fail "could not parse .dsc $fname line \`$_'";
1771 my $digester = eval "$module"."->$method;" or die $@;
1776 Digester => $digester,
1781 fail "missing any supported Checksums-* or Files field in ".
1782 $dsc->get_option('name');
1786 map { $_->{Filename} } dsc_files_info();
1789 sub files_compare_inputs (@) {
1794 my $showinputs = sub {
1795 return join "; ", map { $_->get_option('name') } @$inputs;
1798 foreach my $in (@$inputs) {
1800 my $in_name = $in->get_option('name');
1802 printdebug "files_compare_inputs $in_name\n";
1804 foreach my $csumi (@files_csum_info_fields) {
1805 my ($fname) = @$csumi;
1806 printdebug "files_compare_inputs $in_name $fname\n";
1808 my $field = $in->{$fname};
1809 next unless defined $field;
1812 foreach (split /\n/, $field) {
1815 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1816 fail "could not parse $in_name $fname line \`$_'";
1818 printdebug "files_compare_inputs $in_name $fname $f\n";
1822 my $re = \ $record{$f}{$fname};
1824 $fchecked{$f}{$in_name} = 1;
1826 fail "hash or size of $f varies in $fname fields".
1827 " (between: ".$showinputs->().")";
1832 @files = sort @files;
1833 $expected_files //= \@files;
1834 "@$expected_files" eq "@files" or
1835 fail "file list in $in_name varies between hash fields!";
1838 fail "$in_name has no files list field(s)";
1840 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1843 grep { keys %$_ == @$inputs-1 } values %fchecked
1844 or fail "no file appears in all file lists".
1845 " (looked in: ".$showinputs->().")";
1848 sub is_orig_file_in_dsc ($$) {
1849 my ($f, $dsc_files_info) = @_;
1850 return 0 if @$dsc_files_info <= 1;
1851 # One file means no origs, and the filename doesn't have a "what
1852 # part of dsc" component. (Consider versions ending `.orig'.)
1853 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1857 sub is_orig_file_of_vsn ($$) {
1858 my ($f, $upstreamvsn) = @_;
1859 my $base = srcfn $upstreamvsn, '';
1860 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1864 sub changes_update_origs_from_dsc ($$$$) {
1865 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1867 printdebug "checking origs needed ($upstreamvsn)...\n";
1868 $_ = getfield $changes, 'Files';
1869 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1870 fail "cannot find section/priority from .changes Files field";
1871 my $placementinfo = $1;
1873 printdebug "checking origs needed placement '$placementinfo'...\n";
1874 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1875 $l =~ m/\S+$/ or next;
1877 printdebug "origs $file | $l\n";
1878 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1879 printdebug "origs $file is_orig\n";
1880 my $have = archive_query('file_in_archive', $file);
1881 if (!defined $have) {
1883 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1889 printdebug "origs $file \$#\$have=$#$have\n";
1890 foreach my $h (@$have) {
1893 foreach my $csumi (@files_csum_info_fields) {
1894 my ($fname, $module, $method, $archivefield) = @$csumi;
1895 next unless defined $h->{$archivefield};
1896 $_ = $dsc->{$fname};
1897 next unless defined;
1898 m/^(\w+) .* \Q$file\E$/m or
1899 fail ".dsc $fname missing entry for $file";
1900 if ($h->{$archivefield} eq $1) {
1904 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1907 die "$file ".Dumper($h)." ?!" if $same && @differ;
1910 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1913 printdebug "origs $file f.same=$found_same".
1914 " #f._differ=$#found_differ\n";
1915 if (@found_differ && !$found_same) {
1917 "archive contains $file with different checksum",
1920 # Now we edit the changes file to add or remove it
1921 foreach my $csumi (@files_csum_info_fields) {
1922 my ($fname, $module, $method, $archivefield) = @$csumi;
1923 next unless defined $changes->{$fname};
1925 # in archive, delete from .changes if it's there
1926 $changed{$file} = "removed" if
1927 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1928 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1929 # not in archive, but it's here in the .changes
1931 my $dsc_data = getfield $dsc, $fname;
1932 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1934 $extra =~ s/ \d+ /$&$placementinfo /
1935 or die "$fname $extra >$dsc_data< ?"
1936 if $fname eq 'Files';
1937 $changes->{$fname} .= "\n". $extra;
1938 $changed{$file} = "added";
1943 foreach my $file (keys %changed) {
1945 "edited .changes for archive .orig contents: %s %s",
1946 $changed{$file}, $file;
1948 my $chtmp = "$changesfile.tmp";
1949 $changes->save($chtmp);
1951 rename $chtmp,$changesfile or die "$changesfile $!";
1953 progress "[new .changes left in $changesfile]";
1956 progress "$changesfile already has appropriate .orig(s) (if any)";
1960 sub make_commit ($) {
1962 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1965 sub make_commit_text ($) {
1968 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1970 print Dumper($text) if $debuglevel > 1;
1971 my $child = open2($out, $in, @cmd) or die $!;
1974 print $in $text or die $!;
1975 close $in or die $!;
1977 $h =~ m/^\w+$/ or die;
1979 printdebug "=> $h\n";
1982 waitpid $child, 0 == $child or die "$child $!";
1983 $? and failedcmd @cmd;
1987 sub clogp_authline ($) {
1989 my $author = getfield $clogp, 'Maintainer';
1990 $author =~ s#,.*##ms;
1991 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
1992 my $authline = "$author $date";
1993 $authline =~ m/$git_authline_re/o or
1994 fail "unexpected commit author line format \`$authline'".
1995 " (was generated from changelog Maintainer field)";
1996 return ($1,$2,$3) if wantarray;
2000 sub vendor_patches_distro ($$) {
2001 my ($checkdistro, $what) = @_;
2002 return unless defined $checkdistro;
2004 my $series = "debian/patches/\L$checkdistro\E.series";
2005 printdebug "checking for vendor-specific $series ($what)\n";
2007 if (!open SERIES, "<", $series) {
2008 die "$series $!" unless $!==ENOENT;
2017 Unfortunately, this source package uses a feature of dpkg-source where
2018 the same source package unpacks to different source code on different
2019 distros. dgit cannot safely operate on such packages on affected
2020 distros, because the meaning of source packages is not stable.
2022 Please ask the distro/maintainer to remove the distro-specific series
2023 files and use a different technique (if necessary, uploading actually
2024 different packages, if different distros are supposed to have
2028 fail "Found active distro-specific series file for".
2029 " $checkdistro ($what): $series, cannot continue";
2031 die "$series $!" if SERIES->error;
2035 sub check_for_vendor_patches () {
2036 # This dpkg-source feature doesn't seem to be documented anywhere!
2037 # But it can be found in the changelog (reformatted):
2039 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2040 # Author: Raphael Hertzog <hertzog@debian.org>
2041 # Date: Sun Oct 3 09:36:48 2010 +0200
2043 # dpkg-source: correctly create .pc/.quilt_series with alternate
2046 # If you have debian/patches/ubuntu.series and you were
2047 # unpacking the source package on ubuntu, quilt was still
2048 # directed to debian/patches/series instead of
2049 # debian/patches/ubuntu.series.
2051 # debian/changelog | 3 +++
2052 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2053 # 2 files changed, 6 insertions(+), 1 deletion(-)
2056 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2057 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2058 "Dpkg::Vendor \`current vendor'");
2059 vendor_patches_distro(access_basedistro(),
2060 "(base) distro being accessed");
2061 vendor_patches_distro(access_nomdistro(),
2062 "(nominal) distro being accessed");
2065 sub generate_commits_from_dsc () {
2066 # See big comment in fetch_from_archive, below.
2067 # See also README.dsc-import.
2071 my @dfi = dsc_files_info();
2072 foreach my $fi (@dfi) {
2073 my $f = $fi->{Filename};
2074 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2075 my $upper_f = "../../../../$f";
2077 printdebug "considering reusing $f: ";
2079 if (link_ltarget "$upper_f,fetch", $f) {
2080 printdebug "linked (using ...,fetch).\n";
2081 } elsif ((printdebug "($!) "),
2083 fail "accessing ../$f,fetch: $!";
2084 } elsif (link_ltarget $upper_f, $f) {
2085 printdebug "linked.\n";
2086 } elsif ((printdebug "($!) "),
2088 fail "accessing ../$f: $!";
2090 printdebug "absent.\n";
2094 complete_file_from_dsc('.', $fi, \$refetched)
2097 printdebug "considering saving $f: ";
2099 if (link $f, $upper_f) {
2100 printdebug "linked.\n";
2101 } elsif ((printdebug "($!) "),
2103 fail "saving ../$f: $!";
2104 } elsif (!$refetched) {
2105 printdebug "no need.\n";
2106 } elsif (link $f, "$upper_f,fetch") {
2107 printdebug "linked (using ...,fetch).\n";
2108 } elsif ((printdebug "($!) "),
2110 fail "saving ../$f,fetch: $!";
2112 printdebug "cannot.\n";
2116 # We unpack and record the orig tarballs first, so that we only
2117 # need disk space for one private copy of the unpacked source.
2118 # But we can't make them into commits until we have the metadata
2119 # from the debian/changelog, so we record the tree objects now and
2120 # make them into commits later.
2122 my $upstreamv = upstreamversion $dsc->{version};
2123 my $orig_f_base = srcfn $upstreamv, '';
2125 foreach my $fi (@dfi) {
2126 # We actually import, and record as a commit, every tarball
2127 # (unless there is only one file, in which case there seems
2130 my $f = $fi->{Filename};
2131 printdebug "import considering $f ";
2132 (printdebug "only one dfi\n"), next if @dfi == 1;
2133 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2134 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2138 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2140 printdebug "Y ", (join ' ', map { $_//"(none)" }
2141 $compr_ext, $orig_f_part
2144 my $input = new IO::File $f, '<' or die "$f $!";
2148 if (defined $compr_ext) {
2150 Dpkg::Compression::compression_guess_from_filename $f;
2151 fail "Dpkg::Compression cannot handle file $f in source package"
2152 if defined $compr_ext && !defined $cname;
2154 new Dpkg::Compression::Process compression => $cname;
2155 my @compr_cmd = $compr_proc->get_uncompress_cmdline();
2156 my $compr_fh = new IO::Handle;
2157 my $compr_pid = open $compr_fh, "-|" // die $!;
2159 open STDIN, "<&", $input or die $!;
2161 die "dgit (child): exec $compr_cmd[0]: $!\n";
2166 rmtree "_unpack-tar";
2167 mkdir "_unpack-tar" or die $!;
2168 my @tarcmd = qw(tar -x -f -
2169 --no-same-owner --no-same-permissions
2170 --no-acls --no-xattrs --no-selinux);
2171 my $tar_pid = fork // die $!;
2173 chdir "_unpack-tar" or die $!;
2174 open STDIN, "<&", $input or die $!;
2176 die "dgit (child): exec $tarcmd[0]: $!";
2178 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2179 !$? or failedcmd @tarcmd;
2182 (@compr_cmd ? failedcmd @compr_cmd
2184 # finally, we have the results in "tarball", but maybe
2185 # with the wrong permissions
2187 runcmd qw(chmod -R +rwX _unpack-tar);
2188 changedir "_unpack-tar";
2189 remove_stray_gits($f);
2190 mktree_in_ud_here();
2192 my ($tree) = git_add_write_tree();
2193 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2194 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2196 printdebug "one subtree $1\n";
2198 printdebug "multiple subtrees\n";
2201 rmtree "_unpack-tar";
2203 my $ent = [ $f, $tree ];
2205 Orig => !!$orig_f_part,
2206 Sort => (!$orig_f_part ? 2 :
2207 $orig_f_part =~ m/-/g ? 1 :
2215 # put any without "_" first (spec is not clear whether files
2216 # are always in the usual order). Tarballs without "_" are
2217 # the main orig or the debian tarball.
2218 $a->{Sort} <=> $b->{Sort} or
2222 my $any_orig = grep { $_->{Orig} } @tartrees;
2224 my $dscfn = "$package.dsc";
2226 my $treeimporthow = 'package';
2228 open D, ">", $dscfn or die "$dscfn: $!";
2229 print D $dscdata or die "$dscfn: $!";
2230 close D or die "$dscfn: $!";
2231 my @cmd = qw(dpkg-source);
2232 push @cmd, '--no-check' if $dsc_checked;
2233 if (madformat $dsc->{format}) {
2234 push @cmd, '--skip-patches';
2235 $treeimporthow = 'unpatched';
2237 push @cmd, qw(-x --), $dscfn;
2240 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2241 if (madformat $dsc->{format}) {
2242 check_for_vendor_patches();
2246 if (madformat $dsc->{format}) {
2247 my @pcmd = qw(dpkg-source --before-build .);
2248 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2250 $dappliedtree = git_add_write_tree();
2253 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2254 debugcmd "|",@clogcmd;
2255 open CLOGS, "-|", @clogcmd or die $!;
2260 printdebug "import clog search...\n";
2263 my $stanzatext = do { local $/=""; <CLOGS>; };
2264 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2265 last if !defined $stanzatext;
2267 my $desc = "package changelog, entry no.$.";
2268 open my $stanzafh, "<", \$stanzatext or die;
2269 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2270 $clogp //= $thisstanza;
2272 printdebug "import clog $thisstanza->{version} $desc...\n";
2274 last if !$any_orig; # we don't need $r1clogp
2276 # We look for the first (most recent) changelog entry whose
2277 # version number is lower than the upstream version of this
2278 # package. Then the last (least recent) previous changelog
2279 # entry is treated as the one which introduced this upstream
2280 # version and used for the synthetic commits for the upstream
2283 # One might think that a more sophisticated algorithm would be
2284 # necessary. But: we do not want to scan the whole changelog
2285 # file. Stopping when we see an earlier version, which
2286 # necessarily then is an earlier upstream version, is the only
2287 # realistic way to do that. Then, either the earliest
2288 # changelog entry we have seen so far is indeed the earliest
2289 # upload of this upstream version; or there are only changelog
2290 # entries relating to later upstream versions (which is not
2291 # possible unless the changelog and .dsc disagree about the
2292 # version). Then it remains to choose between the physically
2293 # last entry in the file, and the one with the lowest version
2294 # number. If these are not the same, we guess that the
2295 # versions were created in a non-monotic order rather than
2296 # that the changelog entries have been misordered.
2298 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2300 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2301 $r1clogp = $thisstanza;
2303 printdebug "import clog $r1clogp->{version} becomes r1\n";
2305 die $! if CLOGS->error;
2306 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2308 $clogp or fail "package changelog has no entries!";
2310 my $authline = clogp_authline $clogp;
2311 my $changes = getfield $clogp, 'Changes';
2312 my $cversion = getfield $clogp, 'Version';
2315 $r1clogp //= $clogp; # maybe there's only one entry;
2316 my $r1authline = clogp_authline $r1clogp;
2317 # Strictly, r1authline might now be wrong if it's going to be
2318 # unused because !$any_orig. Whatever.
2320 printdebug "import tartrees authline $authline\n";
2321 printdebug "import tartrees r1authline $r1authline\n";
2323 foreach my $tt (@tartrees) {
2324 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2326 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2329 committer $r1authline
2333 [dgit import orig $tt->{F}]
2341 [dgit import tarball $package $cversion $tt->{F}]
2346 printdebug "import main commit\n";
2348 open C, ">../commit.tmp" or die $!;
2349 print C <<END or die $!;
2352 print C <<END or die $! foreach @tartrees;
2355 print C <<END or die $!;
2361 [dgit import $treeimporthow $package $cversion]
2365 my $rawimport_hash = make_commit qw(../commit.tmp);
2367 if (madformat $dsc->{format}) {
2368 printdebug "import apply patches...\n";
2370 # regularise the state of the working tree so that
2371 # the checkout of $rawimport_hash works nicely.
2372 my $dappliedcommit = make_commit_text(<<END);
2379 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2381 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2383 # We need the answers to be reproducible
2384 my @authline = clogp_authline($clogp);
2385 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2386 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2387 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2388 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2389 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2390 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2392 my $path = $ENV{PATH} or die;
2394 foreach my $use_absurd (qw(0 1)) {
2395 runcmd @git, qw(checkout -q unpa);
2396 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2397 local $ENV{PATH} = $path;
2400 progress "warning: $@";
2401 $path = "$absurdity:$path";
2402 progress "$us: trying slow absurd-git-apply...";
2403 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2408 die "forbid absurd git-apply\n" if $use_absurd
2409 && forceing [qw(import-gitapply-no-absurd)];
2410 die "only absurd git-apply!\n" if !$use_absurd
2411 && forceing [qw(import-gitapply-absurd)];
2413 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2414 local $ENV{PATH} = $path if $use_absurd;
2416 my @showcmd = (gbp_pq, qw(import));
2417 my @realcmd = shell_cmd
2418 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2419 debugcmd "+",@realcmd;
2420 if (system @realcmd) {
2421 die +(shellquote @showcmd).
2423 failedcmd_waitstatus()."\n";
2426 my $gapplied = git_rev_parse('HEAD');
2427 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2428 $gappliedtree eq $dappliedtree or
2430 gbp-pq import and dpkg-source disagree!
2431 gbp-pq import gave commit $gapplied
2432 gbp-pq import gave tree $gappliedtree
2433 dpkg-source --before-build gave tree $dappliedtree
2435 $rawimport_hash = $gapplied;
2440 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2445 progress "synthesised git commit from .dsc $cversion";
2447 my $rawimport_mergeinput = {
2448 Commit => $rawimport_hash,
2449 Info => "Import of source package",
2451 my @output = ($rawimport_mergeinput);
2453 if ($lastpush_mergeinput) {
2454 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2455 my $oversion = getfield $oldclogp, 'Version';
2457 version_compare($oversion, $cversion);
2459 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2460 { Message => <<END, ReverseParents => 1 });
2461 Record $package ($cversion) in archive suite $csuite
2463 } elsif ($vcmp > 0) {
2464 print STDERR <<END or die $!;
2466 Version actually in archive: $cversion (older)
2467 Last version pushed with dgit: $oversion (newer or same)
2470 @output = $lastpush_mergeinput;
2472 # Same version. Use what's in the server git branch,
2473 # discarding our own import. (This could happen if the
2474 # server automatically imports all packages into git.)
2475 @output = $lastpush_mergeinput;
2478 changedir '../../../..';
2483 sub complete_file_from_dsc ($$;$) {
2484 our ($dstdir, $fi, $refetched) = @_;
2485 # Ensures that we have, in $dstdir, the file $fi, with the correct
2486 # contents. (Downloading it from alongside $dscurl if necessary.)
2487 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2488 # and will set $$refetched=1 if it did so (or tried to).
2490 my $f = $fi->{Filename};
2491 my $tf = "$dstdir/$f";
2495 my $checkhash = sub {
2496 open F, "<", "$tf" or die "$tf: $!";
2497 $fi->{Digester}->reset();
2498 $fi->{Digester}->addfile(*F);
2499 F->error and die $!;
2500 my $got = $fi->{Digester}->hexdigest();
2501 return $got eq $fi->{Hash};
2504 if (stat_exists $tf) {
2505 if ($checkhash->()) {
2506 progress "using existing $f";
2510 fail "file $f has hash $got but .dsc".
2511 " demands hash $fi->{Hash} ".
2512 "(perhaps you should delete this file?)";
2514 progress "need to fetch correct version of $f";
2515 unlink $tf or die "$tf $!";
2518 printdebug "$tf does not exist, need to fetch\n";
2522 $furl =~ s{/[^/]+$}{};
2524 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2525 die "$f ?" if $f =~ m#/#;
2526 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2527 return 0 if !act_local();
2530 fail "file $f has hash $got but .dsc".
2531 " demands hash $fi->{Hash} ".
2532 "(got wrong file from archive!)";
2537 sub ensure_we_have_orig () {
2538 my @dfi = dsc_files_info();
2539 foreach my $fi (@dfi) {
2540 my $f = $fi->{Filename};
2541 next unless is_orig_file_in_dsc($f, \@dfi);
2542 complete_file_from_dsc('..', $fi)
2547 #---------- git fetch ----------
2549 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2550 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2552 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2553 # locally fetched refs because they have unhelpful names and clutter
2554 # up gitk etc. So we track whether we have "used up" head ref (ie,
2555 # whether we have made another local ref which refers to this object).
2557 # (If we deleted them unconditionally, then we might end up
2558 # re-fetching the same git objects each time dgit fetch was run.)
2560 # So, leach use of lrfetchrefs needs to be accompanied by arrangements
2561 # in git_fetch_us to fetch the refs in question, and possibly a call
2562 # to lrfetchref_used.
2564 our (%lrfetchrefs_f, %lrfetchrefs_d);
2565 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2567 sub lrfetchref_used ($) {
2568 my ($fullrefname) = @_;
2569 my $objid = $lrfetchrefs_f{$fullrefname};
2570 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2573 sub git_lrfetch_sane {
2574 my ($supplementary, @specs) = @_;
2575 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2576 # at least as regards @specs. Also leave the results in
2577 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2578 # able to clean these up.
2580 # With $supplementary==1, @specs must not contain wildcards
2581 # and we add to our previous fetches (non-atomically).
2583 # This is rather miserable:
2584 # When git fetch --prune is passed a fetchspec ending with a *,
2585 # it does a plausible thing. If there is no * then:
2586 # - it matches subpaths too, even if the supplied refspec
2587 # starts refs, and behaves completely madly if the source
2588 # has refs/refs/something. (See, for example, Debian #NNNN.)
2589 # - if there is no matching remote ref, it bombs out the whole
2591 # We want to fetch a fixed ref, and we don't know in advance
2592 # if it exists, so this is not suitable.
2594 # Our workaround is to use git ls-remote. git ls-remote has its
2595 # own qairks. Notably, it has the absurd multi-tail-matching
2596 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2597 # refs/refs/foo etc.
2599 # Also, we want an idempotent snapshot, but we have to make two
2600 # calls to the remote: one to git ls-remote and to git fetch. The
2601 # solution is use git ls-remote to obtain a target state, and
2602 # git fetch to try to generate it. If we don't manage to generate
2603 # the target state, we try again.
2605 my $url = access_giturl();
2607 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2609 my $specre = join '|', map {
2612 my $wildcard = $x =~ s/\\\*$/.*/;
2613 die if $wildcard && $supplementary;
2616 printdebug "git_lrfetch_sane specre=$specre\n";
2617 my $wanted_rref = sub {
2619 return m/^(?:$specre)$/;
2622 my $fetch_iteration = 0;
2625 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2626 if (++$fetch_iteration > 10) {
2627 fail "too many iterations trying to get sane fetch!";
2630 my @look = map { "refs/$_" } @specs;
2631 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2635 open GITLS, "-|", @lcmd or die $!;
2637 printdebug "=> ", $_;
2638 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2639 my ($objid,$rrefname) = ($1,$2);
2640 if (!$wanted_rref->($rrefname)) {
2642 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2646 $wantr{$rrefname} = $objid;
2649 close GITLS or failedcmd @lcmd;
2651 # OK, now %want is exactly what we want for refs in @specs
2653 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2654 "+refs/$_:".lrfetchrefs."/$_";
2657 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2659 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2660 runcmd_ordryrun_local @fcmd if @fspecs;
2662 if (!$supplementary) {
2663 %lrfetchrefs_f = ();
2667 git_for_each_ref(lrfetchrefs, sub {
2668 my ($objid,$objtype,$lrefname,$reftail) = @_;
2669 $lrfetchrefs_f{$lrefname} = $objid;
2670 $objgot{$objid} = 1;
2673 if ($supplementary) {
2677 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2678 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2679 if (!exists $wantr{$rrefname}) {
2680 if ($wanted_rref->($rrefname)) {
2682 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2686 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2689 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2690 delete $lrfetchrefs_f{$lrefname};
2694 foreach my $rrefname (sort keys %wantr) {
2695 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2696 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2697 my $want = $wantr{$rrefname};
2698 next if $got eq $want;
2699 if (!defined $objgot{$want}) {
2701 warning: git ls-remote suggests we want $lrefname
2702 warning: and it should refer to $want
2703 warning: but git fetch didn't fetch that object to any relevant ref.
2704 warning: This may be due to a race with someone updating the server.
2705 warning: Will try again...
2707 next FETCH_ITERATION;
2710 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2712 runcmd_ordryrun_local @git, qw(update-ref -m),
2713 "dgit fetch git fetch fixup", $lrefname, $want;
2714 $lrfetchrefs_f{$lrefname} = $want;
2719 if (defined $csuite) {
2720 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2721 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2722 my ($objid,$objtype,$lrefname,$reftail) = @_;
2723 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2724 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2728 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2729 Dumper(\%lrfetchrefs_f);
2732 sub git_fetch_us () {
2733 # Want to fetch only what we are going to use, unless
2734 # deliberately-not-ff, in which case we must fetch everything.
2736 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2738 (quiltmode_splitbrain
2739 ? (map { $_->('*',access_nomdistro) }
2740 \&debiantag_new, \&debiantag_maintview)
2741 : debiantags('*',access_nomdistro));
2742 push @specs, server_branch($csuite);
2743 push @specs, $rewritemap;
2744 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2746 git_lrfetch_sane 0, @specs;
2749 my @tagpats = debiantags('*',access_nomdistro);
2751 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2752 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2753 printdebug "currently $fullrefname=$objid\n";
2754 $here{$fullrefname} = $objid;
2756 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2757 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2758 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2759 printdebug "offered $lref=$objid\n";
2760 if (!defined $here{$lref}) {
2761 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2762 runcmd_ordryrun_local @upd;
2763 lrfetchref_used $fullrefname;
2764 } elsif ($here{$lref} eq $objid) {
2765 lrfetchref_used $fullrefname;
2768 "Not updateting $lref from $here{$lref} to $objid.\n";
2773 #---------- dsc and archive handling ----------
2775 sub mergeinfo_getclogp ($) {
2776 # Ensures thit $mi->{Clogp} exists and returns it
2778 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2781 sub mergeinfo_version ($) {
2782 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2785 sub fetch_from_archive_record_1 ($) {
2787 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2788 'DGIT_ARCHIVE', $hash;
2789 cmdoutput @git, qw(log -n2), $hash;
2790 # ... gives git a chance to complain if our commit is malformed
2793 sub fetch_from_archive_record_2 ($) {
2795 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2799 dryrun_report @upd_cmd;
2803 sub parse_dsc_field ($$) {
2804 my ($dsc, $what) = @_;
2806 foreach my $field (@ourdscfield) {
2807 $f = $dsc->{$field};
2811 progress "$what: NO git hash";
2812 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2813 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2814 progress "$what: specified git info ($dsc_distro)";
2815 $dsc_hint_tag = [ $dsc_hint_tag ];
2816 } elsif ($f =~ m/^\w+\s*$/) {
2818 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2819 dgit.default.distro);
2820 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2822 progress "$what: specified git hash";
2824 fail "$what: invalid Dgit info";
2828 sub resolve_dsc_field_commit ($$) {
2829 my ($already_distro, $already_mapref) = @_;
2831 return unless defined $dsc_hash;
2834 defined $already_mapref &&
2835 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2836 ? $already_mapref : undef;
2840 my ($what, @fetch) = @_;
2842 local $idistro = $dsc_distro;
2843 my $lrf = lrfetchrefs;
2845 if (!$chase_dsc_distro) {
2847 "not chasing .dsc distro $dsc_distro: not fetching $what";
2852 ".dsc names distro $dsc_distro: fetching $what";
2854 my $url = access_giturl();
2855 if (!defined $url) {
2856 defined $dsc_hint_url or fail <<END;
2857 .dsc Dgit metadata is in context of distro $dsc_distro
2858 for which we have no configured url and .dsc provides no hint
2861 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2862 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2863 parse_cfg_bool "dsc-url-proto-ok", 'false',
2864 cfg("dgit.dsc-url-proto-ok.$proto",
2865 "dgit.default.dsc-url-proto-ok")
2867 .dsc Dgit metadata is in context of distro $dsc_distro
2868 for which we have no configured url;
2869 .dsc provices hinted url with protocol $proto which is unsafe.
2870 (can be overridden by config - consult documentation)
2872 $url = $dsc_hint_url;
2875 git_lrfetch_sane 1, @fetch;
2880 my $rewrite_enable = do {
2881 local $idistro = $dsc_distro;
2882 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2885 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2886 if (!defined $mapref) {
2887 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2888 $mapref = $lrf.'/'.$rewritemap;
2890 my $rewritemapdata = git_cat_file $mapref.':map';
2891 if (defined $rewritemapdata
2892 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2894 "server's git history rewrite map contains a relevant entry!";
2897 if (defined $dsc_hash) {
2898 progress "using rewritten git hash in place of .dsc value";
2900 progress "server data says .dsc hash is to be disregarded";
2905 if (!defined git_cat_file $dsc_hash) {
2906 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2907 my $lrf = $do_fetch->("additional commits", @tags) &&
2908 defined git_cat_file $dsc_hash
2910 .dsc Dgit metadata requires commit $dsc_hash
2911 but we could not obtain that object anywhere.
2913 foreach my $t (@tags) {
2914 my $fullrefname = $lrf.'/'.$t;
2915 print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2916 next unless $lrfetchrefs_f{$fullrefname};
2917 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2918 lrfetchref_used $fullrefname;
2923 sub fetch_from_archive () {
2924 ensure_setup_existing_tree();
2926 # Ensures that lrref() is what is actually in the archive, one way
2927 # or another, according to us - ie this client's
2928 # appropritaely-updated archive view. Also returns the commit id.
2929 # If there is nothing in the archive, leaves lrref alone and
2930 # returns undef. git_fetch_us must have already been called.
2934 parse_dsc_field($dsc, 'last upload to archive');
2935 resolve_dsc_field_commit access_basedistro,
2936 lrfetchrefs."/".$rewritemap
2938 progress "no version available from the archive";
2941 # If the archive's .dsc has a Dgit field, there are three
2942 # relevant git commitids we need to choose between and/or merge
2944 # 1. $dsc_hash: the Dgit field from the archive
2945 # 2. $lastpush_hash: the suite branch on the dgit git server
2946 # 3. $lastfetch_hash: our local tracking brach for the suite
2948 # These may all be distinct and need not be in any fast forward
2951 # If the dsc was pushed to this suite, then the server suite
2952 # branch will have been updated; but it might have been pushed to
2953 # a different suite and copied by the archive. Conversely a more
2954 # recent version may have been pushed with dgit but not appeared
2955 # in the archive (yet).
2957 # $lastfetch_hash may be awkward because archive imports
2958 # (particularly, imports of Dgit-less .dscs) are performed only as
2959 # needed on individual clients, so different clients may perform a
2960 # different subset of them - and these imports are only made
2961 # public during push. So $lastfetch_hash may represent a set of
2962 # imports different to a subsequent upload by a different dgit
2965 # Our approach is as follows:
2967 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
2968 # descendant of $dsc_hash, then it was pushed by a dgit user who
2969 # had based their work on $dsc_hash, so we should prefer it.
2970 # Otherwise, $dsc_hash was installed into this suite in the
2971 # archive other than by a dgit push, and (necessarily) after the
2972 # last dgit push into that suite (since a dgit push would have
2973 # been descended from the dgit server git branch); thus, in that
2974 # case, we prefer the archive's version (and produce a
2975 # pseudo-merge to overwrite the dgit server git branch).
2977 # (If there is no Dgit field in the archive's .dsc then
2978 # generate_commit_from_dsc uses the version numbers to decide
2979 # whether the suite branch or the archive is newer. If the suite
2980 # branch is newer it ignores the archive's .dsc; otherwise it
2981 # generates an import of the .dsc, and produces a pseudo-merge to
2982 # overwrite the suite branch with the archive contents.)
2984 # The outcome of that part of the algorithm is the `public view',
2985 # and is same for all dgit clients: it does not depend on any
2986 # unpublished history in the local tracking branch.
2988 # As between the public view and the local tracking branch: The
2989 # local tracking branch is only updated by dgit fetch, and
2990 # whenever dgit fetch runs it includes the public view in the
2991 # local tracking branch. Therefore if the public view is not
2992 # descended from the local tracking branch, the local tracking
2993 # branch must contain history which was imported from the archive
2994 # but never pushed; and, its tip is now out of date. So, we make
2995 # a pseudo-merge to overwrite the old imports and stitch the old
2998 # Finally: we do not necessarily reify the public view (as
2999 # described above). This is so that we do not end up stacking two
3000 # pseudo-merges. So what we actually do is figure out the inputs
3001 # to any public view pseudo-merge and put them in @mergeinputs.
3004 # $mergeinputs[]{Commit}
3005 # $mergeinputs[]{Info}
3006 # $mergeinputs[0] is the one whose tree we use
3007 # @mergeinputs is in the order we use in the actual commit)
3010 # $mergeinputs[]{Message} is a commit message to use
3011 # $mergeinputs[]{ReverseParents} if def specifies that parent
3012 # list should be in opposite order
3013 # Such an entry has no Commit or Info. It applies only when found
3014 # in the last entry. (This ugliness is to support making
3015 # identical imports to previous dgit versions.)
3017 my $lastpush_hash = git_get_ref(lrfetchref());
3018 printdebug "previous reference hash=$lastpush_hash\n";
3019 $lastpush_mergeinput = $lastpush_hash && {
3020 Commit => $lastpush_hash,
3021 Info => "dgit suite branch on dgit git server",
3024 my $lastfetch_hash = git_get_ref(lrref());
3025 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3026 my $lastfetch_mergeinput = $lastfetch_hash && {
3027 Commit => $lastfetch_hash,
3028 Info => "dgit client's archive history view",
3031 my $dsc_mergeinput = $dsc_hash && {
3032 Commit => $dsc_hash,
3033 Info => "Dgit field in .dsc from archive",
3037 my $del_lrfetchrefs = sub {
3040 printdebug "del_lrfetchrefs...\n";
3041 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3042 my $objid = $lrfetchrefs_d{$fullrefname};
3043 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3045 $gur ||= new IO::Handle;
3046 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3048 printf $gur "delete %s %s\n", $fullrefname, $objid;
3051 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3055 if (defined $dsc_hash) {
3056 ensure_we_have_orig();
3057 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3058 @mergeinputs = $dsc_mergeinput
3059 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3060 print STDERR <<END or die $!;
3062 Git commit in archive is behind the last version allegedly pushed/uploaded.
3063 Commit referred to by archive: $dsc_hash
3064 Last version pushed with dgit: $lastpush_hash
3067 @mergeinputs = ($lastpush_mergeinput);
3069 # Archive has .dsc which is not a descendant of the last dgit
3070 # push. This can happen if the archive moves .dscs about.
3071 # Just follow its lead.
3072 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3073 progress "archive .dsc names newer git commit";
3074 @mergeinputs = ($dsc_mergeinput);
3076 progress "archive .dsc names other git commit, fixing up";
3077 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3081 @mergeinputs = generate_commits_from_dsc();
3082 # We have just done an import. Now, our import algorithm might
3083 # have been improved. But even so we do not want to generate
3084 # a new different import of the same package. So if the
3085 # version numbers are the same, just use our existing version.
3086 # If the version numbers are different, the archive has changed
3087 # (perhaps, rewound).
3088 if ($lastfetch_mergeinput &&
3089 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3090 (mergeinfo_version $mergeinputs[0]) )) {
3091 @mergeinputs = ($lastfetch_mergeinput);
3093 } elsif ($lastpush_hash) {
3094 # only in git, not in the archive yet
3095 @mergeinputs = ($lastpush_mergeinput);
3096 print STDERR <<END or die $!;
3098 Package not found in the archive, but has allegedly been pushed using dgit.
3102 printdebug "nothing found!\n";
3103 if (defined $skew_warning_vsn) {
3104 print STDERR <<END or die $!;
3106 Warning: relevant archive skew detected.
3107 Archive allegedly contains $skew_warning_vsn
3108 But we were not able to obtain any version from the archive or git.
3112 unshift @end, $del_lrfetchrefs;
3116 if ($lastfetch_hash &&
3118 my $h = $_->{Commit};
3119 $h and is_fast_fwd($lastfetch_hash, $h);
3120 # If true, one of the existing parents of this commit
3121 # is a descendant of the $lastfetch_hash, so we'll
3122 # be ff from that automatically.
3126 push @mergeinputs, $lastfetch_mergeinput;
3129 printdebug "fetch mergeinfos:\n";
3130 foreach my $mi (@mergeinputs) {
3132 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3134 printdebug sprintf " ReverseParents=%d Message=%s",
3135 $mi->{ReverseParents}, $mi->{Message};
3139 my $compat_info= pop @mergeinputs
3140 if $mergeinputs[$#mergeinputs]{Message};
3142 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3145 if (@mergeinputs > 1) {
3147 my $tree_commit = $mergeinputs[0]{Commit};
3149 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3150 $tree =~ m/\n\n/; $tree = $`;
3151 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3154 # We use the changelog author of the package in question the
3155 # author of this pseudo-merge. This is (roughly) correct if
3156 # this commit is simply representing aa non-dgit upload.
3157 # (Roughly because it does not record sponsorship - but we
3158 # don't have sponsorship info because that's in the .changes,
3159 # which isn't in the archivw.)
3161 # But, it might be that we are representing archive history
3162 # updates (including in-archive copies). These are not really
3163 # the responsibility of the person who created the .dsc, but
3164 # there is no-one whose name we should better use. (The
3165 # author of the .dsc-named commit is clearly worse.)
3167 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3168 my $author = clogp_authline $useclogp;
3169 my $cversion = getfield $useclogp, 'Version';
3171 my $mcf = ".git/dgit/mergecommit";
3172 open MC, ">", $mcf or die "$mcf $!";
3173 print MC <<END or die $!;
3177 my @parents = grep { $_->{Commit} } @mergeinputs;
3178 @parents = reverse @parents if $compat_info->{ReverseParents};
3179 print MC <<END or die $! foreach @parents;
3183 print MC <<END or die $!;
3189 if (defined $compat_info->{Message}) {
3190 print MC $compat_info->{Message} or die $!;
3192 print MC <<END or die $!;
3193 Record $package ($cversion) in archive suite $csuite
3197 my $message_add_info = sub {
3199 my $mversion = mergeinfo_version $mi;
3200 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3204 $message_add_info->($mergeinputs[0]);
3205 print MC <<END or die $!;
3206 should be treated as descended from
3208 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3212 $hash = make_commit $mcf;
3214 $hash = $mergeinputs[0]{Commit};
3216 printdebug "fetch hash=$hash\n";
3219 my ($lasth, $what) = @_;
3220 return unless $lasth;
3221 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3224 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3226 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3228 fetch_from_archive_record_1($hash);
3230 if (defined $skew_warning_vsn) {
3232 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3233 my $gotclogp = commit_getclogp($hash);
3234 my $got_vsn = getfield $gotclogp, 'Version';
3235 printdebug "SKEW CHECK GOT $got_vsn\n";
3236 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3237 print STDERR <<END or die $!;
3239 Warning: archive skew detected. Using the available version:
3240 Archive allegedly contains $skew_warning_vsn
3241 We were able to obtain only $got_vsn
3247 if ($lastfetch_hash ne $hash) {
3248 fetch_from_archive_record_2($hash);
3251 lrfetchref_used lrfetchref();
3253 unshift @end, $del_lrfetchrefs;
3257 sub set_local_git_config ($$) {
3259 runcmd @git, qw(config), $k, $v;
3262 sub setup_mergechangelogs (;$) {
3264 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3266 my $driver = 'dpkg-mergechangelogs';
3267 my $cb = "merge.$driver";
3268 my $attrs = '.git/info/attributes';
3269 ensuredir '.git/info';
3271 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3272 if (!open ATTRS, "<", $attrs) {
3273 $!==ENOENT or die "$attrs: $!";
3277 next if m{^debian/changelog\s};
3278 print NATTRS $_, "\n" or die $!;
3280 ATTRS->error and die $!;
3283 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3286 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3287 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3289 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3292 sub setup_useremail (;$) {
3294 return unless $always || access_cfg_bool(1, 'setup-useremail');
3297 my ($k, $envvar) = @_;
3298 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3299 return unless defined $v;
3300 set_local_git_config "user.$k", $v;
3303 $setup->('email', 'DEBEMAIL');
3304 $setup->('name', 'DEBFULLNAME');
3307 sub ensure_setup_existing_tree () {
3308 my $k = "remote.$remotename.skipdefaultupdate";
3309 my $c = git_get_config $k;
3310 return if defined $c;
3311 set_local_git_config $k, 'true';
3314 sub setup_new_tree () {
3315 setup_mergechangelogs();
3319 sub multisuite_suite_child ($$$) {
3320 my ($tsuite, $merginputs, $fn) = @_;
3321 # in child, sets things up, calls $fn->(), and returns undef
3322 # in parent, returns canonical suite name for $tsuite
3323 my $canonsuitefh = IO::File::new_tmpfile;
3324 my $pid = fork // die $!;
3328 $us .= " [$isuite]";
3329 $debugprefix .= " ";
3330 progress "fetching $tsuite...";
3331 canonicalise_suite();
3332 print $canonsuitefh $csuite, "\n" or die $!;
3333 close $canonsuitefh or die $!;
3337 waitpid $pid,0 == $pid or die $!;
3338 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3339 seek $canonsuitefh,0,0 or die $!;
3340 local $csuite = <$canonsuitefh>;
3341 die $! unless defined $csuite && chomp $csuite;
3343 printdebug "multisuite $tsuite missing\n";
3346 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3347 push @$merginputs, {
3354 sub fork_for_multisuite ($) {
3355 my ($before_fetch_merge) = @_;
3356 # if nothing unusual, just returns ''
3359 # returns 0 to caller in child, to do first of the specified suites
3360 # in child, $csuite is not yet set
3362 # returns 1 to caller in parent, to finish up anything needed after
3363 # in parent, $csuite is set to canonicalised portmanteau
3365 my $org_isuite = $isuite;
3366 my @suites = split /\,/, $isuite;
3367 return '' unless @suites > 1;
3368 printdebug "fork_for_multisuite: @suites\n";
3372 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3374 return 0 unless defined $cbasesuite;
3376 fail "package $package missing in (base suite) $cbasesuite"
3377 unless @mergeinputs;
3379 my @csuites = ($cbasesuite);
3381 $before_fetch_merge->();
3383 foreach my $tsuite (@suites[1..$#suites]) {
3384 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3390 # xxx collecte the ref here
3392 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3393 push @csuites, $csubsuite;
3396 foreach my $mi (@mergeinputs) {
3397 my $ref = git_get_ref $mi->{Ref};
3398 die "$mi->{Ref} ?" unless length $ref;
3399 $mi->{Commit} = $ref;
3402 $csuite = join ",", @csuites;
3404 my $previous = git_get_ref lrref;
3406 unshift @mergeinputs, {
3407 Commit => $previous,
3408 Info => "local combined tracking branch",
3410 "archive seems to have rewound: local tracking branch is ahead!",
3414 foreach my $ix (0..$#mergeinputs) {
3415 $mergeinputs[$ix]{Index} = $ix;
3418 @mergeinputs = sort {
3419 -version_compare(mergeinfo_version $a,
3420 mergeinfo_version $b) # highest version first
3422 $a->{Index} <=> $b->{Index}; # earliest in spec first
3428 foreach my $mi (@mergeinputs) {
3429 printdebug "multisuite merge check $mi->{Info}\n";
3430 foreach my $previous (@needed) {
3431 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3432 printdebug "multisuite merge un-needed $previous->{Info}\n";
3436 printdebug "multisuite merge this-needed\n";
3437 $mi->{Character} = '+';
3440 $needed[0]{Character} = '*';
3442 my $output = $needed[0]{Commit};
3445 printdebug "multisuite merge nontrivial\n";
3446 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3448 my $commit = "tree $tree\n";
3449 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3450 "Input branches:\n";
3452 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3453 printdebug "multisuite merge include $mi->{Info}\n";
3454 $mi->{Character} //= ' ';
3455 $commit .= "parent $mi->{Commit}\n";
3456 $msg .= sprintf " %s %-25s %s\n",
3458 (mergeinfo_version $mi),
3461 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3463 " * marks the highest version branch, which choose to use\n".
3464 " + marks each branch which was not already an ancestor\n\n".
3465 "[dgit multi-suite $csuite]\n";
3467 "author $authline\n".
3468 "committer $authline\n\n";
3469 $output = make_commit_text $commit.$msg;
3470 printdebug "multisuite merge generated $output\n";
3473 fetch_from_archive_record_1($output);
3474 fetch_from_archive_record_2($output);
3476 progress "calculated combined tracking suite $csuite";
3481 sub clone_set_head () {
3482 open H, "> .git/HEAD" or die $!;
3483 print H "ref: ".lref()."\n" or die $!;
3486 sub clone_finish ($) {
3488 runcmd @git, qw(reset --hard), lrref();
3489 runcmd qw(bash -ec), <<'END';
3491 git ls-tree -r --name-only -z HEAD | \
3492 xargs -0r touch -h -r . --
3494 printdone "ready for work in $dstdir";
3499 badusage "dry run makes no sense with clone" unless act_local();
3501 my $multi_fetched = fork_for_multisuite(sub {
3502 printdebug "multi clone before fetch merge\n";
3505 if ($multi_fetched) {
3506 printdebug "multi clone after fetch merge\n";
3508 clone_finish($dstdir);
3511 printdebug "clone main body\n";
3513 canonicalise_suite();
3514 my $hasgit = check_for_git();
3515 mkdir $dstdir or fail "create \`$dstdir': $!";
3517 runcmd @git, qw(init -q);
3519 my $giturl = access_giturl(1);
3520 if (defined $giturl) {
3521 runcmd @git, qw(remote add), 'origin', $giturl;
3524 progress "fetching existing git history";
3526 runcmd_ordryrun_local @git, qw(fetch origin);
3528 progress "starting new git history";
3530 fetch_from_archive() or no_such_package;
3531 my $vcsgiturl = $dsc->{'Vcs-Git'};
3532 if (length $vcsgiturl) {
3533 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3534 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3537 clone_finish($dstdir);
3541 canonicalise_suite();
3542 if (check_for_git()) {
3545 fetch_from_archive() or no_such_package();
3546 printdone "fetched into ".lrref();
3550 my $multi_fetched = fork_for_multisuite(sub { });
3551 fetch() unless $multi_fetched; # parent
3552 return if $multi_fetched eq '0'; # child
3553 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3555 printdone "fetched to ".lrref()." and merged into HEAD";
3558 sub check_not_dirty () {
3559 foreach my $f (qw(local-options local-patch-header)) {
3560 if (stat_exists "debian/source/$f") {
3561 fail "git tree contains debian/source/$f";
3565 return if $ignoredirty;
3567 my @cmd = (@git, qw(diff --quiet HEAD));
3569 $!=0; $?=-1; system @cmd;
3572 fail "working tree is dirty (does not match HEAD)";
3578 sub commit_admin ($) {
3581 runcmd_ordryrun_local @git, qw(commit -m), $m;
3584 sub commit_quilty_patch () {
3585 my $output = cmdoutput @git, qw(status --porcelain);
3587 foreach my $l (split /\n/, $output) {
3588 next unless $l =~ m/\S/;
3589 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3593 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3595 progress "nothing quilty to commit, ok.";
3598 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3599 runcmd_ordryrun_local @git, qw(add -f), @adds;
3601 Commit Debian 3.0 (quilt) metadata
3603 [dgit ($our_version) quilt-fixup]
3607 sub get_source_format () {
3609 if (open F, "debian/source/options") {
3613 s/\s+$//; # ignore missing final newline
3615 my ($k, $v) = ($`, $'); #');
3616 $v =~ s/^"(.*)"$/$1/;
3622 F->error and die $!;
3625 die $! unless $!==&ENOENT;
3628 if (!open F, "debian/source/format") {
3629 die $! unless $!==&ENOENT;
3633 F->error and die $!;
3635 return ($_, \%options);
3638 sub madformat_wantfixup ($) {
3640 return 0 unless $format eq '3.0 (quilt)';
3641 our $quilt_mode_warned;
3642 if ($quilt_mode eq 'nocheck') {
3643 progress "Not doing any fixup of \`$format' due to".
3644 " ----no-quilt-fixup or --quilt=nocheck"
3645 unless $quilt_mode_warned++;
3648 progress "Format \`$format', need to check/update patch stack"
3649 unless $quilt_mode_warned++;
3653 sub maybe_split_brain_save ($$$) {
3654 my ($headref, $dgitview, $msg) = @_;
3655 # => message fragment "$saved" describing disposition of $dgitview
3656 return "commit id $dgitview" unless defined $split_brain_save;
3657 my @cmd = (shell_cmd "cd ../../../..",
3658 @git, qw(update-ref -m),
3659 "dgit --dgit-view-save $msg HEAD=$headref",
3660 $split_brain_save, $dgitview);
3662 return "and left in $split_brain_save";
3665 # An "infopair" is a tuple [ $thing, $what ]
3666 # (often $thing is a commit hash; $what is a description)
3668 sub infopair_cond_equal ($$) {
3670 $x->[0] eq $y->[0] or fail <<END;
3671 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3675 sub infopair_lrf_tag_lookup ($$) {
3676 my ($tagnames, $what) = @_;
3677 # $tagname may be an array ref
3678 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3679 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3680 foreach my $tagname (@tagnames) {
3681 my $lrefname = lrfetchrefs."/tags/$tagname";
3682 my $tagobj = $lrfetchrefs_f{$lrefname};
3683 next unless defined $tagobj;
3684 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3685 return [ git_rev_parse($tagobj), $what ];
3687 fail @tagnames==1 ? <<END : <<END;
3688 Wanted tag $what (@tagnames) on dgit server, but not found
3690 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3694 sub infopair_cond_ff ($$) {
3695 my ($anc,$desc) = @_;
3696 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3697 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3701 sub pseudomerge_version_check ($$) {
3702 my ($clogp, $archive_hash) = @_;
3704 my $arch_clogp = commit_getclogp $archive_hash;
3705 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3706 'version currently in archive' ];
3707 if (defined $overwrite_version) {
3708 if (length $overwrite_version) {
3709 infopair_cond_equal([ $overwrite_version,
3710 '--overwrite= version' ],
3713 my $v = $i_arch_v->[0];
3714 progress "Checking package changelog for archive version $v ...";
3716 my @xa = ("-f$v", "-t$v");
3717 my $vclogp = parsechangelog @xa;
3718 my $cv = [ (getfield $vclogp, 'Version'),
3719 "Version field from dpkg-parsechangelog @xa" ];
3720 infopair_cond_equal($i_arch_v, $cv);
3723 $@ =~ s/^dgit: //gm;
3725 "Perhaps debian/changelog does not mention $v ?";
3730 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3734 sub pseudomerge_make_commit ($$$$ $$) {
3735 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3736 $msg_cmd, $msg_msg) = @_;
3737 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3739 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3740 my $authline = clogp_authline $clogp;
3744 !defined $overwrite_version ? ""
3745 : !length $overwrite_version ? " --overwrite"
3746 : " --overwrite=".$overwrite_version;
3749 my $pmf = ".git/dgit/pseudomerge";
3750 open MC, ">", $pmf or die "$pmf $!";
3751 print MC <<END or die $!;
3754 parent $archive_hash
3764 return make_commit($pmf);
3767 sub splitbrain_pseudomerge ($$$$) {
3768 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3769 # => $merged_dgitview
3770 printdebug "splitbrain_pseudomerge...\n";
3772 # We: debian/PREVIOUS HEAD($maintview)
3773 # expect: o ----------------- o
3776 # a/d/PREVIOUS $dgitview
3779 # we do: `------------------ o
3783 return $dgitview unless defined $archive_hash;
3785 printdebug "splitbrain_pseudomerge...\n";
3787 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3789 if (!defined $overwrite_version) {
3790 progress "Checking that HEAD inciudes all changes in archive...";
3793 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3795 if (defined $overwrite_version) {
3797 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3798 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3799 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3800 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3801 my $i_archive = [ $archive_hash, "current archive contents" ];
3803 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3805 infopair_cond_equal($i_dgit, $i_archive);
3806 infopair_cond_ff($i_dep14, $i_dgit);
3807 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3811 $us: check failed (maybe --overwrite is needed, consult documentation)
3816 my $r = pseudomerge_make_commit
3817 $clogp, $dgitview, $archive_hash, $i_arch_v,
3818 "dgit --quilt=$quilt_mode",
3819 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3820 Declare fast forward from $i_arch_v->[0]
3822 Make fast forward from $i_arch_v->[0]
3825 maybe_split_brain_save $maintview, $r, "pseudomerge";
3827 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3831 sub plain_overwrite_pseudomerge ($$$) {
3832 my ($clogp, $head, $archive_hash) = @_;
3834 printdebug "plain_overwrite_pseudomerge...";
3836 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3838 return $head if is_fast_fwd $archive_hash, $head;
3840 my $m = "Declare fast forward from $i_arch_v->[0]";
3842 my $r = pseudomerge_make_commit
3843 $clogp, $head, $archive_hash, $i_arch_v,
3846 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3848 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3852 sub push_parse_changelog ($) {
3855 my $clogp = Dpkg::Control::Hash->new();
3856 $clogp->load($clogpfn) or die;
3858 my $clogpackage = getfield $clogp, 'Source';
3859 $package //= $clogpackage;
3860 fail "-p specified $package but changelog specified $clogpackage"
3861 unless $package eq $clogpackage;
3862 my $cversion = getfield $clogp, 'Version';
3864 if (!$we_are_initiator) {
3865 # rpush initiator can't do this because it doesn't have $isuite yet
3866 my $tag = debiantag($cversion, access_nomdistro);
3867 runcmd @git, qw(check-ref-format), $tag;
3870 my $dscfn = dscfn($cversion);
3872 return ($clogp, $cversion, $dscfn);
3875 sub push_parse_dsc ($$$) {
3876 my ($dscfn,$dscfnwhat, $cversion) = @_;
3877 $dsc = parsecontrol($dscfn,$dscfnwhat);
3878 my $dversion = getfield $dsc, 'Version';
3879 my $dscpackage = getfield $dsc, 'Source';
3880 ($dscpackage eq $package && $dversion eq $cversion) or
3881 fail "$dscfn is for $dscpackage $dversion".
3882 " but debian/changelog is for $package $cversion";
3885 sub push_tagwants ($$$$) {
3886 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
3889 TagFn => \&debiantag,
3894 if (defined $maintviewhead) {
3896 TagFn => \&debiantag_maintview,
3897 Objid => $maintviewhead,
3898 TfSuffix => '-maintview',
3901 } elsif ($dodep14tag eq 'no' ? 0
3902 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
3903 : $dodep14tag eq 'always'
3904 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
3905 --dep14tag-always (or equivalent in config) means server must support
3906 both "new" and "maint" tag formats, but config says it doesn't.
3908 : die "$dodep14tag ?") {
3910 TagFn => \&debiantag_maintview,
3912 TfSuffix => '-dgit',
3916 foreach my $tw (@tagwants) {
3917 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
3918 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
3920 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
3924 sub push_mktags ($$ $$ $) {
3926 $changesfile,$changesfilewhat,
3929 die unless $tagwants->[0]{View} eq 'dgit';
3931 my $declaredistro = access_nomdistro();
3932 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
3933 $dsc->{$ourdscfield[0]} = join " ",
3934 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
3936 $dsc->save("$dscfn.tmp") or die $!;
3938 my $changes = parsecontrol($changesfile,$changesfilewhat);
3939 foreach my $field (qw(Source Distribution Version)) {
3940 $changes->{$field} eq $clogp->{$field} or
3941 fail "changes field $field \`$changes->{$field}'".
3942 " does not match changelog \`$clogp->{$field}'";
3945 my $cversion = getfield $clogp, 'Version';
3946 my $clogsuite = getfield $clogp, 'Distribution';
3948 # We make the git tag by hand because (a) that makes it easier
3949 # to control the "tagger" (b) we can do remote signing
3950 my $authline = clogp_authline $clogp;
3951 my $delibs = join(" ", "",@deliberatelies);
3955 my $tfn = $tw->{Tfn};
3956 my $head = $tw->{Objid};
3957 my $tag = $tw->{Tag};
3959 open TO, '>', $tfn->('.tmp') or die $!;
3960 print TO <<END or die $!;
3967 if ($tw->{View} eq 'dgit') {
3968 print TO <<END or die $!;
3969 $package release $cversion for $clogsuite ($csuite) [dgit]
3970 [dgit distro=$declaredistro$delibs]
3972 foreach my $ref (sort keys %previously) {
3973 print TO <<END or die $!;
3974 [dgit previously:$ref=$previously{$ref}]
3977 } elsif ($tw->{View} eq 'maint') {
3978 print TO <<END or die $!;
3979 $package release $cversion for $clogsuite ($csuite)
3980 (maintainer view tag generated by dgit --quilt=$quilt_mode)
3983 die Dumper($tw)."?";
3988 my $tagobjfn = $tfn->('.tmp');
3990 if (!defined $keyid) {
3991 $keyid = access_cfg('keyid','RETURN-UNDEF');
3993 if (!defined $keyid) {
3994 $keyid = getfield $clogp, 'Maintainer';
3996 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
3997 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
3998 push @sign_cmd, qw(-u),$keyid if defined $keyid;
3999 push @sign_cmd, $tfn->('.tmp');
4000 runcmd_ordryrun @sign_cmd;
4002 $tagobjfn = $tfn->('.signed.tmp');
4003 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4004 $tfn->('.tmp'), $tfn->('.tmp.asc');
4010 my @r = map { $mktag->($_); } @$tagwants;
4014 sub sign_changes ($) {
4015 my ($changesfile) = @_;
4017 my @debsign_cmd = @debsign;
4018 push @debsign_cmd, "-k$keyid" if defined $keyid;
4019 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4020 push @debsign_cmd, $changesfile;
4021 runcmd_ordryrun @debsign_cmd;
4026 printdebug "actually entering push\n";
4028 supplementary_message(<<'END');
4029 Push failed, while checking state of the archive.
4030 You can retry the push, after fixing the problem, if you like.
4032 if (check_for_git()) {
4035 my $archive_hash = fetch_from_archive();
4036 if (!$archive_hash) {
4038 fail "package appears to be new in this suite;".
4039 " if this is intentional, use --new";
4042 supplementary_message(<<'END');
4043 Push failed, while preparing your push.
4044 You can retry the push, after fixing the problem, if you like.
4047 need_tagformat 'new', "quilt mode $quilt_mode"
4048 if quiltmode_splitbrain;
4052 access_giturl(); # check that success is vaguely likely
4053 rpush_handle_protovsn_bothends() if $we_are_initiator;
4056 my $clogpfn = ".git/dgit/changelog.822.tmp";
4057 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4059 responder_send_file('parsed-changelog', $clogpfn);
4061 my ($clogp, $cversion, $dscfn) =
4062 push_parse_changelog("$clogpfn");
4064 my $dscpath = "$buildproductsdir/$dscfn";
4065 stat_exists $dscpath or
4066 fail "looked for .dsc $dscpath, but $!;".
4067 " maybe you forgot to build";
4069 responder_send_file('dsc', $dscpath);
4071 push_parse_dsc($dscpath, $dscfn, $cversion);
4073 my $format = getfield $dsc, 'Format';
4074 printdebug "format $format\n";
4076 my $actualhead = git_rev_parse('HEAD');
4077 my $dgithead = $actualhead;
4078 my $maintviewhead = undef;
4080 my $upstreamversion = upstreamversion $clogp->{Version};
4082 if (madformat_wantfixup($format)) {
4083 # user might have not used dgit build, so maybe do this now:
4084 if (quiltmode_splitbrain()) {
4086 quilt_make_fake_dsc($upstreamversion);
4088 ($dgithead, $cachekey) =
4089 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4091 "--quilt=$quilt_mode but no cached dgit view:
4092 perhaps tree changed since dgit build[-source] ?";
4094 $dgithead = splitbrain_pseudomerge($clogp,
4095 $actualhead, $dgithead,
4097 $maintviewhead = $actualhead;
4098 changedir '../../../..';
4099 prep_ud(); # so _only_subdir() works, below
4101 commit_quilty_patch();
4105 if (defined $overwrite_version && !defined $maintviewhead) {
4106 $dgithead = plain_overwrite_pseudomerge($clogp,
4114 if ($archive_hash) {
4115 if (is_fast_fwd($archive_hash, $dgithead)) {
4117 } elsif (deliberately_not_fast_forward) {
4120 fail "dgit push: HEAD is not a descendant".
4121 " of the archive's version.\n".
4122 "To overwrite the archive's contents,".
4123 " pass --overwrite[=VERSION].\n".
4124 "To rewind history, if permitted by the archive,".
4125 " use --deliberately-not-fast-forward.";
4130 progress "checking that $dscfn corresponds to HEAD";
4131 runcmd qw(dpkg-source -x --),
4132 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4133 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4134 check_for_vendor_patches() if madformat($dsc->{format});
4135 changedir '../../../..';
4136 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4137 debugcmd "+",@diffcmd;
4139 my $r = system @diffcmd;
4142 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4144 HEAD specifies a different tree to $dscfn:
4146 Perhaps you forgot to build. Or perhaps there is a problem with your
4147 source tree (see dgit(7) for some hints). To see a full diff, run
4154 if (!$changesfile) {
4155 my $pat = changespat $cversion;
4156 my @cs = glob "$buildproductsdir/$pat";
4157 fail "failed to find unique changes file".
4158 " (looked for $pat in $buildproductsdir);".
4159 " perhaps you need to use dgit -C"
4161 ($changesfile) = @cs;
4163 $changesfile = "$buildproductsdir/$changesfile";
4166 # Check that changes and .dsc agree enough
4167 $changesfile =~ m{[^/]*$};
4168 my $changes = parsecontrol($changesfile,$&);
4169 files_compare_inputs($dsc, $changes)
4170 unless forceing [qw(dsc-changes-mismatch)];
4172 # Perhaps adjust .dsc to contain right set of origs
4173 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4175 unless forceing [qw(changes-origs-exactly)];
4177 # Checks complete, we're going to try and go ahead:
4179 responder_send_file('changes',$changesfile);
4180 responder_send_command("param head $dgithead");
4181 responder_send_command("param csuite $csuite");
4182 responder_send_command("param isuite $isuite");
4183 responder_send_command("param tagformat $tagformat");
4184 if (defined $maintviewhead) {
4185 die unless ($protovsn//4) >= 4;
4186 responder_send_command("param maint-view $maintviewhead");
4189 if (deliberately_not_fast_forward) {
4190 git_for_each_ref(lrfetchrefs, sub {
4191 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4192 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4193 responder_send_command("previously $rrefname=$objid");
4194 $previously{$rrefname} = $objid;
4198 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4202 supplementary_message(<<'END');
4203 Push failed, while signing the tag.
4204 You can retry the push, after fixing the problem, if you like.
4206 # If we manage to sign but fail to record it anywhere, it's fine.
4207 if ($we_are_responder) {
4208 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4209 responder_receive_files('signed-tag', @tagobjfns);
4211 @tagobjfns = push_mktags($clogp,$dscpath,
4212 $changesfile,$changesfile,
4215 supplementary_message(<<'END');
4216 Push failed, *after* signing the tag.
4217 If you want to try again, you should use a new version number.
4220 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4222 foreach my $tw (@tagwants) {
4223 my $tag = $tw->{Tag};
4224 my $tagobjfn = $tw->{TagObjFn};
4226 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4227 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4228 runcmd_ordryrun_local
4229 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4232 supplementary_message(<<'END');
4233 Push failed, while updating the remote git repository - see messages above.
4234 If you want to try again, you should use a new version number.
4236 if (!check_for_git()) {
4237 create_remote_git_repo();
4240 my @pushrefs = $forceflag.$dgithead.":".rrref();
4241 foreach my $tw (@tagwants) {
4242 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4245 runcmd_ordryrun @git,
4246 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4247 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4249 supplementary_message(<<'END');
4250 Push failed, while obtaining signatures on the .changes and .dsc.
4251 If it was just that the signature failed, you may try again by using
4252 debsign by hand to sign the changes
4254 and then dput to complete the upload.
4255 If you need to change the package, you must use a new version number.
4257 if ($we_are_responder) {
4258 my $dryrunsuffix = act_local() ? "" : ".tmp";
4259 responder_receive_files('signed-dsc-changes',
4260 "$dscpath$dryrunsuffix",
4261 "$changesfile$dryrunsuffix");
4264 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4266 progress "[new .dsc left in $dscpath.tmp]";
4268 sign_changes $changesfile;
4271 supplementary_message(<<END);
4272 Push failed, while uploading package(s) to the archive server.
4273 You can retry the upload of exactly these same files with dput of:
4275 If that .changes file is broken, you will need to use a new version
4276 number for your next attempt at the upload.
4278 my $host = access_cfg('upload-host','RETURN-UNDEF');
4279 my @hostarg = defined($host) ? ($host,) : ();
4280 runcmd_ordryrun @dput, @hostarg, $changesfile;
4281 printdone "pushed and uploaded $cversion";
4283 supplementary_message('');
4284 responder_send_command("complete");
4290 badusage "-p is not allowed with clone; specify as argument instead"
4291 if defined $package;
4294 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4295 ($package,$isuite) = @ARGV;
4296 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4297 ($package,$dstdir) = @ARGV;
4298 } elsif (@ARGV==3) {
4299 ($package,$isuite,$dstdir) = @ARGV;
4301 badusage "incorrect arguments to dgit clone";
4305 $dstdir ||= "$package";
4306 if (stat_exists $dstdir) {
4307 fail "$dstdir already exists";
4311 if ($rmonerror && !$dryrun_level) {
4312 $cwd_remove= getcwd();
4314 return unless defined $cwd_remove;
4315 if (!chdir "$cwd_remove") {
4316 return if $!==&ENOENT;
4317 die "chdir $cwd_remove: $!";
4319 printdebug "clone rmonerror removing $dstdir\n";
4321 rmtree($dstdir) or die "remove $dstdir: $!\n";
4322 } elsif (grep { $! == $_ }
4323 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4325 print STDERR "check whether to remove $dstdir: $!\n";
4331 $cwd_remove = undef;
4334 sub branchsuite () {
4335 my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
4336 if ($branch =~ m#$lbranch_re#o) {
4343 sub fetchpullargs () {
4344 if (!defined $package) {
4345 my $sourcep = parsecontrol('debian/control','debian/control');
4346 $package = getfield $sourcep, 'Source';
4349 $isuite = branchsuite();
4351 my $clogp = parsechangelog();
4352 my $clogsuite = getfield $clogp, 'Distribution';
4353 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4355 } elsif (@ARGV==1) {
4358 badusage "incorrect arguments to dgit fetch or dgit pull";
4366 my $multi_fetched = fork_for_multisuite(sub { });
4367 exit 0 if $multi_fetched;
4374 if (quiltmode_splitbrain()) {
4375 my ($format, $fopts) = get_source_format();
4376 madformat($format) and fail <<END
4377 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4385 badusage "-p is not allowed with dgit push" if defined $package;
4387 my $clogp = parsechangelog();
4388 $package = getfield $clogp, 'Source';
4391 } elsif (@ARGV==1) {
4392 ($specsuite) = (@ARGV);
4394 badusage "incorrect arguments to dgit push";
4396 $isuite = getfield $clogp, 'Distribution';
4399 local ($package) = $existing_package; # this is a hack
4400 canonicalise_suite();
4402 canonicalise_suite();
4404 if (defined $specsuite &&
4405 $specsuite ne $isuite &&
4406 $specsuite ne $csuite) {
4407 fail "dgit push: changelog specifies $isuite ($csuite)".
4408 " but command line specifies $specsuite";
4413 #---------- remote commands' implementation ----------
4415 sub cmd_remote_push_build_host {
4416 my ($nrargs) = shift @ARGV;
4417 my (@rargs) = @ARGV[0..$nrargs-1];
4418 @ARGV = @ARGV[$nrargs..$#ARGV];
4420 my ($dir,$vsnwant) = @rargs;
4421 # vsnwant is a comma-separated list; we report which we have
4422 # chosen in our ready response (so other end can tell if they
4425 $we_are_responder = 1;
4426 $us .= " (build host)";
4428 open PI, "<&STDIN" or die $!;
4429 open STDIN, "/dev/null" or die $!;
4430 open PO, ">&STDOUT" or die $!;
4432 open STDOUT, ">&STDERR" or die $!;
4436 ($protovsn) = grep {
4437 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4438 } @rpushprotovsn_support;
4440 fail "build host has dgit rpush protocol versions ".
4441 (join ",", @rpushprotovsn_support).
4442 " but invocation host has $vsnwant"
4443 unless defined $protovsn;
4445 responder_send_command("dgit-remote-push-ready $protovsn");
4450 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4451 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4452 # a good error message)
4454 sub rpush_handle_protovsn_bothends () {
4455 if ($protovsn < 4) {
4456 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4465 my $report = i_child_report();
4466 if (defined $report) {
4467 printdebug "($report)\n";
4468 } elsif ($i_child_pid) {
4469 printdebug "(killing build host child $i_child_pid)\n";
4470 kill 15, $i_child_pid;
4472 if (defined $i_tmp && !defined $initiator_tempdir) {
4474 eval { rmtree $i_tmp; };
4479 return unless forkcheck_mainprocess();
4484 my ($base,$selector,@args) = @_;
4485 $selector =~ s/\-/_/g;
4486 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4492 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4500 push @rargs, join ",", @rpushprotovsn_support;
4503 push @rdgit, @ropts;
4504 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4506 my @cmd = (@ssh, $host, shellquote @rdgit);
4509 $we_are_initiator=1;
4511 if (defined $initiator_tempdir) {
4512 rmtree $initiator_tempdir;
4513 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4514 $i_tmp = $initiator_tempdir;
4518 $i_child_pid = open2(\*RO, \*RI, @cmd);
4520 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4521 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4522 $supplementary_message = '' unless $protovsn >= 3;
4525 my ($icmd,$iargs) = initiator_expect {
4526 m/^(\S+)(?: (.*))?$/;
4529 i_method "i_resp", $icmd, $iargs;
4533 sub i_resp_progress ($) {
4535 my $msg = protocol_read_bytes \*RO, $rhs;
4539 sub i_resp_supplementary_message ($) {
4541 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4544 sub i_resp_complete {
4545 my $pid = $i_child_pid;
4546 $i_child_pid = undef; # prevents killing some other process with same pid
4547 printdebug "waiting for build host child $pid...\n";
4548 my $got = waitpid $pid, 0;
4549 die $! unless $got == $pid;
4550 die "build host child failed $?" if $?;
4553 printdebug "all done\n";
4557 sub i_resp_file ($) {
4559 my $localname = i_method "i_localname", $keyword;
4560 my $localpath = "$i_tmp/$localname";
4561 stat_exists $localpath and
4562 badproto \*RO, "file $keyword ($localpath) twice";
4563 protocol_receive_file \*RO, $localpath;
4564 i_method "i_file", $keyword;
4569 sub i_resp_param ($) {
4570 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4574 sub i_resp_previously ($) {
4575 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4576 or badproto \*RO, "bad previously spec";
4577 my $r = system qw(git check-ref-format), $1;
4578 die "bad previously ref spec ($r)" if $r;
4579 $previously{$1} = $2;
4584 sub i_resp_want ($) {
4586 die "$keyword ?" if $i_wanted{$keyword}++;
4588 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4589 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4590 die unless $isuite =~ m/^$suite_re$/;
4593 rpush_handle_protovsn_bothends();
4595 fail "rpush negotiated protocol version $protovsn".
4596 " which does not support quilt mode $quilt_mode"
4597 if quiltmode_splitbrain;
4599 my @localpaths = i_method "i_want", $keyword;
4600 printdebug "[[ $keyword @localpaths\n";
4601 foreach my $localpath (@localpaths) {
4602 protocol_send_file \*RI, $localpath;
4604 print RI "files-end\n" or die $!;
4607 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn);
4609 sub i_localname_parsed_changelog {
4610 return "remote-changelog.822";
4612 sub i_file_parsed_changelog {
4613 ($i_clogp, $i_version, $i_dscfn) =
4614 push_parse_changelog "$i_tmp/remote-changelog.822";
4615 die if $i_dscfn =~ m#/|^\W#;
4618 sub i_localname_dsc {
4619 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4624 sub i_localname_changes {
4625 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4626 $i_changesfn = $i_dscfn;
4627 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4628 return $i_changesfn;
4630 sub i_file_changes { }
4632 sub i_want_signed_tag {
4633 printdebug Dumper(\%i_param, $i_dscfn);
4634 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4635 && defined $i_param{'csuite'}
4636 or badproto \*RO, "premature desire for signed-tag";
4637 my $head = $i_param{'head'};
4638 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4640 my $maintview = $i_param{'maint-view'};
4641 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4644 if ($protovsn >= 4) {
4645 my $p = $i_param{'tagformat'} // '<undef>';
4647 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4650 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4652 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4654 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4657 push_mktags $i_clogp, $i_dscfn,
4658 $i_changesfn, 'remote changes',
4662 sub i_want_signed_dsc_changes {
4663 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4664 sign_changes $i_changesfn;
4665 return ($i_dscfn, $i_changesfn);
4668 #---------- building etc. ----------
4674 #----- `3.0 (quilt)' handling -----
4676 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4678 sub quiltify_dpkg_commit ($$$;$) {
4679 my ($patchname,$author,$msg, $xinfo) = @_;
4683 my $descfn = ".git/dgit/quilt-description.tmp";
4684 open O, '>', $descfn or die "$descfn: $!";
4685 $msg =~ s/\n+/\n\n/;
4686 print O <<END or die $!;
4688 ${xinfo}Subject: $msg
4695 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4696 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4697 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4698 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4702 sub quiltify_trees_differ ($$;$$$) {
4703 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4704 # returns true iff the two tree objects differ other than in debian/
4705 # with $finegrained,
4706 # returns bitmask 01 - differ in upstream files except .gitignore
4707 # 02 - differ in .gitignore
4708 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4709 # is set for each modified .gitignore filename $fn
4710 # if $unrepres is defined, array ref to which is appeneded
4711 # a list of unrepresentable changes (removals of upstream files
4714 my @cmd = (@git, qw(diff-tree -z));
4715 push @cmd, qw(--name-only) unless $unrepres;
4716 push @cmd, qw(-r) if $finegrained || $unrepres;
4718 my $diffs= cmdoutput @cmd;
4721 foreach my $f (split /\0/, $diffs) {
4722 if ($unrepres && !@lmodes) {
4723 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4726 my ($oldmode,$newmode) = @lmodes;
4729 next if $f =~ m#^debian(?:/.*)?$#s;
4733 die "not a plain file\n"
4734 unless $newmode =~ m/^10\d{4}$/ ||
4735 $oldmode =~ m/^10\d{4}$/;
4736 if ($oldmode =~ m/[^0]/ &&
4737 $newmode =~ m/[^0]/) {
4738 die "mode changed\n" if $oldmode ne $newmode;
4740 die "non-default mode\n"
4741 unless $newmode =~ m/^100644$/ ||
4742 $oldmode =~ m/^100644$/;
4746 local $/="\n"; chomp $@;
4747 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4751 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4752 $r |= $isignore ? 02 : 01;
4753 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4755 printdebug "quiltify_trees_differ $x $y => $r\n";
4759 sub quiltify_tree_sentinelfiles ($) {
4760 # lists the `sentinel' files present in the tree
4762 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4763 qw(-- debian/rules debian/control);
4768 sub quiltify_splitbrain_needed () {
4769 if (!$split_brain) {
4770 progress "dgit view: changes are required...";
4771 runcmd @git, qw(checkout -q -b dgit-view);
4776 sub quiltify_splitbrain ($$$$$$) {
4777 my ($clogp, $unapplied, $headref, $diffbits,
4778 $editedignores, $cachekey) = @_;
4779 if ($quilt_mode !~ m/gbp|dpm/) {
4780 # treat .gitignore just like any other upstream file
4781 $diffbits = { %$diffbits };
4782 $_ = !!$_ foreach values %$diffbits;
4784 # We would like any commits we generate to be reproducible
4785 my @authline = clogp_authline($clogp);
4786 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4787 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4788 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4789 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4790 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4791 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4793 if ($quilt_mode =~ m/gbp|unapplied/ &&
4794 ($diffbits->{O2H} & 01)) {
4796 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4797 " but git tree differs from orig in upstream files.";
4798 if (!stat_exists "debian/patches") {
4800 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4804 if ($quilt_mode =~ m/dpm/ &&
4805 ($diffbits->{H2A} & 01)) {
4807 --quilt=$quilt_mode specified, implying patches-applied git tree
4808 but git tree differs from result of applying debian/patches to upstream
4811 if ($quilt_mode =~ m/gbp|unapplied/ &&
4812 ($diffbits->{O2A} & 01)) { # some patches
4813 quiltify_splitbrain_needed();
4814 progress "dgit view: creating patches-applied version using gbp pq";
4815 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4816 # gbp pq import creates a fresh branch; push back to dgit-view
4817 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4818 runcmd @git, qw(checkout -q dgit-view);
4820 if ($quilt_mode =~ m/gbp|dpm/ &&
4821 ($diffbits->{O2A} & 02)) {
4823 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4824 tool which does not create patches for changes to upstream
4825 .gitignores: but, such patches exist in debian/patches.
4828 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4829 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4830 quiltify_splitbrain_needed();
4831 progress "dgit view: creating patch to represent .gitignore changes";
4832 ensuredir "debian/patches";
4833 my $gipatch = "debian/patches/auto-gitignore";
4834 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4835 stat GIPATCH or die "$gipatch: $!";
4836 fail "$gipatch already exists; but want to create it".
4837 " to record .gitignore changes" if (stat _)[7];
4838 print GIPATCH <<END or die "$gipatch: $!";
4839 Subject: Update .gitignore from Debian packaging branch
4841 The Debian packaging git branch contains these updates to the upstream
4842 .gitignore file(s). This patch is autogenerated, to provide these
4843 updates to users of the official Debian archive view of the package.
4845 [dgit ($our_version) update-gitignore]
4848 close GIPATCH or die "$gipatch: $!";
4849 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
4850 $unapplied, $headref, "--", sort keys %$editedignores;
4851 open SERIES, "+>>", "debian/patches/series" or die $!;
4852 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
4854 defined read SERIES, $newline, 1 or die $!;
4855 print SERIES "\n" or die $! unless $newline eq "\n";
4856 print SERIES "auto-gitignore\n" or die $!;
4857 close SERIES or die $!;
4858 runcmd @git, qw(add -- debian/patches/series), $gipatch;
4860 Commit patch to update .gitignore
4862 [dgit ($our_version) update-gitignore-quilt-fixup]
4866 my $dgitview = git_rev_parse 'HEAD';
4868 changedir '../../../..';
4869 # When we no longer need to support squeeze, use --create-reflog
4871 ensuredir ".git/logs/refs/dgit-intern";
4872 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
4875 my $oldcache = git_get_ref "refs/$splitbraincache";
4876 if ($oldcache eq $dgitview) {
4877 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
4878 # git update-ref doesn't always update, in this case. *sigh*
4879 my $dummy = make_commit_text <<END;
4882 author Dgit <dgit\@example.com> 1000000000 +0000
4883 committer Dgit <dgit\@example.com> 1000000000 +0000
4885 Dummy commit - do not use
4887 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
4888 "refs/$splitbraincache", $dummy;
4890 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
4893 changedir '.git/dgit/unpack/work';
4895 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
4896 progress "dgit view: created ($saved)";
4899 sub quiltify ($$$$) {
4900 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
4902 # Quilt patchification algorithm
4904 # We search backwards through the history of the main tree's HEAD
4905 # (T) looking for a start commit S whose tree object is identical
4906 # to to the patch tip tree (ie the tree corresponding to the
4907 # current dpkg-committed patch series). For these purposes
4908 # `identical' disregards anything in debian/ - this wrinkle is
4909 # necessary because dpkg-source treates debian/ specially.
4911 # We can only traverse edges where at most one of the ancestors'
4912 # trees differs (in changes outside in debian/). And we cannot
4913 # handle edges which change .pc/ or debian/patches. To avoid
4914 # going down a rathole we avoid traversing edges which introduce
4915 # debian/rules or debian/control. And we set a limit on the
4916 # number of edges we are willing to look at.
4918 # If we succeed, we walk forwards again. For each traversed edge
4919 # PC (with P parent, C child) (starting with P=S and ending with
4920 # C=T) to we do this:
4922 # - dpkg-source --commit with a patch name and message derived from C
4923 # After traversing PT, we git commit the changes which
4924 # should be contained within debian/patches.
4926 # The search for the path S..T is breadth-first. We maintain a
4927 # todo list containing search nodes. A search node identifies a
4928 # commit, and looks something like this:
4930 # Commit => $git_commit_id,
4931 # Child => $c, # or undef if P=T
4932 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
4933 # Nontrivial => true iff $p..$c has relevant changes
4940 my %considered; # saves being exponential on some weird graphs
4942 my $t_sentinels = quiltify_tree_sentinelfiles $target;
4945 my ($search,$whynot) = @_;
4946 printdebug " search NOT $search->{Commit} $whynot\n";
4947 $search->{Whynot} = $whynot;
4948 push @nots, $search;
4949 no warnings qw(exiting);
4958 my $c = shift @todo;
4959 next if $considered{$c->{Commit}}++;
4961 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
4963 printdebug "quiltify investigate $c->{Commit}\n";
4966 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
4967 printdebug " search finished hooray!\n";
4972 if ($quilt_mode eq 'nofix') {
4973 fail "quilt fixup required but quilt mode is \`nofix'\n".
4974 "HEAD commit $c->{Commit} differs from tree implied by ".
4975 " debian/patches (tree object $oldtiptree)";
4977 if ($quilt_mode eq 'smash') {
4978 printdebug " search quitting smash\n";
4982 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
4983 $not->($c, "has $c_sentinels not $t_sentinels")
4984 if $c_sentinels ne $t_sentinels;
4986 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
4987 $commitdata =~ m/\n\n/;
4989 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
4990 @parents = map { { Commit => $_, Child => $c } } @parents;
4992 $not->($c, "root commit") if !@parents;
4994 foreach my $p (@parents) {
4995 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
4997 my $ndiffers = grep { $_->{Nontrivial} } @parents;
4998 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5000 foreach my $p (@parents) {
5001 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5003 my @cmd= (@git, qw(diff-tree -r --name-only),
5004 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5005 my $patchstackchange = cmdoutput @cmd;
5006 if (length $patchstackchange) {
5007 $patchstackchange =~ s/\n/,/g;
5008 $not->($p, "changed $patchstackchange");
5011 printdebug " search queue P=$p->{Commit} ",
5012 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5018 printdebug "quiltify want to smash\n";
5021 my $x = $_[0]{Commit};
5022 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5025 my $reportnot = sub {
5027 my $s = $abbrev->($notp);
5028 my $c = $notp->{Child};
5029 $s .= "..".$abbrev->($c) if $c;
5030 $s .= ": ".$notp->{Whynot};
5033 if ($quilt_mode eq 'linear') {
5034 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5035 foreach my $notp (@nots) {
5036 print STDERR "$us: ", $reportnot->($notp), "\n";
5038 print STDERR "$us: $_\n" foreach @$failsuggestion;
5039 fail "quilt fixup naive history linearisation failed.\n".
5040 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5041 } elsif ($quilt_mode eq 'smash') {
5042 } elsif ($quilt_mode eq 'auto') {
5043 progress "quilt fixup cannot be linear, smashing...";
5045 die "$quilt_mode ?";
5048 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5049 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5051 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5053 quiltify_dpkg_commit "auto-$version-$target-$time",
5054 (getfield $clogp, 'Maintainer'),
5055 "Automatically generated patch ($clogp->{Version})\n".
5056 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5060 progress "quiltify linearisation planning successful, executing...";
5062 for (my $p = $sref_S;
5063 my $c = $p->{Child};
5065 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5066 next unless $p->{Nontrivial};
5068 my $cc = $c->{Commit};
5070 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5071 $commitdata =~ m/\n\n/ or die "$c ?";
5074 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5077 my $commitdate = cmdoutput
5078 @git, qw(log -n1 --pretty=format:%aD), $cc;
5080 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5082 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5089 my $gbp_check_suitable = sub {
5094 die "contains unexpected slashes\n" if m{//} || m{/$};
5095 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5096 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5097 die "too long" if length > 200;
5099 return $_ unless $@;
5100 print STDERR "quiltifying commit $cc:".
5101 " ignoring/dropping Gbp-Pq $what: $@";
5105 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5107 (\S+) \s* \n //ixm) {
5108 $patchname = $gbp_check_suitable->($1, 'Name');
5110 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5112 (\S+) \s* \n //ixm) {
5113 $patchdir = $gbp_check_suitable->($1, 'Topic');
5118 if (!defined $patchname) {
5119 $patchname = $title;
5120 $patchname =~ s/[.:]$//;
5123 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5124 my $translitname = $converter->convert($patchname);
5125 die unless defined $translitname;
5126 $patchname = $translitname;
5129 "dgit: patch title transliteration error: $@"
5131 $patchname =~ y/ A-Z/-a-z/;
5132 $patchname =~ y/-a-z0-9_.+=~//cd;
5133 $patchname =~ s/^\W/x-$&/;
5134 $patchname = substr($patchname,0,40);
5136 if (!defined $patchdir) {
5139 if (length $patchdir) {
5140 $patchname = "$patchdir/$patchname";
5142 if ($patchname =~ m{^(.*)/}) {
5143 mkpath "debian/patches/$1";
5148 stat "debian/patches/$patchname$index";
5150 $!==ENOENT or die "$patchname$index $!";
5152 runcmd @git, qw(checkout -q), $cc;
5154 # We use the tip's changelog so that dpkg-source doesn't
5155 # produce complaining messages from dpkg-parsechangelog. None
5156 # of the information dpkg-source gets from the changelog is
5157 # actually relevant - it gets put into the original message
5158 # which dpkg-source provides our stunt editor, and then
5160 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5162 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5163 "Date: $commitdate\n".
5164 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5166 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5169 runcmd @git, qw(checkout -q master);
5172 sub build_maybe_quilt_fixup () {
5173 my ($format,$fopts) = get_source_format;
5174 return unless madformat_wantfixup $format;
5177 check_for_vendor_patches();
5179 if (quiltmode_splitbrain) {
5180 fail <<END unless access_cfg_tagformats_can_splitbrain;
5181 quilt mode $quilt_mode requires split view so server needs to support
5182 both "new" and "maint" tag formats, but config says it doesn't.
5186 my $clogp = parsechangelog();
5187 my $headref = git_rev_parse('HEAD');
5192 my $upstreamversion = upstreamversion $version;
5194 if ($fopts->{'single-debian-patch'}) {
5195 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5197 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5200 die 'bug' if $split_brain && !$need_split_build_invocation;
5202 changedir '../../../..';
5203 runcmd_ordryrun_local
5204 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5207 sub quilt_fixup_mkwork ($) {
5210 mkdir "work" or die $!;
5212 mktree_in_ud_here();
5213 runcmd @git, qw(reset -q --hard), $headref;
5216 sub quilt_fixup_linkorigs ($$) {
5217 my ($upstreamversion, $fn) = @_;
5218 # calls $fn->($leafname);
5220 foreach my $f (<../../../../*>) { #/){
5221 my $b=$f; $b =~ s{.*/}{};
5223 local ($debuglevel) = $debuglevel-1;
5224 printdebug "QF linkorigs $b, $f ?\n";
5226 next unless is_orig_file_of_vsn $b, $upstreamversion;
5227 printdebug "QF linkorigs $b, $f Y\n";
5228 link_ltarget $f, $b or die "$b $!";
5233 sub quilt_fixup_delete_pc () {
5234 runcmd @git, qw(rm -rqf .pc);
5236 Commit removal of .pc (quilt series tracking data)
5238 [dgit ($our_version) upgrade quilt-remove-pc]
5242 sub quilt_fixup_singlepatch ($$$) {
5243 my ($clogp, $headref, $upstreamversion) = @_;
5245 progress "starting quiltify (single-debian-patch)";
5247 # dpkg-source --commit generates new patches even if
5248 # single-debian-patch is in debian/source/options. In order to
5249 # get it to generate debian/patches/debian-changes, it is
5250 # necessary to build the source package.
5252 quilt_fixup_linkorigs($upstreamversion, sub { });
5253 quilt_fixup_mkwork($headref);
5255 rmtree("debian/patches");
5257 runcmd @dpkgsource, qw(-b .);
5259 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5260 rename srcfn("$upstreamversion", "/debian/patches"),
5261 "work/debian/patches";
5264 commit_quilty_patch();
5267 sub quilt_make_fake_dsc ($) {
5268 my ($upstreamversion) = @_;
5270 my $fakeversion="$upstreamversion-~~DGITFAKE";
5272 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5273 print $fakedsc <<END or die $!;
5276 Version: $fakeversion
5280 my $dscaddfile=sub {
5283 my $md = new Digest::MD5;
5285 my $fh = new IO::File $b, '<' or die "$b $!";
5290 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5293 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5295 my @files=qw(debian/source/format debian/rules
5296 debian/control debian/changelog);
5297 foreach my $maybe (qw(debian/patches debian/source/options
5298 debian/tests/control)) {
5299 next unless stat_exists "../../../$maybe";
5300 push @files, $maybe;
5303 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5304 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5306 $dscaddfile->($debtar);
5307 close $fakedsc or die $!;
5310 sub quilt_check_splitbrain_cache ($$) {
5311 my ($headref, $upstreamversion) = @_;
5312 # Called only if we are in (potentially) split brain mode.
5314 # Computes the cache key and looks in the cache.
5315 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5317 my $splitbrain_cachekey;
5320 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5321 # we look in the reflog of dgit-intern/quilt-cache
5322 # we look for an entry whose message is the key for the cache lookup
5323 my @cachekey = (qw(dgit), $our_version);
5324 push @cachekey, $upstreamversion;
5325 push @cachekey, $quilt_mode;
5326 push @cachekey, $headref;
5328 push @cachekey, hashfile('fake.dsc');
5330 my $srcshash = Digest::SHA->new(256);
5331 my %sfs = ( %INC, '$0(dgit)' => $0 );
5332 foreach my $sfk (sort keys %sfs) {
5333 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5334 $srcshash->add($sfk," ");
5335 $srcshash->add(hashfile($sfs{$sfk}));
5336 $srcshash->add("\n");
5338 push @cachekey, $srcshash->hexdigest();
5339 $splitbrain_cachekey = "@cachekey";
5341 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5343 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5344 debugcmd "|(probably)",@cmd;
5345 my $child = open GC, "-|"; defined $child or die $!;
5347 chdir '../../..' or die $!;
5348 if (!stat ".git/logs/refs/$splitbraincache") {
5349 $! == ENOENT or die $!;
5350 printdebug ">(no reflog)\n";
5357 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5358 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5361 quilt_fixup_mkwork($headref);
5362 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5363 if ($cachehit ne $headref) {
5364 progress "dgit view: found cached ($saved)";
5365 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5367 return ($cachehit, $splitbrain_cachekey);
5369 progress "dgit view: found cached, no changes required";
5370 return ($headref, $splitbrain_cachekey);
5372 die $! if GC->error;
5373 failedcmd unless close GC;
5375 printdebug "splitbrain cache miss\n";
5376 return (undef, $splitbrain_cachekey);
5379 sub quilt_fixup_multipatch ($$$) {
5380 my ($clogp, $headref, $upstreamversion) = @_;
5382 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5385 # - honour any existing .pc in case it has any strangeness
5386 # - determine the git commit corresponding to the tip of
5387 # the patch stack (if there is one)
5388 # - if there is such a git commit, convert each subsequent
5389 # git commit into a quilt patch with dpkg-source --commit
5390 # - otherwise convert all the differences in the tree into
5391 # a single git commit
5395 # Our git tree doesn't necessarily contain .pc. (Some versions of
5396 # dgit would include the .pc in the git tree.) If there isn't
5397 # one, we need to generate one by unpacking the patches that we
5400 # We first look for a .pc in the git tree. If there is one, we
5401 # will use it. (This is not the normal case.)
5403 # Otherwise need to regenerate .pc so that dpkg-source --commit
5404 # can work. We do this as follows:
5405 # 1. Collect all relevant .orig from parent directory
5406 # 2. Generate a debian.tar.gz out of
5407 # debian/{patches,rules,source/format,source/options}
5408 # 3. Generate a fake .dsc containing just these fields:
5409 # Format Source Version Files
5410 # 4. Extract the fake .dsc
5411 # Now the fake .dsc has a .pc directory.
5412 # (In fact we do this in every case, because in future we will
5413 # want to search for a good base commit for generating patches.)
5415 # Then we can actually do the dpkg-source --commit
5416 # 1. Make a new working tree with the same object
5417 # store as our main tree and check out the main
5419 # 2. Copy .pc from the fake's extraction, if necessary
5420 # 3. Run dpkg-source --commit
5421 # 4. If the result has changes to debian/, then
5422 # - git add them them
5423 # - git add .pc if we had a .pc in-tree
5425 # 5. If we had a .pc in-tree, delete it, and git commit
5426 # 6. Back in the main tree, fast forward to the new HEAD
5428 # Another situation we may have to cope with is gbp-style
5429 # patches-unapplied trees.
5431 # We would want to detect these, so we know to escape into
5432 # quilt_fixup_gbp. However, this is in general not possible.
5433 # Consider a package with a one patch which the dgit user reverts
5434 # (with git revert or the moral equivalent).
5436 # That is indistinguishable in contents from a patches-unapplied
5437 # tree. And looking at the history to distinguish them is not
5438 # useful because the user might have made a confusing-looking git
5439 # history structure (which ought to produce an error if dgit can't
5440 # cope, not a silent reintroduction of an unwanted patch).
5442 # So gbp users will have to pass an option. But we can usually
5443 # detect their failure to do so: if the tree is not a clean
5444 # patches-applied tree, quilt linearisation fails, but the tree
5445 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5446 # they want --quilt=unapplied.
5448 # To help detect this, when we are extracting the fake dsc, we
5449 # first extract it with --skip-patches, and then apply the patches
5450 # afterwards with dpkg-source --before-build. That lets us save a
5451 # tree object corresponding to .origs.
5453 my $splitbrain_cachekey;
5455 quilt_make_fake_dsc($upstreamversion);
5457 if (quiltmode_splitbrain()) {
5459 ($cachehit, $splitbrain_cachekey) =
5460 quilt_check_splitbrain_cache($headref, $upstreamversion);
5461 return if $cachehit;
5465 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5467 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5468 rename $fakexdir, "fake" or die "$fakexdir $!";
5472 remove_stray_gits("source package");
5473 mktree_in_ud_here();
5477 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5478 my $unapplied=git_add_write_tree();
5479 printdebug "fake orig tree object $unapplied\n";
5483 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5485 if (system @bbcmd) {
5486 failedcmd @bbcmd if $? < 0;
5488 failed to apply your git tree's patch stack (from debian/patches/) to
5489 the corresponding upstream tarball(s). Your source tree and .orig
5490 are probably too inconsistent. dgit can only fix up certain kinds of
5491 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5497 quilt_fixup_mkwork($headref);
5500 if (stat_exists ".pc") {
5502 progress "Tree already contains .pc - will use it then delete it.";
5505 rename '../fake/.pc','.pc' or die $!;
5508 changedir '../fake';
5510 my $oldtiptree=git_add_write_tree();
5511 printdebug "fake o+d/p tree object $unapplied\n";
5512 changedir '../work';
5515 # We calculate some guesswork now about what kind of tree this might
5516 # be. This is mostly for error reporting.
5522 # O = orig, without patches applied
5523 # A = "applied", ie orig with H's debian/patches applied
5524 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5525 \%editedignores, \@unrepres),
5526 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5527 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5531 foreach my $b (qw(01 02)) {
5532 foreach my $v (qw(O2H O2A H2A)) {
5533 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5536 printdebug "differences \@dl @dl.\n";
5539 "$us: base trees orig=%.20s o+d/p=%.20s",
5540 $unapplied, $oldtiptree;
5542 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5543 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5544 $dl[0], $dl[1], $dl[3], $dl[4],
5548 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5550 forceable_fail [qw(unrepresentable)], <<END;
5551 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5556 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5557 push @failsuggestion, "This might be a patches-unapplied branch.";
5558 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5559 push @failsuggestion, "This might be a patches-applied branch.";
5561 push @failsuggestion, "Maybe you need to specify one of".
5562 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5564 if (quiltmode_splitbrain()) {
5565 quiltify_splitbrain($clogp, $unapplied, $headref,
5566 $diffbits, \%editedignores,
5567 $splitbrain_cachekey);
5571 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5572 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5574 if (!open P, '>>', ".pc/applied-patches") {
5575 $!==&ENOENT or die $!;
5580 commit_quilty_patch();
5582 if ($mustdeletepc) {
5583 quilt_fixup_delete_pc();
5587 sub quilt_fixup_editor () {
5588 my $descfn = $ENV{$fakeeditorenv};
5589 my $editing = $ARGV[$#ARGV];
5590 open I1, '<', $descfn or die "$descfn: $!";
5591 open I2, '<', $editing or die "$editing: $!";
5592 unlink $editing or die "$editing: $!";
5593 open O, '>', $editing or die "$editing: $!";
5594 while (<I1>) { print O or die $!; } I1->error and die $!;
5597 $copying ||= m/^\-\-\- /;
5598 next unless $copying;
5601 I2->error and die $!;
5606 sub maybe_apply_patches_dirtily () {
5607 return unless $quilt_mode =~ m/gbp|unapplied/;
5608 print STDERR <<END or die $!;
5610 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5611 dgit: Have to apply the patches - making the tree dirty.
5612 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5615 $patches_applied_dirtily = 01;
5616 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5617 runcmd qw(dpkg-source --before-build .);
5620 sub maybe_unapply_patches_again () {
5621 progress "dgit: Unapplying patches again to tidy up the tree."
5622 if $patches_applied_dirtily;
5623 runcmd qw(dpkg-source --after-build .)
5624 if $patches_applied_dirtily & 01;
5626 if $patches_applied_dirtily & 02;
5627 $patches_applied_dirtily = 0;
5630 #----- other building -----
5632 our $clean_using_builder;
5633 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5634 # clean the tree before building (perhaps invoked indirectly by
5635 # whatever we are using to run the build), rather than separately
5636 # and explicitly by us.
5639 return if $clean_using_builder;
5640 if ($cleanmode eq 'dpkg-source') {
5641 maybe_apply_patches_dirtily();
5642 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5643 } elsif ($cleanmode eq 'dpkg-source-d') {
5644 maybe_apply_patches_dirtily();
5645 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5646 } elsif ($cleanmode eq 'git') {
5647 runcmd_ordryrun_local @git, qw(clean -xdf);
5648 } elsif ($cleanmode eq 'git-ff') {
5649 runcmd_ordryrun_local @git, qw(clean -xdff);
5650 } elsif ($cleanmode eq 'check') {
5651 my $leftovers = cmdoutput @git, qw(clean -xdn);
5652 if (length $leftovers) {
5653 print STDERR $leftovers, "\n" or die $!;
5654 fail "tree contains uncommitted files and --clean=check specified";
5656 } elsif ($cleanmode eq 'none') {
5663 badusage "clean takes no additional arguments" if @ARGV;
5666 maybe_unapply_patches_again();
5669 sub build_prep_early () {
5670 our $build_prep_early_done //= 0;
5671 return if $build_prep_early_done++;
5672 badusage "-p is not allowed when building" if defined $package;
5673 my $clogp = parsechangelog();
5674 $isuite = getfield $clogp, 'Distribution';
5675 $package = getfield $clogp, 'Source';
5676 $version = getfield $clogp, 'Version';
5684 build_maybe_quilt_fixup();
5686 my $pat = changespat $version;
5687 foreach my $f (glob "$buildproductsdir/$pat") {
5689 unlink $f or fail "remove old changes file $f: $!";
5691 progress "would remove $f";
5697 sub changesopts_initial () {
5698 my @opts =@changesopts[1..$#changesopts];
5701 sub changesopts_version () {
5702 if (!defined $changes_since_version) {
5703 my @vsns = archive_query('archive_query');
5704 my @quirk = access_quirk();
5705 if ($quirk[0] eq 'backports') {
5706 local $isuite = $quirk[2];
5708 canonicalise_suite();
5709 push @vsns, archive_query('archive_query');
5712 @vsns = map { $_->[0] } @vsns;
5713 @vsns = sort { -version_compare($a, $b) } @vsns;
5714 $changes_since_version = $vsns[0];
5715 progress "changelog will contain changes since $vsns[0]";
5717 $changes_since_version = '_';
5718 progress "package seems new, not specifying -v<version>";
5721 if ($changes_since_version ne '_') {
5722 return ("-v$changes_since_version");
5728 sub changesopts () {
5729 return (changesopts_initial(), changesopts_version());
5732 sub massage_dbp_args ($;$) {
5733 my ($cmd,$xargs) = @_;
5736 # - if we're going to split the source build out so we can
5737 # do strange things to it, massage the arguments to dpkg-buildpackage
5738 # so that the main build doessn't build source (or add an argument
5739 # to stop it building source by default).
5741 # - add -nc to stop dpkg-source cleaning the source tree,
5742 # unless we're not doing a split build and want dpkg-source
5743 # as cleanmode, in which case we can do nothing
5746 # 0 - source will NOT need to be built separately by caller
5747 # +1 - source will need to be built separately by caller
5748 # +2 - source will need to be built separately by caller AND
5749 # dpkg-buildpackage should not in fact be run at all!
5750 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5751 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5752 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5753 $clean_using_builder = 1;
5756 # -nc has the side effect of specifying -b if nothing else specified
5757 # and some combinations of -S, -b, et al, are errors, rather than
5758 # later simply overriding earlie. So we need to:
5759 # - search the command line for these options
5760 # - pick the last one
5761 # - perhaps add our own as a default
5762 # - perhaps adjust it to the corresponding non-source-building version
5764 foreach my $l ($cmd, $xargs) {
5766 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5769 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5771 if ($need_split_build_invocation) {
5772 printdebug "massage split $dmode.\n";
5773 $r = $dmode =~ m/[S]/ ? +2 :
5774 $dmode =~ y/gGF/ABb/ ? +1 :
5775 $dmode =~ m/[ABb]/ ? 0 :
5778 printdebug "massage done $r $dmode.\n";
5780 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5786 my $wasdir = must_getcwd();
5792 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5793 my ($msg_if_onlyone) = @_;
5794 # If there is only one .changes file, fail with $msg_if_onlyone,
5795 # or if that is undef, be a no-op.
5796 # Returns the changes file to report to the user.
5797 my $pat = changespat $version;
5798 my @changesfiles = glob $pat;
5799 @changesfiles = sort {
5800 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5804 if (@changesfiles==1) {
5805 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5806 only one changes file from build (@changesfiles)
5808 $result = $changesfiles[0];
5809 } elsif (@changesfiles==2) {
5810 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5811 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5812 fail "$l found in binaries changes file $binchanges"
5815 runcmd_ordryrun_local @mergechanges, @changesfiles;
5816 my $multichanges = changespat $version,'multi';
5818 stat_exists $multichanges or fail "$multichanges: $!";
5819 foreach my $cf (glob $pat) {
5820 next if $cf eq $multichanges;
5821 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5824 $result = $multichanges;
5826 fail "wrong number of different changes files (@changesfiles)";
5828 printdone "build successful, results in $result\n" or die $!;
5831 sub midbuild_checkchanges () {
5832 my $pat = changespat $version;
5833 return if $rmchanges;
5834 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5835 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
5837 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
5838 Suggest you delete @unwanted.
5843 sub midbuild_checkchanges_vanilla ($) {
5845 midbuild_checkchanges() if $wantsrc == 1;
5848 sub postbuild_mergechanges_vanilla ($) {
5850 if ($wantsrc == 1) {
5852 postbuild_mergechanges(undef);
5855 printdone "build successful\n";
5861 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
5862 my $wantsrc = massage_dbp_args \@dbp;
5865 midbuild_checkchanges_vanilla $wantsrc;
5870 push @dbp, changesopts_version();
5871 maybe_apply_patches_dirtily();
5872 runcmd_ordryrun_local @dbp;
5874 maybe_unapply_patches_again();
5875 postbuild_mergechanges_vanilla $wantsrc;
5879 $quilt_mode //= 'gbp';
5885 # gbp can make .origs out of thin air. In my tests it does this
5886 # even for a 1.0 format package, with no origs present. So I
5887 # guess it keys off just the version number. We don't know
5888 # exactly what .origs ought to exist, but let's assume that we
5889 # should run gbp if: the version has an upstream part and the main
5891 my $upstreamversion = upstreamversion $version;
5892 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
5893 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
5895 if ($gbp_make_orig) {
5897 $cleanmode = 'none'; # don't do it again
5898 $need_split_build_invocation = 1;
5901 my @dbp = @dpkgbuildpackage;
5903 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
5905 if (!length $gbp_build[0]) {
5906 if (length executable_on_path('git-buildpackage')) {
5907 $gbp_build[0] = qw(git-buildpackage);
5909 $gbp_build[0] = 'gbp buildpackage';
5912 my @cmd = opts_opt_multi_cmd @gbp_build;
5914 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
5916 if ($gbp_make_orig) {
5917 ensuredir '.git/dgit';
5918 my $ok = '.git/dgit/origs-gen-ok';
5919 unlink $ok or $!==&ENOENT or die $!;
5920 my @origs_cmd = @cmd;
5921 push @origs_cmd, qw(--git-cleaner=true);
5922 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
5923 push @origs_cmd, @ARGV;
5925 debugcmd @origs_cmd;
5927 do { local $!; stat_exists $ok; }
5928 or failedcmd @origs_cmd;
5930 dryrun_report @origs_cmd;
5936 midbuild_checkchanges_vanilla $wantsrc;
5938 if (!$clean_using_builder) {
5939 push @cmd, '--git-cleaner=true';
5943 maybe_unapply_patches_again();
5945 push @cmd, changesopts();
5946 runcmd_ordryrun_local @cmd, @ARGV;
5948 postbuild_mergechanges_vanilla $wantsrc;
5950 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
5954 my $our_cleanmode = $cleanmode;
5955 if ($need_split_build_invocation) {
5956 # Pretend that clean is being done some other way. This
5957 # forces us not to try to use dpkg-buildpackage to clean and
5958 # build source all in one go; and instead we run dpkg-source
5959 # (and build_prep() will do the clean since $clean_using_builder
5961 $our_cleanmode = 'ELSEWHERE';
5963 if ($our_cleanmode =~ m/^dpkg-source/) {
5964 # dpkg-source invocation (below) will clean, so build_prep shouldn't
5965 $clean_using_builder = 1;
5968 $sourcechanges = changespat $version,'source';
5970 unlink "../$sourcechanges" or $!==ENOENT
5971 or fail "remove $sourcechanges: $!";
5973 $dscfn = dscfn($version);
5974 if ($our_cleanmode eq 'dpkg-source') {
5975 maybe_apply_patches_dirtily();
5976 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
5978 } elsif ($our_cleanmode eq 'dpkg-source-d') {
5979 maybe_apply_patches_dirtily();
5980 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
5983 my @cmd = (@dpkgsource, qw(-b --));
5986 runcmd_ordryrun_local @cmd, "work";
5987 my @udfiles = <${package}_*>;
5988 changedir "../../..";
5989 foreach my $f (@udfiles) {
5990 printdebug "source copy, found $f\n";
5993 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
5994 $f eq srcfn($version, $&));
5995 printdebug "source copy, found $f - renaming\n";
5996 rename "$ud/$f", "../$f" or $!==ENOENT
5997 or fail "put in place new source file ($f): $!";
6000 my $pwd = must_getcwd();
6001 my $leafdir = basename $pwd;
6003 runcmd_ordryrun_local @cmd, $leafdir;
6006 runcmd_ordryrun_local qw(sh -ec),
6007 'exec >$1; shift; exec "$@"','x',
6008 "../$sourcechanges",
6009 @dpkggenchanges, qw(-S), changesopts();
6013 sub cmd_build_source {
6015 badusage "build-source takes no additional arguments" if @ARGV;
6017 maybe_unapply_patches_again();
6018 printdone "source built, results in $dscfn and $sourcechanges";
6023 midbuild_checkchanges();
6026 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6027 stat_exists $sourcechanges
6028 or fail "$sourcechanges (in parent directory): $!";
6030 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6032 maybe_unapply_patches_again();
6034 postbuild_mergechanges(<<END);
6035 perhaps you need to pass -A ? (sbuild's default is to build only
6036 arch-specific binaries; dgit 1.4 used to override that.)
6041 sub cmd_quilt_fixup {
6042 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6045 build_maybe_quilt_fixup();
6048 sub cmd_import_dsc {
6052 last unless $ARGV[0] =~ m/^-/;
6055 if (m/^--require-valid-signature$/) {
6058 badusage "unknown dgit import-dsc sub-option \`$_'";
6062 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6063 my ($dscfn, $dstbranch) = @ARGV;
6065 badusage "dry run makes no sense with import-dsc" unless act_local();
6067 my $force = $dstbranch =~ s/^\+// ? +1 :
6068 $dstbranch =~ s/^\.\.// ? -1 :
6070 my $info = $force ? " $&" : '';
6071 $info = "$dscfn$info";
6073 my $specbranch = $dstbranch;
6074 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6075 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6077 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6078 my $chead = cmdoutput_errok @symcmd;
6079 defined $chead or $?==256 or failedcmd @symcmd;
6081 fail "$dstbranch is checked out - will not update it"
6082 if defined $chead and $chead eq $dstbranch;
6084 my $oldhash = git_get_ref $dstbranch;
6086 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6087 $dscdata = do { local $/ = undef; <D>; };
6088 D->error and fail "read $dscfn: $!";
6091 # we don't normally need this so import it here
6092 use Dpkg::Source::Package;
6093 my $dp = new Dpkg::Source::Package filename => $dscfn,
6094 require_valid_signature => $needsig;
6096 local $SIG{__WARN__} = sub {
6098 return unless $needsig;
6099 fail "import-dsc signature check failed";
6101 if (!$dp->is_signed()) {
6102 warn "$us: warning: importing unsigned .dsc\n";
6104 my $r = $dp->check_signature();
6105 die "->check_signature => $r" if $needsig && $r;
6111 $package = getfield $dsc, 'Source';
6113 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6114 unless forceing [qw(import-dsc-with-dgit-field)];
6116 if (defined $dsc_hash) {
6117 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6118 resolve_dsc_field_commit undef, undef;
6120 if (defined $dsc_hash) {
6121 my @cmd = (qw(sh -ec),
6122 "echo $dsc_hash | git cat-file --batch-check");
6123 my $objgot = cmdoutput @cmd;
6124 if ($objgot =~ m#^\w+ missing\b#) {
6126 .dsc contains Dgit field referring to object $dsc_hash
6127 Your git tree does not have that object. Try `git fetch' from a
6128 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6131 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6133 progress "Not fast forward, forced update.";
6135 fail "Not fast forward to $dsc_hash";
6138 @cmd = (@git, qw(update-ref -m), "dgit import-dsc (Dgit): $info",
6139 $dstbranch, $dsc_hash);
6141 progress "dgit: import-dsc updated git ref $dstbranch";
6146 Branch $dstbranch already exists
6147 Specify ..$specbranch for a pseudo-merge, binding in existing history
6148 Specify +$specbranch to overwrite, discarding existing history
6150 if $oldhash && !$force;
6154 my @dfi = dsc_files_info();
6155 foreach my $fi (@dfi) {
6156 my $f = $fi->{Filename};
6158 next if lstat $here;
6159 fail "stat $here: $!" unless $! == ENOENT;
6161 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6163 } elsif ($dscfn =~ m#^/#) {
6166 fail "cannot import $dscfn which seems to be inside working tree!";
6168 $there =~ s#/+[^/]+$## or
6169 fail "cannot import $dscfn which seems to not have a basename";
6171 symlink $there, $here or fail "symlink $there to $here: $!";
6172 progress "made symlink $here -> $there";
6173 # print STDERR Dumper($fi);
6175 my @mergeinputs = generate_commits_from_dsc();
6176 die unless @mergeinputs == 1;
6178 my $newhash = $mergeinputs[0]{Commit};
6182 progress "Import, forced update - synthetic orphan git history.";
6183 } elsif ($force < 0) {
6184 progress "Import, merging.";
6185 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6186 my $version = getfield $dsc, 'Version';
6187 my $clogp = commit_getclogp $newhash;
6188 my $authline = clogp_authline $clogp;
6189 $newhash = make_commit_text <<END;
6196 Merge $package ($version) import into $dstbranch
6199 die; # caught earlier
6203 my @cmd = (@git, qw(update-ref -m), "dgit import-dsc: $info",
6204 $dstbranch, $newhash);
6206 progress "dgit: import-dsc results are in in git ref $dstbranch";
6209 sub cmd_archive_api_query {
6210 badusage "need only 1 subpath argument" unless @ARGV==1;
6211 my ($subpath) = @ARGV;
6212 my @cmd = archive_api_query_cmd($subpath);
6215 exec @cmd or fail "exec curl: $!\n";
6218 sub cmd_clone_dgit_repos_server {
6219 badusage "need destination argument" unless @ARGV==1;
6220 my ($destdir) = @ARGV;
6221 $package = '_dgit-repos-server';
6222 local $access_forpush = 0;
6223 my @cmd = (@git, qw(clone), access_giturl(), $destdir);
6225 exec @cmd or fail "exec git clone: $!\n";
6228 sub cmd_print_dgit_repos_server_source_url {
6229 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6231 $package = '_dgit-repos-server';
6232 local $access_forpush = 0;
6233 my $url = access_giturl();
6234 print $url, "\n" or die $!;
6237 sub cmd_setup_mergechangelogs {
6238 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6239 setup_mergechangelogs(1);
6242 sub cmd_setup_useremail {
6243 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6247 sub cmd_setup_new_tree {
6248 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6252 #---------- argument parsing and main program ----------
6255 print "dgit version $our_version\n" or die $!;
6259 our (%valopts_long, %valopts_short);
6262 sub defvalopt ($$$$) {
6263 my ($long,$short,$val_re,$how) = @_;
6264 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6265 $valopts_long{$long} = $oi;
6266 $valopts_short{$short} = $oi;
6267 # $how subref should:
6268 # do whatever assignemnt or thing it likes with $_[0]
6269 # if the option should not be passed on to remote, @rvalopts=()
6270 # or $how can be a scalar ref, meaning simply assign the value
6273 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6274 defvalopt '--distro', '-d', '.+', \$idistro;
6275 defvalopt '', '-k', '.+', \$keyid;
6276 defvalopt '--existing-package','', '.*', \$existing_package;
6277 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6278 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6279 defvalopt '--package', '-p', $package_re, \$package;
6280 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6282 defvalopt '', '-C', '.+', sub {
6283 ($changesfile) = (@_);
6284 if ($changesfile =~ s#^(.*)/##) {
6285 $buildproductsdir = $1;
6289 defvalopt '--initiator-tempdir','','.*', sub {
6290 ($initiator_tempdir) = (@_);
6291 $initiator_tempdir =~ m#^/# or
6292 badusage "--initiator-tempdir must be used specify an".
6293 " absolute, not relative, directory."
6299 if (defined $ENV{'DGIT_SSH'}) {
6300 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6301 } elsif (defined $ENV{'GIT_SSH'}) {
6302 @ssh = ($ENV{'GIT_SSH'});
6310 if (!defined $val) {
6311 badusage "$what needs a value" unless @ARGV;
6313 push @rvalopts, $val;
6315 badusage "bad value \`$val' for $what" unless
6316 $val =~ m/^$oi->{Re}$(?!\n)/s;
6317 my $how = $oi->{How};
6318 if (ref($how) eq 'SCALAR') {
6323 push @ropts, @rvalopts;
6327 last unless $ARGV[0] =~ m/^-/;
6331 if (m/^--dry-run$/) {
6334 } elsif (m/^--damp-run$/) {
6337 } elsif (m/^--no-sign$/) {
6340 } elsif (m/^--help$/) {
6342 } elsif (m/^--version$/) {
6344 } elsif (m/^--new$/) {
6347 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6348 ($om = $opts_opt_map{$1}) &&
6352 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6353 !$opts_opt_cmdonly{$1} &&
6354 ($om = $opts_opt_map{$1})) {
6357 } elsif (m/^--(gbp|dpm)$/s) {
6358 push @ropts, "--quilt=$1";
6360 } elsif (m/^--ignore-dirty$/s) {
6363 } elsif (m/^--no-quilt-fixup$/s) {
6365 $quilt_mode = 'nocheck';
6366 } elsif (m/^--no-rm-on-error$/s) {
6369 } elsif (m/^--no-chase-dsc-distro$/s) {
6371 $chase_dsc_distro = 0;
6372 } elsif (m/^--overwrite$/s) {
6374 $overwrite_version = '';
6375 } elsif (m/^--overwrite=(.+)$/s) {
6377 $overwrite_version = $1;
6378 } elsif (m/^--dep14tag$/s) {
6380 $dodep14tag= 'want';
6381 } elsif (m/^--no-dep14tag$/s) {
6384 } elsif (m/^--always-dep14tag$/s) {
6386 $dodep14tag= 'always';
6387 } elsif (m/^--delayed=(\d+)$/s) {
6390 } elsif (m/^--dgit-view-save=(.+)$/s) {
6392 $split_brain_save = $1;
6393 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6394 } elsif (m/^--(no-)?rm-old-changes$/s) {
6397 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6399 push @deliberatelies, $&;
6400 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6404 } elsif (m/^--force-/) {
6406 "$us: warning: ignoring unknown force option $_\n";
6408 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6409 # undocumented, for testing
6411 $tagformat_want = [ $1, 'command line', 1 ];
6412 # 1 menas overrides distro configuration
6413 } elsif (m/^--always-split-source-build$/s) {
6414 # undocumented, for testing
6416 $need_split_build_invocation = 1;
6417 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6418 # undocumented, for testing
6420 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6421 # ^ it's supposed to be an array ref
6422 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6423 $val = $2 ? $' : undef; #';
6424 $valopt->($oi->{Long});
6426 badusage "unknown long option \`$_'";
6433 } elsif (s/^-L/-/) {
6436 } elsif (s/^-h/-/) {
6438 } elsif (s/^-D/-/) {
6442 } elsif (s/^-N/-/) {
6447 push @changesopts, $_;
6449 } elsif (s/^-wn$//s) {
6451 $cleanmode = 'none';
6452 } elsif (s/^-wg$//s) {
6455 } elsif (s/^-wgf$//s) {
6457 $cleanmode = 'git-ff';
6458 } elsif (s/^-wd$//s) {
6460 $cleanmode = 'dpkg-source';
6461 } elsif (s/^-wdd$//s) {
6463 $cleanmode = 'dpkg-source-d';
6464 } elsif (s/^-wc$//s) {
6466 $cleanmode = 'check';
6467 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6468 push @git, '-c', $&;
6469 $gitcfgs{cmdline}{$1} = [ $2 ];
6470 } elsif (s/^-c([^=]+)$//s) {
6471 push @git, '-c', $&;
6472 $gitcfgs{cmdline}{$1} = [ 'true' ];
6473 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6475 $val = undef unless length $val;
6476 $valopt->($oi->{Short});
6479 badusage "unknown short option \`$_'";
6486 sub check_env_sanity () {
6487 my $blocked = new POSIX::SigSet;
6488 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6491 foreach my $name (qw(PIPE CHLD)) {
6492 my $signame = "SIG$name";
6493 my $signum = eval "POSIX::$signame" // die;
6494 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6495 die "$signame is set to something other than SIG_DFL\n";
6496 $blocked->ismember($signum) and
6497 die "$signame is blocked\n";
6503 On entry to dgit, $@
6504 This is a bug produced by something in in your execution environment.
6510 sub parseopts_late_defaults () {
6511 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6512 if defined $idistro;
6513 $isuite //= cfg('dgit.default.default-suite');
6515 foreach my $k (keys %opts_opt_map) {
6516 my $om = $opts_opt_map{$k};
6518 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6520 badcfg "cannot set command for $k"
6521 unless length $om->[0];
6525 foreach my $c (access_cfg_cfgs("opts-$k")) {
6527 map { $_ ? @$_ : () }
6528 map { $gitcfgs{$_}{$c} }
6529 reverse @gitcfgsources;
6530 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6531 "\n" if $debuglevel >= 4;
6533 badcfg "cannot configure options for $k"
6534 if $opts_opt_cmdonly{$k};
6535 my $insertpos = $opts_cfg_insertpos{$k};
6536 @$om = ( @$om[0..$insertpos-1],
6538 @$om[$insertpos..$#$om] );
6542 if (!defined $rmchanges) {
6543 local $access_forpush;
6544 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6547 if (!defined $quilt_mode) {
6548 local $access_forpush;
6549 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6550 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6552 $quilt_mode =~ m/^($quilt_modes_re)$/
6553 or badcfg "unknown quilt-mode \`$quilt_mode'";
6557 if (!defined $dodep14tag) {
6558 local $access_forpush;
6559 $dodep14tag = access_cfg('dep14tag', 'RETURN-UNDEF') // 'want';
6560 $dodep14tag =~ m/^($dodep14tag_re)$/
6561 or badcfg "unknown dep14tag setting \`$dodep14tag'";
6565 $need_split_build_invocation ||= quiltmode_splitbrain();
6567 if (!defined $cleanmode) {
6568 local $access_forpush;
6569 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6570 $cleanmode //= 'dpkg-source';
6572 badcfg "unknown clean-mode \`$cleanmode'" unless
6573 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6577 if ($ENV{$fakeeditorenv}) {
6579 quilt_fixup_editor();
6586 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6587 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6588 if $dryrun_level == 1;
6590 print STDERR $helpmsg or die $!;
6593 my $cmd = shift @ARGV;
6596 my $pre_fn = ${*::}{"pre_$cmd"};
6597 $pre_fn->() if $pre_fn;
6599 my $fn = ${*::}{"cmd_$cmd"};
6600 $fn or badusage "unknown operation $cmd";