3 # Integration between git and Debian-style archives
5 # Copyright (C)2013-2016 Ian Jackson
7 # This program is free software: you can redistribute it and/or modify
8 # it under the terms of the GNU General Public License as published by
9 # the Free Software Foundation, either version 3 of the License, or
10 # (at your option) any later version.
12 # This program is distributed in the hope that it will be useful,
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 # GNU General Public License for more details.
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
28 use Dpkg::Control::Hash;
30 use File::Temp qw(tempdir);
37 use List::MoreUtils qw(pairwise);
38 use Text::Glob qw(match_glob);
39 use Fcntl qw(:DEFAULT :flock);
44 our $our_version = 'UNRELEASED'; ###substituted###
45 our $absurdity = undef; ###substituted###
47 our @rpushprotovsn_support = qw(4 3 2); # 4 is new tag format
56 our $dryrun_level = 0;
58 our $buildproductsdir = '..';
64 our $existing_package = 'dpkg';
66 our $changes_since_version;
68 our $overwrite_version; # undef: not specified; '': check changelog
70 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
72 our $split_brain_save;
73 our $we_are_responder;
74 our $we_are_initiator;
75 our $initiator_tempdir;
76 our $patches_applied_dirtily = 00;
80 our $chase_dsc_distro=1;
82 our %forceopts = map { $_=>0 }
83 qw(unrepresentable unsupported-source-format
84 dsc-changes-mismatch changes-origs-exactly
85 import-gitapply-absurd
86 import-gitapply-no-absurd
87 import-dsc-with-dgit-field);
89 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
91 our $suite_re = '[-+.0-9a-z]+';
92 our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
93 our $orig_f_comp_re = 'orig(?:-[-0-9a-z]+)?';
94 our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
95 our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
97 our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$';
98 our $splitbraincache = 'dgit-intern/quilt-cache';
99 our $rewritemap = 'dgit-rewrite/map';
101 our (@git) = qw(git);
102 our (@dget) = qw(dget);
103 our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
104 our (@dput) = qw(dput);
105 our (@debsign) = qw(debsign);
106 our (@gpg) = qw(gpg);
107 our (@sbuild) = qw(sbuild);
109 our (@dgit) = qw(dgit);
110 our (@aptget) = qw(apt-get);
111 our (@aptcache) = qw(apt-cache);
112 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
113 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
114 our (@dpkggenchanges) = qw(dpkg-genchanges);
115 our (@mergechanges) = qw(mergechanges -f);
116 our (@gbp_build) = ('');
117 our (@gbp_pq) = ('gbp pq');
118 our (@changesopts) = ('');
120 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
123 'debsign' => \@debsign,
125 'sbuild' => \@sbuild,
129 'apt-get' => \@aptget,
130 'apt-cache' => \@aptcache,
131 'dpkg-source' => \@dpkgsource,
132 'dpkg-buildpackage' => \@dpkgbuildpackage,
133 'dpkg-genchanges' => \@dpkggenchanges,
134 'gbp-build' => \@gbp_build,
135 'gbp-pq' => \@gbp_pq,
136 'ch' => \@changesopts,
137 'mergechanges' => \@mergechanges);
139 our %opts_opt_cmdonly = ('gpg' => 1, 'git' => 1);
140 our %opts_cfg_insertpos = map {
142 scalar @{ $opts_opt_map{$_} }
143 } keys %opts_opt_map;
145 sub parseopts_late_defaults();
146 sub setup_gitattrs(;$);
147 sub check_gitattrs($$);
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 # > param buildinfo-filename P_V_X.buildinfo # zero or more times
320 # > file buildinfo # for buildinfos to sign
322 # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward
323 # # goes into tag, for replay prevention
326 # [indicates that signed tag is wanted]
327 # < data-block NBYTES
328 # < [NBYTES bytes of data (no newline)]
329 # [maybe some more blocks]
333 # > want signed-dsc-changes
334 # < data-block NBYTES [transfer of signed dsc]
336 # < data-block NBYTES [transfer of signed changes]
338 # < data-block NBYTES [transfer of each signed buildinfo
339 # [etc] same number and order as "file buildinfo"]
347 sub i_child_report () {
348 # Sees if our child has died, and reap it if so. Returns a string
349 # describing how it died if it failed, or undef otherwise.
350 return undef unless $i_child_pid;
351 my $got = waitpid $i_child_pid, WNOHANG;
352 return undef if $got <= 0;
353 die unless $got == $i_child_pid;
354 $i_child_pid = undef;
355 return undef unless $?;
356 return "build host child ".waitstatusmsg();
361 fail "connection lost: $!" if $fh->error;
362 fail "protocol violation; $m not expected";
365 sub badproto_badread ($$) {
367 fail "connection lost: $!" if $!;
368 my $report = i_child_report();
369 fail $report if defined $report;
370 badproto $fh, "eof (reading $wh)";
373 sub protocol_expect (&$) {
374 my ($match, $fh) = @_;
377 defined && chomp or badproto_badread $fh, "protocol message";
385 badproto $fh, "\`$_'";
388 sub protocol_send_file ($$) {
389 my ($fh, $ourfn) = @_;
390 open PF, "<", $ourfn or die "$ourfn: $!";
393 my $got = read PF, $d, 65536;
394 die "$ourfn: $!" unless defined $got;
396 print $fh "data-block ".length($d)."\n" or die $!;
397 print $fh $d or die $!;
399 PF->error and die "$ourfn $!";
400 print $fh "data-end\n" or die $!;
404 sub protocol_read_bytes ($$) {
405 my ($fh, $nbytes) = @_;
406 $nbytes =~ m/^[1-9]\d{0,5}$|^0$/ or badproto \*RO, "bad byte count";
408 my $got = read $fh, $d, $nbytes;
409 $got==$nbytes or badproto_badread $fh, "data block";
413 sub protocol_receive_file ($$) {
414 my ($fh, $ourfn) = @_;
415 printdebug "() $ourfn\n";
416 open PF, ">", $ourfn or die "$ourfn: $!";
418 my ($y,$l) = protocol_expect {
419 m/^data-block (.*)$/ ? (1,$1) :
420 m/^data-end$/ ? (0,) :
424 my $d = protocol_read_bytes $fh, $l;
425 print PF $d or die $!;
430 #---------- remote protocol support, responder ----------
432 sub responder_send_command ($) {
434 return unless $we_are_responder;
435 # called even without $we_are_responder
436 printdebug ">> $command\n";
437 print PO $command, "\n" or die $!;
440 sub responder_send_file ($$) {
441 my ($keyword, $ourfn) = @_;
442 return unless $we_are_responder;
443 printdebug "]] $keyword $ourfn\n";
444 responder_send_command "file $keyword";
445 protocol_send_file \*PO, $ourfn;
448 sub responder_receive_files ($@) {
449 my ($keyword, @ourfns) = @_;
450 die unless $we_are_responder;
451 printdebug "[[ $keyword @ourfns\n";
452 responder_send_command "want $keyword";
453 foreach my $fn (@ourfns) {
454 protocol_receive_file \*PI, $fn;
457 protocol_expect { m/^files-end$/ } \*PI;
460 #---------- remote protocol support, initiator ----------
462 sub initiator_expect (&) {
464 protocol_expect { &$match } \*RO;
467 #---------- end remote code ----------
470 if ($we_are_responder) {
472 responder_send_command "progress ".length($m) or die $!;
473 print PO $m or die $!;
483 $ua = LWP::UserAgent->new();
487 progress "downloading $what...";
488 my $r = $ua->get(@_) or die $!;
489 return undef if $r->code == 404;
490 $r->is_success or fail "failed to fetch $what: ".$r->status_line;
491 return $r->decoded_content(charset => 'none');
494 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
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;
567 print $helpmsg or die $!;
571 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
573 our %defcfg = ('dgit.default.distro' => 'debian',
574 'dgit.default.default-suite' => 'unstable',
575 'dgit.default.old-dsc-distro' => 'debian',
576 'dgit-suite.*-security.distro' => 'debian-security',
577 'dgit.default.username' => '',
578 'dgit.default.archive-query-default-component' => 'main',
579 'dgit.default.ssh' => 'ssh',
580 'dgit.default.archive-query' => 'madison:',
581 'dgit.default.sshpsql-dbname' => 'service=projectb',
582 'dgit.default.aptget-components' => 'main',
583 'dgit.default.dgit-tag-format' => 'new,old,maint',
584 'dgit.dsc-url-proto-ok.http' => 'true',
585 'dgit.dsc-url-proto-ok.https' => 'true',
586 'dgit.dsc-url-proto-ok.git' => 'true',
587 'dgit.default.dsc-url-proto-ok' => 'false',
588 # old means "repo server accepts pushes with old dgit tags"
589 # new means "repo server accepts pushes with new dgit tags"
590 # maint means "repo server accepts split brain pushes"
591 # hist means "repo server may have old pushes without new tag"
592 # ("hist" is implied by "old")
593 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
594 'dgit-distro.debian.git-check' => 'url',
595 'dgit-distro.debian.git-check-suffix' => '/info/refs',
596 'dgit-distro.debian.new-private-pushers' => 't',
597 'dgit-distro.debian/push.git-url' => '',
598 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
599 'dgit-distro.debian/push.git-user-force' => 'dgit',
600 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
601 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
602 'dgit-distro.debian/push.git-create' => 'true',
603 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
604 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
605 # 'dgit-distro.debian.archive-query-tls-key',
606 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
607 # ^ this does not work because curl is broken nowadays
608 # Fixing #790093 properly will involve providing providing the key
609 # in some pacagke and maybe updating these paths.
611 # 'dgit-distro.debian.archive-query-tls-curl-args',
612 # '--ca-path=/etc/ssl/ca-debian',
613 # ^ this is a workaround but works (only) on DSA-administered machines
614 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
615 'dgit-distro.debian.git-url-suffix' => '',
616 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
617 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
618 'dgit-distro.debian-security.archive-query' => 'aptget:',
619 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
620 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
621 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
622 'dgit-distro.debian-security.nominal-distro' => 'debian',
623 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
624 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
625 'dgit-distro.ubuntu.git-check' => 'false',
626 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
627 'dgit-distro.test-dummy.ssh' => "$td/ssh",
628 'dgit-distro.test-dummy.username' => "alice",
629 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
630 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
631 'dgit-distro.test-dummy.git-url' => "$td/git",
632 'dgit-distro.test-dummy.git-host' => "git",
633 'dgit-distro.test-dummy.git-path' => "$td/git",
634 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
635 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
636 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
637 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
641 our @gitcfgsources = qw(cmdline local global system);
643 sub git_slurp_config () {
644 local ($debuglevel) = $debuglevel-2;
647 # This algoritm is a bit subtle, but this is needed so that for
648 # options which we want to be single-valued, we allow the
649 # different config sources to override properly. See #835858.
650 foreach my $src (@gitcfgsources) {
651 next if $src eq 'cmdline';
652 # we do this ourselves since git doesn't handle it
654 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
657 open GITS, "-|", @cmd or die $!;
660 printdebug "=> ", (messagequote $_), "\n";
662 push @{ $gitcfgs{$src}{$`} }, $'; #';
666 or ($!==0 && $?==256)
671 sub git_get_config ($) {
673 foreach my $src (@gitcfgsources) {
674 my $l = $gitcfgs{$src}{$c};
675 confess "internal error ($l $c)" if $l && !ref $l;
676 printdebug"C $c ".(defined $l ?
677 join " ", map { messagequote "'$_'" } @$l :
681 @$l==1 or badcfg "multiple values for $c".
682 " (in $src git config)" if @$l > 1;
690 return undef if $c =~ /RETURN-UNDEF/;
691 printdebug "C? $c\n" if $debuglevel >= 5;
692 my $v = git_get_config($c);
693 return $v if defined $v;
694 my $dv = $defcfg{$c};
696 printdebug "CD $c $dv\n" if $debuglevel >= 4;
700 badcfg "need value for one of: @_\n".
701 "$us: distro or suite appears not to be (properly) supported";
704 sub no_local_git_cfg () {
705 # needs to be called from pre_*
706 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
709 sub access_basedistro__noalias () {
710 if (defined $idistro) {
713 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
714 return $def if defined $def;
715 foreach my $src (@gitcfgsources, 'internal') {
716 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
718 foreach my $k (keys %$kl) {
719 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
721 next unless match_glob $dpat, $isuite;
725 return cfg("dgit.default.distro");
729 sub access_basedistro () {
730 my $noalias = access_basedistro__noalias();
731 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
732 return $canon // $noalias;
735 sub access_nomdistro () {
736 my $base = access_basedistro();
737 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
738 $r =~ m/^$distro_re$/ or badcfg
739 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
743 sub access_quirk () {
744 # returns (quirk name, distro to use instead or undef, quirk-specific info)
745 my $basedistro = access_basedistro();
746 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
748 if (defined $backports_quirk) {
749 my $re = $backports_quirk;
750 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
752 $re =~ s/\%/([-0-9a-z_]+)/
753 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
754 if ($isuite =~ m/^$re$/) {
755 return ('backports',"$basedistro-backports",$1);
758 return ('none',undef);
763 sub parse_cfg_bool ($$$) {
764 my ($what,$def,$v) = @_;
767 $v =~ m/^[ty1]/ ? 1 :
768 $v =~ m/^[fn0]/ ? 0 :
769 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
772 sub access_forpush_config () {
773 my $d = access_basedistro();
777 parse_cfg_bool('new-private-pushers', 0,
778 cfg("dgit-distro.$d.new-private-pushers",
781 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
784 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
785 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
786 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
787 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
790 sub access_forpush () {
791 $access_forpush //= access_forpush_config();
792 return $access_forpush;
796 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
797 badcfg "pushing but distro is configured readonly"
798 if access_forpush_config() eq '0';
800 $supplementary_message = <<'END' unless $we_are_responder;
801 Push failed, before we got started.
802 You can retry the push, after fixing the problem, if you like.
804 parseopts_late_defaults();
808 parseopts_late_defaults();
811 sub supplementary_message ($) {
813 if (!$we_are_responder) {
814 $supplementary_message = $msg;
816 } elsif ($protovsn >= 3) {
817 responder_send_command "supplementary-message ".length($msg)
819 print PO $msg or die $!;
823 sub access_distros () {
824 # Returns list of distros to try, in order
827 # 0. `instead of' distro name(s) we have been pointed to
828 # 1. the access_quirk distro, if any
829 # 2a. the user's specified distro, or failing that } basedistro
830 # 2b. the distro calculated from the suite }
831 my @l = access_basedistro();
833 my (undef,$quirkdistro) = access_quirk();
834 unshift @l, $quirkdistro;
835 unshift @l, $instead_distro;
836 @l = grep { defined } @l;
838 push @l, access_nomdistro();
840 if (access_forpush()) {
841 @l = map { ("$_/push", $_) } @l;
846 sub access_cfg_cfgs (@) {
849 # The nesting of these loops determines the search order. We put
850 # the key loop on the outside so that we search all the distros
851 # for each key, before going on to the next key. That means that
852 # if access_cfg is called with a more specific, and then a less
853 # specific, key, an earlier distro can override the less specific
854 # without necessarily overriding any more specific keys. (If the
855 # distro wants to override the more specific keys it can simply do
856 # so; whereas if we did the loop the other way around, it would be
857 # impossible to for an earlier distro to override a less specific
858 # key but not the more specific ones without restating the unknown
859 # values of the more specific keys.
862 # We have to deal with RETURN-UNDEF specially, so that we don't
863 # terminate the search prematurely.
865 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
868 foreach my $d (access_distros()) {
869 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
871 push @cfgs, map { "dgit.default.$_" } @realkeys;
878 my (@cfgs) = access_cfg_cfgs(@keys);
879 my $value = cfg(@cfgs);
883 sub access_cfg_bool ($$) {
884 my ($def, @keys) = @_;
885 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
888 sub string_to_ssh ($) {
890 if ($spec =~ m/\s/) {
891 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
897 sub access_cfg_ssh () {
898 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
899 if (!defined $gitssh) {
902 return string_to_ssh $gitssh;
906 sub access_runeinfo ($) {
908 return ": dgit ".access_basedistro()." $info ;";
911 sub access_someuserhost ($) {
913 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
914 defined($user) && length($user) or
915 $user = access_cfg("$some-user",'username');
916 my $host = access_cfg("$some-host");
917 return length($user) ? "$user\@$host" : $host;
920 sub access_gituserhost () {
921 return access_someuserhost('git');
924 sub access_giturl (;$) {
926 my $url = access_cfg('git-url','RETURN-UNDEF');
929 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
930 return undef unless defined $proto;
933 access_gituserhost().
934 access_cfg('git-path');
936 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
939 return "$url/$package$suffix";
942 sub parsecontrolfh ($$;$) {
943 my ($fh, $desc, $allowsigned) = @_;
944 our $dpkgcontrolhash_noissigned;
947 my %opts = ('name' => $desc);
948 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
949 $c = Dpkg::Control::Hash->new(%opts);
950 $c->parse($fh,$desc) or die "parsing of $desc failed";
951 last if $allowsigned;
952 last if $dpkgcontrolhash_noissigned;
953 my $issigned= $c->get_option('is_pgp_signed');
954 if (!defined $issigned) {
955 $dpkgcontrolhash_noissigned= 1;
956 seek $fh, 0,0 or die "seek $desc: $!";
957 } elsif ($issigned) {
958 fail "control file $desc is (already) PGP-signed. ".
959 " Note that dgit push needs to modify the .dsc and then".
960 " do the signature itself";
969 my ($file, $desc, $allowsigned) = @_;
970 my $fh = new IO::Handle;
971 open $fh, '<', $file or die "$file: $!";
972 my $c = parsecontrolfh($fh,$desc,$allowsigned);
973 $fh->error and die $!;
979 my ($dctrl,$field) = @_;
980 my $v = $dctrl->{$field};
981 return $v if defined $v;
982 fail "missing field $field in ".$dctrl->get_option('name');
986 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
987 my $p = new IO::Handle;
988 my @cmd = (qw(dpkg-parsechangelog), @_);
989 open $p, '-|', @cmd or die $!;
991 $?=0; $!=0; close $p or failedcmd @cmd;
995 sub commit_getclogp ($) {
996 # Returns the parsed changelog hashref for a particular commit
998 our %commit_getclogp_memo;
999 my $memo = $commit_getclogp_memo{$objid};
1000 return $memo if $memo;
1002 my $mclog = ".git/dgit/clog-$objid";
1003 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1004 "$objid:debian/changelog";
1005 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1008 sub must_getcwd () {
1010 defined $d or fail "getcwd failed: $!";
1014 sub parse_dscdata () {
1015 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1016 printdebug Dumper($dscdata) if $debuglevel>1;
1017 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1018 printdebug Dumper($dsc) if $debuglevel>1;
1023 sub archive_query ($;@) {
1024 my ($method) = shift @_;
1025 fail "this operation does not support multiple comma-separated suites"
1027 my $query = access_cfg('archive-query','RETURN-UNDEF');
1028 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1031 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1034 sub archive_query_prepend_mirror {
1035 my $m = access_cfg('mirror');
1036 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1039 sub pool_dsc_subpath ($$) {
1040 my ($vsn,$component) = @_; # $package is implict arg
1041 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1042 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1045 sub cfg_apply_map ($$$) {
1046 my ($varref, $what, $mapspec) = @_;
1047 return unless $mapspec;
1049 printdebug "config $what EVAL{ $mapspec; }\n";
1051 eval "package Dgit::Config; $mapspec;";
1056 #---------- `ftpmasterapi' archive query method (nascent) ----------
1058 sub archive_api_query_cmd ($) {
1060 my @cmd = (@curl, qw(-sS));
1061 my $url = access_cfg('archive-query-url');
1062 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1064 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1065 foreach my $key (split /\:/, $keys) {
1066 $key =~ s/\%HOST\%/$host/g;
1068 fail "for $url: stat $key: $!" unless $!==ENOENT;
1071 fail "config requested specific TLS key but do not know".
1072 " how to get curl to use exactly that EE key ($key)";
1073 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1074 # # Sadly the above line does not work because of changes
1075 # # to gnutls. The real fix for #790093 may involve
1076 # # new curl options.
1079 # Fixing #790093 properly will involve providing a value
1080 # for this on clients.
1081 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1082 push @cmd, split / /, $kargs if defined $kargs;
1084 push @cmd, $url.$subpath;
1088 sub api_query ($$;$) {
1090 my ($data, $subpath, $ok404) = @_;
1091 badcfg "ftpmasterapi archive query method takes no data part"
1093 my @cmd = archive_api_query_cmd($subpath);
1094 my $url = $cmd[$#cmd];
1095 push @cmd, qw(-w %{http_code});
1096 my $json = cmdoutput @cmd;
1097 unless ($json =~ s/\d+\d+\d$//) {
1098 failedcmd_report_cmd undef, @cmd;
1099 fail "curl failed to print 3-digit HTTP code";
1102 return undef if $code eq '404' && $ok404;
1103 fail "fetch of $url gave HTTP code $code"
1104 unless $url =~ m#^file://# or $code =~ m/^2/;
1105 return decode_json($json);
1108 sub canonicalise_suite_ftpmasterapi {
1109 my ($proto,$data) = @_;
1110 my $suites = api_query($data, 'suites');
1112 foreach my $entry (@$suites) {
1114 my $v = $entry->{$_};
1115 defined $v && $v eq $isuite;
1116 } qw(codename name);
1117 push @matched, $entry;
1119 fail "unknown suite $isuite" unless @matched;
1122 @matched==1 or die "multiple matches for suite $isuite\n";
1123 $cn = "$matched[0]{codename}";
1124 defined $cn or die "suite $isuite info has no codename\n";
1125 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1127 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1132 sub archive_query_ftpmasterapi {
1133 my ($proto,$data) = @_;
1134 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1136 my $digester = Digest::SHA->new(256);
1137 foreach my $entry (@$info) {
1139 my $vsn = "$entry->{version}";
1140 my ($ok,$msg) = version_check $vsn;
1141 die "bad version: $msg\n" unless $ok;
1142 my $component = "$entry->{component}";
1143 $component =~ m/^$component_re$/ or die "bad component";
1144 my $filename = "$entry->{filename}";
1145 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1146 or die "bad filename";
1147 my $sha256sum = "$entry->{sha256sum}";
1148 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1149 push @rows, [ $vsn, "/pool/$component/$filename",
1150 $digester, $sha256sum ];
1152 die "bad ftpmaster api response: $@\n".Dumper($entry)
1155 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1156 return archive_query_prepend_mirror @rows;
1159 sub file_in_archive_ftpmasterapi {
1160 my ($proto,$data,$filename) = @_;
1161 my $pat = $filename;
1164 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1165 my $info = api_query($data, "file_in_archive/$pat", 1);
1168 #---------- `aptget' archive query method ----------
1171 our $aptget_releasefile;
1172 our $aptget_configpath;
1174 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1175 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1177 sub aptget_cache_clean {
1178 runcmd_ordryrun_local qw(sh -ec),
1179 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1183 sub aptget_lock_acquire () {
1184 my $lockfile = "$aptget_base/lock";
1185 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1186 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1189 sub aptget_prep ($) {
1191 return if defined $aptget_base;
1193 badcfg "aptget archive query method takes no data part"
1196 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1199 ensuredir "$cache/dgit";
1201 access_cfg('aptget-cachekey','RETURN-UNDEF')
1202 // access_nomdistro();
1204 $aptget_base = "$cache/dgit/aptget";
1205 ensuredir $aptget_base;
1207 my $quoted_base = $aptget_base;
1208 die "$quoted_base contains bad chars, cannot continue"
1209 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1211 ensuredir $aptget_base;
1213 aptget_lock_acquire();
1215 aptget_cache_clean();
1217 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1218 my $sourceslist = "source.list#$cachekey";
1220 my $aptsuites = $isuite;
1221 cfg_apply_map(\$aptsuites, 'suite map',
1222 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1224 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1225 printf SRCS "deb-src %s %s %s\n",
1226 access_cfg('mirror'),
1228 access_cfg('aptget-components')
1231 ensuredir "$aptget_base/cache";
1232 ensuredir "$aptget_base/lists";
1234 open CONF, ">", $aptget_configpath or die $!;
1236 Debug::NoLocking "true";
1237 APT::Get::List-Cleanup "false";
1238 #clear APT::Update::Post-Invoke-Success;
1239 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1240 Dir::State::Lists "$quoted_base/lists";
1241 Dir::Etc::preferences "$quoted_base/preferences";
1242 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1243 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1246 foreach my $key (qw(
1249 Dir::Cache::Archives
1250 Dir::Etc::SourceParts
1251 Dir::Etc::preferencesparts
1253 ensuredir "$aptget_base/$key";
1254 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1257 my $oldatime = (time // die $!) - 1;
1258 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1259 next unless stat_exists $oldlist;
1260 my ($mtime) = (stat _)[9];
1261 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1264 runcmd_ordryrun_local aptget_aptget(), qw(update);
1267 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1268 next unless stat_exists $oldlist;
1269 my ($atime) = (stat _)[8];
1270 next if $atime == $oldatime;
1271 push @releasefiles, $oldlist;
1273 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1274 @releasefiles = @inreleasefiles if @inreleasefiles;
1275 die "apt updated wrong number of Release files (@releasefiles), erk"
1276 unless @releasefiles == 1;
1278 ($aptget_releasefile) = @releasefiles;
1281 sub canonicalise_suite_aptget {
1282 my ($proto,$data) = @_;
1285 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1287 foreach my $name (qw(Codename Suite)) {
1288 my $val = $release->{$name};
1290 printdebug "release file $name: $val\n";
1291 $val =~ m/^$suite_re$/o or fail
1292 "Release file ($aptget_releasefile) specifies intolerable $name";
1293 cfg_apply_map(\$val, 'suite rmap',
1294 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1301 sub archive_query_aptget {
1302 my ($proto,$data) = @_;
1305 ensuredir "$aptget_base/source";
1306 foreach my $old (<$aptget_base/source/*.dsc>) {
1307 unlink $old or die "$old: $!";
1310 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1311 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1312 # avoids apt-get source failing with ambiguous error code
1314 runcmd_ordryrun_local
1315 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1316 aptget_aptget(), qw(--download-only --only-source source), $package;
1318 my @dscs = <$aptget_base/source/*.dsc>;
1319 fail "apt-get source did not produce a .dsc" unless @dscs;
1320 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1322 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1325 my $uri = "file://". uri_escape $dscs[0];
1326 $uri =~ s{\%2f}{/}gi;
1327 return [ (getfield $pre_dsc, 'Version'), $uri ];
1330 sub file_in_archive_aptget () { return undef; }
1332 #---------- `dummyapicat' archive query method ----------
1334 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1335 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1337 sub file_in_archive_dummycatapi ($$$) {
1338 my ($proto,$data,$filename) = @_;
1339 my $mirror = access_cfg('mirror');
1340 $mirror =~ s#^file://#/# or die "$mirror ?";
1342 my @cmd = (qw(sh -ec), '
1344 find -name "$2" -print0 |
1346 ', qw(x), $mirror, $filename);
1347 debugcmd "-|", @cmd;
1348 open FIA, "-|", @cmd or die $!;
1351 printdebug "| $_\n";
1352 m/^(\w+) (\S+)$/ or die "$_ ?";
1353 push @out, { sha256sum => $1, filename => $2 };
1355 close FIA or die failedcmd @cmd;
1359 #---------- `madison' archive query method ----------
1361 sub archive_query_madison {
1362 return archive_query_prepend_mirror
1363 map { [ @$_[0..1] ] } madison_get_parse(@_);
1366 sub madison_get_parse {
1367 my ($proto,$data) = @_;
1368 die unless $proto eq 'madison';
1369 if (!length $data) {
1370 $data= access_cfg('madison-distro','RETURN-UNDEF');
1371 $data //= access_basedistro();
1373 $rmad{$proto,$data,$package} ||= cmdoutput
1374 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1375 my $rmad = $rmad{$proto,$data,$package};
1378 foreach my $l (split /\n/, $rmad) {
1379 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1380 \s*( [^ \t|]+ )\s* \|
1381 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1382 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1383 $1 eq $package or die "$rmad $package ?";
1390 $component = access_cfg('archive-query-default-component');
1392 $5 eq 'source' or die "$rmad ?";
1393 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1395 return sort { -version_compare($a->[0],$b->[0]); } @out;
1398 sub canonicalise_suite_madison {
1399 # madison canonicalises for us
1400 my @r = madison_get_parse(@_);
1402 "unable to canonicalise suite using package $package".
1403 " which does not appear to exist in suite $isuite;".
1404 " --existing-package may help";
1408 sub file_in_archive_madison { return undef; }
1410 #---------- `sshpsql' archive query method ----------
1413 my ($data,$runeinfo,$sql) = @_;
1414 if (!length $data) {
1415 $data= access_someuserhost('sshpsql').':'.
1416 access_cfg('sshpsql-dbname');
1418 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1419 my ($userhost,$dbname) = ($`,$'); #';
1421 my @cmd = (access_cfg_ssh, $userhost,
1422 access_runeinfo("ssh-psql $runeinfo").
1423 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1424 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1426 open P, "-|", @cmd or die $!;
1429 printdebug(">|$_|\n");
1432 $!=0; $?=0; close P or failedcmd @cmd;
1434 my $nrows = pop @rows;
1435 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1436 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1437 @rows = map { [ split /\|/, $_ ] } @rows;
1438 my $ncols = scalar @{ shift @rows };
1439 die if grep { scalar @$_ != $ncols } @rows;
1443 sub sql_injection_check {
1444 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1447 sub archive_query_sshpsql ($$) {
1448 my ($proto,$data) = @_;
1449 sql_injection_check $isuite, $package;
1450 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1451 SELECT source.version, component.name, files.filename, files.sha256sum
1453 JOIN src_associations ON source.id = src_associations.source
1454 JOIN suite ON suite.id = src_associations.suite
1455 JOIN dsc_files ON dsc_files.source = source.id
1456 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1457 JOIN component ON component.id = files_archive_map.component_id
1458 JOIN files ON files.id = dsc_files.file
1459 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1460 AND source.source='$package'
1461 AND files.filename LIKE '%.dsc';
1463 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1464 my $digester = Digest::SHA->new(256);
1466 my ($vsn,$component,$filename,$sha256sum) = @$_;
1467 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1469 return archive_query_prepend_mirror @rows;
1472 sub canonicalise_suite_sshpsql ($$) {
1473 my ($proto,$data) = @_;
1474 sql_injection_check $isuite;
1475 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1476 SELECT suite.codename
1477 FROM suite where suite_name='$isuite' or codename='$isuite';
1479 @rows = map { $_->[0] } @rows;
1480 fail "unknown suite $isuite" unless @rows;
1481 die "ambiguous $isuite: @rows ?" if @rows>1;
1485 sub file_in_archive_sshpsql ($$$) { return undef; }
1487 #---------- `dummycat' archive query method ----------
1489 sub canonicalise_suite_dummycat ($$) {
1490 my ($proto,$data) = @_;
1491 my $dpath = "$data/suite.$isuite";
1492 if (!open C, "<", $dpath) {
1493 $!==ENOENT or die "$dpath: $!";
1494 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1498 chomp or die "$dpath: $!";
1500 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1504 sub archive_query_dummycat ($$) {
1505 my ($proto,$data) = @_;
1506 canonicalise_suite();
1507 my $dpath = "$data/package.$csuite.$package";
1508 if (!open C, "<", $dpath) {
1509 $!==ENOENT or die "$dpath: $!";
1510 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1518 printdebug "dummycat query $csuite $package $dpath | $_\n";
1519 my @row = split /\s+/, $_;
1520 @row==2 or die "$dpath: $_ ?";
1523 C->error and die "$dpath: $!";
1525 return archive_query_prepend_mirror
1526 sort { -version_compare($a->[0],$b->[0]); } @rows;
1529 sub file_in_archive_dummycat () { return undef; }
1531 #---------- tag format handling ----------
1533 sub access_cfg_tagformats () {
1534 split /\,/, access_cfg('dgit-tag-format');
1537 sub access_cfg_tagformats_can_splitbrain () {
1538 my %y = map { $_ => 1 } access_cfg_tagformats;
1539 foreach my $needtf (qw(new maint)) {
1540 next if $y{$needtf};
1546 sub need_tagformat ($$) {
1547 my ($fmt, $why) = @_;
1548 fail "need to use tag format $fmt ($why) but also need".
1549 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1550 " - no way to proceed"
1551 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1552 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1555 sub select_tagformat () {
1557 return if $tagformatfn && !$tagformat_want;
1558 die 'bug' if $tagformatfn && $tagformat_want;
1559 # ... $tagformat_want assigned after previous select_tagformat
1561 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1562 printdebug "select_tagformat supported @supported\n";
1564 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1565 printdebug "select_tagformat specified @$tagformat_want\n";
1567 my ($fmt,$why,$override) = @$tagformat_want;
1569 fail "target distro supports tag formats @supported".
1570 " but have to use $fmt ($why)"
1572 or grep { $_ eq $fmt } @supported;
1574 $tagformat_want = undef;
1576 $tagformatfn = ${*::}{"debiantag_$fmt"};
1578 fail "trying to use unknown tag format \`$fmt' ($why) !"
1579 unless $tagformatfn;
1582 #---------- archive query entrypoints and rest of program ----------
1584 sub canonicalise_suite () {
1585 return if defined $csuite;
1586 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1587 $csuite = archive_query('canonicalise_suite');
1588 if ($isuite ne $csuite) {
1589 progress "canonical suite name for $isuite is $csuite";
1591 progress "canonical suite name is $csuite";
1595 sub get_archive_dsc () {
1596 canonicalise_suite();
1597 my @vsns = archive_query('archive_query');
1598 foreach my $vinfo (@vsns) {
1599 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1600 $dscurl = $vsn_dscurl;
1601 $dscdata = url_get($dscurl);
1603 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1608 $digester->add($dscdata);
1609 my $got = $digester->hexdigest();
1611 fail "$dscurl has hash $got but".
1612 " archive told us to expect $digest";
1615 my $fmt = getfield $dsc, 'Format';
1616 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1617 "unsupported source format $fmt, sorry";
1619 $dsc_checked = !!$digester;
1620 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1624 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1627 sub check_for_git ();
1628 sub check_for_git () {
1630 my $how = access_cfg('git-check');
1631 if ($how eq 'ssh-cmd') {
1633 (access_cfg_ssh, access_gituserhost(),
1634 access_runeinfo("git-check $package").
1635 " set -e; cd ".access_cfg('git-path').";".
1636 " if test -d $package.git; then echo 1; else echo 0; fi");
1637 my $r= cmdoutput @cmd;
1638 if (defined $r and $r =~ m/^divert (\w+)$/) {
1640 my ($usedistro,) = access_distros();
1641 # NB that if we are pushing, $usedistro will be $distro/push
1642 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1643 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1644 progress "diverting to $divert (using config for $instead_distro)";
1645 return check_for_git();
1647 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1649 } elsif ($how eq 'url') {
1650 my $prefix = access_cfg('git-check-url','git-url');
1651 my $suffix = access_cfg('git-check-suffix','git-suffix',
1652 'RETURN-UNDEF') // '.git';
1653 my $url = "$prefix/$package$suffix";
1654 my @cmd = (@curl, qw(-sS -I), $url);
1655 my $result = cmdoutput @cmd;
1656 $result =~ s/^\S+ 200 .*\n\r?\n//;
1657 # curl -sS -I with https_proxy prints
1658 # HTTP/1.0 200 Connection established
1659 $result =~ m/^\S+ (404|200) /s or
1660 fail "unexpected results from git check query - ".
1661 Dumper($prefix, $result);
1663 if ($code eq '404') {
1665 } elsif ($code eq '200') {
1670 } elsif ($how eq 'true') {
1672 } elsif ($how eq 'false') {
1675 badcfg "unknown git-check \`$how'";
1679 sub create_remote_git_repo () {
1680 my $how = access_cfg('git-create');
1681 if ($how eq 'ssh-cmd') {
1683 (access_cfg_ssh, access_gituserhost(),
1684 access_runeinfo("git-create $package").
1685 "set -e; cd ".access_cfg('git-path').";".
1686 " cp -a _template $package.git");
1687 } elsif ($how eq 'true') {
1690 badcfg "unknown git-create \`$how'";
1694 our ($dsc_hash,$lastpush_mergeinput);
1695 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1697 our $ud = '.git/dgit/unpack';
1707 sub mktree_in_ud_here () {
1708 runcmd qw(git init -q);
1709 runcmd qw(git config gc.auto 0);
1710 foreach my $copy (qw(user.email user.name user.useConfigOnly
1711 core.sharedRepository
1712 core.compression core.looseCompression
1713 core.bigFileThreshold core.fsyncObjectFiles)) {
1714 my $v = $gitcfgs{local}{$copy};
1716 runcmd qw(git config), $copy, $_ foreach @$v;
1718 rmtree('.git/objects');
1719 symlink '../../../../objects','.git/objects' or die $!;
1723 sub git_write_tree () {
1724 my $tree = cmdoutput @git, qw(write-tree);
1725 $tree =~ m/^\w+$/ or die "$tree ?";
1729 sub git_add_write_tree () {
1730 runcmd @git, qw(add -Af .);
1731 return git_write_tree();
1734 sub remove_stray_gits ($) {
1736 my @gitscmd = qw(find -name .git -prune -print0);
1737 debugcmd "|",@gitscmd;
1738 open GITS, "-|", @gitscmd or die $!;
1743 print STDERR "$us: warning: removing from $what: ",
1744 (messagequote $_), "\n";
1748 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1751 sub mktree_in_ud_from_only_subdir ($;$) {
1752 my ($what,$raw) = @_;
1754 # changes into the subdir
1756 die "expected one subdir but found @dirs ?" unless @dirs==1;
1757 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1761 remove_stray_gits($what);
1762 mktree_in_ud_here();
1764 my ($format, $fopts) = get_source_format();
1765 if (madformat($format)) {
1770 my $tree=git_add_write_tree();
1771 return ($tree,$dir);
1774 our @files_csum_info_fields =
1775 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1776 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1777 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1779 sub dsc_files_info () {
1780 foreach my $csumi (@files_csum_info_fields) {
1781 my ($fname, $module, $method) = @$csumi;
1782 my $field = $dsc->{$fname};
1783 next unless defined $field;
1784 eval "use $module; 1;" or die $@;
1786 foreach (split /\n/, $field) {
1788 m/^(\w+) (\d+) (\S+)$/ or
1789 fail "could not parse .dsc $fname line \`$_'";
1790 my $digester = eval "$module"."->$method;" or die $@;
1795 Digester => $digester,
1800 fail "missing any supported Checksums-* or Files field in ".
1801 $dsc->get_option('name');
1805 map { $_->{Filename} } dsc_files_info();
1808 sub files_compare_inputs (@) {
1813 my $showinputs = sub {
1814 return join "; ", map { $_->get_option('name') } @$inputs;
1817 foreach my $in (@$inputs) {
1819 my $in_name = $in->get_option('name');
1821 printdebug "files_compare_inputs $in_name\n";
1823 foreach my $csumi (@files_csum_info_fields) {
1824 my ($fname) = @$csumi;
1825 printdebug "files_compare_inputs $in_name $fname\n";
1827 my $field = $in->{$fname};
1828 next unless defined $field;
1831 foreach (split /\n/, $field) {
1834 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1835 fail "could not parse $in_name $fname line \`$_'";
1837 printdebug "files_compare_inputs $in_name $fname $f\n";
1841 my $re = \ $record{$f}{$fname};
1843 $fchecked{$f}{$in_name} = 1;
1845 fail "hash or size of $f varies in $fname fields".
1846 " (between: ".$showinputs->().")";
1851 @files = sort @files;
1852 $expected_files //= \@files;
1853 "@$expected_files" eq "@files" or
1854 fail "file list in $in_name varies between hash fields!";
1857 fail "$in_name has no files list field(s)";
1859 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1862 grep { keys %$_ == @$inputs-1 } values %fchecked
1863 or fail "no file appears in all file lists".
1864 " (looked in: ".$showinputs->().")";
1867 sub is_orig_file_in_dsc ($$) {
1868 my ($f, $dsc_files_info) = @_;
1869 return 0 if @$dsc_files_info <= 1;
1870 # One file means no origs, and the filename doesn't have a "what
1871 # part of dsc" component. (Consider versions ending `.orig'.)
1872 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1876 sub is_orig_file_of_vsn ($$) {
1877 my ($f, $upstreamvsn) = @_;
1878 my $base = srcfn $upstreamvsn, '';
1879 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1883 sub changes_update_origs_from_dsc ($$$$) {
1884 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1886 printdebug "checking origs needed ($upstreamvsn)...\n";
1887 $_ = getfield $changes, 'Files';
1888 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1889 fail "cannot find section/priority from .changes Files field";
1890 my $placementinfo = $1;
1892 printdebug "checking origs needed placement '$placementinfo'...\n";
1893 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1894 $l =~ m/\S+$/ or next;
1896 printdebug "origs $file | $l\n";
1897 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1898 printdebug "origs $file is_orig\n";
1899 my $have = archive_query('file_in_archive', $file);
1900 if (!defined $have) {
1902 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1908 printdebug "origs $file \$#\$have=$#$have\n";
1909 foreach my $h (@$have) {
1912 foreach my $csumi (@files_csum_info_fields) {
1913 my ($fname, $module, $method, $archivefield) = @$csumi;
1914 next unless defined $h->{$archivefield};
1915 $_ = $dsc->{$fname};
1916 next unless defined;
1917 m/^(\w+) .* \Q$file\E$/m or
1918 fail ".dsc $fname missing entry for $file";
1919 if ($h->{$archivefield} eq $1) {
1923 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1926 die "$file ".Dumper($h)." ?!" if $same && @differ;
1929 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1932 printdebug "origs $file f.same=$found_same".
1933 " #f._differ=$#found_differ\n";
1934 if (@found_differ && !$found_same) {
1936 "archive contains $file with different checksum",
1939 # Now we edit the changes file to add or remove it
1940 foreach my $csumi (@files_csum_info_fields) {
1941 my ($fname, $module, $method, $archivefield) = @$csumi;
1942 next unless defined $changes->{$fname};
1944 # in archive, delete from .changes if it's there
1945 $changed{$file} = "removed" if
1946 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1947 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1948 # not in archive, but it's here in the .changes
1950 my $dsc_data = getfield $dsc, $fname;
1951 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1953 $extra =~ s/ \d+ /$&$placementinfo /
1954 or die "$fname $extra >$dsc_data< ?"
1955 if $fname eq 'Files';
1956 $changes->{$fname} .= "\n". $extra;
1957 $changed{$file} = "added";
1962 foreach my $file (keys %changed) {
1964 "edited .changes for archive .orig contents: %s %s",
1965 $changed{$file}, $file;
1967 my $chtmp = "$changesfile.tmp";
1968 $changes->save($chtmp);
1970 rename $chtmp,$changesfile or die "$changesfile $!";
1972 progress "[new .changes left in $changesfile]";
1975 progress "$changesfile already has appropriate .orig(s) (if any)";
1979 sub make_commit ($) {
1981 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1984 sub make_commit_text ($) {
1987 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1989 print Dumper($text) if $debuglevel > 1;
1990 my $child = open2($out, $in, @cmd) or die $!;
1993 print $in $text or die $!;
1994 close $in or die $!;
1996 $h =~ m/^\w+$/ or die;
1998 printdebug "=> $h\n";
2001 waitpid $child, 0 == $child or die "$child $!";
2002 $? and failedcmd @cmd;
2006 sub clogp_authline ($) {
2008 my $author = getfield $clogp, 'Maintainer';
2009 if ($author =~ m/^[^"\@]+\,/) {
2010 # single entry Maintainer field with unquoted comma
2011 $author = ($& =~ y/,//rd).$'; # strip the comma
2013 # git wants a single author; any remaining commas in $author
2014 # are by now preceded by @ (or "). It seems safer to punt on
2015 # "..." for now rather than attempting to dequote or something.
2016 $author =~ s#,.*##ms unless $author =~ m/"/;
2017 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2018 my $authline = "$author $date";
2019 $authline =~ m/$git_authline_re/o or
2020 fail "unexpected commit author line format \`$authline'".
2021 " (was generated from changelog Maintainer field)";
2022 return ($1,$2,$3) if wantarray;
2026 sub vendor_patches_distro ($$) {
2027 my ($checkdistro, $what) = @_;
2028 return unless defined $checkdistro;
2030 my $series = "debian/patches/\L$checkdistro\E.series";
2031 printdebug "checking for vendor-specific $series ($what)\n";
2033 if (!open SERIES, "<", $series) {
2034 die "$series $!" unless $!==ENOENT;
2043 Unfortunately, this source package uses a feature of dpkg-source where
2044 the same source package unpacks to different source code on different
2045 distros. dgit cannot safely operate on such packages on affected
2046 distros, because the meaning of source packages is not stable.
2048 Please ask the distro/maintainer to remove the distro-specific series
2049 files and use a different technique (if necessary, uploading actually
2050 different packages, if different distros are supposed to have
2054 fail "Found active distro-specific series file for".
2055 " $checkdistro ($what): $series, cannot continue";
2057 die "$series $!" if SERIES->error;
2061 sub check_for_vendor_patches () {
2062 # This dpkg-source feature doesn't seem to be documented anywhere!
2063 # But it can be found in the changelog (reformatted):
2065 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2066 # Author: Raphael Hertzog <hertzog@debian.org>
2067 # Date: Sun Oct 3 09:36:48 2010 +0200
2069 # dpkg-source: correctly create .pc/.quilt_series with alternate
2072 # If you have debian/patches/ubuntu.series and you were
2073 # unpacking the source package on ubuntu, quilt was still
2074 # directed to debian/patches/series instead of
2075 # debian/patches/ubuntu.series.
2077 # debian/changelog | 3 +++
2078 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2079 # 2 files changed, 6 insertions(+), 1 deletion(-)
2082 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2083 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2084 "Dpkg::Vendor \`current vendor'");
2085 vendor_patches_distro(access_basedistro(),
2086 "(base) distro being accessed");
2087 vendor_patches_distro(access_nomdistro(),
2088 "(nominal) distro being accessed");
2091 sub generate_commits_from_dsc () {
2092 # See big comment in fetch_from_archive, below.
2093 # See also README.dsc-import.
2097 my @dfi = dsc_files_info();
2098 foreach my $fi (@dfi) {
2099 my $f = $fi->{Filename};
2100 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2101 my $upper_f = "../../../../$f";
2103 printdebug "considering reusing $f: ";
2105 if (link_ltarget "$upper_f,fetch", $f) {
2106 printdebug "linked (using ...,fetch).\n";
2107 } elsif ((printdebug "($!) "),
2109 fail "accessing ../$f,fetch: $!";
2110 } elsif (link_ltarget $upper_f, $f) {
2111 printdebug "linked.\n";
2112 } elsif ((printdebug "($!) "),
2114 fail "accessing ../$f: $!";
2116 printdebug "absent.\n";
2120 complete_file_from_dsc('.', $fi, \$refetched)
2123 printdebug "considering saving $f: ";
2125 if (link $f, $upper_f) {
2126 printdebug "linked.\n";
2127 } elsif ((printdebug "($!) "),
2129 fail "saving ../$f: $!";
2130 } elsif (!$refetched) {
2131 printdebug "no need.\n";
2132 } elsif (link $f, "$upper_f,fetch") {
2133 printdebug "linked (using ...,fetch).\n";
2134 } elsif ((printdebug "($!) "),
2136 fail "saving ../$f,fetch: $!";
2138 printdebug "cannot.\n";
2142 # We unpack and record the orig tarballs first, so that we only
2143 # need disk space for one private copy of the unpacked source.
2144 # But we can't make them into commits until we have the metadata
2145 # from the debian/changelog, so we record the tree objects now and
2146 # make them into commits later.
2148 my $upstreamv = upstreamversion $dsc->{version};
2149 my $orig_f_base = srcfn $upstreamv, '';
2151 foreach my $fi (@dfi) {
2152 # We actually import, and record as a commit, every tarball
2153 # (unless there is only one file, in which case there seems
2156 my $f = $fi->{Filename};
2157 printdebug "import considering $f ";
2158 (printdebug "only one dfi\n"), next if @dfi == 1;
2159 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2160 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2164 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2166 printdebug "Y ", (join ' ', map { $_//"(none)" }
2167 $compr_ext, $orig_f_part
2170 my $input = new IO::File $f, '<' or die "$f $!";
2174 if (defined $compr_ext) {
2176 Dpkg::Compression::compression_guess_from_filename $f;
2177 fail "Dpkg::Compression cannot handle file $f in source package"
2178 if defined $compr_ext && !defined $cname;
2180 new Dpkg::Compression::Process compression => $cname;
2181 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2182 my $compr_fh = new IO::Handle;
2183 my $compr_pid = open $compr_fh, "-|" // die $!;
2185 open STDIN, "<&", $input or die $!;
2187 die "dgit (child): exec $compr_cmd[0]: $!\n";
2192 rmtree "_unpack-tar";
2193 mkdir "_unpack-tar" or die $!;
2194 my @tarcmd = qw(tar -x -f -
2195 --no-same-owner --no-same-permissions
2196 --no-acls --no-xattrs --no-selinux);
2197 my $tar_pid = fork // die $!;
2199 chdir "_unpack-tar" or die $!;
2200 open STDIN, "<&", $input or die $!;
2202 die "dgit (child): exec $tarcmd[0]: $!";
2204 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2205 !$? or failedcmd @tarcmd;
2208 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2210 # finally, we have the results in "tarball", but maybe
2211 # with the wrong permissions
2213 runcmd qw(chmod -R +rwX _unpack-tar);
2214 changedir "_unpack-tar";
2215 remove_stray_gits($f);
2216 mktree_in_ud_here();
2218 my ($tree) = git_add_write_tree();
2219 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2220 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2222 printdebug "one subtree $1\n";
2224 printdebug "multiple subtrees\n";
2227 rmtree "_unpack-tar";
2229 my $ent = [ $f, $tree ];
2231 Orig => !!$orig_f_part,
2232 Sort => (!$orig_f_part ? 2 :
2233 $orig_f_part =~ m/-/g ? 1 :
2241 # put any without "_" first (spec is not clear whether files
2242 # are always in the usual order). Tarballs without "_" are
2243 # the main orig or the debian tarball.
2244 $a->{Sort} <=> $b->{Sort} or
2248 my $any_orig = grep { $_->{Orig} } @tartrees;
2250 my $dscfn = "$package.dsc";
2252 my $treeimporthow = 'package';
2254 open D, ">", $dscfn or die "$dscfn: $!";
2255 print D $dscdata or die "$dscfn: $!";
2256 close D or die "$dscfn: $!";
2257 my @cmd = qw(dpkg-source);
2258 push @cmd, '--no-check' if $dsc_checked;
2259 if (madformat $dsc->{format}) {
2260 push @cmd, '--skip-patches';
2261 $treeimporthow = 'unpatched';
2263 push @cmd, qw(-x --), $dscfn;
2266 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2267 if (madformat $dsc->{format}) {
2268 check_for_vendor_patches();
2272 if (madformat $dsc->{format}) {
2273 my @pcmd = qw(dpkg-source --before-build .);
2274 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2276 $dappliedtree = git_add_write_tree();
2279 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2280 debugcmd "|",@clogcmd;
2281 open CLOGS, "-|", @clogcmd or die $!;
2286 printdebug "import clog search...\n";
2289 my $stanzatext = do { local $/=""; <CLOGS>; };
2290 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2291 last if !defined $stanzatext;
2293 my $desc = "package changelog, entry no.$.";
2294 open my $stanzafh, "<", \$stanzatext or die;
2295 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2296 $clogp //= $thisstanza;
2298 printdebug "import clog $thisstanza->{version} $desc...\n";
2300 last if !$any_orig; # we don't need $r1clogp
2302 # We look for the first (most recent) changelog entry whose
2303 # version number is lower than the upstream version of this
2304 # package. Then the last (least recent) previous changelog
2305 # entry is treated as the one which introduced this upstream
2306 # version and used for the synthetic commits for the upstream
2309 # One might think that a more sophisticated algorithm would be
2310 # necessary. But: we do not want to scan the whole changelog
2311 # file. Stopping when we see an earlier version, which
2312 # necessarily then is an earlier upstream version, is the only
2313 # realistic way to do that. Then, either the earliest
2314 # changelog entry we have seen so far is indeed the earliest
2315 # upload of this upstream version; or there are only changelog
2316 # entries relating to later upstream versions (which is not
2317 # possible unless the changelog and .dsc disagree about the
2318 # version). Then it remains to choose between the physically
2319 # last entry in the file, and the one with the lowest version
2320 # number. If these are not the same, we guess that the
2321 # versions were created in a non-monotic order rather than
2322 # that the changelog entries have been misordered.
2324 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2326 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2327 $r1clogp = $thisstanza;
2329 printdebug "import clog $r1clogp->{version} becomes r1\n";
2331 die $! if CLOGS->error;
2332 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2334 $clogp or fail "package changelog has no entries!";
2336 my $authline = clogp_authline $clogp;
2337 my $changes = getfield $clogp, 'Changes';
2338 $changes =~ s/^\n//; # Changes: \n
2339 my $cversion = getfield $clogp, 'Version';
2342 $r1clogp //= $clogp; # maybe there's only one entry;
2343 my $r1authline = clogp_authline $r1clogp;
2344 # Strictly, r1authline might now be wrong if it's going to be
2345 # unused because !$any_orig. Whatever.
2347 printdebug "import tartrees authline $authline\n";
2348 printdebug "import tartrees r1authline $r1authline\n";
2350 foreach my $tt (@tartrees) {
2351 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2353 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2356 committer $r1authline
2360 [dgit import orig $tt->{F}]
2368 [dgit import tarball $package $cversion $tt->{F}]
2373 printdebug "import main commit\n";
2375 open C, ">../commit.tmp" or die $!;
2376 print C <<END or die $!;
2379 print C <<END or die $! foreach @tartrees;
2382 print C <<END or die $!;
2388 [dgit import $treeimporthow $package $cversion]
2392 my $rawimport_hash = make_commit qw(../commit.tmp);
2394 if (madformat $dsc->{format}) {
2395 printdebug "import apply patches...\n";
2397 # regularise the state of the working tree so that
2398 # the checkout of $rawimport_hash works nicely.
2399 my $dappliedcommit = make_commit_text(<<END);
2406 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2408 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2410 # We need the answers to be reproducible
2411 my @authline = clogp_authline($clogp);
2412 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2413 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2414 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2415 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2416 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2417 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2419 my $path = $ENV{PATH} or die;
2421 foreach my $use_absurd (qw(0 1)) {
2422 runcmd @git, qw(checkout -q unpa);
2423 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2424 local $ENV{PATH} = $path;
2427 progress "warning: $@";
2428 $path = "$absurdity:$path";
2429 progress "$us: trying slow absurd-git-apply...";
2430 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2435 die "forbid absurd git-apply\n" if $use_absurd
2436 && forceing [qw(import-gitapply-no-absurd)];
2437 die "only absurd git-apply!\n" if !$use_absurd
2438 && forceing [qw(import-gitapply-absurd)];
2440 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2441 local $ENV{PATH} = $path if $use_absurd;
2443 my @showcmd = (gbp_pq, qw(import));
2444 my @realcmd = shell_cmd
2445 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2446 debugcmd "+",@realcmd;
2447 if (system @realcmd) {
2448 die +(shellquote @showcmd).
2450 failedcmd_waitstatus()."\n";
2453 my $gapplied = git_rev_parse('HEAD');
2454 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2455 $gappliedtree eq $dappliedtree or
2457 gbp-pq import and dpkg-source disagree!
2458 gbp-pq import gave commit $gapplied
2459 gbp-pq import gave tree $gappliedtree
2460 dpkg-source --before-build gave tree $dappliedtree
2462 $rawimport_hash = $gapplied;
2467 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2472 progress "synthesised git commit from .dsc $cversion";
2474 my $rawimport_mergeinput = {
2475 Commit => $rawimport_hash,
2476 Info => "Import of source package",
2478 my @output = ($rawimport_mergeinput);
2480 if ($lastpush_mergeinput) {
2481 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2482 my $oversion = getfield $oldclogp, 'Version';
2484 version_compare($oversion, $cversion);
2486 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2487 { Message => <<END, ReverseParents => 1 });
2488 Record $package ($cversion) in archive suite $csuite
2490 } elsif ($vcmp > 0) {
2491 print STDERR <<END or die $!;
2493 Version actually in archive: $cversion (older)
2494 Last version pushed with dgit: $oversion (newer or same)
2497 @output = $lastpush_mergeinput;
2499 # Same version. Use what's in the server git branch,
2500 # discarding our own import. (This could happen if the
2501 # server automatically imports all packages into git.)
2502 @output = $lastpush_mergeinput;
2505 changedir '../../../..';
2510 sub complete_file_from_dsc ($$;$) {
2511 our ($dstdir, $fi, $refetched) = @_;
2512 # Ensures that we have, in $dstdir, the file $fi, with the correct
2513 # contents. (Downloading it from alongside $dscurl if necessary.)
2514 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2515 # and will set $$refetched=1 if it did so (or tried to).
2517 my $f = $fi->{Filename};
2518 my $tf = "$dstdir/$f";
2522 my $checkhash = sub {
2523 open F, "<", "$tf" or die "$tf: $!";
2524 $fi->{Digester}->reset();
2525 $fi->{Digester}->addfile(*F);
2526 F->error and die $!;
2527 $got = $fi->{Digester}->hexdigest();
2528 return $got eq $fi->{Hash};
2531 if (stat_exists $tf) {
2532 if ($checkhash->()) {
2533 progress "using existing $f";
2537 fail "file $f has hash $got but .dsc".
2538 " demands hash $fi->{Hash} ".
2539 "(perhaps you should delete this file?)";
2541 progress "need to fetch correct version of $f";
2542 unlink $tf or die "$tf $!";
2545 printdebug "$tf does not exist, need to fetch\n";
2549 $furl =~ s{/[^/]+$}{};
2551 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2552 die "$f ?" if $f =~ m#/#;
2553 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2554 return 0 if !act_local();
2557 fail "file $f has hash $got but .dsc".
2558 " demands hash $fi->{Hash} ".
2559 "(got wrong file from archive!)";
2564 sub ensure_we_have_orig () {
2565 my @dfi = dsc_files_info();
2566 foreach my $fi (@dfi) {
2567 my $f = $fi->{Filename};
2568 next unless is_orig_file_in_dsc($f, \@dfi);
2569 complete_file_from_dsc('..', $fi)
2574 #---------- git fetch ----------
2576 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2577 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2579 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2580 # locally fetched refs because they have unhelpful names and clutter
2581 # up gitk etc. So we track whether we have "used up" head ref (ie,
2582 # whether we have made another local ref which refers to this object).
2584 # (If we deleted them unconditionally, then we might end up
2585 # re-fetching the same git objects each time dgit fetch was run.)
2587 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2588 # in git_fetch_us to fetch the refs in question, and possibly a call
2589 # to lrfetchref_used.
2591 our (%lrfetchrefs_f, %lrfetchrefs_d);
2592 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2594 sub lrfetchref_used ($) {
2595 my ($fullrefname) = @_;
2596 my $objid = $lrfetchrefs_f{$fullrefname};
2597 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2600 sub git_lrfetch_sane {
2601 my ($url, $supplementary, @specs) = @_;
2602 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2603 # at least as regards @specs. Also leave the results in
2604 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2605 # able to clean these up.
2607 # With $supplementary==1, @specs must not contain wildcards
2608 # and we add to our previous fetches (non-atomically).
2610 # This is rather miserable:
2611 # When git fetch --prune is passed a fetchspec ending with a *,
2612 # it does a plausible thing. If there is no * then:
2613 # - it matches subpaths too, even if the supplied refspec
2614 # starts refs, and behaves completely madly if the source
2615 # has refs/refs/something. (See, for example, Debian #NNNN.)
2616 # - if there is no matching remote ref, it bombs out the whole
2618 # We want to fetch a fixed ref, and we don't know in advance
2619 # if it exists, so this is not suitable.
2621 # Our workaround is to use git ls-remote. git ls-remote has its
2622 # own qairks. Notably, it has the absurd multi-tail-matching
2623 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2624 # refs/refs/foo etc.
2626 # Also, we want an idempotent snapshot, but we have to make two
2627 # calls to the remote: one to git ls-remote and to git fetch. The
2628 # solution is use git ls-remote to obtain a target state, and
2629 # git fetch to try to generate it. If we don't manage to generate
2630 # the target state, we try again.
2632 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2634 my $specre = join '|', map {
2637 my $wildcard = $x =~ s/\\\*$/.*/;
2638 die if $wildcard && $supplementary;
2641 printdebug "git_lrfetch_sane specre=$specre\n";
2642 my $wanted_rref = sub {
2644 return m/^(?:$specre)$/;
2647 my $fetch_iteration = 0;
2650 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2651 if (++$fetch_iteration > 10) {
2652 fail "too many iterations trying to get sane fetch!";
2655 my @look = map { "refs/$_" } @specs;
2656 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2660 open GITLS, "-|", @lcmd or die $!;
2662 printdebug "=> ", $_;
2663 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2664 my ($objid,$rrefname) = ($1,$2);
2665 if (!$wanted_rref->($rrefname)) {
2667 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2671 $wantr{$rrefname} = $objid;
2674 close GITLS or failedcmd @lcmd;
2676 # OK, now %want is exactly what we want for refs in @specs
2678 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2679 "+refs/$_:".lrfetchrefs."/$_";
2682 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2684 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2685 runcmd_ordryrun_local @fcmd if @fspecs;
2687 if (!$supplementary) {
2688 %lrfetchrefs_f = ();
2692 git_for_each_ref(lrfetchrefs, sub {
2693 my ($objid,$objtype,$lrefname,$reftail) = @_;
2694 $lrfetchrefs_f{$lrefname} = $objid;
2695 $objgot{$objid} = 1;
2698 if ($supplementary) {
2702 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2703 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2704 if (!exists $wantr{$rrefname}) {
2705 if ($wanted_rref->($rrefname)) {
2707 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2711 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2714 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2715 delete $lrfetchrefs_f{$lrefname};
2719 foreach my $rrefname (sort keys %wantr) {
2720 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2721 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2722 my $want = $wantr{$rrefname};
2723 next if $got eq $want;
2724 if (!defined $objgot{$want}) {
2726 warning: git ls-remote suggests we want $lrefname
2727 warning: and it should refer to $want
2728 warning: but git fetch didn't fetch that object to any relevant ref.
2729 warning: This may be due to a race with someone updating the server.
2730 warning: Will try again...
2732 next FETCH_ITERATION;
2735 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2737 runcmd_ordryrun_local @git, qw(update-ref -m),
2738 "dgit fetch git fetch fixup", $lrefname, $want;
2739 $lrfetchrefs_f{$lrefname} = $want;
2744 if (defined $csuite) {
2745 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2746 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2747 my ($objid,$objtype,$lrefname,$reftail) = @_;
2748 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2749 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2753 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2754 Dumper(\%lrfetchrefs_f);
2757 sub git_fetch_us () {
2758 # Want to fetch only what we are going to use, unless
2759 # deliberately-not-ff, in which case we must fetch everything.
2761 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2763 (quiltmode_splitbrain
2764 ? (map { $_->('*',access_nomdistro) }
2765 \&debiantag_new, \&debiantag_maintview)
2766 : debiantags('*',access_nomdistro));
2767 push @specs, server_branch($csuite);
2768 push @specs, $rewritemap;
2769 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2771 my $url = access_giturl();
2772 git_lrfetch_sane $url, 0, @specs;
2775 my @tagpats = debiantags('*',access_nomdistro);
2777 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2778 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2779 printdebug "currently $fullrefname=$objid\n";
2780 $here{$fullrefname} = $objid;
2782 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2783 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2784 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2785 printdebug "offered $lref=$objid\n";
2786 if (!defined $here{$lref}) {
2787 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2788 runcmd_ordryrun_local @upd;
2789 lrfetchref_used $fullrefname;
2790 } elsif ($here{$lref} eq $objid) {
2791 lrfetchref_used $fullrefname;
2794 "Not updating $lref from $here{$lref} to $objid.\n";
2799 #---------- dsc and archive handling ----------
2801 sub mergeinfo_getclogp ($) {
2802 # Ensures thit $mi->{Clogp} exists and returns it
2804 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2807 sub mergeinfo_version ($) {
2808 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2811 sub fetch_from_archive_record_1 ($) {
2813 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2814 'DGIT_ARCHIVE', $hash;
2815 cmdoutput @git, qw(log -n2), $hash;
2816 # ... gives git a chance to complain if our commit is malformed
2819 sub fetch_from_archive_record_2 ($) {
2821 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2825 dryrun_report @upd_cmd;
2829 sub parse_dsc_field_def_dsc_distro () {
2830 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2831 dgit.default.distro);
2834 sub parse_dsc_field ($$) {
2835 my ($dsc, $what) = @_;
2837 foreach my $field (@ourdscfield) {
2838 $f = $dsc->{$field};
2843 progress "$what: NO git hash";
2844 parse_dsc_field_def_dsc_distro();
2845 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2846 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2847 progress "$what: specified git info ($dsc_distro)";
2848 $dsc_hint_tag = [ $dsc_hint_tag ];
2849 } elsif ($f =~ m/^\w+\s*$/) {
2851 parse_dsc_field_def_dsc_distro();
2852 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2854 progress "$what: specified git hash";
2856 fail "$what: invalid Dgit info";
2860 sub resolve_dsc_field_commit ($$) {
2861 my ($already_distro, $already_mapref) = @_;
2863 return unless defined $dsc_hash;
2866 defined $already_mapref &&
2867 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2868 ? $already_mapref : undef;
2872 my ($what, @fetch) = @_;
2874 local $idistro = $dsc_distro;
2875 my $lrf = lrfetchrefs;
2877 if (!$chase_dsc_distro) {
2879 "not chasing .dsc distro $dsc_distro: not fetching $what";
2884 ".dsc names distro $dsc_distro: fetching $what";
2886 my $url = access_giturl();
2887 if (!defined $url) {
2888 defined $dsc_hint_url or fail <<END;
2889 .dsc Dgit metadata is in context of distro $dsc_distro
2890 for which we have no configured url and .dsc provides no hint
2893 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2894 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2895 parse_cfg_bool "dsc-url-proto-ok", 'false',
2896 cfg("dgit.dsc-url-proto-ok.$proto",
2897 "dgit.default.dsc-url-proto-ok")
2899 .dsc Dgit metadata is in context of distro $dsc_distro
2900 for which we have no configured url;
2901 .dsc provides hinted url with protocol $proto which is unsafe.
2902 (can be overridden by config - consult documentation)
2904 $url = $dsc_hint_url;
2907 git_lrfetch_sane $url, 1, @fetch;
2912 my $rewrite_enable = do {
2913 local $idistro = $dsc_distro;
2914 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2917 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2918 if (!defined $mapref) {
2919 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2920 $mapref = $lrf.'/'.$rewritemap;
2922 my $rewritemapdata = git_cat_file $mapref.':map';
2923 if (defined $rewritemapdata
2924 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2926 "server's git history rewrite map contains a relevant entry!";
2929 if (defined $dsc_hash) {
2930 progress "using rewritten git hash in place of .dsc value";
2932 progress "server data says .dsc hash is to be disregarded";
2937 if (!defined git_cat_file $dsc_hash) {
2938 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2939 my $lrf = $do_fetch->("additional commits", @tags) &&
2940 defined git_cat_file $dsc_hash
2942 .dsc Dgit metadata requires commit $dsc_hash
2943 but we could not obtain that object anywhere.
2945 foreach my $t (@tags) {
2946 my $fullrefname = $lrf.'/'.$t;
2947 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2948 next unless $lrfetchrefs_f{$fullrefname};
2949 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2950 lrfetchref_used $fullrefname;
2955 sub fetch_from_archive () {
2956 ensure_setup_existing_tree();
2958 # Ensures that lrref() is what is actually in the archive, one way
2959 # or another, according to us - ie this client's
2960 # appropritaely-updated archive view. Also returns the commit id.
2961 # If there is nothing in the archive, leaves lrref alone and
2962 # returns undef. git_fetch_us must have already been called.
2966 parse_dsc_field($dsc, 'last upload to archive');
2967 resolve_dsc_field_commit access_basedistro,
2968 lrfetchrefs."/".$rewritemap
2970 progress "no version available from the archive";
2973 # If the archive's .dsc has a Dgit field, there are three
2974 # relevant git commitids we need to choose between and/or merge
2976 # 1. $dsc_hash: the Dgit field from the archive
2977 # 2. $lastpush_hash: the suite branch on the dgit git server
2978 # 3. $lastfetch_hash: our local tracking brach for the suite
2980 # These may all be distinct and need not be in any fast forward
2983 # If the dsc was pushed to this suite, then the server suite
2984 # branch will have been updated; but it might have been pushed to
2985 # a different suite and copied by the archive. Conversely a more
2986 # recent version may have been pushed with dgit but not appeared
2987 # in the archive (yet).
2989 # $lastfetch_hash may be awkward because archive imports
2990 # (particularly, imports of Dgit-less .dscs) are performed only as
2991 # needed on individual clients, so different clients may perform a
2992 # different subset of them - and these imports are only made
2993 # public during push. So $lastfetch_hash may represent a set of
2994 # imports different to a subsequent upload by a different dgit
2997 # Our approach is as follows:
2999 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3000 # descendant of $dsc_hash, then it was pushed by a dgit user who
3001 # had based their work on $dsc_hash, so we should prefer it.
3002 # Otherwise, $dsc_hash was installed into this suite in the
3003 # archive other than by a dgit push, and (necessarily) after the
3004 # last dgit push into that suite (since a dgit push would have
3005 # been descended from the dgit server git branch); thus, in that
3006 # case, we prefer the archive's version (and produce a
3007 # pseudo-merge to overwrite the dgit server git branch).
3009 # (If there is no Dgit field in the archive's .dsc then
3010 # generate_commit_from_dsc uses the version numbers to decide
3011 # whether the suite branch or the archive is newer. If the suite
3012 # branch is newer it ignores the archive's .dsc; otherwise it
3013 # generates an import of the .dsc, and produces a pseudo-merge to
3014 # overwrite the suite branch with the archive contents.)
3016 # The outcome of that part of the algorithm is the `public view',
3017 # and is same for all dgit clients: it does not depend on any
3018 # unpublished history in the local tracking branch.
3020 # As between the public view and the local tracking branch: The
3021 # local tracking branch is only updated by dgit fetch, and
3022 # whenever dgit fetch runs it includes the public view in the
3023 # local tracking branch. Therefore if the public view is not
3024 # descended from the local tracking branch, the local tracking
3025 # branch must contain history which was imported from the archive
3026 # but never pushed; and, its tip is now out of date. So, we make
3027 # a pseudo-merge to overwrite the old imports and stitch the old
3030 # Finally: we do not necessarily reify the public view (as
3031 # described above). This is so that we do not end up stacking two
3032 # pseudo-merges. So what we actually do is figure out the inputs
3033 # to any public view pseudo-merge and put them in @mergeinputs.
3036 # $mergeinputs[]{Commit}
3037 # $mergeinputs[]{Info}
3038 # $mergeinputs[0] is the one whose tree we use
3039 # @mergeinputs is in the order we use in the actual commit)
3042 # $mergeinputs[]{Message} is a commit message to use
3043 # $mergeinputs[]{ReverseParents} if def specifies that parent
3044 # list should be in opposite order
3045 # Such an entry has no Commit or Info. It applies only when found
3046 # in the last entry. (This ugliness is to support making
3047 # identical imports to previous dgit versions.)
3049 my $lastpush_hash = git_get_ref(lrfetchref());
3050 printdebug "previous reference hash=$lastpush_hash\n";
3051 $lastpush_mergeinput = $lastpush_hash && {
3052 Commit => $lastpush_hash,
3053 Info => "dgit suite branch on dgit git server",
3056 my $lastfetch_hash = git_get_ref(lrref());
3057 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3058 my $lastfetch_mergeinput = $lastfetch_hash && {
3059 Commit => $lastfetch_hash,
3060 Info => "dgit client's archive history view",
3063 my $dsc_mergeinput = $dsc_hash && {
3064 Commit => $dsc_hash,
3065 Info => "Dgit field in .dsc from archive",
3069 my $del_lrfetchrefs = sub {
3072 printdebug "del_lrfetchrefs...\n";
3073 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3074 my $objid = $lrfetchrefs_d{$fullrefname};
3075 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3077 $gur ||= new IO::Handle;
3078 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3080 printf $gur "delete %s %s\n", $fullrefname, $objid;
3083 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3087 if (defined $dsc_hash) {
3088 ensure_we_have_orig();
3089 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3090 @mergeinputs = $dsc_mergeinput
3091 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3092 print STDERR <<END or die $!;
3094 Git commit in archive is behind the last version allegedly pushed/uploaded.
3095 Commit referred to by archive: $dsc_hash
3096 Last version pushed with dgit: $lastpush_hash
3099 @mergeinputs = ($lastpush_mergeinput);
3101 # Archive has .dsc which is not a descendant of the last dgit
3102 # push. This can happen if the archive moves .dscs about.
3103 # Just follow its lead.
3104 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3105 progress "archive .dsc names newer git commit";
3106 @mergeinputs = ($dsc_mergeinput);
3108 progress "archive .dsc names other git commit, fixing up";
3109 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3113 @mergeinputs = generate_commits_from_dsc();
3114 # We have just done an import. Now, our import algorithm might
3115 # have been improved. But even so we do not want to generate
3116 # a new different import of the same package. So if the
3117 # version numbers are the same, just use our existing version.
3118 # If the version numbers are different, the archive has changed
3119 # (perhaps, rewound).
3120 if ($lastfetch_mergeinput &&
3121 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3122 (mergeinfo_version $mergeinputs[0]) )) {
3123 @mergeinputs = ($lastfetch_mergeinput);
3125 } elsif ($lastpush_hash) {
3126 # only in git, not in the archive yet
3127 @mergeinputs = ($lastpush_mergeinput);
3128 print STDERR <<END or die $!;
3130 Package not found in the archive, but has allegedly been pushed using dgit.
3134 printdebug "nothing found!\n";
3135 if (defined $skew_warning_vsn) {
3136 print STDERR <<END or die $!;
3138 Warning: relevant archive skew detected.
3139 Archive allegedly contains $skew_warning_vsn
3140 But we were not able to obtain any version from the archive or git.
3144 unshift @end, $del_lrfetchrefs;
3148 if ($lastfetch_hash &&
3150 my $h = $_->{Commit};
3151 $h and is_fast_fwd($lastfetch_hash, $h);
3152 # If true, one of the existing parents of this commit
3153 # is a descendant of the $lastfetch_hash, so we'll
3154 # be ff from that automatically.
3158 push @mergeinputs, $lastfetch_mergeinput;
3161 printdebug "fetch mergeinfos:\n";
3162 foreach my $mi (@mergeinputs) {
3164 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3166 printdebug sprintf " ReverseParents=%d Message=%s",
3167 $mi->{ReverseParents}, $mi->{Message};
3171 my $compat_info= pop @mergeinputs
3172 if $mergeinputs[$#mergeinputs]{Message};
3174 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3177 if (@mergeinputs > 1) {
3179 my $tree_commit = $mergeinputs[0]{Commit};
3181 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3182 $tree =~ m/\n\n/; $tree = $`;
3183 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3186 # We use the changelog author of the package in question the
3187 # author of this pseudo-merge. This is (roughly) correct if
3188 # this commit is simply representing aa non-dgit upload.
3189 # (Roughly because it does not record sponsorship - but we
3190 # don't have sponsorship info because that's in the .changes,
3191 # which isn't in the archivw.)
3193 # But, it might be that we are representing archive history
3194 # updates (including in-archive copies). These are not really
3195 # the responsibility of the person who created the .dsc, but
3196 # there is no-one whose name we should better use. (The
3197 # author of the .dsc-named commit is clearly worse.)
3199 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3200 my $author = clogp_authline $useclogp;
3201 my $cversion = getfield $useclogp, 'Version';
3203 my $mcf = ".git/dgit/mergecommit";
3204 open MC, ">", $mcf or die "$mcf $!";
3205 print MC <<END or die $!;
3209 my @parents = grep { $_->{Commit} } @mergeinputs;
3210 @parents = reverse @parents if $compat_info->{ReverseParents};
3211 print MC <<END or die $! foreach @parents;
3215 print MC <<END or die $!;
3221 if (defined $compat_info->{Message}) {
3222 print MC $compat_info->{Message} or die $!;
3224 print MC <<END or die $!;
3225 Record $package ($cversion) in archive suite $csuite
3229 my $message_add_info = sub {
3231 my $mversion = mergeinfo_version $mi;
3232 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3236 $message_add_info->($mergeinputs[0]);
3237 print MC <<END or die $!;
3238 should be treated as descended from
3240 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3244 $hash = make_commit $mcf;
3246 $hash = $mergeinputs[0]{Commit};
3248 printdebug "fetch hash=$hash\n";
3251 my ($lasth, $what) = @_;
3252 return unless $lasth;
3253 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3256 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3258 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3260 fetch_from_archive_record_1($hash);
3262 if (defined $skew_warning_vsn) {
3264 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3265 my $gotclogp = commit_getclogp($hash);
3266 my $got_vsn = getfield $gotclogp, 'Version';
3267 printdebug "SKEW CHECK GOT $got_vsn\n";
3268 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3269 print STDERR <<END or die $!;
3271 Warning: archive skew detected. Using the available version:
3272 Archive allegedly contains $skew_warning_vsn
3273 We were able to obtain only $got_vsn
3279 if ($lastfetch_hash ne $hash) {
3280 fetch_from_archive_record_2($hash);
3283 lrfetchref_used lrfetchref();
3285 check_gitattrs($hash, "fetched source tree");
3287 unshift @end, $del_lrfetchrefs;
3291 sub set_local_git_config ($$) {
3293 runcmd @git, qw(config), $k, $v;
3296 sub setup_mergechangelogs (;$) {
3298 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3300 my $driver = 'dpkg-mergechangelogs';
3301 my $cb = "merge.$driver";
3302 my $attrs = '.git/info/attributes';
3303 ensuredir '.git/info';
3305 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3306 if (!open ATTRS, "<", $attrs) {
3307 $!==ENOENT or die "$attrs: $!";
3311 next if m{^debian/changelog\s};
3312 print NATTRS $_, "\n" or die $!;
3314 ATTRS->error and die $!;
3317 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3320 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3321 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3323 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3326 sub setup_useremail (;$) {
3328 return unless $always || access_cfg_bool(1, 'setup-useremail');
3331 my ($k, $envvar) = @_;
3332 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3333 return unless defined $v;
3334 set_local_git_config "user.$k", $v;
3337 $setup->('email', 'DEBEMAIL');
3338 $setup->('name', 'DEBFULLNAME');
3341 sub ensure_setup_existing_tree () {
3342 my $k = "remote.$remotename.skipdefaultupdate";
3343 my $c = git_get_config $k;
3344 return if defined $c;
3345 set_local_git_config $k, 'true';
3348 sub open_gitattrs () {
3349 my $gai = new IO::File ".git/info/attributes"
3351 or die "open .git/info/attributes: $!";
3355 sub is_gitattrs_setup () {
3356 my $gai = open_gitattrs();
3357 return 0 unless $gai;
3359 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3361 $gai->error and die $!;
3365 sub setup_gitattrs (;$) {
3367 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3369 if (is_gitattrs_setup()) {
3371 [attr]dgit-defuse-attrs already found in .git/info/attributes
3372 not doing further gitattributes setup
3376 my $af = ".git/info/attributes";
3377 ensuredir '.git/info';
3378 open GAO, "> $af.new" or die $!;
3379 print GAO <<END or die $!;
3381 [attr]dgit-defuse-attrs $negate_harmful_gitattrs
3382 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3384 my $gai = open_gitattrs();
3388 print GAO $_, "\n" or die $!;
3390 $gai->error and die $!;
3392 close GAO or die $!;
3393 rename "$af.new", "$af" or die "install $af: $!";
3396 sub setup_new_tree () {
3397 setup_mergechangelogs();
3402 sub check_gitattrs ($$) {
3403 my ($treeish, $what) = @_;
3405 return if is_gitattrs_setup;
3408 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3410 my $gafl = new IO::File;
3411 open $gafl, "-|", @cmd or die $!;
3414 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3416 next unless m{(?:^|/)\.gitattributes$};
3418 # oh dear, found one
3420 dgit: warning: $what contains .gitattributes
3421 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3426 # tree contains no .gitattributes files
3427 $?=0; $!=0; close $gafl or failedcmd @cmd;
3431 sub multisuite_suite_child ($$$) {
3432 my ($tsuite, $merginputs, $fn) = @_;
3433 # in child, sets things up, calls $fn->(), and returns undef
3434 # in parent, returns canonical suite name for $tsuite
3435 my $canonsuitefh = IO::File::new_tmpfile;
3436 my $pid = fork // die $!;
3440 $us .= " [$isuite]";
3441 $debugprefix .= " ";
3442 progress "fetching $tsuite...";
3443 canonicalise_suite();
3444 print $canonsuitefh $csuite, "\n" or die $!;
3445 close $canonsuitefh or die $!;
3449 waitpid $pid,0 == $pid or die $!;
3450 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3451 seek $canonsuitefh,0,0 or die $!;
3452 local $csuite = <$canonsuitefh>;
3453 die $! unless defined $csuite && chomp $csuite;
3455 printdebug "multisuite $tsuite missing\n";
3458 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3459 push @$merginputs, {
3466 sub fork_for_multisuite ($) {
3467 my ($before_fetch_merge) = @_;
3468 # if nothing unusual, just returns ''
3471 # returns 0 to caller in child, to do first of the specified suites
3472 # in child, $csuite is not yet set
3474 # returns 1 to caller in parent, to finish up anything needed after
3475 # in parent, $csuite is set to canonicalised portmanteau
3477 my $org_isuite = $isuite;
3478 my @suites = split /\,/, $isuite;
3479 return '' unless @suites > 1;
3480 printdebug "fork_for_multisuite: @suites\n";
3484 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3486 return 0 unless defined $cbasesuite;
3488 fail "package $package missing in (base suite) $cbasesuite"
3489 unless @mergeinputs;
3491 my @csuites = ($cbasesuite);
3493 $before_fetch_merge->();
3495 foreach my $tsuite (@suites[1..$#suites]) {
3496 $tsuite =~ s/^-/$cbasesuite-/;
3497 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3503 # xxx collecte the ref here
3505 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3506 push @csuites, $csubsuite;
3509 foreach my $mi (@mergeinputs) {
3510 my $ref = git_get_ref $mi->{Ref};
3511 die "$mi->{Ref} ?" unless length $ref;
3512 $mi->{Commit} = $ref;
3515 $csuite = join ",", @csuites;
3517 my $previous = git_get_ref lrref;
3519 unshift @mergeinputs, {
3520 Commit => $previous,
3521 Info => "local combined tracking branch",
3523 "archive seems to have rewound: local tracking branch is ahead!",
3527 foreach my $ix (0..$#mergeinputs) {
3528 $mergeinputs[$ix]{Index} = $ix;
3531 @mergeinputs = sort {
3532 -version_compare(mergeinfo_version $a,
3533 mergeinfo_version $b) # highest version first
3535 $a->{Index} <=> $b->{Index}; # earliest in spec first
3541 foreach my $mi (@mergeinputs) {
3542 printdebug "multisuite merge check $mi->{Info}\n";
3543 foreach my $previous (@needed) {
3544 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3545 printdebug "multisuite merge un-needed $previous->{Info}\n";
3549 printdebug "multisuite merge this-needed\n";
3550 $mi->{Character} = '+';
3553 $needed[0]{Character} = '*';
3555 my $output = $needed[0]{Commit};
3558 printdebug "multisuite merge nontrivial\n";
3559 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3561 my $commit = "tree $tree\n";
3562 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3563 "Input branches:\n";
3565 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3566 printdebug "multisuite merge include $mi->{Info}\n";
3567 $mi->{Character} //= ' ';
3568 $commit .= "parent $mi->{Commit}\n";
3569 $msg .= sprintf " %s %-25s %s\n",
3571 (mergeinfo_version $mi),
3574 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3576 " * marks the highest version branch, which choose to use\n".
3577 " + marks each branch which was not already an ancestor\n\n".
3578 "[dgit multi-suite $csuite]\n";
3580 "author $authline\n".
3581 "committer $authline\n\n";
3582 $output = make_commit_text $commit.$msg;
3583 printdebug "multisuite merge generated $output\n";
3586 fetch_from_archive_record_1($output);
3587 fetch_from_archive_record_2($output);
3589 progress "calculated combined tracking suite $csuite";
3594 sub clone_set_head () {
3595 open H, "> .git/HEAD" or die $!;
3596 print H "ref: ".lref()."\n" or die $!;
3599 sub clone_finish ($) {
3601 runcmd @git, qw(reset --hard), lrref();
3602 runcmd qw(bash -ec), <<'END';
3604 git ls-tree -r --name-only -z HEAD | \
3605 xargs -0r touch -h -r . --
3607 printdone "ready for work in $dstdir";
3611 # in multisuite, returns twice!
3612 # once in parent after first suite fetched,
3613 # and then again in child after everything is finished
3615 badusage "dry run makes no sense with clone" unless act_local();
3617 my $multi_fetched = fork_for_multisuite(sub {
3618 printdebug "multi clone before fetch merge\n";
3621 if ($multi_fetched) {
3622 printdebug "multi clone after fetch merge\n";
3624 clone_finish($dstdir);
3627 printdebug "clone main body\n";
3629 canonicalise_suite();
3630 my $hasgit = check_for_git();
3631 mkdir $dstdir or fail "create \`$dstdir': $!";
3633 runcmd @git, qw(init -q);
3636 my $giturl = access_giturl(1);
3637 if (defined $giturl) {
3638 runcmd @git, qw(remote add), 'origin', $giturl;
3641 progress "fetching existing git history";
3643 runcmd_ordryrun_local @git, qw(fetch origin);
3645 progress "starting new git history";
3647 fetch_from_archive() or no_such_package;
3648 my $vcsgiturl = $dsc->{'Vcs-Git'};
3649 if (length $vcsgiturl) {
3650 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3651 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3653 clone_finish($dstdir);
3657 canonicalise_suite();
3658 if (check_for_git()) {
3661 fetch_from_archive() or no_such_package();
3662 printdone "fetched into ".lrref();
3666 my $multi_fetched = fork_for_multisuite(sub { });
3667 fetch() unless $multi_fetched; # parent
3668 return if $multi_fetched eq '0'; # child
3669 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3671 printdone "fetched to ".lrref()." and merged into HEAD";
3674 sub check_not_dirty () {
3675 foreach my $f (qw(local-options local-patch-header)) {
3676 if (stat_exists "debian/source/$f") {
3677 fail "git tree contains debian/source/$f";
3681 return if $ignoredirty;
3683 my @cmd = (@git, qw(diff --quiet HEAD));
3685 $!=0; $?=-1; system @cmd;
3688 fail "working tree is dirty (does not match HEAD)";
3694 sub commit_admin ($) {
3697 runcmd_ordryrun_local @git, qw(commit -m), $m;
3700 sub commit_quilty_patch () {
3701 my $output = cmdoutput @git, qw(status --porcelain);
3703 foreach my $l (split /\n/, $output) {
3704 next unless $l =~ m/\S/;
3705 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3709 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3711 progress "nothing quilty to commit, ok.";
3714 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3715 runcmd_ordryrun_local @git, qw(add -f), @adds;
3717 Commit Debian 3.0 (quilt) metadata
3719 [dgit ($our_version) quilt-fixup]
3723 sub get_source_format () {
3725 if (open F, "debian/source/options") {
3729 s/\s+$//; # ignore missing final newline
3731 my ($k, $v) = ($`, $'); #');
3732 $v =~ s/^"(.*)"$/$1/;
3738 F->error and die $!;
3741 die $! unless $!==&ENOENT;
3744 if (!open F, "debian/source/format") {
3745 die $! unless $!==&ENOENT;
3749 F->error and die $!;
3751 return ($_, \%options);
3754 sub madformat_wantfixup ($) {
3756 return 0 unless $format eq '3.0 (quilt)';
3757 our $quilt_mode_warned;
3758 if ($quilt_mode eq 'nocheck') {
3759 progress "Not doing any fixup of \`$format' due to".
3760 " ----no-quilt-fixup or --quilt=nocheck"
3761 unless $quilt_mode_warned++;
3764 progress "Format \`$format', need to check/update patch stack"
3765 unless $quilt_mode_warned++;
3769 sub maybe_split_brain_save ($$$) {
3770 my ($headref, $dgitview, $msg) = @_;
3771 # => message fragment "$saved" describing disposition of $dgitview
3772 return "commit id $dgitview" unless defined $split_brain_save;
3773 my @cmd = (shell_cmd "cd ../../../..",
3774 @git, qw(update-ref -m),
3775 "dgit --dgit-view-save $msg HEAD=$headref",
3776 $split_brain_save, $dgitview);
3778 return "and left in $split_brain_save";
3781 # An "infopair" is a tuple [ $thing, $what ]
3782 # (often $thing is a commit hash; $what is a description)
3784 sub infopair_cond_equal ($$) {
3786 $x->[0] eq $y->[0] or fail <<END;
3787 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3791 sub infopair_lrf_tag_lookup ($$) {
3792 my ($tagnames, $what) = @_;
3793 # $tagname may be an array ref
3794 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3795 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3796 foreach my $tagname (@tagnames) {
3797 my $lrefname = lrfetchrefs."/tags/$tagname";
3798 my $tagobj = $lrfetchrefs_f{$lrefname};
3799 next unless defined $tagobj;
3800 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3801 return [ git_rev_parse($tagobj), $what ];
3803 fail @tagnames==1 ? <<END : <<END;
3804 Wanted tag $what (@tagnames) on dgit server, but not found
3806 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3810 sub infopair_cond_ff ($$) {
3811 my ($anc,$desc) = @_;
3812 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3813 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3817 sub pseudomerge_version_check ($$) {
3818 my ($clogp, $archive_hash) = @_;
3820 my $arch_clogp = commit_getclogp $archive_hash;
3821 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3822 'version currently in archive' ];
3823 if (defined $overwrite_version) {
3824 if (length $overwrite_version) {
3825 infopair_cond_equal([ $overwrite_version,
3826 '--overwrite= version' ],
3829 my $v = $i_arch_v->[0];
3830 progress "Checking package changelog for archive version $v ...";
3833 my @xa = ("-f$v", "-t$v");
3834 my $vclogp = parsechangelog @xa;
3837 [ (getfield $vclogp, $fn),
3838 "$fn field from dpkg-parsechangelog @xa" ];
3840 my $cv = $gf->('Version');
3841 infopair_cond_equal($i_arch_v, $cv);
3842 $cd = $gf->('Distribution');
3845 $@ =~ s/^dgit: //gm;
3847 "Perhaps debian/changelog does not mention $v ?";
3849 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3850 $cd->[1] is $cd->[0]
3851 Your tree seems to based on earlier (not uploaded) $v.
3856 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3860 sub pseudomerge_make_commit ($$$$ $$) {
3861 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3862 $msg_cmd, $msg_msg) = @_;
3863 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3865 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3866 my $authline = clogp_authline $clogp;
3870 !defined $overwrite_version ? ""
3871 : !length $overwrite_version ? " --overwrite"
3872 : " --overwrite=".$overwrite_version;
3875 my $pmf = ".git/dgit/pseudomerge";
3876 open MC, ">", $pmf or die "$pmf $!";
3877 print MC <<END or die $!;
3880 parent $archive_hash
3890 return make_commit($pmf);
3893 sub splitbrain_pseudomerge ($$$$) {
3894 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3895 # => $merged_dgitview
3896 printdebug "splitbrain_pseudomerge...\n";
3898 # We: debian/PREVIOUS HEAD($maintview)
3899 # expect: o ----------------- o
3902 # a/d/PREVIOUS $dgitview
3905 # we do: `------------------ o
3909 return $dgitview unless defined $archive_hash;
3910 return $dgitview if deliberately_not_fast_forward();
3912 printdebug "splitbrain_pseudomerge...\n";
3914 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3916 if (!defined $overwrite_version) {
3917 progress "Checking that HEAD inciudes all changes in archive...";
3920 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3922 if (defined $overwrite_version) {
3924 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3925 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3926 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3927 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3928 my $i_archive = [ $archive_hash, "current archive contents" ];
3930 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3932 infopair_cond_equal($i_dgit, $i_archive);
3933 infopair_cond_ff($i_dep14, $i_dgit);
3934 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3938 $us: check failed (maybe --overwrite is needed, consult documentation)
3943 my $r = pseudomerge_make_commit
3944 $clogp, $dgitview, $archive_hash, $i_arch_v,
3945 "dgit --quilt=$quilt_mode",
3946 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3947 Declare fast forward from $i_arch_v->[0]
3949 Make fast forward from $i_arch_v->[0]
3952 maybe_split_brain_save $maintview, $r, "pseudomerge";
3954 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3958 sub plain_overwrite_pseudomerge ($$$) {
3959 my ($clogp, $head, $archive_hash) = @_;
3961 printdebug "plain_overwrite_pseudomerge...";
3963 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3965 return $head if is_fast_fwd $archive_hash, $head;
3967 my $m = "Declare fast forward from $i_arch_v->[0]";
3969 my $r = pseudomerge_make_commit
3970 $clogp, $head, $archive_hash, $i_arch_v,
3973 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3975 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3979 sub push_parse_changelog ($) {
3982 my $clogp = Dpkg::Control::Hash->new();
3983 $clogp->load($clogpfn) or die;
3985 my $clogpackage = getfield $clogp, 'Source';
3986 $package //= $clogpackage;
3987 fail "-p specified $package but changelog specified $clogpackage"
3988 unless $package eq $clogpackage;
3989 my $cversion = getfield $clogp, 'Version';
3991 if (!$we_are_initiator) {
3992 # rpush initiator can't do this because it doesn't have $isuite yet
3993 my $tag = debiantag($cversion, access_nomdistro);
3994 runcmd @git, qw(check-ref-format), $tag;
3997 my $dscfn = dscfn($cversion);
3999 return ($clogp, $cversion, $dscfn);
4002 sub push_parse_dsc ($$$) {
4003 my ($dscfn,$dscfnwhat, $cversion) = @_;
4004 $dsc = parsecontrol($dscfn,$dscfnwhat);
4005 my $dversion = getfield $dsc, 'Version';
4006 my $dscpackage = getfield $dsc, 'Source';
4007 ($dscpackage eq $package && $dversion eq $cversion) or
4008 fail "$dscfn is for $dscpackage $dversion".
4009 " but debian/changelog is for $package $cversion";
4012 sub push_tagwants ($$$$) {
4013 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4016 TagFn => \&debiantag,
4021 if (defined $maintviewhead) {
4023 TagFn => \&debiantag_maintview,
4024 Objid => $maintviewhead,
4025 TfSuffix => '-maintview',
4028 } elsif ($dodep14tag eq 'no' ? 0
4029 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4030 : $dodep14tag eq 'always'
4031 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4032 --dep14tag-always (or equivalent in config) means server must support
4033 both "new" and "maint" tag formats, but config says it doesn't.
4035 : die "$dodep14tag ?") {
4037 TagFn => \&debiantag_maintview,
4039 TfSuffix => '-dgit',
4043 foreach my $tw (@tagwants) {
4044 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4045 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4047 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4051 sub push_mktags ($$ $$ $) {
4053 $changesfile,$changesfilewhat,
4056 die unless $tagwants->[0]{View} eq 'dgit';
4058 my $declaredistro = access_nomdistro();
4059 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4060 $dsc->{$ourdscfield[0]} = join " ",
4061 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4063 $dsc->save("$dscfn.tmp") or die $!;
4065 my $changes = parsecontrol($changesfile,$changesfilewhat);
4066 foreach my $field (qw(Source Distribution Version)) {
4067 $changes->{$field} eq $clogp->{$field} or
4068 fail "changes field $field \`$changes->{$field}'".
4069 " does not match changelog \`$clogp->{$field}'";
4072 my $cversion = getfield $clogp, 'Version';
4073 my $clogsuite = getfield $clogp, 'Distribution';
4075 # We make the git tag by hand because (a) that makes it easier
4076 # to control the "tagger" (b) we can do remote signing
4077 my $authline = clogp_authline $clogp;
4078 my $delibs = join(" ", "",@deliberatelies);
4082 my $tfn = $tw->{Tfn};
4083 my $head = $tw->{Objid};
4084 my $tag = $tw->{Tag};
4086 open TO, '>', $tfn->('.tmp') or die $!;
4087 print TO <<END or die $!;
4094 if ($tw->{View} eq 'dgit') {
4095 print TO <<END or die $!;
4096 $package release $cversion for $clogsuite ($csuite) [dgit]
4097 [dgit distro=$declaredistro$delibs]
4099 foreach my $ref (sort keys %previously) {
4100 print TO <<END or die $!;
4101 [dgit previously:$ref=$previously{$ref}]
4104 } elsif ($tw->{View} eq 'maint') {
4105 print TO <<END or die $!;
4106 $package release $cversion for $clogsuite ($csuite)
4107 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4110 die Dumper($tw)."?";
4115 my $tagobjfn = $tfn->('.tmp');
4117 if (!defined $keyid) {
4118 $keyid = access_cfg('keyid','RETURN-UNDEF');
4120 if (!defined $keyid) {
4121 $keyid = getfield $clogp, 'Maintainer';
4123 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4124 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4125 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4126 push @sign_cmd, $tfn->('.tmp');
4127 runcmd_ordryrun @sign_cmd;
4129 $tagobjfn = $tfn->('.signed.tmp');
4130 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4131 $tfn->('.tmp'), $tfn->('.tmp.asc');
4137 my @r = map { $mktag->($_); } @$tagwants;
4141 sub sign_changes ($) {
4142 my ($changesfile) = @_;
4144 my @debsign_cmd = @debsign;
4145 push @debsign_cmd, "-k$keyid" if defined $keyid;
4146 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4147 push @debsign_cmd, $changesfile;
4148 runcmd_ordryrun @debsign_cmd;
4153 printdebug "actually entering push\n";
4155 supplementary_message(<<'END');
4156 Push failed, while checking state of the archive.
4157 You can retry the push, after fixing the problem, if you like.
4159 if (check_for_git()) {
4162 my $archive_hash = fetch_from_archive();
4163 if (!$archive_hash) {
4165 fail "package appears to be new in this suite;".
4166 " if this is intentional, use --new";
4169 supplementary_message(<<'END');
4170 Push failed, while preparing your push.
4171 You can retry the push, after fixing the problem, if you like.
4174 need_tagformat 'new', "quilt mode $quilt_mode"
4175 if quiltmode_splitbrain;
4179 access_giturl(); # check that success is vaguely likely
4180 rpush_handle_protovsn_bothends() if $we_are_initiator;
4183 my $clogpfn = ".git/dgit/changelog.822.tmp";
4184 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4186 responder_send_file('parsed-changelog', $clogpfn);
4188 my ($clogp, $cversion, $dscfn) =
4189 push_parse_changelog("$clogpfn");
4191 my $dscpath = "$buildproductsdir/$dscfn";
4192 stat_exists $dscpath or
4193 fail "looked for .dsc $dscpath, but $!;".
4194 " maybe you forgot to build";
4196 responder_send_file('dsc', $dscpath);
4198 push_parse_dsc($dscpath, $dscfn, $cversion);
4200 my $format = getfield $dsc, 'Format';
4201 printdebug "format $format\n";
4203 my $actualhead = git_rev_parse('HEAD');
4204 my $dgithead = $actualhead;
4205 my $maintviewhead = undef;
4207 my $upstreamversion = upstreamversion $clogp->{Version};
4209 if (madformat_wantfixup($format)) {
4210 # user might have not used dgit build, so maybe do this now:
4211 if (quiltmode_splitbrain()) {
4213 quilt_make_fake_dsc($upstreamversion);
4215 ($dgithead, $cachekey) =
4216 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4218 "--quilt=$quilt_mode but no cached dgit view:
4219 perhaps tree changed since dgit build[-source] ?";
4221 $dgithead = splitbrain_pseudomerge($clogp,
4222 $actualhead, $dgithead,
4224 $maintviewhead = $actualhead;
4225 changedir '../../../..';
4226 prep_ud(); # so _only_subdir() works, below
4228 commit_quilty_patch();
4232 if (defined $overwrite_version && !defined $maintviewhead) {
4233 $dgithead = plain_overwrite_pseudomerge($clogp,
4241 if ($archive_hash) {
4242 if (is_fast_fwd($archive_hash, $dgithead)) {
4244 } elsif (deliberately_not_fast_forward) {
4247 fail "dgit push: HEAD is not a descendant".
4248 " of the archive's version.\n".
4249 "To overwrite the archive's contents,".
4250 " pass --overwrite[=VERSION].\n".
4251 "To rewind history, if permitted by the archive,".
4252 " use --deliberately-not-fast-forward.";
4257 progress "checking that $dscfn corresponds to HEAD";
4258 runcmd qw(dpkg-source -x --),
4259 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4260 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4261 check_for_vendor_patches() if madformat($dsc->{format});
4262 changedir '../../../..';
4263 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4264 debugcmd "+",@diffcmd;
4266 my $r = system @diffcmd;
4269 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4271 HEAD specifies a different tree to $dscfn:
4273 Perhaps you forgot to build. Or perhaps there is a problem with your
4274 source tree (see dgit(7) for some hints). To see a full diff, run
4281 if (!$changesfile) {
4282 my $pat = changespat $cversion;
4283 my @cs = glob "$buildproductsdir/$pat";
4284 fail "failed to find unique changes file".
4285 " (looked for $pat in $buildproductsdir);".
4286 " perhaps you need to use dgit -C"
4288 ($changesfile) = @cs;
4290 $changesfile = "$buildproductsdir/$changesfile";
4293 # Check that changes and .dsc agree enough
4294 $changesfile =~ m{[^/]*$};
4295 my $changes = parsecontrol($changesfile,$&);
4296 files_compare_inputs($dsc, $changes)
4297 unless forceing [qw(dsc-changes-mismatch)];
4299 # Perhaps adjust .dsc to contain right set of origs
4300 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4302 unless forceing [qw(changes-origs-exactly)];
4304 # Checks complete, we're going to try and go ahead:
4306 responder_send_file('changes',$changesfile);
4307 responder_send_command("param head $dgithead");
4308 responder_send_command("param csuite $csuite");
4309 responder_send_command("param isuite $isuite");
4310 responder_send_command("param tagformat $tagformat");
4311 if (defined $maintviewhead) {
4312 die unless ($protovsn//4) >= 4;
4313 responder_send_command("param maint-view $maintviewhead");
4316 # Perhaps send buildinfo(s) for signing
4317 my $changes_files = getfield $changes, 'Files';
4318 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4319 foreach my $bi (@buildinfos) {
4320 responder_send_command("param buildinfo-filename $bi");
4321 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4324 if (deliberately_not_fast_forward) {
4325 git_for_each_ref(lrfetchrefs, sub {
4326 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4327 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4328 responder_send_command("previously $rrefname=$objid");
4329 $previously{$rrefname} = $objid;
4333 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4337 supplementary_message(<<'END');
4338 Push failed, while signing the tag.
4339 You can retry the push, after fixing the problem, if you like.
4341 # If we manage to sign but fail to record it anywhere, it's fine.
4342 if ($we_are_responder) {
4343 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4344 responder_receive_files('signed-tag', @tagobjfns);
4346 @tagobjfns = push_mktags($clogp,$dscpath,
4347 $changesfile,$changesfile,
4350 supplementary_message(<<'END');
4351 Push failed, *after* signing the tag.
4352 If you want to try again, you should use a new version number.
4355 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4357 foreach my $tw (@tagwants) {
4358 my $tag = $tw->{Tag};
4359 my $tagobjfn = $tw->{TagObjFn};
4361 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4362 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4363 runcmd_ordryrun_local
4364 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4367 supplementary_message(<<'END');
4368 Push failed, while updating the remote git repository - see messages above.
4369 If you want to try again, you should use a new version number.
4371 if (!check_for_git()) {
4372 create_remote_git_repo();
4375 my @pushrefs = $forceflag.$dgithead.":".rrref();
4376 foreach my $tw (@tagwants) {
4377 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4380 runcmd_ordryrun @git,
4381 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4382 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4384 supplementary_message(<<'END');
4385 Push failed, while obtaining signatures on the .changes and .dsc.
4386 If it was just that the signature failed, you may try again by using
4387 debsign by hand to sign the changes
4389 and then dput to complete the upload.
4390 If you need to change the package, you must use a new version number.
4392 if ($we_are_responder) {
4393 my $dryrunsuffix = act_local() ? "" : ".tmp";
4394 my @rfiles = ($dscpath, $changesfile);
4395 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4396 responder_receive_files('signed-dsc-changes',
4397 map { "$_$dryrunsuffix" } @rfiles);
4400 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4402 progress "[new .dsc left in $dscpath.tmp]";
4404 sign_changes $changesfile;
4407 supplementary_message(<<END);
4408 Push failed, while uploading package(s) to the archive server.
4409 You can retry the upload of exactly these same files with dput of:
4411 If that .changes file is broken, you will need to use a new version
4412 number for your next attempt at the upload.
4414 my $host = access_cfg('upload-host','RETURN-UNDEF');
4415 my @hostarg = defined($host) ? ($host,) : ();
4416 runcmd_ordryrun @dput, @hostarg, $changesfile;
4417 printdone "pushed and uploaded $cversion";
4419 supplementary_message('');
4420 responder_send_command("complete");
4429 badusage "-p is not allowed with clone; specify as argument instead"
4430 if defined $package;
4433 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4434 ($package,$isuite) = @ARGV;
4435 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4436 ($package,$dstdir) = @ARGV;
4437 } elsif (@ARGV==3) {
4438 ($package,$isuite,$dstdir) = @ARGV;
4440 badusage "incorrect arguments to dgit clone";
4444 $dstdir ||= "$package";
4445 if (stat_exists $dstdir) {
4446 fail "$dstdir already exists";
4450 if ($rmonerror && !$dryrun_level) {
4451 $cwd_remove= getcwd();
4453 return unless defined $cwd_remove;
4454 if (!chdir "$cwd_remove") {
4455 return if $!==&ENOENT;
4456 die "chdir $cwd_remove: $!";
4458 printdebug "clone rmonerror removing $dstdir\n";
4460 rmtree($dstdir) or die "remove $dstdir: $!\n";
4461 } elsif (grep { $! == $_ }
4462 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4464 print STDERR "check whether to remove $dstdir: $!\n";
4470 $cwd_remove = undef;
4473 sub branchsuite () {
4474 my @cmd = (@git, qw(symbolic-ref -q HEAD));
4475 my $branch = cmdoutput_errok @cmd;
4476 if (!defined $branch) {
4477 $?==256 or failedcmd @cmd;
4480 if ($branch =~ m#$lbranch_re#o) {
4487 sub fetchpullargs () {
4488 if (!defined $package) {
4489 my $sourcep = parsecontrol('debian/control','debian/control');
4490 $package = getfield $sourcep, 'Source';
4493 $isuite = branchsuite();
4495 my $clogp = parsechangelog();
4496 my $clogsuite = getfield $clogp, 'Distribution';
4497 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4499 } elsif (@ARGV==1) {
4502 badusage "incorrect arguments to dgit fetch or dgit pull";
4510 my $multi_fetched = fork_for_multisuite(sub { });
4511 exit 0 if $multi_fetched;
4518 if (quiltmode_splitbrain()) {
4519 my ($format, $fopts) = get_source_format();
4520 madformat($format) and fail <<END
4521 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4529 badusage "-p is not allowed with dgit push" if defined $package;
4531 my $clogp = parsechangelog();
4532 $package = getfield $clogp, 'Source';
4535 } elsif (@ARGV==1) {
4536 ($specsuite) = (@ARGV);
4538 badusage "incorrect arguments to dgit push";
4540 $isuite = getfield $clogp, 'Distribution';
4543 local ($package) = $existing_package; # this is a hack
4544 canonicalise_suite();
4546 canonicalise_suite();
4548 if (defined $specsuite &&
4549 $specsuite ne $isuite &&
4550 $specsuite ne $csuite) {
4551 fail "dgit push: changelog specifies $isuite ($csuite)".
4552 " but command line specifies $specsuite";
4557 #---------- remote commands' implementation ----------
4559 sub pre_remote_push_build_host {
4560 my ($nrargs) = shift @ARGV;
4561 my (@rargs) = @ARGV[0..$nrargs-1];
4562 @ARGV = @ARGV[$nrargs..$#ARGV];
4564 my ($dir,$vsnwant) = @rargs;
4565 # vsnwant is a comma-separated list; we report which we have
4566 # chosen in our ready response (so other end can tell if they
4569 $we_are_responder = 1;
4570 $us .= " (build host)";
4572 open PI, "<&STDIN" or die $!;
4573 open STDIN, "/dev/null" or die $!;
4574 open PO, ">&STDOUT" or die $!;
4576 open STDOUT, ">&STDERR" or die $!;
4580 ($protovsn) = grep {
4581 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4582 } @rpushprotovsn_support;
4584 fail "build host has dgit rpush protocol versions ".
4585 (join ",", @rpushprotovsn_support).
4586 " but invocation host has $vsnwant"
4587 unless defined $protovsn;
4591 sub cmd_remote_push_build_host {
4592 responder_send_command("dgit-remote-push-ready $protovsn");
4596 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4597 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4598 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4599 # a good error message)
4601 sub rpush_handle_protovsn_bothends () {
4602 if ($protovsn < 4) {
4603 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4612 my $report = i_child_report();
4613 if (defined $report) {
4614 printdebug "($report)\n";
4615 } elsif ($i_child_pid) {
4616 printdebug "(killing build host child $i_child_pid)\n";
4617 kill 15, $i_child_pid;
4619 if (defined $i_tmp && !defined $initiator_tempdir) {
4621 eval { rmtree $i_tmp; };
4626 return unless forkcheck_mainprocess();
4631 my ($base,$selector,@args) = @_;
4632 $selector =~ s/\-/_/g;
4633 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4642 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4650 push @rargs, join ",", @rpushprotovsn_support;
4653 push @rdgit, @ropts;
4654 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4656 my @cmd = (@ssh, $host, shellquote @rdgit);
4659 $we_are_initiator=1;
4661 if (defined $initiator_tempdir) {
4662 rmtree $initiator_tempdir;
4663 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4664 $i_tmp = $initiator_tempdir;
4668 $i_child_pid = open2(\*RO, \*RI, @cmd);
4670 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4671 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4672 $supplementary_message = '' unless $protovsn >= 3;
4675 my ($icmd,$iargs) = initiator_expect {
4676 m/^(\S+)(?: (.*))?$/;
4679 i_method "i_resp", $icmd, $iargs;
4683 sub i_resp_progress ($) {
4685 my $msg = protocol_read_bytes \*RO, $rhs;
4689 sub i_resp_supplementary_message ($) {
4691 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4694 sub i_resp_complete {
4695 my $pid = $i_child_pid;
4696 $i_child_pid = undef; # prevents killing some other process with same pid
4697 printdebug "waiting for build host child $pid...\n";
4698 my $got = waitpid $pid, 0;
4699 die $! unless $got == $pid;
4700 die "build host child failed $?" if $?;
4703 printdebug "all done\n";
4707 sub i_resp_file ($) {
4709 my $localname = i_method "i_localname", $keyword;
4710 my $localpath = "$i_tmp/$localname";
4711 stat_exists $localpath and
4712 badproto \*RO, "file $keyword ($localpath) twice";
4713 protocol_receive_file \*RO, $localpath;
4714 i_method "i_file", $keyword;
4719 sub i_resp_param ($) {
4720 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4724 sub i_resp_previously ($) {
4725 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4726 or badproto \*RO, "bad previously spec";
4727 my $r = system qw(git check-ref-format), $1;
4728 die "bad previously ref spec ($r)" if $r;
4729 $previously{$1} = $2;
4734 sub i_resp_want ($) {
4736 die "$keyword ?" if $i_wanted{$keyword}++;
4738 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4739 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4740 die unless $isuite =~ m/^$suite_re$/;
4743 rpush_handle_protovsn_bothends();
4745 fail "rpush negotiated protocol version $protovsn".
4746 " which does not support quilt mode $quilt_mode"
4747 if quiltmode_splitbrain;
4749 my @localpaths = i_method "i_want", $keyword;
4750 printdebug "[[ $keyword @localpaths\n";
4751 foreach my $localpath (@localpaths) {
4752 protocol_send_file \*RI, $localpath;
4754 print RI "files-end\n" or die $!;
4757 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4759 sub i_localname_parsed_changelog {
4760 return "remote-changelog.822";
4762 sub i_file_parsed_changelog {
4763 ($i_clogp, $i_version, $i_dscfn) =
4764 push_parse_changelog "$i_tmp/remote-changelog.822";
4765 die if $i_dscfn =~ m#/|^\W#;
4768 sub i_localname_dsc {
4769 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4774 sub i_localname_buildinfo ($) {
4775 my $bi = $i_param{'buildinfo-filename'};
4776 defined $bi or badproto \*RO, "buildinfo before filename";
4777 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4778 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4779 or badproto \*RO, "improper buildinfo filename";
4782 sub i_file_buildinfo {
4783 my $bi = $i_param{'buildinfo-filename'};
4784 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4785 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4786 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4787 files_compare_inputs($bd, $ch);
4788 (getfield $bd, $_) eq (getfield $ch, $_) or
4789 fail "buildinfo mismatch $_"
4790 foreach qw(Source Version);
4791 !defined $bd->{$_} or
4792 fail "buildinfo contains $_"
4793 foreach qw(Changes Changed-by Distribution);
4795 push @i_buildinfos, $bi;
4796 delete $i_param{'buildinfo-filename'};
4799 sub i_localname_changes {
4800 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4801 $i_changesfn = $i_dscfn;
4802 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4803 return $i_changesfn;
4805 sub i_file_changes { }
4807 sub i_want_signed_tag {
4808 printdebug Dumper(\%i_param, $i_dscfn);
4809 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4810 && defined $i_param{'csuite'}
4811 or badproto \*RO, "premature desire for signed-tag";
4812 my $head = $i_param{'head'};
4813 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4815 my $maintview = $i_param{'maint-view'};
4816 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4819 if ($protovsn >= 4) {
4820 my $p = $i_param{'tagformat'} // '<undef>';
4822 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4825 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4827 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4829 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4832 push_mktags $i_clogp, $i_dscfn,
4833 $i_changesfn, 'remote changes',
4837 sub i_want_signed_dsc_changes {
4838 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4839 sign_changes $i_changesfn;
4840 return ($i_dscfn, $i_changesfn, @i_buildinfos);
4843 #---------- building etc. ----------
4849 #----- `3.0 (quilt)' handling -----
4851 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4853 sub quiltify_dpkg_commit ($$$;$) {
4854 my ($patchname,$author,$msg, $xinfo) = @_;
4858 my $descfn = ".git/dgit/quilt-description.tmp";
4859 open O, '>', $descfn or die "$descfn: $!";
4860 $msg =~ s/\n+/\n\n/;
4861 print O <<END or die $!;
4863 ${xinfo}Subject: $msg
4870 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4871 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4872 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4873 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4877 sub quiltify_trees_differ ($$;$$$) {
4878 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4879 # returns true iff the two tree objects differ other than in debian/
4880 # with $finegrained,
4881 # returns bitmask 01 - differ in upstream files except .gitignore
4882 # 02 - differ in .gitignore
4883 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4884 # is set for each modified .gitignore filename $fn
4885 # if $unrepres is defined, array ref to which is appeneded
4886 # a list of unrepresentable changes (removals of upstream files
4889 my @cmd = (@git, qw(diff-tree -z --no-renames));
4890 push @cmd, qw(--name-only) unless $unrepres;
4891 push @cmd, qw(-r) if $finegrained || $unrepres;
4893 my $diffs= cmdoutput @cmd;
4896 foreach my $f (split /\0/, $diffs) {
4897 if ($unrepres && !@lmodes) {
4898 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4901 my ($oldmode,$newmode) = @lmodes;
4904 next if $f =~ m#^debian(?:/.*)?$#s;
4908 die "not a plain file or symlink\n"
4909 unless $newmode =~ m/^(?:10|12)\d{4}$/ ||
4910 $oldmode =~ m/^(?:10|12)\d{4}$/;
4911 if ($oldmode =~ m/[^0]/ &&
4912 $newmode =~ m/[^0]/) {
4913 # both old and new files exist
4914 die "mode or type changed\n" if $oldmode ne $newmode;
4915 die "modified symlink\n" unless $newmode =~ m/^10/;
4916 } elsif ($oldmode =~ m/[^0]/) {
4918 die "deletion of symlink\n"
4919 unless $oldmode =~ m/^10/;
4922 die "creation with non-default mode\n"
4923 unless $newmode =~ m/^100644$/ or
4924 $newmode =~ m/^120000$/;
4928 local $/="\n"; chomp $@;
4929 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4933 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4934 $r |= $isignore ? 02 : 01;
4935 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4937 printdebug "quiltify_trees_differ $x $y => $r\n";
4941 sub quiltify_tree_sentinelfiles ($) {
4942 # lists the `sentinel' files present in the tree
4944 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4945 qw(-- debian/rules debian/control);
4950 sub quiltify_splitbrain_needed () {
4951 if (!$split_brain) {
4952 progress "dgit view: changes are required...";
4953 runcmd @git, qw(checkout -q -b dgit-view);
4958 sub quiltify_splitbrain ($$$$$$) {
4959 my ($clogp, $unapplied, $headref, $diffbits,
4960 $editedignores, $cachekey) = @_;
4961 if ($quilt_mode !~ m/gbp|dpm/) {
4962 # treat .gitignore just like any other upstream file
4963 $diffbits = { %$diffbits };
4964 $_ = !!$_ foreach values %$diffbits;
4966 # We would like any commits we generate to be reproducible
4967 my @authline = clogp_authline($clogp);
4968 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4969 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4970 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4971 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4972 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4973 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4975 if ($quilt_mode =~ m/gbp|unapplied/ &&
4976 ($diffbits->{O2H} & 01)) {
4978 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4979 " but git tree differs from orig in upstream files.";
4980 if (!stat_exists "debian/patches") {
4982 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4986 if ($quilt_mode =~ m/dpm/ &&
4987 ($diffbits->{H2A} & 01)) {
4989 --quilt=$quilt_mode specified, implying patches-applied git tree
4990 but git tree differs from result of applying debian/patches to upstream
4993 if ($quilt_mode =~ m/gbp|unapplied/ &&
4994 ($diffbits->{O2A} & 01)) { # some patches
4995 quiltify_splitbrain_needed();
4996 progress "dgit view: creating patches-applied version using gbp pq";
4997 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4998 # gbp pq import creates a fresh branch; push back to dgit-view
4999 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
5000 runcmd @git, qw(checkout -q dgit-view);
5002 if ($quilt_mode =~ m/gbp|dpm/ &&
5003 ($diffbits->{O2A} & 02)) {
5005 --quilt=$quilt_mode specified, implying that HEAD is for use with a
5006 tool which does not create patches for changes to upstream
5007 .gitignores: but, such patches exist in debian/patches.
5010 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5011 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5012 quiltify_splitbrain_needed();
5013 progress "dgit view: creating patch to represent .gitignore changes";
5014 ensuredir "debian/patches";
5015 my $gipatch = "debian/patches/auto-gitignore";
5016 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
5017 stat GIPATCH or die "$gipatch: $!";
5018 fail "$gipatch already exists; but want to create it".
5019 " to record .gitignore changes" if (stat _)[7];
5020 print GIPATCH <<END or die "$gipatch: $!";
5021 Subject: Update .gitignore from Debian packaging branch
5023 The Debian packaging git branch contains these updates to the upstream
5024 .gitignore file(s). This patch is autogenerated, to provide these
5025 updates to users of the official Debian archive view of the package.
5027 [dgit ($our_version) update-gitignore]
5030 close GIPATCH or die "$gipatch: $!";
5031 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5032 $unapplied, $headref, "--", sort keys %$editedignores;
5033 open SERIES, "+>>", "debian/patches/series" or die $!;
5034 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5036 defined read SERIES, $newline, 1 or die $!;
5037 print SERIES "\n" or die $! unless $newline eq "\n";
5038 print SERIES "auto-gitignore\n" or die $!;
5039 close SERIES or die $!;
5040 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5042 Commit patch to update .gitignore
5044 [dgit ($our_version) update-gitignore-quilt-fixup]
5048 my $dgitview = git_rev_parse 'HEAD';
5050 changedir '../../../..';
5051 # When we no longer need to support squeeze, use --create-reflog
5053 ensuredir ".git/logs/refs/dgit-intern";
5054 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
5057 my $oldcache = git_get_ref "refs/$splitbraincache";
5058 if ($oldcache eq $dgitview) {
5059 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5060 # git update-ref doesn't always update, in this case. *sigh*
5061 my $dummy = make_commit_text <<END;
5064 author Dgit <dgit\@example.com> 1000000000 +0000
5065 committer Dgit <dgit\@example.com> 1000000000 +0000
5067 Dummy commit - do not use
5069 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5070 "refs/$splitbraincache", $dummy;
5072 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5075 changedir '.git/dgit/unpack/work';
5077 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5078 progress "dgit view: created ($saved)";
5081 sub quiltify ($$$$) {
5082 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5084 # Quilt patchification algorithm
5086 # We search backwards through the history of the main tree's HEAD
5087 # (T) looking for a start commit S whose tree object is identical
5088 # to to the patch tip tree (ie the tree corresponding to the
5089 # current dpkg-committed patch series). For these purposes
5090 # `identical' disregards anything in debian/ - this wrinkle is
5091 # necessary because dpkg-source treates debian/ specially.
5093 # We can only traverse edges where at most one of the ancestors'
5094 # trees differs (in changes outside in debian/). And we cannot
5095 # handle edges which change .pc/ or debian/patches. To avoid
5096 # going down a rathole we avoid traversing edges which introduce
5097 # debian/rules or debian/control. And we set a limit on the
5098 # number of edges we are willing to look at.
5100 # If we succeed, we walk forwards again. For each traversed edge
5101 # PC (with P parent, C child) (starting with P=S and ending with
5102 # C=T) to we do this:
5104 # - dpkg-source --commit with a patch name and message derived from C
5105 # After traversing PT, we git commit the changes which
5106 # should be contained within debian/patches.
5108 # The search for the path S..T is breadth-first. We maintain a
5109 # todo list containing search nodes. A search node identifies a
5110 # commit, and looks something like this:
5112 # Commit => $git_commit_id,
5113 # Child => $c, # or undef if P=T
5114 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5115 # Nontrivial => true iff $p..$c has relevant changes
5122 my %considered; # saves being exponential on some weird graphs
5124 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5127 my ($search,$whynot) = @_;
5128 printdebug " search NOT $search->{Commit} $whynot\n";
5129 $search->{Whynot} = $whynot;
5130 push @nots, $search;
5131 no warnings qw(exiting);
5140 my $c = shift @todo;
5141 next if $considered{$c->{Commit}}++;
5143 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5145 printdebug "quiltify investigate $c->{Commit}\n";
5148 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5149 printdebug " search finished hooray!\n";
5154 if ($quilt_mode eq 'nofix') {
5155 fail "quilt fixup required but quilt mode is \`nofix'\n".
5156 "HEAD commit $c->{Commit} differs from tree implied by ".
5157 " debian/patches (tree object $oldtiptree)";
5159 if ($quilt_mode eq 'smash') {
5160 printdebug " search quitting smash\n";
5164 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5165 $not->($c, "has $c_sentinels not $t_sentinels")
5166 if $c_sentinels ne $t_sentinels;
5168 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5169 $commitdata =~ m/\n\n/;
5171 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5172 @parents = map { { Commit => $_, Child => $c } } @parents;
5174 $not->($c, "root commit") if !@parents;
5176 foreach my $p (@parents) {
5177 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5179 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5180 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5182 foreach my $p (@parents) {
5183 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5185 my @cmd= (@git, qw(diff-tree -r --name-only),
5186 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5187 my $patchstackchange = cmdoutput @cmd;
5188 if (length $patchstackchange) {
5189 $patchstackchange =~ s/\n/,/g;
5190 $not->($p, "changed $patchstackchange");
5193 printdebug " search queue P=$p->{Commit} ",
5194 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5200 printdebug "quiltify want to smash\n";
5203 my $x = $_[0]{Commit};
5204 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5207 my $reportnot = sub {
5209 my $s = $abbrev->($notp);
5210 my $c = $notp->{Child};
5211 $s .= "..".$abbrev->($c) if $c;
5212 $s .= ": ".$notp->{Whynot};
5215 if ($quilt_mode eq 'linear') {
5216 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5217 foreach my $notp (@nots) {
5218 print STDERR "$us: ", $reportnot->($notp), "\n";
5220 print STDERR "$us: $_\n" foreach @$failsuggestion;
5221 fail "quilt fixup naive history linearisation failed.\n".
5222 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5223 } elsif ($quilt_mode eq 'smash') {
5224 } elsif ($quilt_mode eq 'auto') {
5225 progress "quilt fixup cannot be linear, smashing...";
5227 die "$quilt_mode ?";
5230 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5231 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5233 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5235 quiltify_dpkg_commit "auto-$version-$target-$time",
5236 (getfield $clogp, 'Maintainer'),
5237 "Automatically generated patch ($clogp->{Version})\n".
5238 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5242 progress "quiltify linearisation planning successful, executing...";
5244 for (my $p = $sref_S;
5245 my $c = $p->{Child};
5247 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5248 next unless $p->{Nontrivial};
5250 my $cc = $c->{Commit};
5252 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5253 $commitdata =~ m/\n\n/ or die "$c ?";
5256 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5259 my $commitdate = cmdoutput
5260 @git, qw(log -n1 --pretty=format:%aD), $cc;
5262 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5264 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5271 my $gbp_check_suitable = sub {
5276 die "contains unexpected slashes\n" if m{//} || m{/$};
5277 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5278 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5279 die "is series file\n" if m{$series_filename_re}o;
5280 die "too long" if length > 200;
5282 return $_ unless $@;
5283 print STDERR "quiltifying commit $cc:".
5284 " ignoring/dropping Gbp-Pq $what: $@";
5288 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5290 (\S+) \s* \n //ixm) {
5291 $patchname = $gbp_check_suitable->($1, 'Name');
5293 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5295 (\S+) \s* \n //ixm) {
5296 $patchdir = $gbp_check_suitable->($1, 'Topic');
5301 if (!defined $patchname) {
5302 $patchname = $title;
5303 $patchname =~ s/[.:]$//;
5306 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5307 my $translitname = $converter->convert($patchname);
5308 die unless defined $translitname;
5309 $patchname = $translitname;
5312 "dgit: patch title transliteration error: $@"
5314 $patchname =~ y/ A-Z/-a-z/;
5315 $patchname =~ y/-a-z0-9_.+=~//cd;
5316 $patchname =~ s/^\W/x-$&/;
5317 $patchname = substr($patchname,0,40);
5318 $patchname .= ".patch";
5320 if (!defined $patchdir) {
5323 if (length $patchdir) {
5324 $patchname = "$patchdir/$patchname";
5326 if ($patchname =~ m{^(.*)/}) {
5327 mkpath "debian/patches/$1";
5332 stat "debian/patches/$patchname$index";
5334 $!==ENOENT or die "$patchname$index $!";
5336 runcmd @git, qw(checkout -q), $cc;
5338 # We use the tip's changelog so that dpkg-source doesn't
5339 # produce complaining messages from dpkg-parsechangelog. None
5340 # of the information dpkg-source gets from the changelog is
5341 # actually relevant - it gets put into the original message
5342 # which dpkg-source provides our stunt editor, and then
5344 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5346 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5347 "Date: $commitdate\n".
5348 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5350 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5353 runcmd @git, qw(checkout -q master);
5356 sub build_maybe_quilt_fixup () {
5357 my ($format,$fopts) = get_source_format;
5358 return unless madformat_wantfixup $format;
5361 check_for_vendor_patches();
5363 if (quiltmode_splitbrain) {
5364 fail <<END unless access_cfg_tagformats_can_splitbrain;
5365 quilt mode $quilt_mode requires split view so server needs to support
5366 both "new" and "maint" tag formats, but config says it doesn't.
5370 my $clogp = parsechangelog();
5371 my $headref = git_rev_parse('HEAD');
5376 my $upstreamversion = upstreamversion $version;
5378 if ($fopts->{'single-debian-patch'}) {
5379 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5381 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5384 die 'bug' if $split_brain && !$need_split_build_invocation;
5386 changedir '../../../..';
5387 runcmd_ordryrun_local
5388 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5391 sub quilt_fixup_mkwork ($) {
5394 mkdir "work" or die $!;
5396 mktree_in_ud_here();
5397 runcmd @git, qw(reset -q --hard), $headref;
5400 sub quilt_fixup_linkorigs ($$) {
5401 my ($upstreamversion, $fn) = @_;
5402 # calls $fn->($leafname);
5404 foreach my $f (<../../../../*>) { #/){
5405 my $b=$f; $b =~ s{.*/}{};
5407 local ($debuglevel) = $debuglevel-1;
5408 printdebug "QF linkorigs $b, $f ?\n";
5410 next unless is_orig_file_of_vsn $b, $upstreamversion;
5411 printdebug "QF linkorigs $b, $f Y\n";
5412 link_ltarget $f, $b or die "$b $!";
5417 sub quilt_fixup_delete_pc () {
5418 runcmd @git, qw(rm -rqf .pc);
5420 Commit removal of .pc (quilt series tracking data)
5422 [dgit ($our_version) upgrade quilt-remove-pc]
5426 sub quilt_fixup_singlepatch ($$$) {
5427 my ($clogp, $headref, $upstreamversion) = @_;
5429 progress "starting quiltify (single-debian-patch)";
5431 # dpkg-source --commit generates new patches even if
5432 # single-debian-patch is in debian/source/options. In order to
5433 # get it to generate debian/patches/debian-changes, it is
5434 # necessary to build the source package.
5436 quilt_fixup_linkorigs($upstreamversion, sub { });
5437 quilt_fixup_mkwork($headref);
5439 rmtree("debian/patches");
5441 runcmd @dpkgsource, qw(-b .);
5443 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5444 rename srcfn("$upstreamversion", "/debian/patches"),
5445 "work/debian/patches";
5448 commit_quilty_patch();
5451 sub quilt_make_fake_dsc ($) {
5452 my ($upstreamversion) = @_;
5454 my $fakeversion="$upstreamversion-~~DGITFAKE";
5456 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5457 print $fakedsc <<END or die $!;
5460 Version: $fakeversion
5464 my $dscaddfile=sub {
5467 my $md = new Digest::MD5;
5469 my $fh = new IO::File $b, '<' or die "$b $!";
5474 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5477 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5479 my @files=qw(debian/source/format debian/rules
5480 debian/control debian/changelog);
5481 foreach my $maybe (qw(debian/patches debian/source/options
5482 debian/tests/control)) {
5483 next unless stat_exists "../../../$maybe";
5484 push @files, $maybe;
5487 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5488 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5490 $dscaddfile->($debtar);
5491 close $fakedsc or die $!;
5494 sub quilt_check_splitbrain_cache ($$) {
5495 my ($headref, $upstreamversion) = @_;
5496 # Called only if we are in (potentially) split brain mode.
5498 # Computes the cache key and looks in the cache.
5499 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5501 my $splitbrain_cachekey;
5504 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5505 # we look in the reflog of dgit-intern/quilt-cache
5506 # we look for an entry whose message is the key for the cache lookup
5507 my @cachekey = (qw(dgit), $our_version);
5508 push @cachekey, $upstreamversion;
5509 push @cachekey, $quilt_mode;
5510 push @cachekey, $headref;
5512 push @cachekey, hashfile('fake.dsc');
5514 my $srcshash = Digest::SHA->new(256);
5515 my %sfs = ( %INC, '$0(dgit)' => $0 );
5516 foreach my $sfk (sort keys %sfs) {
5517 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5518 $srcshash->add($sfk," ");
5519 $srcshash->add(hashfile($sfs{$sfk}));
5520 $srcshash->add("\n");
5522 push @cachekey, $srcshash->hexdigest();
5523 $splitbrain_cachekey = "@cachekey";
5525 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5527 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5528 debugcmd "|(probably)",@cmd;
5529 my $child = open GC, "-|"; defined $child or die $!;
5531 chdir '../../..' or die $!;
5532 if (!stat ".git/logs/refs/$splitbraincache") {
5533 $! == ENOENT or die $!;
5534 printdebug ">(no reflog)\n";
5541 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5542 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5545 quilt_fixup_mkwork($headref);
5546 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5547 if ($cachehit ne $headref) {
5548 progress "dgit view: found cached ($saved)";
5549 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5551 return ($cachehit, $splitbrain_cachekey);
5553 progress "dgit view: found cached, no changes required";
5554 return ($headref, $splitbrain_cachekey);
5556 die $! if GC->error;
5557 failedcmd unless close GC;
5559 printdebug "splitbrain cache miss\n";
5560 return (undef, $splitbrain_cachekey);
5563 sub quilt_fixup_multipatch ($$$) {
5564 my ($clogp, $headref, $upstreamversion) = @_;
5566 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5569 # - honour any existing .pc in case it has any strangeness
5570 # - determine the git commit corresponding to the tip of
5571 # the patch stack (if there is one)
5572 # - if there is such a git commit, convert each subsequent
5573 # git commit into a quilt patch with dpkg-source --commit
5574 # - otherwise convert all the differences in the tree into
5575 # a single git commit
5579 # Our git tree doesn't necessarily contain .pc. (Some versions of
5580 # dgit would include the .pc in the git tree.) If there isn't
5581 # one, we need to generate one by unpacking the patches that we
5584 # We first look for a .pc in the git tree. If there is one, we
5585 # will use it. (This is not the normal case.)
5587 # Otherwise need to regenerate .pc so that dpkg-source --commit
5588 # can work. We do this as follows:
5589 # 1. Collect all relevant .orig from parent directory
5590 # 2. Generate a debian.tar.gz out of
5591 # debian/{patches,rules,source/format,source/options}
5592 # 3. Generate a fake .dsc containing just these fields:
5593 # Format Source Version Files
5594 # 4. Extract the fake .dsc
5595 # Now the fake .dsc has a .pc directory.
5596 # (In fact we do this in every case, because in future we will
5597 # want to search for a good base commit for generating patches.)
5599 # Then we can actually do the dpkg-source --commit
5600 # 1. Make a new working tree with the same object
5601 # store as our main tree and check out the main
5603 # 2. Copy .pc from the fake's extraction, if necessary
5604 # 3. Run dpkg-source --commit
5605 # 4. If the result has changes to debian/, then
5606 # - git add them them
5607 # - git add .pc if we had a .pc in-tree
5609 # 5. If we had a .pc in-tree, delete it, and git commit
5610 # 6. Back in the main tree, fast forward to the new HEAD
5612 # Another situation we may have to cope with is gbp-style
5613 # patches-unapplied trees.
5615 # We would want to detect these, so we know to escape into
5616 # quilt_fixup_gbp. However, this is in general not possible.
5617 # Consider a package with a one patch which the dgit user reverts
5618 # (with git revert or the moral equivalent).
5620 # That is indistinguishable in contents from a patches-unapplied
5621 # tree. And looking at the history to distinguish them is not
5622 # useful because the user might have made a confusing-looking git
5623 # history structure (which ought to produce an error if dgit can't
5624 # cope, not a silent reintroduction of an unwanted patch).
5626 # So gbp users will have to pass an option. But we can usually
5627 # detect their failure to do so: if the tree is not a clean
5628 # patches-applied tree, quilt linearisation fails, but the tree
5629 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5630 # they want --quilt=unapplied.
5632 # To help detect this, when we are extracting the fake dsc, we
5633 # first extract it with --skip-patches, and then apply the patches
5634 # afterwards with dpkg-source --before-build. That lets us save a
5635 # tree object corresponding to .origs.
5637 my $splitbrain_cachekey;
5639 quilt_make_fake_dsc($upstreamversion);
5641 if (quiltmode_splitbrain()) {
5643 ($cachehit, $splitbrain_cachekey) =
5644 quilt_check_splitbrain_cache($headref, $upstreamversion);
5645 return if $cachehit;
5649 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5651 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5652 rename $fakexdir, "fake" or die "$fakexdir $!";
5656 remove_stray_gits("source package");
5657 mktree_in_ud_here();
5661 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5662 my $unapplied=git_add_write_tree();
5663 printdebug "fake orig tree object $unapplied\n";
5667 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5669 if (system @bbcmd) {
5670 failedcmd @bbcmd if $? < 0;
5672 failed to apply your git tree's patch stack (from debian/patches/) to
5673 the corresponding upstream tarball(s). Your source tree and .orig
5674 are probably too inconsistent. dgit can only fix up certain kinds of
5675 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5681 quilt_fixup_mkwork($headref);
5684 if (stat_exists ".pc") {
5686 progress "Tree already contains .pc - will use it then delete it.";
5689 rename '../fake/.pc','.pc' or die $!;
5692 changedir '../fake';
5694 my $oldtiptree=git_add_write_tree();
5695 printdebug "fake o+d/p tree object $unapplied\n";
5696 changedir '../work';
5699 # We calculate some guesswork now about what kind of tree this might
5700 # be. This is mostly for error reporting.
5706 # O = orig, without patches applied
5707 # A = "applied", ie orig with H's debian/patches applied
5708 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5709 \%editedignores, \@unrepres),
5710 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5711 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5715 foreach my $b (qw(01 02)) {
5716 foreach my $v (qw(O2H O2A H2A)) {
5717 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5720 printdebug "differences \@dl @dl.\n";
5723 "$us: base trees orig=%.20s o+d/p=%.20s",
5724 $unapplied, $oldtiptree;
5726 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5727 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5728 $dl[0], $dl[1], $dl[3], $dl[4],
5732 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5734 forceable_fail [qw(unrepresentable)], <<END;
5735 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5740 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5741 push @failsuggestion, "This might be a patches-unapplied branch.";
5742 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5743 push @failsuggestion, "This might be a patches-applied branch.";
5745 push @failsuggestion, "Maybe you need to specify one of".
5746 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5748 if (quiltmode_splitbrain()) {
5749 quiltify_splitbrain($clogp, $unapplied, $headref,
5750 $diffbits, \%editedignores,
5751 $splitbrain_cachekey);
5755 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5756 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5758 if (!open P, '>>', ".pc/applied-patches") {
5759 $!==&ENOENT or die $!;
5764 commit_quilty_patch();
5766 if ($mustdeletepc) {
5767 quilt_fixup_delete_pc();
5771 sub quilt_fixup_editor () {
5772 my $descfn = $ENV{$fakeeditorenv};
5773 my $editing = $ARGV[$#ARGV];
5774 open I1, '<', $descfn or die "$descfn: $!";
5775 open I2, '<', $editing or die "$editing: $!";
5776 unlink $editing or die "$editing: $!";
5777 open O, '>', $editing or die "$editing: $!";
5778 while (<I1>) { print O or die $!; } I1->error and die $!;
5781 $copying ||= m/^\-\-\- /;
5782 next unless $copying;
5785 I2->error and die $!;
5790 sub maybe_apply_patches_dirtily () {
5791 return unless $quilt_mode =~ m/gbp|unapplied/;
5792 print STDERR <<END or die $!;
5794 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5795 dgit: Have to apply the patches - making the tree dirty.
5796 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5799 $patches_applied_dirtily = 01;
5800 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5801 runcmd qw(dpkg-source --before-build .);
5804 sub maybe_unapply_patches_again () {
5805 progress "dgit: Unapplying patches again to tidy up the tree."
5806 if $patches_applied_dirtily;
5807 runcmd qw(dpkg-source --after-build .)
5808 if $patches_applied_dirtily & 01;
5810 if $patches_applied_dirtily & 02;
5811 $patches_applied_dirtily = 0;
5814 #----- other building -----
5816 our $clean_using_builder;
5817 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5818 # clean the tree before building (perhaps invoked indirectly by
5819 # whatever we are using to run the build), rather than separately
5820 # and explicitly by us.
5823 return if $clean_using_builder;
5824 if ($cleanmode eq 'dpkg-source') {
5825 maybe_apply_patches_dirtily();
5826 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5827 } elsif ($cleanmode eq 'dpkg-source-d') {
5828 maybe_apply_patches_dirtily();
5829 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5830 } elsif ($cleanmode eq 'git') {
5831 runcmd_ordryrun_local @git, qw(clean -xdf);
5832 } elsif ($cleanmode eq 'git-ff') {
5833 runcmd_ordryrun_local @git, qw(clean -xdff);
5834 } elsif ($cleanmode eq 'check') {
5835 my $leftovers = cmdoutput @git, qw(clean -xdn);
5836 if (length $leftovers) {
5837 print STDERR $leftovers, "\n" or die $!;
5838 fail "tree contains uncommitted files and --clean=check specified";
5840 } elsif ($cleanmode eq 'none') {
5847 badusage "clean takes no additional arguments" if @ARGV;
5850 maybe_unapply_patches_again();
5853 sub build_prep_early () {
5854 our $build_prep_early_done //= 0;
5855 return if $build_prep_early_done++;
5856 badusage "-p is not allowed when building" if defined $package;
5857 my $clogp = parsechangelog();
5858 $isuite = getfield $clogp, 'Distribution';
5859 $package = getfield $clogp, 'Source';
5860 $version = getfield $clogp, 'Version';
5868 build_maybe_quilt_fixup();
5870 my $pat = changespat $version;
5871 foreach my $f (glob "$buildproductsdir/$pat") {
5873 unlink $f or fail "remove old changes file $f: $!";
5875 progress "would remove $f";
5881 sub changesopts_initial () {
5882 my @opts =@changesopts[1..$#changesopts];
5885 sub changesopts_version () {
5886 if (!defined $changes_since_version) {
5887 my @vsns = archive_query('archive_query');
5888 my @quirk = access_quirk();
5889 if ($quirk[0] eq 'backports') {
5890 local $isuite = $quirk[2];
5892 canonicalise_suite();
5893 push @vsns, archive_query('archive_query');
5896 @vsns = map { $_->[0] } @vsns;
5897 @vsns = sort { -version_compare($a, $b) } @vsns;
5898 $changes_since_version = $vsns[0];
5899 progress "changelog will contain changes since $vsns[0]";
5901 $changes_since_version = '_';
5902 progress "package seems new, not specifying -v<version>";
5905 if ($changes_since_version ne '_') {
5906 return ("-v$changes_since_version");
5912 sub changesopts () {
5913 return (changesopts_initial(), changesopts_version());
5916 sub massage_dbp_args ($;$) {
5917 my ($cmd,$xargs) = @_;
5920 # - if we're going to split the source build out so we can
5921 # do strange things to it, massage the arguments to dpkg-buildpackage
5922 # so that the main build doessn't build source (or add an argument
5923 # to stop it building source by default).
5925 # - add -nc to stop dpkg-source cleaning the source tree,
5926 # unless we're not doing a split build and want dpkg-source
5927 # as cleanmode, in which case we can do nothing
5930 # 0 - source will NOT need to be built separately by caller
5931 # +1 - source will need to be built separately by caller
5932 # +2 - source will need to be built separately by caller AND
5933 # dpkg-buildpackage should not in fact be run at all!
5934 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5935 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5936 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5937 $clean_using_builder = 1;
5940 # -nc has the side effect of specifying -b if nothing else specified
5941 # and some combinations of -S, -b, et al, are errors, rather than
5942 # later simply overriding earlie. So we need to:
5943 # - search the command line for these options
5944 # - pick the last one
5945 # - perhaps add our own as a default
5946 # - perhaps adjust it to the corresponding non-source-building version
5948 foreach my $l ($cmd, $xargs) {
5950 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5953 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5955 if ($need_split_build_invocation) {
5956 printdebug "massage split $dmode.\n";
5957 $r = $dmode =~ m/[S]/ ? +2 :
5958 $dmode =~ y/gGF/ABb/ ? +1 :
5959 $dmode =~ m/[ABb]/ ? 0 :
5962 printdebug "massage done $r $dmode.\n";
5964 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5970 my $wasdir = must_getcwd();
5976 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5977 my ($msg_if_onlyone) = @_;
5978 # If there is only one .changes file, fail with $msg_if_onlyone,
5979 # or if that is undef, be a no-op.
5980 # Returns the changes file to report to the user.
5981 my $pat = changespat $version;
5982 my @changesfiles = glob $pat;
5983 @changesfiles = sort {
5984 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5988 if (@changesfiles==1) {
5989 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5990 only one changes file from build (@changesfiles)
5992 $result = $changesfiles[0];
5993 } elsif (@changesfiles==2) {
5994 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5995 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5996 fail "$l found in binaries changes file $binchanges"
5999 runcmd_ordryrun_local @mergechanges, @changesfiles;
6000 my $multichanges = changespat $version,'multi';
6002 stat_exists $multichanges or fail "$multichanges: $!";
6003 foreach my $cf (glob $pat) {
6004 next if $cf eq $multichanges;
6005 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
6008 $result = $multichanges;
6010 fail "wrong number of different changes files (@changesfiles)";
6012 printdone "build successful, results in $result\n" or die $!;
6015 sub midbuild_checkchanges () {
6016 my $pat = changespat $version;
6017 return if $rmchanges;
6018 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
6019 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
6021 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
6022 Suggest you delete @unwanted.
6027 sub midbuild_checkchanges_vanilla ($) {
6029 midbuild_checkchanges() if $wantsrc == 1;
6032 sub postbuild_mergechanges_vanilla ($) {
6034 if ($wantsrc == 1) {
6036 postbuild_mergechanges(undef);
6039 printdone "build successful\n";
6045 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6046 my $wantsrc = massage_dbp_args \@dbp;
6049 midbuild_checkchanges_vanilla $wantsrc;
6054 push @dbp, changesopts_version();
6055 maybe_apply_patches_dirtily();
6056 runcmd_ordryrun_local @dbp;
6058 maybe_unapply_patches_again();
6059 postbuild_mergechanges_vanilla $wantsrc;
6063 $quilt_mode //= 'gbp';
6069 # gbp can make .origs out of thin air. In my tests it does this
6070 # even for a 1.0 format package, with no origs present. So I
6071 # guess it keys off just the version number. We don't know
6072 # exactly what .origs ought to exist, but let's assume that we
6073 # should run gbp if: the version has an upstream part and the main
6075 my $upstreamversion = upstreamversion $version;
6076 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6077 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6079 if ($gbp_make_orig) {
6081 $cleanmode = 'none'; # don't do it again
6082 $need_split_build_invocation = 1;
6085 my @dbp = @dpkgbuildpackage;
6087 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6089 if (!length $gbp_build[0]) {
6090 if (length executable_on_path('git-buildpackage')) {
6091 $gbp_build[0] = qw(git-buildpackage);
6093 $gbp_build[0] = 'gbp buildpackage';
6096 my @cmd = opts_opt_multi_cmd @gbp_build;
6098 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6100 if ($gbp_make_orig) {
6101 ensuredir '.git/dgit';
6102 my $ok = '.git/dgit/origs-gen-ok';
6103 unlink $ok or $!==&ENOENT or die $!;
6104 my @origs_cmd = @cmd;
6105 push @origs_cmd, qw(--git-cleaner=true);
6106 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6107 push @origs_cmd, @ARGV;
6109 debugcmd @origs_cmd;
6111 do { local $!; stat_exists $ok; }
6112 or failedcmd @origs_cmd;
6114 dryrun_report @origs_cmd;
6120 midbuild_checkchanges_vanilla $wantsrc;
6122 if (!$clean_using_builder) {
6123 push @cmd, '--git-cleaner=true';
6127 maybe_unapply_patches_again();
6129 push @cmd, changesopts();
6130 runcmd_ordryrun_local @cmd, @ARGV;
6132 postbuild_mergechanges_vanilla $wantsrc;
6134 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6138 my $our_cleanmode = $cleanmode;
6139 if ($need_split_build_invocation) {
6140 # Pretend that clean is being done some other way. This
6141 # forces us not to try to use dpkg-buildpackage to clean and
6142 # build source all in one go; and instead we run dpkg-source
6143 # (and build_prep() will do the clean since $clean_using_builder
6145 $our_cleanmode = 'ELSEWHERE';
6147 if ($our_cleanmode =~ m/^dpkg-source/) {
6148 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6149 $clean_using_builder = 1;
6152 $sourcechanges = changespat $version,'source';
6154 unlink "../$sourcechanges" or $!==ENOENT
6155 or fail "remove $sourcechanges: $!";
6157 $dscfn = dscfn($version);
6158 if ($our_cleanmode eq 'dpkg-source') {
6159 maybe_apply_patches_dirtily();
6160 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6162 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6163 maybe_apply_patches_dirtily();
6164 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6167 my @cmd = (@dpkgsource, qw(-b --));
6170 runcmd_ordryrun_local @cmd, "work";
6171 my @udfiles = <${package}_*>;
6172 changedir "../../..";
6173 foreach my $f (@udfiles) {
6174 printdebug "source copy, found $f\n";
6177 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6178 $f eq srcfn($version, $&));
6179 printdebug "source copy, found $f - renaming\n";
6180 rename "$ud/$f", "../$f" or $!==ENOENT
6181 or fail "put in place new source file ($f): $!";
6184 my $pwd = must_getcwd();
6185 my $leafdir = basename $pwd;
6187 runcmd_ordryrun_local @cmd, $leafdir;
6190 runcmd_ordryrun_local qw(sh -ec),
6191 'exec >$1; shift; exec "$@"','x',
6192 "../$sourcechanges",
6193 @dpkggenchanges, qw(-S), changesopts();
6197 sub cmd_build_source {
6199 badusage "build-source takes no additional arguments" if @ARGV;
6201 maybe_unapply_patches_again();
6202 printdone "source built, results in $dscfn and $sourcechanges";
6207 midbuild_checkchanges();
6210 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6211 stat_exists $sourcechanges
6212 or fail "$sourcechanges (in parent directory): $!";
6214 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6216 maybe_unapply_patches_again();
6218 postbuild_mergechanges(<<END);
6219 perhaps you need to pass -A ? (sbuild's default is to build only
6220 arch-specific binaries; dgit 1.4 used to override that.)
6225 sub cmd_quilt_fixup {
6226 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6229 build_maybe_quilt_fixup();
6232 sub import_dsc_result {
6233 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6234 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6236 check_gitattrs($newhash, "source tree");
6238 progress "dgit: import-dsc: $what_msg";
6241 sub cmd_import_dsc {
6245 last unless $ARGV[0] =~ m/^-/;
6248 if (m/^--require-valid-signature$/) {
6251 badusage "unknown dgit import-dsc sub-option \`$_'";
6255 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6256 my ($dscfn, $dstbranch) = @ARGV;
6258 badusage "dry run makes no sense with import-dsc" unless act_local();
6260 my $force = $dstbranch =~ s/^\+// ? +1 :
6261 $dstbranch =~ s/^\.\.// ? -1 :
6263 my $info = $force ? " $&" : '';
6264 $info = "$dscfn$info";
6266 my $specbranch = $dstbranch;
6267 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6268 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6270 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6271 my $chead = cmdoutput_errok @symcmd;
6272 defined $chead or $?==256 or failedcmd @symcmd;
6274 fail "$dstbranch is checked out - will not update it"
6275 if defined $chead and $chead eq $dstbranch;
6277 my $oldhash = git_get_ref $dstbranch;
6279 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6280 $dscdata = do { local $/ = undef; <D>; };
6281 D->error and fail "read $dscfn: $!";
6284 # we don't normally need this so import it here
6285 use Dpkg::Source::Package;
6286 my $dp = new Dpkg::Source::Package filename => $dscfn,
6287 require_valid_signature => $needsig;
6289 local $SIG{__WARN__} = sub {
6291 return unless $needsig;
6292 fail "import-dsc signature check failed";
6294 if (!$dp->is_signed()) {
6295 warn "$us: warning: importing unsigned .dsc\n";
6297 my $r = $dp->check_signature();
6298 die "->check_signature => $r" if $needsig && $r;
6304 $package = getfield $dsc, 'Source';
6306 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6307 unless forceing [qw(import-dsc-with-dgit-field)];
6308 parse_dsc_field_def_dsc_distro();
6310 $isuite = 'DGIT-IMPORT-DSC';
6311 $idistro //= $dsc_distro;
6315 if (defined $dsc_hash) {
6316 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6317 resolve_dsc_field_commit undef, undef;
6319 if (defined $dsc_hash) {
6320 my @cmd = (qw(sh -ec),
6321 "echo $dsc_hash | git cat-file --batch-check");
6322 my $objgot = cmdoutput @cmd;
6323 if ($objgot =~ m#^\w+ missing\b#) {
6325 .dsc contains Dgit field referring to object $dsc_hash
6326 Your git tree does not have that object. Try `git fetch' from a
6327 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6330 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6332 progress "Not fast forward, forced update.";
6334 fail "Not fast forward to $dsc_hash";
6337 import_dsc_result $dstbranch, $dsc_hash,
6338 "dgit import-dsc (Dgit): $info",
6339 "updated git ref $dstbranch";
6344 Branch $dstbranch already exists
6345 Specify ..$specbranch for a pseudo-merge, binding in existing history
6346 Specify +$specbranch to overwrite, discarding existing history
6348 if $oldhash && !$force;
6350 my @dfi = dsc_files_info();
6351 foreach my $fi (@dfi) {
6352 my $f = $fi->{Filename};
6356 fail "lstat $here works but stat gives $! !";
6358 fail "stat $here: $!" unless $! == ENOENT;
6360 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6362 } elsif ($dscfn =~ m#^/#) {
6365 fail "cannot import $dscfn which seems to be inside working tree!";
6367 $there =~ s#/+[^/]+$## or
6368 fail "import $dscfn requires ../$f, but it does not exist";
6370 my $test = $there =~ m{^/} ? $there : "../$there";
6371 stat $test or fail "import $dscfn requires $test, but: $!";
6372 symlink $there, $here or fail "symlink $there to $here: $!";
6373 progress "made symlink $here -> $there";
6374 # print STDERR Dumper($fi);
6376 my @mergeinputs = generate_commits_from_dsc();
6377 die unless @mergeinputs == 1;
6379 my $newhash = $mergeinputs[0]{Commit};
6383 progress "Import, forced update - synthetic orphan git history.";
6384 } elsif ($force < 0) {
6385 progress "Import, merging.";
6386 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6387 my $version = getfield $dsc, 'Version';
6388 my $clogp = commit_getclogp $newhash;
6389 my $authline = clogp_authline $clogp;
6390 $newhash = make_commit_text <<END;
6397 Merge $package ($version) import into $dstbranch
6400 die; # caught earlier
6404 import_dsc_result $dstbranch, $newhash,
6405 "dgit import-dsc: $info",
6406 "results are in in git ref $dstbranch";
6409 sub pre_archive_api_query () {
6412 sub cmd_archive_api_query {
6413 badusage "need only 1 subpath argument" unless @ARGV==1;
6414 my ($subpath) = @ARGV;
6415 my @cmd = archive_api_query_cmd($subpath);
6418 exec @cmd or fail "exec curl: $!\n";
6421 sub repos_server_url () {
6422 $package = '_dgit-repos-server';
6423 local $access_forpush = 1;
6424 local $isuite = 'DGIT-REPOS-SERVER';
6425 my $url = access_giturl();
6428 sub pre_clone_dgit_repos_server () {
6431 sub cmd_clone_dgit_repos_server {
6432 badusage "need destination argument" unless @ARGV==1;
6433 my ($destdir) = @ARGV;
6434 my $url = repos_server_url();
6435 my @cmd = (@git, qw(clone), $url, $destdir);
6437 exec @cmd or fail "exec git clone: $!\n";
6440 sub pre_print_dgit_repos_server_source_url () {
6443 sub cmd_print_dgit_repos_server_source_url {
6444 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6446 my $url = repos_server_url();
6447 print $url, "\n" or die $!;
6450 sub cmd_setup_mergechangelogs {
6451 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6452 local $isuite = 'DGIT-SETUP-TREE';
6453 setup_mergechangelogs(1);
6456 sub cmd_setup_useremail {
6457 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6458 local $isuite = 'DGIT-SETUP-TREE';
6462 sub cmd_setup_gitattributes {
6463 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6464 local $isuite = 'DGIT-SETUP-TREE';
6468 sub cmd_setup_new_tree {
6469 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6470 local $isuite = 'DGIT-SETUP-TREE';
6474 #---------- argument parsing and main program ----------
6477 print "dgit version $our_version\n" or die $!;
6481 our (%valopts_long, %valopts_short);
6482 our (%funcopts_long);
6484 our (@modeopt_cfgs);
6486 sub defvalopt ($$$$) {
6487 my ($long,$short,$val_re,$how) = @_;
6488 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6489 $valopts_long{$long} = $oi;
6490 $valopts_short{$short} = $oi;
6491 # $how subref should:
6492 # do whatever assignemnt or thing it likes with $_[0]
6493 # if the option should not be passed on to remote, @rvalopts=()
6494 # or $how can be a scalar ref, meaning simply assign the value
6497 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6498 defvalopt '--distro', '-d', '.+', \$idistro;
6499 defvalopt '', '-k', '.+', \$keyid;
6500 defvalopt '--existing-package','', '.*', \$existing_package;
6501 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6502 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6503 defvalopt '--package', '-p', $package_re, \$package;
6504 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6506 defvalopt '', '-C', '.+', sub {
6507 ($changesfile) = (@_);
6508 if ($changesfile =~ s#^(.*)/##) {
6509 $buildproductsdir = $1;
6513 defvalopt '--initiator-tempdir','','.*', sub {
6514 ($initiator_tempdir) = (@_);
6515 $initiator_tempdir =~ m#^/# or
6516 badusage "--initiator-tempdir must be used specify an".
6517 " absolute, not relative, directory."
6520 sub defoptmodes ($@) {
6521 my ($varref, $cfgkey, $default, %optmap) = @_;
6523 while (my ($opt,$val) = each %optmap) {
6524 $funcopts_long{$opt} = sub { $$varref = $val; };
6525 $permit{$val} = $val;
6527 push @modeopt_cfgs, {
6530 Default => $default,
6535 defoptmodes \$dodep14tag, qw( dep14tag want
6538 --always-dep14tag always );
6543 if (defined $ENV{'DGIT_SSH'}) {
6544 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6545 } elsif (defined $ENV{'GIT_SSH'}) {
6546 @ssh = ($ENV{'GIT_SSH'});
6554 if (!defined $val) {
6555 badusage "$what needs a value" unless @ARGV;
6557 push @rvalopts, $val;
6559 badusage "bad value \`$val' for $what" unless
6560 $val =~ m/^$oi->{Re}$(?!\n)/s;
6561 my $how = $oi->{How};
6562 if (ref($how) eq 'SCALAR') {
6567 push @ropts, @rvalopts;
6571 last unless $ARGV[0] =~ m/^-/;
6575 if (m/^--dry-run$/) {
6578 } elsif (m/^--damp-run$/) {
6581 } elsif (m/^--no-sign$/) {
6584 } elsif (m/^--help$/) {
6586 } elsif (m/^--version$/) {
6588 } elsif (m/^--new$/) {
6591 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6592 ($om = $opts_opt_map{$1}) &&
6596 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6597 !$opts_opt_cmdonly{$1} &&
6598 ($om = $opts_opt_map{$1})) {
6601 } elsif (m/^--(gbp|dpm)$/s) {
6602 push @ropts, "--quilt=$1";
6604 } elsif (m/^--ignore-dirty$/s) {
6607 } elsif (m/^--no-quilt-fixup$/s) {
6609 $quilt_mode = 'nocheck';
6610 } elsif (m/^--no-rm-on-error$/s) {
6613 } elsif (m/^--no-chase-dsc-distro$/s) {
6615 $chase_dsc_distro = 0;
6616 } elsif (m/^--overwrite$/s) {
6618 $overwrite_version = '';
6619 } elsif (m/^--overwrite=(.+)$/s) {
6621 $overwrite_version = $1;
6622 } elsif (m/^--delayed=(\d+)$/s) {
6625 } elsif (m/^--dgit-view-save=(.+)$/s) {
6627 $split_brain_save = $1;
6628 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6629 } elsif (m/^--(no-)?rm-old-changes$/s) {
6632 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6634 push @deliberatelies, $&;
6635 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6639 } elsif (m/^--force-/) {
6641 "$us: warning: ignoring unknown force option $_\n";
6643 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6644 # undocumented, for testing
6646 $tagformat_want = [ $1, 'command line', 1 ];
6647 # 1 menas overrides distro configuration
6648 } elsif (m/^--always-split-source-build$/s) {
6649 # undocumented, for testing
6651 $need_split_build_invocation = 1;
6652 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6653 # undocumented, for testing
6655 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6656 # ^ it's supposed to be an array ref
6657 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6658 $val = $2 ? $' : undef; #';
6659 $valopt->($oi->{Long});
6660 } elsif ($funcopts_long{$_}) {
6662 $funcopts_long{$_}();
6664 badusage "unknown long option \`$_'";
6671 } elsif (s/^-L/-/) {
6674 } elsif (s/^-h/-/) {
6676 } elsif (s/^-D/-/) {
6680 } elsif (s/^-N/-/) {
6685 push @changesopts, $_;
6687 } elsif (s/^-wn$//s) {
6689 $cleanmode = 'none';
6690 } elsif (s/^-wg$//s) {
6693 } elsif (s/^-wgf$//s) {
6695 $cleanmode = 'git-ff';
6696 } elsif (s/^-wd$//s) {
6698 $cleanmode = 'dpkg-source';
6699 } elsif (s/^-wdd$//s) {
6701 $cleanmode = 'dpkg-source-d';
6702 } elsif (s/^-wc$//s) {
6704 $cleanmode = 'check';
6705 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6706 push @git, '-c', $&;
6707 $gitcfgs{cmdline}{$1} = [ $2 ];
6708 } elsif (s/^-c([^=]+)$//s) {
6709 push @git, '-c', $&;
6710 $gitcfgs{cmdline}{$1} = [ 'true' ];
6711 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6713 $val = undef unless length $val;
6714 $valopt->($oi->{Short});
6717 badusage "unknown short option \`$_'";
6724 sub check_env_sanity () {
6725 my $blocked = new POSIX::SigSet;
6726 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6729 foreach my $name (qw(PIPE CHLD)) {
6730 my $signame = "SIG$name";
6731 my $signum = eval "POSIX::$signame" // die;
6732 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6733 die "$signame is set to something other than SIG_DFL\n";
6734 $blocked->ismember($signum) and
6735 die "$signame is blocked\n";
6741 On entry to dgit, $@
6742 This is a bug produced by something in in your execution environment.
6748 sub parseopts_late_defaults () {
6749 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6750 if defined $idistro;
6751 $isuite //= cfg('dgit.default.default-suite');
6753 foreach my $k (keys %opts_opt_map) {
6754 my $om = $opts_opt_map{$k};
6756 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6758 badcfg "cannot set command for $k"
6759 unless length $om->[0];
6763 foreach my $c (access_cfg_cfgs("opts-$k")) {
6765 map { $_ ? @$_ : () }
6766 map { $gitcfgs{$_}{$c} }
6767 reverse @gitcfgsources;
6768 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6769 "\n" if $debuglevel >= 4;
6771 badcfg "cannot configure options for $k"
6772 if $opts_opt_cmdonly{$k};
6773 my $insertpos = $opts_cfg_insertpos{$k};
6774 @$om = ( @$om[0..$insertpos-1],
6776 @$om[$insertpos..$#$om] );
6780 if (!defined $rmchanges) {
6781 local $access_forpush;
6782 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6785 if (!defined $quilt_mode) {
6786 local $access_forpush;
6787 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6788 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6790 $quilt_mode =~ m/^($quilt_modes_re)$/
6791 or badcfg "unknown quilt-mode \`$quilt_mode'";
6795 foreach my $moc (@modeopt_cfgs) {
6796 local $access_forpush;
6797 my $vr = $moc->{Var};
6798 next if defined $$vr;
6799 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6800 my $v = $moc->{Vals}{$$vr};
6801 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6805 $need_split_build_invocation ||= quiltmode_splitbrain();
6807 if (!defined $cleanmode) {
6808 local $access_forpush;
6809 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6810 $cleanmode //= 'dpkg-source';
6812 badcfg "unknown clean-mode \`$cleanmode'" unless
6813 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6817 if ($ENV{$fakeeditorenv}) {
6819 quilt_fixup_editor();
6825 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6826 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6827 if $dryrun_level == 1;
6829 print STDERR $helpmsg or die $!;
6832 my $cmd = shift @ARGV;
6835 my $pre_fn = ${*::}{"pre_$cmd"};
6836 $pre_fn->() if $pre_fn;
6840 my $fn = ${*::}{"cmd_$cmd"};
6841 $fn or badusage "unknown operation $cmd";