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);
499 failedcmd @_ if system @_;
502 sub act_local () { return $dryrun_level <= 1; }
503 sub act_scary () { return !$dryrun_level; }
506 if (!$dryrun_level) {
507 progress "$us ok: @_";
509 progress "would be ok: @_ (but dry run only)";
514 printcmd(\*STDERR,$debugprefix."#",@_);
517 sub runcmd_ordryrun {
525 sub runcmd_ordryrun_local {
534 my ($first_shell, @cmd) = @_;
535 return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd;
538 our $helpmsg = <<END;
540 dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]
541 dgit [dgit-opts] fetch|pull [dgit-opts] [suite]
542 dgit [dgit-opts] build [dpkg-buildpackage-opts]
543 dgit [dgit-opts] sbuild [sbuild-opts]
544 dgit [dgit-opts] push [dgit-opts] [suite]
545 dgit [dgit-opts] rpush build-host:build-dir ...
546 important dgit options:
547 -k<keyid> sign tag and package with <keyid> instead of default
548 --dry-run -n do not change anything, but go through the motions
549 --damp-run -L like --dry-run but make local changes, without signing
550 --new -N allow introducing a new package
551 --debug -D increase debug level
552 -c<name>=<value> set git config option (used directly by dgit too)
555 our $later_warning_msg = <<END;
556 Perhaps the upload is stuck in incoming. Using the version from git.
560 print STDERR "$us: @_\n", $helpmsg or die $!;
565 @ARGV or badusage "too few arguments";
566 return scalar shift @ARGV;
570 print $helpmsg or die $!;
574 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
576 our %defcfg = ('dgit.default.distro' => 'debian',
577 'dgit.default.default-suite' => 'unstable',
578 'dgit.default.old-dsc-distro' => 'debian',
579 'dgit-suite.*-security.distro' => 'debian-security',
580 'dgit.default.username' => '',
581 'dgit.default.archive-query-default-component' => 'main',
582 'dgit.default.ssh' => 'ssh',
583 'dgit.default.archive-query' => 'madison:',
584 'dgit.default.sshpsql-dbname' => 'service=projectb',
585 'dgit.default.aptget-components' => 'main',
586 'dgit.default.dgit-tag-format' => 'new,old,maint',
587 'dgit.dsc-url-proto-ok.http' => 'true',
588 'dgit.dsc-url-proto-ok.https' => 'true',
589 'dgit.dsc-url-proto-ok.git' => 'true',
590 'dgit.default.dsc-url-proto-ok' => 'false',
591 # old means "repo server accepts pushes with old dgit tags"
592 # new means "repo server accepts pushes with new dgit tags"
593 # maint means "repo server accepts split brain pushes"
594 # hist means "repo server may have old pushes without new tag"
595 # ("hist" is implied by "old")
596 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
597 'dgit-distro.debian.git-check' => 'url',
598 'dgit-distro.debian.git-check-suffix' => '/info/refs',
599 'dgit-distro.debian.new-private-pushers' => 't',
600 'dgit-distro.debian/push.git-url' => '',
601 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
602 'dgit-distro.debian/push.git-user-force' => 'dgit',
603 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
604 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
605 'dgit-distro.debian/push.git-create' => 'true',
606 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
607 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
608 # 'dgit-distro.debian.archive-query-tls-key',
609 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
610 # ^ this does not work because curl is broken nowadays
611 # Fixing #790093 properly will involve providing providing the key
612 # in some pacagke and maybe updating these paths.
614 # 'dgit-distro.debian.archive-query-tls-curl-args',
615 # '--ca-path=/etc/ssl/ca-debian',
616 # ^ this is a workaround but works (only) on DSA-administered machines
617 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
618 'dgit-distro.debian.git-url-suffix' => '',
619 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
620 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
621 'dgit-distro.debian-security.archive-query' => 'aptget:',
622 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
623 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
624 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
625 'dgit-distro.debian-security.nominal-distro' => 'debian',
626 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
627 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
628 'dgit-distro.ubuntu.git-check' => 'false',
629 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
630 'dgit-distro.test-dummy.ssh' => "$td/ssh",
631 'dgit-distro.test-dummy.username' => "alice",
632 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
633 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
634 'dgit-distro.test-dummy.git-url' => "$td/git",
635 'dgit-distro.test-dummy.git-host' => "git",
636 'dgit-distro.test-dummy.git-path' => "$td/git",
637 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
638 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
639 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
640 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
644 our @gitcfgsources = qw(cmdline local global system);
646 sub git_slurp_config () {
647 local ($debuglevel) = $debuglevel-2;
650 # This algoritm is a bit subtle, but this is needed so that for
651 # options which we want to be single-valued, we allow the
652 # different config sources to override properly. See #835858.
653 foreach my $src (@gitcfgsources) {
654 next if $src eq 'cmdline';
655 # we do this ourselves since git doesn't handle it
657 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
660 open GITS, "-|", @cmd or die $!;
663 printdebug "=> ", (messagequote $_), "\n";
665 push @{ $gitcfgs{$src}{$`} }, $'; #';
669 or ($!==0 && $?==256)
674 sub git_get_config ($) {
676 foreach my $src (@gitcfgsources) {
677 my $l = $gitcfgs{$src}{$c};
678 confess "internal error ($l $c)" if $l && !ref $l;
679 printdebug"C $c ".(defined $l ?
680 join " ", map { messagequote "'$_'" } @$l :
684 @$l==1 or badcfg "multiple values for $c".
685 " (in $src git config)" if @$l > 1;
693 return undef if $c =~ /RETURN-UNDEF/;
694 printdebug "C? $c\n" if $debuglevel >= 5;
695 my $v = git_get_config($c);
696 return $v if defined $v;
697 my $dv = $defcfg{$c};
699 printdebug "CD $c $dv\n" if $debuglevel >= 4;
703 badcfg "need value for one of: @_\n".
704 "$us: distro or suite appears not to be (properly) supported";
707 sub no_local_git_cfg () {
708 # needs to be called from pre_*
709 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
712 sub access_basedistro__noalias () {
713 if (defined $idistro) {
716 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
717 return $def if defined $def;
718 foreach my $src (@gitcfgsources, 'internal') {
719 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
721 foreach my $k (keys %$kl) {
722 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
724 next unless match_glob $dpat, $isuite;
728 return cfg("dgit.default.distro");
732 sub access_basedistro () {
733 my $noalias = access_basedistro__noalias();
734 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
735 return $canon // $noalias;
738 sub access_nomdistro () {
739 my $base = access_basedistro();
740 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
741 $r =~ m/^$distro_re$/ or badcfg
742 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
746 sub access_quirk () {
747 # returns (quirk name, distro to use instead or undef, quirk-specific info)
748 my $basedistro = access_basedistro();
749 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
751 if (defined $backports_quirk) {
752 my $re = $backports_quirk;
753 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
755 $re =~ s/\%/([-0-9a-z_]+)/
756 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
757 if ($isuite =~ m/^$re$/) {
758 return ('backports',"$basedistro-backports",$1);
761 return ('none',undef);
766 sub parse_cfg_bool ($$$) {
767 my ($what,$def,$v) = @_;
770 $v =~ m/^[ty1]/ ? 1 :
771 $v =~ m/^[fn0]/ ? 0 :
772 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
775 sub access_forpush_config () {
776 my $d = access_basedistro();
780 parse_cfg_bool('new-private-pushers', 0,
781 cfg("dgit-distro.$d.new-private-pushers",
784 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
787 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
788 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
789 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
790 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
793 sub access_forpush () {
794 $access_forpush //= access_forpush_config();
795 return $access_forpush;
799 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
800 badcfg "pushing but distro is configured readonly"
801 if access_forpush_config() eq '0';
803 $supplementary_message = <<'END' unless $we_are_responder;
804 Push failed, before we got started.
805 You can retry the push, after fixing the problem, if you like.
807 parseopts_late_defaults();
811 parseopts_late_defaults();
814 sub supplementary_message ($) {
816 if (!$we_are_responder) {
817 $supplementary_message = $msg;
819 } elsif ($protovsn >= 3) {
820 responder_send_command "supplementary-message ".length($msg)
822 print PO $msg or die $!;
826 sub access_distros () {
827 # Returns list of distros to try, in order
830 # 0. `instead of' distro name(s) we have been pointed to
831 # 1. the access_quirk distro, if any
832 # 2a. the user's specified distro, or failing that } basedistro
833 # 2b. the distro calculated from the suite }
834 my @l = access_basedistro();
836 my (undef,$quirkdistro) = access_quirk();
837 unshift @l, $quirkdistro;
838 unshift @l, $instead_distro;
839 @l = grep { defined } @l;
841 push @l, access_nomdistro();
843 if (access_forpush()) {
844 @l = map { ("$_/push", $_) } @l;
849 sub access_cfg_cfgs (@) {
852 # The nesting of these loops determines the search order. We put
853 # the key loop on the outside so that we search all the distros
854 # for each key, before going on to the next key. That means that
855 # if access_cfg is called with a more specific, and then a less
856 # specific, key, an earlier distro can override the less specific
857 # without necessarily overriding any more specific keys. (If the
858 # distro wants to override the more specific keys it can simply do
859 # so; whereas if we did the loop the other way around, it would be
860 # impossible to for an earlier distro to override a less specific
861 # key but not the more specific ones without restating the unknown
862 # values of the more specific keys.
865 # We have to deal with RETURN-UNDEF specially, so that we don't
866 # terminate the search prematurely.
868 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
871 foreach my $d (access_distros()) {
872 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
874 push @cfgs, map { "dgit.default.$_" } @realkeys;
881 my (@cfgs) = access_cfg_cfgs(@keys);
882 my $value = cfg(@cfgs);
886 sub access_cfg_bool ($$) {
887 my ($def, @keys) = @_;
888 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
891 sub string_to_ssh ($) {
893 if ($spec =~ m/\s/) {
894 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
900 sub access_cfg_ssh () {
901 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
902 if (!defined $gitssh) {
905 return string_to_ssh $gitssh;
909 sub access_runeinfo ($) {
911 return ": dgit ".access_basedistro()." $info ;";
914 sub access_someuserhost ($) {
916 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
917 defined($user) && length($user) or
918 $user = access_cfg("$some-user",'username');
919 my $host = access_cfg("$some-host");
920 return length($user) ? "$user\@$host" : $host;
923 sub access_gituserhost () {
924 return access_someuserhost('git');
927 sub access_giturl (;$) {
929 my $url = access_cfg('git-url','RETURN-UNDEF');
932 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
933 return undef unless defined $proto;
936 access_gituserhost().
937 access_cfg('git-path');
939 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
942 return "$url/$package$suffix";
945 sub parsecontrolfh ($$;$) {
946 my ($fh, $desc, $allowsigned) = @_;
947 our $dpkgcontrolhash_noissigned;
950 my %opts = ('name' => $desc);
951 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
952 $c = Dpkg::Control::Hash->new(%opts);
953 $c->parse($fh,$desc) or die "parsing of $desc failed";
954 last if $allowsigned;
955 last if $dpkgcontrolhash_noissigned;
956 my $issigned= $c->get_option('is_pgp_signed');
957 if (!defined $issigned) {
958 $dpkgcontrolhash_noissigned= 1;
959 seek $fh, 0,0 or die "seek $desc: $!";
960 } elsif ($issigned) {
961 fail "control file $desc is (already) PGP-signed. ".
962 " Note that dgit push needs to modify the .dsc and then".
963 " do the signature itself";
972 my ($file, $desc, $allowsigned) = @_;
973 my $fh = new IO::Handle;
974 open $fh, '<', $file or die "$file: $!";
975 my $c = parsecontrolfh($fh,$desc,$allowsigned);
976 $fh->error and die $!;
982 my ($dctrl,$field) = @_;
983 my $v = $dctrl->{$field};
984 return $v if defined $v;
985 fail "missing field $field in ".$dctrl->get_option('name');
989 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
990 my $p = new IO::Handle;
991 my @cmd = (qw(dpkg-parsechangelog), @_);
992 open $p, '-|', @cmd or die $!;
994 $?=0; $!=0; close $p or failedcmd @cmd;
998 sub commit_getclogp ($) {
999 # Returns the parsed changelog hashref for a particular commit
1001 our %commit_getclogp_memo;
1002 my $memo = $commit_getclogp_memo{$objid};
1003 return $memo if $memo;
1005 my $mclog = ".git/dgit/clog-$objid";
1006 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1007 "$objid:debian/changelog";
1008 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1011 sub must_getcwd () {
1013 defined $d or fail "getcwd failed: $!";
1017 sub parse_dscdata () {
1018 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1019 printdebug Dumper($dscdata) if $debuglevel>1;
1020 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1021 printdebug Dumper($dsc) if $debuglevel>1;
1026 sub archive_query ($;@) {
1027 my ($method) = shift @_;
1028 fail "this operation does not support multiple comma-separated suites"
1030 my $query = access_cfg('archive-query','RETURN-UNDEF');
1031 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1034 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1037 sub archive_query_prepend_mirror {
1038 my $m = access_cfg('mirror');
1039 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1042 sub pool_dsc_subpath ($$) {
1043 my ($vsn,$component) = @_; # $package is implict arg
1044 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1045 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1048 sub cfg_apply_map ($$$) {
1049 my ($varref, $what, $mapspec) = @_;
1050 return unless $mapspec;
1052 printdebug "config $what EVAL{ $mapspec; }\n";
1054 eval "package Dgit::Config; $mapspec;";
1059 #---------- `ftpmasterapi' archive query method (nascent) ----------
1061 sub archive_api_query_cmd ($) {
1063 my @cmd = (@curl, qw(-sS));
1064 my $url = access_cfg('archive-query-url');
1065 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1067 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1068 foreach my $key (split /\:/, $keys) {
1069 $key =~ s/\%HOST\%/$host/g;
1071 fail "for $url: stat $key: $!" unless $!==ENOENT;
1074 fail "config requested specific TLS key but do not know".
1075 " how to get curl to use exactly that EE key ($key)";
1076 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1077 # # Sadly the above line does not work because of changes
1078 # # to gnutls. The real fix for #790093 may involve
1079 # # new curl options.
1082 # Fixing #790093 properly will involve providing a value
1083 # for this on clients.
1084 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1085 push @cmd, split / /, $kargs if defined $kargs;
1087 push @cmd, $url.$subpath;
1091 sub api_query ($$;$) {
1093 my ($data, $subpath, $ok404) = @_;
1094 badcfg "ftpmasterapi archive query method takes no data part"
1096 my @cmd = archive_api_query_cmd($subpath);
1097 my $url = $cmd[$#cmd];
1098 push @cmd, qw(-w %{http_code});
1099 my $json = cmdoutput @cmd;
1100 unless ($json =~ s/\d+\d+\d$//) {
1101 failedcmd_report_cmd undef, @cmd;
1102 fail "curl failed to print 3-digit HTTP code";
1105 return undef if $code eq '404' && $ok404;
1106 fail "fetch of $url gave HTTP code $code"
1107 unless $url =~ m#^file://# or $code =~ m/^2/;
1108 return decode_json($json);
1111 sub canonicalise_suite_ftpmasterapi {
1112 my ($proto,$data) = @_;
1113 my $suites = api_query($data, 'suites');
1115 foreach my $entry (@$suites) {
1117 my $v = $entry->{$_};
1118 defined $v && $v eq $isuite;
1119 } qw(codename name);
1120 push @matched, $entry;
1122 fail "unknown suite $isuite" unless @matched;
1125 @matched==1 or die "multiple matches for suite $isuite\n";
1126 $cn = "$matched[0]{codename}";
1127 defined $cn or die "suite $isuite info has no codename\n";
1128 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1130 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1135 sub archive_query_ftpmasterapi {
1136 my ($proto,$data) = @_;
1137 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1139 my $digester = Digest::SHA->new(256);
1140 foreach my $entry (@$info) {
1142 my $vsn = "$entry->{version}";
1143 my ($ok,$msg) = version_check $vsn;
1144 die "bad version: $msg\n" unless $ok;
1145 my $component = "$entry->{component}";
1146 $component =~ m/^$component_re$/ or die "bad component";
1147 my $filename = "$entry->{filename}";
1148 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1149 or die "bad filename";
1150 my $sha256sum = "$entry->{sha256sum}";
1151 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1152 push @rows, [ $vsn, "/pool/$component/$filename",
1153 $digester, $sha256sum ];
1155 die "bad ftpmaster api response: $@\n".Dumper($entry)
1158 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1159 return archive_query_prepend_mirror @rows;
1162 sub file_in_archive_ftpmasterapi {
1163 my ($proto,$data,$filename) = @_;
1164 my $pat = $filename;
1167 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1168 my $info = api_query($data, "file_in_archive/$pat", 1);
1171 #---------- `aptget' archive query method ----------
1174 our $aptget_releasefile;
1175 our $aptget_configpath;
1177 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1178 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1180 sub aptget_cache_clean {
1181 runcmd_ordryrun_local qw(sh -ec),
1182 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1186 sub aptget_lock_acquire () {
1187 my $lockfile = "$aptget_base/lock";
1188 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1189 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1192 sub aptget_prep ($) {
1194 return if defined $aptget_base;
1196 badcfg "aptget archive query method takes no data part"
1199 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1202 ensuredir "$cache/dgit";
1204 access_cfg('aptget-cachekey','RETURN-UNDEF')
1205 // access_nomdistro();
1207 $aptget_base = "$cache/dgit/aptget";
1208 ensuredir $aptget_base;
1210 my $quoted_base = $aptget_base;
1211 die "$quoted_base contains bad chars, cannot continue"
1212 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1214 ensuredir $aptget_base;
1216 aptget_lock_acquire();
1218 aptget_cache_clean();
1220 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1221 my $sourceslist = "source.list#$cachekey";
1223 my $aptsuites = $isuite;
1224 cfg_apply_map(\$aptsuites, 'suite map',
1225 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1227 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1228 printf SRCS "deb-src %s %s %s\n",
1229 access_cfg('mirror'),
1231 access_cfg('aptget-components')
1234 ensuredir "$aptget_base/cache";
1235 ensuredir "$aptget_base/lists";
1237 open CONF, ">", $aptget_configpath or die $!;
1239 Debug::NoLocking "true";
1240 APT::Get::List-Cleanup "false";
1241 #clear APT::Update::Post-Invoke-Success;
1242 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1243 Dir::State::Lists "$quoted_base/lists";
1244 Dir::Etc::preferences "$quoted_base/preferences";
1245 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1246 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1249 foreach my $key (qw(
1252 Dir::Cache::Archives
1253 Dir::Etc::SourceParts
1254 Dir::Etc::preferencesparts
1256 ensuredir "$aptget_base/$key";
1257 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1260 my $oldatime = (time // die $!) - 1;
1261 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1262 next unless stat_exists $oldlist;
1263 my ($mtime) = (stat _)[9];
1264 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1267 runcmd_ordryrun_local aptget_aptget(), qw(update);
1270 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1271 next unless stat_exists $oldlist;
1272 my ($atime) = (stat _)[8];
1273 next if $atime == $oldatime;
1274 push @releasefiles, $oldlist;
1276 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1277 @releasefiles = @inreleasefiles if @inreleasefiles;
1278 die "apt updated wrong number of Release files (@releasefiles), erk"
1279 unless @releasefiles == 1;
1281 ($aptget_releasefile) = @releasefiles;
1284 sub canonicalise_suite_aptget {
1285 my ($proto,$data) = @_;
1288 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1290 foreach my $name (qw(Codename Suite)) {
1291 my $val = $release->{$name};
1293 printdebug "release file $name: $val\n";
1294 $val =~ m/^$suite_re$/o or fail
1295 "Release file ($aptget_releasefile) specifies intolerable $name";
1296 cfg_apply_map(\$val, 'suite rmap',
1297 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1304 sub archive_query_aptget {
1305 my ($proto,$data) = @_;
1308 ensuredir "$aptget_base/source";
1309 foreach my $old (<$aptget_base/source/*.dsc>) {
1310 unlink $old or die "$old: $!";
1313 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1314 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1315 # avoids apt-get source failing with ambiguous error code
1317 runcmd_ordryrun_local
1318 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1319 aptget_aptget(), qw(--download-only --only-source source), $package;
1321 my @dscs = <$aptget_base/source/*.dsc>;
1322 fail "apt-get source did not produce a .dsc" unless @dscs;
1323 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1325 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1328 my $uri = "file://". uri_escape $dscs[0];
1329 $uri =~ s{\%2f}{/}gi;
1330 return [ (getfield $pre_dsc, 'Version'), $uri ];
1333 sub file_in_archive_aptget () { return undef; }
1335 #---------- `dummyapicat' archive query method ----------
1337 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1338 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1340 sub file_in_archive_dummycatapi ($$$) {
1341 my ($proto,$data,$filename) = @_;
1342 my $mirror = access_cfg('mirror');
1343 $mirror =~ s#^file://#/# or die "$mirror ?";
1345 my @cmd = (qw(sh -ec), '
1347 find -name "$2" -print0 |
1349 ', qw(x), $mirror, $filename);
1350 debugcmd "-|", @cmd;
1351 open FIA, "-|", @cmd or die $!;
1354 printdebug "| $_\n";
1355 m/^(\w+) (\S+)$/ or die "$_ ?";
1356 push @out, { sha256sum => $1, filename => $2 };
1358 close FIA or die failedcmd @cmd;
1362 #---------- `madison' archive query method ----------
1364 sub archive_query_madison {
1365 return archive_query_prepend_mirror
1366 map { [ @$_[0..1] ] } madison_get_parse(@_);
1369 sub madison_get_parse {
1370 my ($proto,$data) = @_;
1371 die unless $proto eq 'madison';
1372 if (!length $data) {
1373 $data= access_cfg('madison-distro','RETURN-UNDEF');
1374 $data //= access_basedistro();
1376 $rmad{$proto,$data,$package} ||= cmdoutput
1377 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1378 my $rmad = $rmad{$proto,$data,$package};
1381 foreach my $l (split /\n/, $rmad) {
1382 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1383 \s*( [^ \t|]+ )\s* \|
1384 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1385 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1386 $1 eq $package or die "$rmad $package ?";
1393 $component = access_cfg('archive-query-default-component');
1395 $5 eq 'source' or die "$rmad ?";
1396 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1398 return sort { -version_compare($a->[0],$b->[0]); } @out;
1401 sub canonicalise_suite_madison {
1402 # madison canonicalises for us
1403 my @r = madison_get_parse(@_);
1405 "unable to canonicalise suite using package $package".
1406 " which does not appear to exist in suite $isuite;".
1407 " --existing-package may help";
1411 sub file_in_archive_madison { return undef; }
1413 #---------- `sshpsql' archive query method ----------
1416 my ($data,$runeinfo,$sql) = @_;
1417 if (!length $data) {
1418 $data= access_someuserhost('sshpsql').':'.
1419 access_cfg('sshpsql-dbname');
1421 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1422 my ($userhost,$dbname) = ($`,$'); #';
1424 my @cmd = (access_cfg_ssh, $userhost,
1425 access_runeinfo("ssh-psql $runeinfo").
1426 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1427 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1429 open P, "-|", @cmd or die $!;
1432 printdebug(">|$_|\n");
1435 $!=0; $?=0; close P or failedcmd @cmd;
1437 my $nrows = pop @rows;
1438 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1439 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1440 @rows = map { [ split /\|/, $_ ] } @rows;
1441 my $ncols = scalar @{ shift @rows };
1442 die if grep { scalar @$_ != $ncols } @rows;
1446 sub sql_injection_check {
1447 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1450 sub archive_query_sshpsql ($$) {
1451 my ($proto,$data) = @_;
1452 sql_injection_check $isuite, $package;
1453 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1454 SELECT source.version, component.name, files.filename, files.sha256sum
1456 JOIN src_associations ON source.id = src_associations.source
1457 JOIN suite ON suite.id = src_associations.suite
1458 JOIN dsc_files ON dsc_files.source = source.id
1459 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1460 JOIN component ON component.id = files_archive_map.component_id
1461 JOIN files ON files.id = dsc_files.file
1462 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1463 AND source.source='$package'
1464 AND files.filename LIKE '%.dsc';
1466 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1467 my $digester = Digest::SHA->new(256);
1469 my ($vsn,$component,$filename,$sha256sum) = @$_;
1470 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1472 return archive_query_prepend_mirror @rows;
1475 sub canonicalise_suite_sshpsql ($$) {
1476 my ($proto,$data) = @_;
1477 sql_injection_check $isuite;
1478 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1479 SELECT suite.codename
1480 FROM suite where suite_name='$isuite' or codename='$isuite';
1482 @rows = map { $_->[0] } @rows;
1483 fail "unknown suite $isuite" unless @rows;
1484 die "ambiguous $isuite: @rows ?" if @rows>1;
1488 sub file_in_archive_sshpsql ($$$) { return undef; }
1490 #---------- `dummycat' archive query method ----------
1492 sub canonicalise_suite_dummycat ($$) {
1493 my ($proto,$data) = @_;
1494 my $dpath = "$data/suite.$isuite";
1495 if (!open C, "<", $dpath) {
1496 $!==ENOENT or die "$dpath: $!";
1497 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1501 chomp or die "$dpath: $!";
1503 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1507 sub archive_query_dummycat ($$) {
1508 my ($proto,$data) = @_;
1509 canonicalise_suite();
1510 my $dpath = "$data/package.$csuite.$package";
1511 if (!open C, "<", $dpath) {
1512 $!==ENOENT or die "$dpath: $!";
1513 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1521 printdebug "dummycat query $csuite $package $dpath | $_\n";
1522 my @row = split /\s+/, $_;
1523 @row==2 or die "$dpath: $_ ?";
1526 C->error and die "$dpath: $!";
1528 return archive_query_prepend_mirror
1529 sort { -version_compare($a->[0],$b->[0]); } @rows;
1532 sub file_in_archive_dummycat () { return undef; }
1534 #---------- tag format handling ----------
1536 sub access_cfg_tagformats () {
1537 split /\,/, access_cfg('dgit-tag-format');
1540 sub access_cfg_tagformats_can_splitbrain () {
1541 my %y = map { $_ => 1 } access_cfg_tagformats;
1542 foreach my $needtf (qw(new maint)) {
1543 next if $y{$needtf};
1549 sub need_tagformat ($$) {
1550 my ($fmt, $why) = @_;
1551 fail "need to use tag format $fmt ($why) but also need".
1552 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1553 " - no way to proceed"
1554 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1555 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1558 sub select_tagformat () {
1560 return if $tagformatfn && !$tagformat_want;
1561 die 'bug' if $tagformatfn && $tagformat_want;
1562 # ... $tagformat_want assigned after previous select_tagformat
1564 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1565 printdebug "select_tagformat supported @supported\n";
1567 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1568 printdebug "select_tagformat specified @$tagformat_want\n";
1570 my ($fmt,$why,$override) = @$tagformat_want;
1572 fail "target distro supports tag formats @supported".
1573 " but have to use $fmt ($why)"
1575 or grep { $_ eq $fmt } @supported;
1577 $tagformat_want = undef;
1579 $tagformatfn = ${*::}{"debiantag_$fmt"};
1581 fail "trying to use unknown tag format \`$fmt' ($why) !"
1582 unless $tagformatfn;
1585 #---------- archive query entrypoints and rest of program ----------
1587 sub canonicalise_suite () {
1588 return if defined $csuite;
1589 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1590 $csuite = archive_query('canonicalise_suite');
1591 if ($isuite ne $csuite) {
1592 progress "canonical suite name for $isuite is $csuite";
1594 progress "canonical suite name is $csuite";
1598 sub get_archive_dsc () {
1599 canonicalise_suite();
1600 my @vsns = archive_query('archive_query');
1601 foreach my $vinfo (@vsns) {
1602 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1603 $dscurl = $vsn_dscurl;
1604 $dscdata = url_get($dscurl);
1606 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1611 $digester->add($dscdata);
1612 my $got = $digester->hexdigest();
1614 fail "$dscurl has hash $got but".
1615 " archive told us to expect $digest";
1618 my $fmt = getfield $dsc, 'Format';
1619 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1620 "unsupported source format $fmt, sorry";
1622 $dsc_checked = !!$digester;
1623 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1627 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1630 sub check_for_git ();
1631 sub check_for_git () {
1633 my $how = access_cfg('git-check');
1634 if ($how eq 'ssh-cmd') {
1636 (access_cfg_ssh, access_gituserhost(),
1637 access_runeinfo("git-check $package").
1638 " set -e; cd ".access_cfg('git-path').";".
1639 " if test -d $package.git; then echo 1; else echo 0; fi");
1640 my $r= cmdoutput @cmd;
1641 if (defined $r and $r =~ m/^divert (\w+)$/) {
1643 my ($usedistro,) = access_distros();
1644 # NB that if we are pushing, $usedistro will be $distro/push
1645 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1646 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1647 progress "diverting to $divert (using config for $instead_distro)";
1648 return check_for_git();
1650 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1652 } elsif ($how eq 'url') {
1653 my $prefix = access_cfg('git-check-url','git-url');
1654 my $suffix = access_cfg('git-check-suffix','git-suffix',
1655 'RETURN-UNDEF') // '.git';
1656 my $url = "$prefix/$package$suffix";
1657 my @cmd = (@curl, qw(-sS -I), $url);
1658 my $result = cmdoutput @cmd;
1659 $result =~ s/^\S+ 200 .*\n\r?\n//;
1660 # curl -sS -I with https_proxy prints
1661 # HTTP/1.0 200 Connection established
1662 $result =~ m/^\S+ (404|200) /s or
1663 fail "unexpected results from git check query - ".
1664 Dumper($prefix, $result);
1666 if ($code eq '404') {
1668 } elsif ($code eq '200') {
1673 } elsif ($how eq 'true') {
1675 } elsif ($how eq 'false') {
1678 badcfg "unknown git-check \`$how'";
1682 sub create_remote_git_repo () {
1683 my $how = access_cfg('git-create');
1684 if ($how eq 'ssh-cmd') {
1686 (access_cfg_ssh, access_gituserhost(),
1687 access_runeinfo("git-create $package").
1688 "set -e; cd ".access_cfg('git-path').";".
1689 " cp -a _template $package.git");
1690 } elsif ($how eq 'true') {
1693 badcfg "unknown git-create \`$how'";
1697 our ($dsc_hash,$lastpush_mergeinput);
1698 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1700 our $ud = '.git/dgit/unpack';
1710 sub mktree_in_ud_here () {
1711 runcmd qw(git init -q);
1712 runcmd qw(git config gc.auto 0);
1713 foreach my $copy (qw(user.email user.name user.useConfigOnly)) {
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 my @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 ? 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 open GAO, "> $af.new" or die $!;
3378 print GAO <<END or die $!;
3380 [attr]dgit-defuse-attrs -text -eol -crlf -ident -filter
3381 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3383 my $gai = open_gitattrs();
3387 print GAO $_, "\n" or die $!;
3389 $gai->error and die $!;
3391 close GAO or die $!;
3392 rename "$af.new", "$af" or die "install $af: $!";
3395 sub setup_new_tree () {
3396 setup_mergechangelogs();
3401 sub check_gitattrs ($$) {
3402 my ($treeish, $what) = @_;
3404 return if is_gitattrs_setup;
3407 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3409 my $gafl = new IO::File;
3410 open $gafl, "-|", @cmd or die $!;
3413 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3415 next unless m{(?:^|/)\.gitattributes$};
3417 # oh dear, found one
3419 dgit: warning: $what contains .gitattributes
3420 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3425 # tree contains no .gitattributes files
3426 $?=0; $!=0; close $gafl or failedcmd @cmd;
3430 sub multisuite_suite_child ($$$) {
3431 my ($tsuite, $merginputs, $fn) = @_;
3432 # in child, sets things up, calls $fn->(), and returns undef
3433 # in parent, returns canonical suite name for $tsuite
3434 my $canonsuitefh = IO::File::new_tmpfile;
3435 my $pid = fork // die $!;
3439 $us .= " [$isuite]";
3440 $debugprefix .= " ";
3441 progress "fetching $tsuite...";
3442 canonicalise_suite();
3443 print $canonsuitefh $csuite, "\n" or die $!;
3444 close $canonsuitefh or die $!;
3448 waitpid $pid,0 == $pid or die $!;
3449 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3450 seek $canonsuitefh,0,0 or die $!;
3451 local $csuite = <$canonsuitefh>;
3452 die $! unless defined $csuite && chomp $csuite;
3454 printdebug "multisuite $tsuite missing\n";
3457 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3458 push @$merginputs, {
3465 sub fork_for_multisuite ($) {
3466 my ($before_fetch_merge) = @_;
3467 # if nothing unusual, just returns ''
3470 # returns 0 to caller in child, to do first of the specified suites
3471 # in child, $csuite is not yet set
3473 # returns 1 to caller in parent, to finish up anything needed after
3474 # in parent, $csuite is set to canonicalised portmanteau
3476 my $org_isuite = $isuite;
3477 my @suites = split /\,/, $isuite;
3478 return '' unless @suites > 1;
3479 printdebug "fork_for_multisuite: @suites\n";
3483 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3485 return 0 unless defined $cbasesuite;
3487 fail "package $package missing in (base suite) $cbasesuite"
3488 unless @mergeinputs;
3490 my @csuites = ($cbasesuite);
3492 $before_fetch_merge->();
3494 foreach my $tsuite (@suites[1..$#suites]) {
3495 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3501 # xxx collecte the ref here
3503 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3504 push @csuites, $csubsuite;
3507 foreach my $mi (@mergeinputs) {
3508 my $ref = git_get_ref $mi->{Ref};
3509 die "$mi->{Ref} ?" unless length $ref;
3510 $mi->{Commit} = $ref;
3513 $csuite = join ",", @csuites;
3515 my $previous = git_get_ref lrref;
3517 unshift @mergeinputs, {
3518 Commit => $previous,
3519 Info => "local combined tracking branch",
3521 "archive seems to have rewound: local tracking branch is ahead!",
3525 foreach my $ix (0..$#mergeinputs) {
3526 $mergeinputs[$ix]{Index} = $ix;
3529 @mergeinputs = sort {
3530 -version_compare(mergeinfo_version $a,
3531 mergeinfo_version $b) # highest version first
3533 $a->{Index} <=> $b->{Index}; # earliest in spec first
3539 foreach my $mi (@mergeinputs) {
3540 printdebug "multisuite merge check $mi->{Info}\n";
3541 foreach my $previous (@needed) {
3542 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3543 printdebug "multisuite merge un-needed $previous->{Info}\n";
3547 printdebug "multisuite merge this-needed\n";
3548 $mi->{Character} = '+';
3551 $needed[0]{Character} = '*';
3553 my $output = $needed[0]{Commit};
3556 printdebug "multisuite merge nontrivial\n";
3557 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3559 my $commit = "tree $tree\n";
3560 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3561 "Input branches:\n";
3563 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3564 printdebug "multisuite merge include $mi->{Info}\n";
3565 $mi->{Character} //= ' ';
3566 $commit .= "parent $mi->{Commit}\n";
3567 $msg .= sprintf " %s %-25s %s\n",
3569 (mergeinfo_version $mi),
3572 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3574 " * marks the highest version branch, which choose to use\n".
3575 " + marks each branch which was not already an ancestor\n\n".
3576 "[dgit multi-suite $csuite]\n";
3578 "author $authline\n".
3579 "committer $authline\n\n";
3580 $output = make_commit_text $commit.$msg;
3581 printdebug "multisuite merge generated $output\n";
3584 fetch_from_archive_record_1($output);
3585 fetch_from_archive_record_2($output);
3587 progress "calculated combined tracking suite $csuite";
3592 sub clone_set_head () {
3593 open H, "> .git/HEAD" or die $!;
3594 print H "ref: ".lref()."\n" or die $!;
3597 sub clone_finish ($) {
3599 runcmd @git, qw(reset --hard), lrref();
3600 runcmd qw(bash -ec), <<'END';
3602 git ls-tree -r --name-only -z HEAD | \
3603 xargs -0r touch -h -r . --
3605 printdone "ready for work in $dstdir";
3610 badusage "dry run makes no sense with clone" unless act_local();
3612 my $multi_fetched = fork_for_multisuite(sub {
3613 printdebug "multi clone before fetch merge\n";
3616 if ($multi_fetched) {
3617 printdebug "multi clone after fetch merge\n";
3619 clone_finish($dstdir);
3622 printdebug "clone main body\n";
3624 canonicalise_suite();
3625 my $hasgit = check_for_git();
3626 mkdir $dstdir or fail "create \`$dstdir': $!";
3628 runcmd @git, qw(init -q);
3631 my $giturl = access_giturl(1);
3632 if (defined $giturl) {
3633 runcmd @git, qw(remote add), 'origin', $giturl;
3636 progress "fetching existing git history";
3638 runcmd_ordryrun_local @git, qw(fetch origin);
3640 progress "starting new git history";
3642 fetch_from_archive() or no_such_package;
3643 my $vcsgiturl = $dsc->{'Vcs-Git'};
3644 if (length $vcsgiturl) {
3645 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3646 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3648 clone_finish($dstdir);
3652 canonicalise_suite();
3653 if (check_for_git()) {
3656 fetch_from_archive() or no_such_package();
3657 printdone "fetched into ".lrref();
3661 my $multi_fetched = fork_for_multisuite(sub { });
3662 fetch() unless $multi_fetched; # parent
3663 return if $multi_fetched eq '0'; # child
3664 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3666 printdone "fetched to ".lrref()." and merged into HEAD";
3669 sub check_not_dirty () {
3670 foreach my $f (qw(local-options local-patch-header)) {
3671 if (stat_exists "debian/source/$f") {
3672 fail "git tree contains debian/source/$f";
3676 return if $ignoredirty;
3678 my @cmd = (@git, qw(diff --quiet HEAD));
3680 $!=0; $?=-1; system @cmd;
3683 fail "working tree is dirty (does not match HEAD)";
3689 sub commit_admin ($) {
3692 runcmd_ordryrun_local @git, qw(commit -m), $m;
3695 sub commit_quilty_patch () {
3696 my $output = cmdoutput @git, qw(status --porcelain);
3698 foreach my $l (split /\n/, $output) {
3699 next unless $l =~ m/\S/;
3700 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3704 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3706 progress "nothing quilty to commit, ok.";
3709 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3710 runcmd_ordryrun_local @git, qw(add -f), @adds;
3712 Commit Debian 3.0 (quilt) metadata
3714 [dgit ($our_version) quilt-fixup]
3718 sub get_source_format () {
3720 if (open F, "debian/source/options") {
3724 s/\s+$//; # ignore missing final newline
3726 my ($k, $v) = ($`, $'); #');
3727 $v =~ s/^"(.*)"$/$1/;
3733 F->error and die $!;
3736 die $! unless $!==&ENOENT;
3739 if (!open F, "debian/source/format") {
3740 die $! unless $!==&ENOENT;
3744 F->error and die $!;
3746 return ($_, \%options);
3749 sub madformat_wantfixup ($) {
3751 return 0 unless $format eq '3.0 (quilt)';
3752 our $quilt_mode_warned;
3753 if ($quilt_mode eq 'nocheck') {
3754 progress "Not doing any fixup of \`$format' due to".
3755 " ----no-quilt-fixup or --quilt=nocheck"
3756 unless $quilt_mode_warned++;
3759 progress "Format \`$format', need to check/update patch stack"
3760 unless $quilt_mode_warned++;
3764 sub maybe_split_brain_save ($$$) {
3765 my ($headref, $dgitview, $msg) = @_;
3766 # => message fragment "$saved" describing disposition of $dgitview
3767 return "commit id $dgitview" unless defined $split_brain_save;
3768 my @cmd = (shell_cmd "cd ../../../..",
3769 @git, qw(update-ref -m),
3770 "dgit --dgit-view-save $msg HEAD=$headref",
3771 $split_brain_save, $dgitview);
3773 return "and left in $split_brain_save";
3776 # An "infopair" is a tuple [ $thing, $what ]
3777 # (often $thing is a commit hash; $what is a description)
3779 sub infopair_cond_equal ($$) {
3781 $x->[0] eq $y->[0] or fail <<END;
3782 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3786 sub infopair_lrf_tag_lookup ($$) {
3787 my ($tagnames, $what) = @_;
3788 # $tagname may be an array ref
3789 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3790 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3791 foreach my $tagname (@tagnames) {
3792 my $lrefname = lrfetchrefs."/tags/$tagname";
3793 my $tagobj = $lrfetchrefs_f{$lrefname};
3794 next unless defined $tagobj;
3795 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3796 return [ git_rev_parse($tagobj), $what ];
3798 fail @tagnames==1 ? <<END : <<END;
3799 Wanted tag $what (@tagnames) on dgit server, but not found
3801 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3805 sub infopair_cond_ff ($$) {
3806 my ($anc,$desc) = @_;
3807 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3808 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3812 sub pseudomerge_version_check ($$) {
3813 my ($clogp, $archive_hash) = @_;
3815 my $arch_clogp = commit_getclogp $archive_hash;
3816 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3817 'version currently in archive' ];
3818 if (defined $overwrite_version) {
3819 if (length $overwrite_version) {
3820 infopair_cond_equal([ $overwrite_version,
3821 '--overwrite= version' ],
3824 my $v = $i_arch_v->[0];
3825 progress "Checking package changelog for archive version $v ...";
3828 my @xa = ("-f$v", "-t$v");
3829 my $vclogp = parsechangelog @xa;
3832 [ (getfield $vclogp, $fn),
3833 "$fn field from dpkg-parsechangelog @xa" ];
3835 my $cv = $gf->('Version');
3836 infopair_cond_equal($i_arch_v, $cv);
3837 $cd = $gf->('Distribution');
3840 $@ =~ s/^dgit: //gm;
3842 "Perhaps debian/changelog does not mention $v ?";
3844 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3845 $cd->[1] is $cd->[0]
3846 Your tree seems to based on earlier (not uploaded) $v.
3851 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3855 sub pseudomerge_make_commit ($$$$ $$) {
3856 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3857 $msg_cmd, $msg_msg) = @_;
3858 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3860 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3861 my $authline = clogp_authline $clogp;
3865 !defined $overwrite_version ? ""
3866 : !length $overwrite_version ? " --overwrite"
3867 : " --overwrite=".$overwrite_version;
3870 my $pmf = ".git/dgit/pseudomerge";
3871 open MC, ">", $pmf or die "$pmf $!";
3872 print MC <<END or die $!;
3875 parent $archive_hash
3885 return make_commit($pmf);
3888 sub splitbrain_pseudomerge ($$$$) {
3889 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3890 # => $merged_dgitview
3891 printdebug "splitbrain_pseudomerge...\n";
3893 # We: debian/PREVIOUS HEAD($maintview)
3894 # expect: o ----------------- o
3897 # a/d/PREVIOUS $dgitview
3900 # we do: `------------------ o
3904 return $dgitview unless defined $archive_hash;
3906 printdebug "splitbrain_pseudomerge...\n";
3908 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3910 if (!defined $overwrite_version) {
3911 progress "Checking that HEAD inciudes all changes in archive...";
3914 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3916 if (defined $overwrite_version) {
3918 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3919 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3920 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3921 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3922 my $i_archive = [ $archive_hash, "current archive contents" ];
3924 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3926 infopair_cond_equal($i_dgit, $i_archive);
3927 infopair_cond_ff($i_dep14, $i_dgit);
3928 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3932 $us: check failed (maybe --overwrite is needed, consult documentation)
3937 my $r = pseudomerge_make_commit
3938 $clogp, $dgitview, $archive_hash, $i_arch_v,
3939 "dgit --quilt=$quilt_mode",
3940 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3941 Declare fast forward from $i_arch_v->[0]
3943 Make fast forward from $i_arch_v->[0]
3946 maybe_split_brain_save $maintview, $r, "pseudomerge";
3948 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3952 sub plain_overwrite_pseudomerge ($$$) {
3953 my ($clogp, $head, $archive_hash) = @_;
3955 printdebug "plain_overwrite_pseudomerge...";
3957 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3959 return $head if is_fast_fwd $archive_hash, $head;
3961 my $m = "Declare fast forward from $i_arch_v->[0]";
3963 my $r = pseudomerge_make_commit
3964 $clogp, $head, $archive_hash, $i_arch_v,
3967 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3969 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3973 sub push_parse_changelog ($) {
3976 my $clogp = Dpkg::Control::Hash->new();
3977 $clogp->load($clogpfn) or die;
3979 my $clogpackage = getfield $clogp, 'Source';
3980 $package //= $clogpackage;
3981 fail "-p specified $package but changelog specified $clogpackage"
3982 unless $package eq $clogpackage;
3983 my $cversion = getfield $clogp, 'Version';
3985 if (!$we_are_initiator) {
3986 # rpush initiator can't do this because it doesn't have $isuite yet
3987 my $tag = debiantag($cversion, access_nomdistro);
3988 runcmd @git, qw(check-ref-format), $tag;
3991 my $dscfn = dscfn($cversion);
3993 return ($clogp, $cversion, $dscfn);
3996 sub push_parse_dsc ($$$) {
3997 my ($dscfn,$dscfnwhat, $cversion) = @_;
3998 $dsc = parsecontrol($dscfn,$dscfnwhat);
3999 my $dversion = getfield $dsc, 'Version';
4000 my $dscpackage = getfield $dsc, 'Source';
4001 ($dscpackage eq $package && $dversion eq $cversion) or
4002 fail "$dscfn is for $dscpackage $dversion".
4003 " but debian/changelog is for $package $cversion";
4006 sub push_tagwants ($$$$) {
4007 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4010 TagFn => \&debiantag,
4015 if (defined $maintviewhead) {
4017 TagFn => \&debiantag_maintview,
4018 Objid => $maintviewhead,
4019 TfSuffix => '-maintview',
4022 } elsif ($dodep14tag eq 'no' ? 0
4023 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4024 : $dodep14tag eq 'always'
4025 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4026 --dep14tag-always (or equivalent in config) means server must support
4027 both "new" and "maint" tag formats, but config says it doesn't.
4029 : die "$dodep14tag ?") {
4031 TagFn => \&debiantag_maintview,
4033 TfSuffix => '-dgit',
4037 foreach my $tw (@tagwants) {
4038 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4039 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4041 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4045 sub push_mktags ($$ $$ $) {
4047 $changesfile,$changesfilewhat,
4050 die unless $tagwants->[0]{View} eq 'dgit';
4052 my $declaredistro = access_nomdistro();
4053 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4054 $dsc->{$ourdscfield[0]} = join " ",
4055 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4057 $dsc->save("$dscfn.tmp") or die $!;
4059 my $changes = parsecontrol($changesfile,$changesfilewhat);
4060 foreach my $field (qw(Source Distribution Version)) {
4061 $changes->{$field} eq $clogp->{$field} or
4062 fail "changes field $field \`$changes->{$field}'".
4063 " does not match changelog \`$clogp->{$field}'";
4066 my $cversion = getfield $clogp, 'Version';
4067 my $clogsuite = getfield $clogp, 'Distribution';
4069 # We make the git tag by hand because (a) that makes it easier
4070 # to control the "tagger" (b) we can do remote signing
4071 my $authline = clogp_authline $clogp;
4072 my $delibs = join(" ", "",@deliberatelies);
4076 my $tfn = $tw->{Tfn};
4077 my $head = $tw->{Objid};
4078 my $tag = $tw->{Tag};
4080 open TO, '>', $tfn->('.tmp') or die $!;
4081 print TO <<END or die $!;
4088 if ($tw->{View} eq 'dgit') {
4089 print TO <<END or die $!;
4090 $package release $cversion for $clogsuite ($csuite) [dgit]
4091 [dgit distro=$declaredistro$delibs]
4093 foreach my $ref (sort keys %previously) {
4094 print TO <<END or die $!;
4095 [dgit previously:$ref=$previously{$ref}]
4098 } elsif ($tw->{View} eq 'maint') {
4099 print TO <<END or die $!;
4100 $package release $cversion for $clogsuite ($csuite)
4101 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4104 die Dumper($tw)."?";
4109 my $tagobjfn = $tfn->('.tmp');
4111 if (!defined $keyid) {
4112 $keyid = access_cfg('keyid','RETURN-UNDEF');
4114 if (!defined $keyid) {
4115 $keyid = getfield $clogp, 'Maintainer';
4117 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4118 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4119 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4120 push @sign_cmd, $tfn->('.tmp');
4121 runcmd_ordryrun @sign_cmd;
4123 $tagobjfn = $tfn->('.signed.tmp');
4124 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4125 $tfn->('.tmp'), $tfn->('.tmp.asc');
4131 my @r = map { $mktag->($_); } @$tagwants;
4135 sub sign_changes ($) {
4136 my ($changesfile) = @_;
4138 my @debsign_cmd = @debsign;
4139 push @debsign_cmd, "-k$keyid" if defined $keyid;
4140 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4141 push @debsign_cmd, $changesfile;
4142 runcmd_ordryrun @debsign_cmd;
4147 printdebug "actually entering push\n";
4149 supplementary_message(<<'END');
4150 Push failed, while checking state of the archive.
4151 You can retry the push, after fixing the problem, if you like.
4153 if (check_for_git()) {
4156 my $archive_hash = fetch_from_archive();
4157 if (!$archive_hash) {
4159 fail "package appears to be new in this suite;".
4160 " if this is intentional, use --new";
4163 supplementary_message(<<'END');
4164 Push failed, while preparing your push.
4165 You can retry the push, after fixing the problem, if you like.
4168 need_tagformat 'new', "quilt mode $quilt_mode"
4169 if quiltmode_splitbrain;
4173 access_giturl(); # check that success is vaguely likely
4174 rpush_handle_protovsn_bothends() if $we_are_initiator;
4177 my $clogpfn = ".git/dgit/changelog.822.tmp";
4178 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4180 responder_send_file('parsed-changelog', $clogpfn);
4182 my ($clogp, $cversion, $dscfn) =
4183 push_parse_changelog("$clogpfn");
4185 my $dscpath = "$buildproductsdir/$dscfn";
4186 stat_exists $dscpath or
4187 fail "looked for .dsc $dscpath, but $!;".
4188 " maybe you forgot to build";
4190 responder_send_file('dsc', $dscpath);
4192 push_parse_dsc($dscpath, $dscfn, $cversion);
4194 my $format = getfield $dsc, 'Format';
4195 printdebug "format $format\n";
4197 my $actualhead = git_rev_parse('HEAD');
4198 my $dgithead = $actualhead;
4199 my $maintviewhead = undef;
4201 my $upstreamversion = upstreamversion $clogp->{Version};
4203 if (madformat_wantfixup($format)) {
4204 # user might have not used dgit build, so maybe do this now:
4205 if (quiltmode_splitbrain()) {
4207 quilt_make_fake_dsc($upstreamversion);
4209 ($dgithead, $cachekey) =
4210 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4212 "--quilt=$quilt_mode but no cached dgit view:
4213 perhaps tree changed since dgit build[-source] ?";
4215 $dgithead = splitbrain_pseudomerge($clogp,
4216 $actualhead, $dgithead,
4218 $maintviewhead = $actualhead;
4219 changedir '../../../..';
4220 prep_ud(); # so _only_subdir() works, below
4222 commit_quilty_patch();
4226 if (defined $overwrite_version && !defined $maintviewhead) {
4227 $dgithead = plain_overwrite_pseudomerge($clogp,
4235 if ($archive_hash) {
4236 if (is_fast_fwd($archive_hash, $dgithead)) {
4238 } elsif (deliberately_not_fast_forward) {
4241 fail "dgit push: HEAD is not a descendant".
4242 " of the archive's version.\n".
4243 "To overwrite the archive's contents,".
4244 " pass --overwrite[=VERSION].\n".
4245 "To rewind history, if permitted by the archive,".
4246 " use --deliberately-not-fast-forward.";
4251 progress "checking that $dscfn corresponds to HEAD";
4252 runcmd qw(dpkg-source -x --),
4253 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4254 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4255 check_for_vendor_patches() if madformat($dsc->{format});
4256 changedir '../../../..';
4257 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4258 debugcmd "+",@diffcmd;
4260 my $r = system @diffcmd;
4263 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4265 HEAD specifies a different tree to $dscfn:
4267 Perhaps you forgot to build. Or perhaps there is a problem with your
4268 source tree (see dgit(7) for some hints). To see a full diff, run
4275 if (!$changesfile) {
4276 my $pat = changespat $cversion;
4277 my @cs = glob "$buildproductsdir/$pat";
4278 fail "failed to find unique changes file".
4279 " (looked for $pat in $buildproductsdir);".
4280 " perhaps you need to use dgit -C"
4282 ($changesfile) = @cs;
4284 $changesfile = "$buildproductsdir/$changesfile";
4287 # Check that changes and .dsc agree enough
4288 $changesfile =~ m{[^/]*$};
4289 my $changes = parsecontrol($changesfile,$&);
4290 files_compare_inputs($dsc, $changes)
4291 unless forceing [qw(dsc-changes-mismatch)];
4293 # Perhaps adjust .dsc to contain right set of origs
4294 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4296 unless forceing [qw(changes-origs-exactly)];
4298 # Checks complete, we're going to try and go ahead:
4300 responder_send_file('changes',$changesfile);
4301 responder_send_command("param head $dgithead");
4302 responder_send_command("param csuite $csuite");
4303 responder_send_command("param isuite $isuite");
4304 responder_send_command("param tagformat $tagformat");
4305 if (defined $maintviewhead) {
4306 die unless ($protovsn//4) >= 4;
4307 responder_send_command("param maint-view $maintviewhead");
4310 # Perhaps send buildinfo(s) for signing
4311 my $changes_files = getfield $changes, 'Files';
4312 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4313 foreach my $bi (@buildinfos) {
4314 responder_send_command("param buildinfo-filename $bi");
4315 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4318 if (deliberately_not_fast_forward) {
4319 git_for_each_ref(lrfetchrefs, sub {
4320 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4321 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4322 responder_send_command("previously $rrefname=$objid");
4323 $previously{$rrefname} = $objid;
4327 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4331 supplementary_message(<<'END');
4332 Push failed, while signing the tag.
4333 You can retry the push, after fixing the problem, if you like.
4335 # If we manage to sign but fail to record it anywhere, it's fine.
4336 if ($we_are_responder) {
4337 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4338 responder_receive_files('signed-tag', @tagobjfns);
4340 @tagobjfns = push_mktags($clogp,$dscpath,
4341 $changesfile,$changesfile,
4344 supplementary_message(<<'END');
4345 Push failed, *after* signing the tag.
4346 If you want to try again, you should use a new version number.
4349 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4351 foreach my $tw (@tagwants) {
4352 my $tag = $tw->{Tag};
4353 my $tagobjfn = $tw->{TagObjFn};
4355 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4356 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4357 runcmd_ordryrun_local
4358 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4361 supplementary_message(<<'END');
4362 Push failed, while updating the remote git repository - see messages above.
4363 If you want to try again, you should use a new version number.
4365 if (!check_for_git()) {
4366 create_remote_git_repo();
4369 my @pushrefs = $forceflag.$dgithead.":".rrref();
4370 foreach my $tw (@tagwants) {
4371 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4374 runcmd_ordryrun @git,
4375 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4376 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4378 supplementary_message(<<'END');
4379 Push failed, while obtaining signatures on the .changes and .dsc.
4380 If it was just that the signature failed, you may try again by using
4381 debsign by hand to sign the changes
4383 and then dput to complete the upload.
4384 If you need to change the package, you must use a new version number.
4386 if ($we_are_responder) {
4387 my $dryrunsuffix = act_local() ? "" : ".tmp";
4388 my @rfiles = ($dscpath, $changesfile);
4389 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4390 responder_receive_files('signed-dsc-changes',
4391 map { "$_$dryrunsuffix" } @rfiles);
4394 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4396 progress "[new .dsc left in $dscpath.tmp]";
4398 sign_changes $changesfile;
4401 supplementary_message(<<END);
4402 Push failed, while uploading package(s) to the archive server.
4403 You can retry the upload of exactly these same files with dput of:
4405 If that .changes file is broken, you will need to use a new version
4406 number for your next attempt at the upload.
4408 my $host = access_cfg('upload-host','RETURN-UNDEF');
4409 my @hostarg = defined($host) ? ($host,) : ();
4410 runcmd_ordryrun @dput, @hostarg, $changesfile;
4411 printdone "pushed and uploaded $cversion";
4413 supplementary_message('');
4414 responder_send_command("complete");
4420 badusage "-p is not allowed with clone; specify as argument instead"
4421 if defined $package;
4424 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4425 ($package,$isuite) = @ARGV;
4426 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4427 ($package,$dstdir) = @ARGV;
4428 } elsif (@ARGV==3) {
4429 ($package,$isuite,$dstdir) = @ARGV;
4431 badusage "incorrect arguments to dgit clone";
4435 $dstdir ||= "$package";
4436 if (stat_exists $dstdir) {
4437 fail "$dstdir already exists";
4441 if ($rmonerror && !$dryrun_level) {
4442 $cwd_remove= getcwd();
4444 return unless defined $cwd_remove;
4445 if (!chdir "$cwd_remove") {
4446 return if $!==&ENOENT;
4447 die "chdir $cwd_remove: $!";
4449 printdebug "clone rmonerror removing $dstdir\n";
4451 rmtree($dstdir) or die "remove $dstdir: $!\n";
4452 } elsif (grep { $! == $_ }
4453 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4455 print STDERR "check whether to remove $dstdir: $!\n";
4461 $cwd_remove = undef;
4464 sub branchsuite () {
4465 my @cmd = (@git, qw(symbolic-ref -q HEAD));
4466 my $branch = cmdoutput_errok @cmd;
4467 if (!defined $branch) {
4468 $?==256 or failedcmd @cmd;
4471 if ($branch =~ m#$lbranch_re#o) {
4478 sub fetchpullargs () {
4479 if (!defined $package) {
4480 my $sourcep = parsecontrol('debian/control','debian/control');
4481 $package = getfield $sourcep, 'Source';
4484 $isuite = branchsuite();
4486 my $clogp = parsechangelog();
4487 my $clogsuite = getfield $clogp, 'Distribution';
4488 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4490 } elsif (@ARGV==1) {
4493 badusage "incorrect arguments to dgit fetch or dgit pull";
4501 my $multi_fetched = fork_for_multisuite(sub { });
4502 exit 0 if $multi_fetched;
4509 if (quiltmode_splitbrain()) {
4510 my ($format, $fopts) = get_source_format();
4511 madformat($format) and fail <<END
4512 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4520 badusage "-p is not allowed with dgit push" if defined $package;
4522 my $clogp = parsechangelog();
4523 $package = getfield $clogp, 'Source';
4526 } elsif (@ARGV==1) {
4527 ($specsuite) = (@ARGV);
4529 badusage "incorrect arguments to dgit push";
4531 $isuite = getfield $clogp, 'Distribution';
4534 local ($package) = $existing_package; # this is a hack
4535 canonicalise_suite();
4537 canonicalise_suite();
4539 if (defined $specsuite &&
4540 $specsuite ne $isuite &&
4541 $specsuite ne $csuite) {
4542 fail "dgit push: changelog specifies $isuite ($csuite)".
4543 " but command line specifies $specsuite";
4548 #---------- remote commands' implementation ----------
4550 sub pre_remote_push_build_host {
4551 my ($nrargs) = shift @ARGV;
4552 my (@rargs) = @ARGV[0..$nrargs-1];
4553 @ARGV = @ARGV[$nrargs..$#ARGV];
4555 my ($dir,$vsnwant) = @rargs;
4556 # vsnwant is a comma-separated list; we report which we have
4557 # chosen in our ready response (so other end can tell if they
4560 $we_are_responder = 1;
4561 $us .= " (build host)";
4563 open PI, "<&STDIN" or die $!;
4564 open STDIN, "/dev/null" or die $!;
4565 open PO, ">&STDOUT" or die $!;
4567 open STDOUT, ">&STDERR" or die $!;
4571 ($protovsn) = grep {
4572 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4573 } @rpushprotovsn_support;
4575 fail "build host has dgit rpush protocol versions ".
4576 (join ",", @rpushprotovsn_support).
4577 " but invocation host has $vsnwant"
4578 unless defined $protovsn;
4582 sub cmd_remote_push_build_host {
4583 responder_send_command("dgit-remote-push-ready $protovsn");
4587 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4588 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4589 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4590 # a good error message)
4592 sub rpush_handle_protovsn_bothends () {
4593 if ($protovsn < 4) {
4594 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4603 my $report = i_child_report();
4604 if (defined $report) {
4605 printdebug "($report)\n";
4606 } elsif ($i_child_pid) {
4607 printdebug "(killing build host child $i_child_pid)\n";
4608 kill 15, $i_child_pid;
4610 if (defined $i_tmp && !defined $initiator_tempdir) {
4612 eval { rmtree $i_tmp; };
4617 return unless forkcheck_mainprocess();
4622 my ($base,$selector,@args) = @_;
4623 $selector =~ s/\-/_/g;
4624 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4630 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4638 push @rargs, join ",", @rpushprotovsn_support;
4641 push @rdgit, @ropts;
4642 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4644 my @cmd = (@ssh, $host, shellquote @rdgit);
4647 $we_are_initiator=1;
4649 if (defined $initiator_tempdir) {
4650 rmtree $initiator_tempdir;
4651 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4652 $i_tmp = $initiator_tempdir;
4656 $i_child_pid = open2(\*RO, \*RI, @cmd);
4658 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4659 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4660 $supplementary_message = '' unless $protovsn >= 3;
4663 my ($icmd,$iargs) = initiator_expect {
4664 m/^(\S+)(?: (.*))?$/;
4667 i_method "i_resp", $icmd, $iargs;
4671 sub i_resp_progress ($) {
4673 my $msg = protocol_read_bytes \*RO, $rhs;
4677 sub i_resp_supplementary_message ($) {
4679 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4682 sub i_resp_complete {
4683 my $pid = $i_child_pid;
4684 $i_child_pid = undef; # prevents killing some other process with same pid
4685 printdebug "waiting for build host child $pid...\n";
4686 my $got = waitpid $pid, 0;
4687 die $! unless $got == $pid;
4688 die "build host child failed $?" if $?;
4691 printdebug "all done\n";
4695 sub i_resp_file ($) {
4697 my $localname = i_method "i_localname", $keyword;
4698 my $localpath = "$i_tmp/$localname";
4699 stat_exists $localpath and
4700 badproto \*RO, "file $keyword ($localpath) twice";
4701 protocol_receive_file \*RO, $localpath;
4702 i_method "i_file", $keyword;
4707 sub i_resp_param ($) {
4708 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4712 sub i_resp_previously ($) {
4713 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4714 or badproto \*RO, "bad previously spec";
4715 my $r = system qw(git check-ref-format), $1;
4716 die "bad previously ref spec ($r)" if $r;
4717 $previously{$1} = $2;
4722 sub i_resp_want ($) {
4724 die "$keyword ?" if $i_wanted{$keyword}++;
4726 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4727 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4728 die unless $isuite =~ m/^$suite_re$/;
4731 rpush_handle_protovsn_bothends();
4733 fail "rpush negotiated protocol version $protovsn".
4734 " which does not support quilt mode $quilt_mode"
4735 if quiltmode_splitbrain;
4737 my @localpaths = i_method "i_want", $keyword;
4738 printdebug "[[ $keyword @localpaths\n";
4739 foreach my $localpath (@localpaths) {
4740 protocol_send_file \*RI, $localpath;
4742 print RI "files-end\n" or die $!;
4745 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4747 sub i_localname_parsed_changelog {
4748 return "remote-changelog.822";
4750 sub i_file_parsed_changelog {
4751 ($i_clogp, $i_version, $i_dscfn) =
4752 push_parse_changelog "$i_tmp/remote-changelog.822";
4753 die if $i_dscfn =~ m#/|^\W#;
4756 sub i_localname_dsc {
4757 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4762 sub i_localname_buildinfo ($) {
4763 my $bi = $i_param{'buildinfo-filename'};
4764 defined $bi or badproto \*RO, "buildinfo before filename";
4765 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4766 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4767 or badproto \*RO, "improper buildinfo filename";
4770 sub i_file_buildinfo {
4771 my $bi = $i_param{'buildinfo-filename'};
4772 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4773 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4774 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4775 files_compare_inputs($bd, $ch);
4776 (getfield $bd, $_) eq (getfield $ch, $_) or
4777 fail "buildinfo mismatch $_"
4778 foreach qw(Source Version);
4779 !defined $bd->{$_} or
4780 fail "buildinfo contains $_"
4781 foreach qw(Changes Changed-by Distribution);
4783 push @i_buildinfos, $bi;
4784 delete $i_param{'buildinfo-filename'};
4787 sub i_localname_changes {
4788 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4789 $i_changesfn = $i_dscfn;
4790 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4791 return $i_changesfn;
4793 sub i_file_changes { }
4795 sub i_want_signed_tag {
4796 printdebug Dumper(\%i_param, $i_dscfn);
4797 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4798 && defined $i_param{'csuite'}
4799 or badproto \*RO, "premature desire for signed-tag";
4800 my $head = $i_param{'head'};
4801 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4803 my $maintview = $i_param{'maint-view'};
4804 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4807 if ($protovsn >= 4) {
4808 my $p = $i_param{'tagformat'} // '<undef>';
4810 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4813 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4815 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4817 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4820 push_mktags $i_clogp, $i_dscfn,
4821 $i_changesfn, 'remote changes',
4825 sub i_want_signed_dsc_changes {
4826 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4827 sign_changes $i_changesfn;
4828 return ($i_dscfn, $i_changesfn, @i_buildinfos);
4831 #---------- building etc. ----------
4837 #----- `3.0 (quilt)' handling -----
4839 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4841 sub quiltify_dpkg_commit ($$$;$) {
4842 my ($patchname,$author,$msg, $xinfo) = @_;
4846 my $descfn = ".git/dgit/quilt-description.tmp";
4847 open O, '>', $descfn or die "$descfn: $!";
4848 $msg =~ s/\n+/\n\n/;
4849 print O <<END or die $!;
4851 ${xinfo}Subject: $msg
4858 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4859 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4860 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4861 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4865 sub quiltify_trees_differ ($$;$$$) {
4866 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4867 # returns true iff the two tree objects differ other than in debian/
4868 # with $finegrained,
4869 # returns bitmask 01 - differ in upstream files except .gitignore
4870 # 02 - differ in .gitignore
4871 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4872 # is set for each modified .gitignore filename $fn
4873 # if $unrepres is defined, array ref to which is appeneded
4874 # a list of unrepresentable changes (removals of upstream files
4877 my @cmd = (@git, qw(diff-tree -z));
4878 push @cmd, qw(--name-only) unless $unrepres;
4879 push @cmd, qw(-r) if $finegrained || $unrepres;
4881 my $diffs= cmdoutput @cmd;
4884 foreach my $f (split /\0/, $diffs) {
4885 if ($unrepres && !@lmodes) {
4886 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4889 my ($oldmode,$newmode) = @lmodes;
4892 next if $f =~ m#^debian(?:/.*)?$#s;
4896 die "not a plain file\n"
4897 unless $newmode =~ m/^10\d{4}$/ ||
4898 $oldmode =~ m/^10\d{4}$/;
4899 if ($oldmode =~ m/[^0]/ &&
4900 $newmode =~ m/[^0]/) {
4901 die "mode changed\n" if $oldmode ne $newmode;
4903 die "non-default mode\n"
4904 unless $newmode =~ m/^100644$/ ||
4905 $oldmode =~ m/^100644$/;
4909 local $/="\n"; chomp $@;
4910 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4914 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4915 $r |= $isignore ? 02 : 01;
4916 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4918 printdebug "quiltify_trees_differ $x $y => $r\n";
4922 sub quiltify_tree_sentinelfiles ($) {
4923 # lists the `sentinel' files present in the tree
4925 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4926 qw(-- debian/rules debian/control);
4931 sub quiltify_splitbrain_needed () {
4932 if (!$split_brain) {
4933 progress "dgit view: changes are required...";
4934 runcmd @git, qw(checkout -q -b dgit-view);
4939 sub quiltify_splitbrain ($$$$$$) {
4940 my ($clogp, $unapplied, $headref, $diffbits,
4941 $editedignores, $cachekey) = @_;
4942 if ($quilt_mode !~ m/gbp|dpm/) {
4943 # treat .gitignore just like any other upstream file
4944 $diffbits = { %$diffbits };
4945 $_ = !!$_ foreach values %$diffbits;
4947 # We would like any commits we generate to be reproducible
4948 my @authline = clogp_authline($clogp);
4949 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4950 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4951 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4952 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4953 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4954 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4956 if ($quilt_mode =~ m/gbp|unapplied/ &&
4957 ($diffbits->{O2H} & 01)) {
4959 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4960 " but git tree differs from orig in upstream files.";
4961 if (!stat_exists "debian/patches") {
4963 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4967 if ($quilt_mode =~ m/dpm/ &&
4968 ($diffbits->{H2A} & 01)) {
4970 --quilt=$quilt_mode specified, implying patches-applied git tree
4971 but git tree differs from result of applying debian/patches to upstream
4974 if ($quilt_mode =~ m/gbp|unapplied/ &&
4975 ($diffbits->{O2A} & 01)) { # some patches
4976 quiltify_splitbrain_needed();
4977 progress "dgit view: creating patches-applied version using gbp pq";
4978 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4979 # gbp pq import creates a fresh branch; push back to dgit-view
4980 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4981 runcmd @git, qw(checkout -q dgit-view);
4983 if ($quilt_mode =~ m/gbp|dpm/ &&
4984 ($diffbits->{O2A} & 02)) {
4986 --quilt=$quilt_mode specified, implying that HEAD is for use with a
4987 tool which does not create patches for changes to upstream
4988 .gitignores: but, such patches exist in debian/patches.
4991 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
4992 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
4993 quiltify_splitbrain_needed();
4994 progress "dgit view: creating patch to represent .gitignore changes";
4995 ensuredir "debian/patches";
4996 my $gipatch = "debian/patches/auto-gitignore";
4997 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
4998 stat GIPATCH or die "$gipatch: $!";
4999 fail "$gipatch already exists; but want to create it".
5000 " to record .gitignore changes" if (stat _)[7];
5001 print GIPATCH <<END or die "$gipatch: $!";
5002 Subject: Update .gitignore from Debian packaging branch
5004 The Debian packaging git branch contains these updates to the upstream
5005 .gitignore file(s). This patch is autogenerated, to provide these
5006 updates to users of the official Debian archive view of the package.
5008 [dgit ($our_version) update-gitignore]
5011 close GIPATCH or die "$gipatch: $!";
5012 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5013 $unapplied, $headref, "--", sort keys %$editedignores;
5014 open SERIES, "+>>", "debian/patches/series" or die $!;
5015 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5017 defined read SERIES, $newline, 1 or die $!;
5018 print SERIES "\n" or die $! unless $newline eq "\n";
5019 print SERIES "auto-gitignore\n" or die $!;
5020 close SERIES or die $!;
5021 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5023 Commit patch to update .gitignore
5025 [dgit ($our_version) update-gitignore-quilt-fixup]
5029 my $dgitview = git_rev_parse 'HEAD';
5031 changedir '../../../..';
5032 # When we no longer need to support squeeze, use --create-reflog
5034 ensuredir ".git/logs/refs/dgit-intern";
5035 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
5038 my $oldcache = git_get_ref "refs/$splitbraincache";
5039 if ($oldcache eq $dgitview) {
5040 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5041 # git update-ref doesn't always update, in this case. *sigh*
5042 my $dummy = make_commit_text <<END;
5045 author Dgit <dgit\@example.com> 1000000000 +0000
5046 committer Dgit <dgit\@example.com> 1000000000 +0000
5048 Dummy commit - do not use
5050 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5051 "refs/$splitbraincache", $dummy;
5053 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5056 changedir '.git/dgit/unpack/work';
5058 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5059 progress "dgit view: created ($saved)";
5062 sub quiltify ($$$$) {
5063 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5065 # Quilt patchification algorithm
5067 # We search backwards through the history of the main tree's HEAD
5068 # (T) looking for a start commit S whose tree object is identical
5069 # to to the patch tip tree (ie the tree corresponding to the
5070 # current dpkg-committed patch series). For these purposes
5071 # `identical' disregards anything in debian/ - this wrinkle is
5072 # necessary because dpkg-source treates debian/ specially.
5074 # We can only traverse edges where at most one of the ancestors'
5075 # trees differs (in changes outside in debian/). And we cannot
5076 # handle edges which change .pc/ or debian/patches. To avoid
5077 # going down a rathole we avoid traversing edges which introduce
5078 # debian/rules or debian/control. And we set a limit on the
5079 # number of edges we are willing to look at.
5081 # If we succeed, we walk forwards again. For each traversed edge
5082 # PC (with P parent, C child) (starting with P=S and ending with
5083 # C=T) to we do this:
5085 # - dpkg-source --commit with a patch name and message derived from C
5086 # After traversing PT, we git commit the changes which
5087 # should be contained within debian/patches.
5089 # The search for the path S..T is breadth-first. We maintain a
5090 # todo list containing search nodes. A search node identifies a
5091 # commit, and looks something like this:
5093 # Commit => $git_commit_id,
5094 # Child => $c, # or undef if P=T
5095 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5096 # Nontrivial => true iff $p..$c has relevant changes
5103 my %considered; # saves being exponential on some weird graphs
5105 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5108 my ($search,$whynot) = @_;
5109 printdebug " search NOT $search->{Commit} $whynot\n";
5110 $search->{Whynot} = $whynot;
5111 push @nots, $search;
5112 no warnings qw(exiting);
5121 my $c = shift @todo;
5122 next if $considered{$c->{Commit}}++;
5124 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5126 printdebug "quiltify investigate $c->{Commit}\n";
5129 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5130 printdebug " search finished hooray!\n";
5135 if ($quilt_mode eq 'nofix') {
5136 fail "quilt fixup required but quilt mode is \`nofix'\n".
5137 "HEAD commit $c->{Commit} differs from tree implied by ".
5138 " debian/patches (tree object $oldtiptree)";
5140 if ($quilt_mode eq 'smash') {
5141 printdebug " search quitting smash\n";
5145 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5146 $not->($c, "has $c_sentinels not $t_sentinels")
5147 if $c_sentinels ne $t_sentinels;
5149 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5150 $commitdata =~ m/\n\n/;
5152 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5153 @parents = map { { Commit => $_, Child => $c } } @parents;
5155 $not->($c, "root commit") if !@parents;
5157 foreach my $p (@parents) {
5158 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5160 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5161 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5163 foreach my $p (@parents) {
5164 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5166 my @cmd= (@git, qw(diff-tree -r --name-only),
5167 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5168 my $patchstackchange = cmdoutput @cmd;
5169 if (length $patchstackchange) {
5170 $patchstackchange =~ s/\n/,/g;
5171 $not->($p, "changed $patchstackchange");
5174 printdebug " search queue P=$p->{Commit} ",
5175 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5181 printdebug "quiltify want to smash\n";
5184 my $x = $_[0]{Commit};
5185 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5188 my $reportnot = sub {
5190 my $s = $abbrev->($notp);
5191 my $c = $notp->{Child};
5192 $s .= "..".$abbrev->($c) if $c;
5193 $s .= ": ".$notp->{Whynot};
5196 if ($quilt_mode eq 'linear') {
5197 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5198 foreach my $notp (@nots) {
5199 print STDERR "$us: ", $reportnot->($notp), "\n";
5201 print STDERR "$us: $_\n" foreach @$failsuggestion;
5202 fail "quilt fixup naive history linearisation failed.\n".
5203 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5204 } elsif ($quilt_mode eq 'smash') {
5205 } elsif ($quilt_mode eq 'auto') {
5206 progress "quilt fixup cannot be linear, smashing...";
5208 die "$quilt_mode ?";
5211 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5212 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5214 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5216 quiltify_dpkg_commit "auto-$version-$target-$time",
5217 (getfield $clogp, 'Maintainer'),
5218 "Automatically generated patch ($clogp->{Version})\n".
5219 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5223 progress "quiltify linearisation planning successful, executing...";
5225 for (my $p = $sref_S;
5226 my $c = $p->{Child};
5228 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5229 next unless $p->{Nontrivial};
5231 my $cc = $c->{Commit};
5233 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5234 $commitdata =~ m/\n\n/ or die "$c ?";
5237 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5240 my $commitdate = cmdoutput
5241 @git, qw(log -n1 --pretty=format:%aD), $cc;
5243 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5245 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5252 my $gbp_check_suitable = sub {
5257 die "contains unexpected slashes\n" if m{//} || m{/$};
5258 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5259 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5260 die "too long" if length > 200;
5262 return $_ unless $@;
5263 print STDERR "quiltifying commit $cc:".
5264 " ignoring/dropping Gbp-Pq $what: $@";
5268 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5270 (\S+) \s* \n //ixm) {
5271 $patchname = $gbp_check_suitable->($1, 'Name');
5273 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5275 (\S+) \s* \n //ixm) {
5276 $patchdir = $gbp_check_suitable->($1, 'Topic');
5281 if (!defined $patchname) {
5282 $patchname = $title;
5283 $patchname =~ s/[.:]$//;
5286 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5287 my $translitname = $converter->convert($patchname);
5288 die unless defined $translitname;
5289 $patchname = $translitname;
5292 "dgit: patch title transliteration error: $@"
5294 $patchname =~ y/ A-Z/-a-z/;
5295 $patchname =~ y/-a-z0-9_.+=~//cd;
5296 $patchname =~ s/^\W/x-$&/;
5297 $patchname = substr($patchname,0,40);
5299 if (!defined $patchdir) {
5302 if (length $patchdir) {
5303 $patchname = "$patchdir/$patchname";
5305 if ($patchname =~ m{^(.*)/}) {
5306 mkpath "debian/patches/$1";
5311 stat "debian/patches/$patchname$index";
5313 $!==ENOENT or die "$patchname$index $!";
5315 runcmd @git, qw(checkout -q), $cc;
5317 # We use the tip's changelog so that dpkg-source doesn't
5318 # produce complaining messages from dpkg-parsechangelog. None
5319 # of the information dpkg-source gets from the changelog is
5320 # actually relevant - it gets put into the original message
5321 # which dpkg-source provides our stunt editor, and then
5323 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5325 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5326 "Date: $commitdate\n".
5327 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5329 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5332 runcmd @git, qw(checkout -q master);
5335 sub build_maybe_quilt_fixup () {
5336 my ($format,$fopts) = get_source_format;
5337 return unless madformat_wantfixup $format;
5340 check_for_vendor_patches();
5342 if (quiltmode_splitbrain) {
5343 fail <<END unless access_cfg_tagformats_can_splitbrain;
5344 quilt mode $quilt_mode requires split view so server needs to support
5345 both "new" and "maint" tag formats, but config says it doesn't.
5349 my $clogp = parsechangelog();
5350 my $headref = git_rev_parse('HEAD');
5355 my $upstreamversion = upstreamversion $version;
5357 if ($fopts->{'single-debian-patch'}) {
5358 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5360 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5363 die 'bug' if $split_brain && !$need_split_build_invocation;
5365 changedir '../../../..';
5366 runcmd_ordryrun_local
5367 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5370 sub quilt_fixup_mkwork ($) {
5373 mkdir "work" or die $!;
5375 mktree_in_ud_here();
5376 runcmd @git, qw(reset -q --hard), $headref;
5379 sub quilt_fixup_linkorigs ($$) {
5380 my ($upstreamversion, $fn) = @_;
5381 # calls $fn->($leafname);
5383 foreach my $f (<../../../../*>) { #/){
5384 my $b=$f; $b =~ s{.*/}{};
5386 local ($debuglevel) = $debuglevel-1;
5387 printdebug "QF linkorigs $b, $f ?\n";
5389 next unless is_orig_file_of_vsn $b, $upstreamversion;
5390 printdebug "QF linkorigs $b, $f Y\n";
5391 link_ltarget $f, $b or die "$b $!";
5396 sub quilt_fixup_delete_pc () {
5397 runcmd @git, qw(rm -rqf .pc);
5399 Commit removal of .pc (quilt series tracking data)
5401 [dgit ($our_version) upgrade quilt-remove-pc]
5405 sub quilt_fixup_singlepatch ($$$) {
5406 my ($clogp, $headref, $upstreamversion) = @_;
5408 progress "starting quiltify (single-debian-patch)";
5410 # dpkg-source --commit generates new patches even if
5411 # single-debian-patch is in debian/source/options. In order to
5412 # get it to generate debian/patches/debian-changes, it is
5413 # necessary to build the source package.
5415 quilt_fixup_linkorigs($upstreamversion, sub { });
5416 quilt_fixup_mkwork($headref);
5418 rmtree("debian/patches");
5420 runcmd @dpkgsource, qw(-b .);
5422 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5423 rename srcfn("$upstreamversion", "/debian/patches"),
5424 "work/debian/patches";
5427 commit_quilty_patch();
5430 sub quilt_make_fake_dsc ($) {
5431 my ($upstreamversion) = @_;
5433 my $fakeversion="$upstreamversion-~~DGITFAKE";
5435 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5436 print $fakedsc <<END or die $!;
5439 Version: $fakeversion
5443 my $dscaddfile=sub {
5446 my $md = new Digest::MD5;
5448 my $fh = new IO::File $b, '<' or die "$b $!";
5453 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5456 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5458 my @files=qw(debian/source/format debian/rules
5459 debian/control debian/changelog);
5460 foreach my $maybe (qw(debian/patches debian/source/options
5461 debian/tests/control)) {
5462 next unless stat_exists "../../../$maybe";
5463 push @files, $maybe;
5466 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5467 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5469 $dscaddfile->($debtar);
5470 close $fakedsc or die $!;
5473 sub quilt_check_splitbrain_cache ($$) {
5474 my ($headref, $upstreamversion) = @_;
5475 # Called only if we are in (potentially) split brain mode.
5477 # Computes the cache key and looks in the cache.
5478 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5480 my $splitbrain_cachekey;
5483 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5484 # we look in the reflog of dgit-intern/quilt-cache
5485 # we look for an entry whose message is the key for the cache lookup
5486 my @cachekey = (qw(dgit), $our_version);
5487 push @cachekey, $upstreamversion;
5488 push @cachekey, $quilt_mode;
5489 push @cachekey, $headref;
5491 push @cachekey, hashfile('fake.dsc');
5493 my $srcshash = Digest::SHA->new(256);
5494 my %sfs = ( %INC, '$0(dgit)' => $0 );
5495 foreach my $sfk (sort keys %sfs) {
5496 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5497 $srcshash->add($sfk," ");
5498 $srcshash->add(hashfile($sfs{$sfk}));
5499 $srcshash->add("\n");
5501 push @cachekey, $srcshash->hexdigest();
5502 $splitbrain_cachekey = "@cachekey";
5504 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5506 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5507 debugcmd "|(probably)",@cmd;
5508 my $child = open GC, "-|"; defined $child or die $!;
5510 chdir '../../..' or die $!;
5511 if (!stat ".git/logs/refs/$splitbraincache") {
5512 $! == ENOENT or die $!;
5513 printdebug ">(no reflog)\n";
5520 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5521 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5524 quilt_fixup_mkwork($headref);
5525 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5526 if ($cachehit ne $headref) {
5527 progress "dgit view: found cached ($saved)";
5528 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5530 return ($cachehit, $splitbrain_cachekey);
5532 progress "dgit view: found cached, no changes required";
5533 return ($headref, $splitbrain_cachekey);
5535 die $! if GC->error;
5536 failedcmd unless close GC;
5538 printdebug "splitbrain cache miss\n";
5539 return (undef, $splitbrain_cachekey);
5542 sub quilt_fixup_multipatch ($$$) {
5543 my ($clogp, $headref, $upstreamversion) = @_;
5545 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5548 # - honour any existing .pc in case it has any strangeness
5549 # - determine the git commit corresponding to the tip of
5550 # the patch stack (if there is one)
5551 # - if there is such a git commit, convert each subsequent
5552 # git commit into a quilt patch with dpkg-source --commit
5553 # - otherwise convert all the differences in the tree into
5554 # a single git commit
5558 # Our git tree doesn't necessarily contain .pc. (Some versions of
5559 # dgit would include the .pc in the git tree.) If there isn't
5560 # one, we need to generate one by unpacking the patches that we
5563 # We first look for a .pc in the git tree. If there is one, we
5564 # will use it. (This is not the normal case.)
5566 # Otherwise need to regenerate .pc so that dpkg-source --commit
5567 # can work. We do this as follows:
5568 # 1. Collect all relevant .orig from parent directory
5569 # 2. Generate a debian.tar.gz out of
5570 # debian/{patches,rules,source/format,source/options}
5571 # 3. Generate a fake .dsc containing just these fields:
5572 # Format Source Version Files
5573 # 4. Extract the fake .dsc
5574 # Now the fake .dsc has a .pc directory.
5575 # (In fact we do this in every case, because in future we will
5576 # want to search for a good base commit for generating patches.)
5578 # Then we can actually do the dpkg-source --commit
5579 # 1. Make a new working tree with the same object
5580 # store as our main tree and check out the main
5582 # 2. Copy .pc from the fake's extraction, if necessary
5583 # 3. Run dpkg-source --commit
5584 # 4. If the result has changes to debian/, then
5585 # - git add them them
5586 # - git add .pc if we had a .pc in-tree
5588 # 5. If we had a .pc in-tree, delete it, and git commit
5589 # 6. Back in the main tree, fast forward to the new HEAD
5591 # Another situation we may have to cope with is gbp-style
5592 # patches-unapplied trees.
5594 # We would want to detect these, so we know to escape into
5595 # quilt_fixup_gbp. However, this is in general not possible.
5596 # Consider a package with a one patch which the dgit user reverts
5597 # (with git revert or the moral equivalent).
5599 # That is indistinguishable in contents from a patches-unapplied
5600 # tree. And looking at the history to distinguish them is not
5601 # useful because the user might have made a confusing-looking git
5602 # history structure (which ought to produce an error if dgit can't
5603 # cope, not a silent reintroduction of an unwanted patch).
5605 # So gbp users will have to pass an option. But we can usually
5606 # detect their failure to do so: if the tree is not a clean
5607 # patches-applied tree, quilt linearisation fails, but the tree
5608 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5609 # they want --quilt=unapplied.
5611 # To help detect this, when we are extracting the fake dsc, we
5612 # first extract it with --skip-patches, and then apply the patches
5613 # afterwards with dpkg-source --before-build. That lets us save a
5614 # tree object corresponding to .origs.
5616 my $splitbrain_cachekey;
5618 quilt_make_fake_dsc($upstreamversion);
5620 if (quiltmode_splitbrain()) {
5622 ($cachehit, $splitbrain_cachekey) =
5623 quilt_check_splitbrain_cache($headref, $upstreamversion);
5624 return if $cachehit;
5628 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5630 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5631 rename $fakexdir, "fake" or die "$fakexdir $!";
5635 remove_stray_gits("source package");
5636 mktree_in_ud_here();
5640 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5641 my $unapplied=git_add_write_tree();
5642 printdebug "fake orig tree object $unapplied\n";
5646 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5648 if (system @bbcmd) {
5649 failedcmd @bbcmd if $? < 0;
5651 failed to apply your git tree's patch stack (from debian/patches/) to
5652 the corresponding upstream tarball(s). Your source tree and .orig
5653 are probably too inconsistent. dgit can only fix up certain kinds of
5654 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5660 quilt_fixup_mkwork($headref);
5663 if (stat_exists ".pc") {
5665 progress "Tree already contains .pc - will use it then delete it.";
5668 rename '../fake/.pc','.pc' or die $!;
5671 changedir '../fake';
5673 my $oldtiptree=git_add_write_tree();
5674 printdebug "fake o+d/p tree object $unapplied\n";
5675 changedir '../work';
5678 # We calculate some guesswork now about what kind of tree this might
5679 # be. This is mostly for error reporting.
5685 # O = orig, without patches applied
5686 # A = "applied", ie orig with H's debian/patches applied
5687 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5688 \%editedignores, \@unrepres),
5689 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5690 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5694 foreach my $b (qw(01 02)) {
5695 foreach my $v (qw(O2H O2A H2A)) {
5696 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5699 printdebug "differences \@dl @dl.\n";
5702 "$us: base trees orig=%.20s o+d/p=%.20s",
5703 $unapplied, $oldtiptree;
5705 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5706 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5707 $dl[0], $dl[1], $dl[3], $dl[4],
5711 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5713 forceable_fail [qw(unrepresentable)], <<END;
5714 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5719 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5720 push @failsuggestion, "This might be a patches-unapplied branch.";
5721 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5722 push @failsuggestion, "This might be a patches-applied branch.";
5724 push @failsuggestion, "Maybe you need to specify one of".
5725 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5727 if (quiltmode_splitbrain()) {
5728 quiltify_splitbrain($clogp, $unapplied, $headref,
5729 $diffbits, \%editedignores,
5730 $splitbrain_cachekey);
5734 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5735 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5737 if (!open P, '>>', ".pc/applied-patches") {
5738 $!==&ENOENT or die $!;
5743 commit_quilty_patch();
5745 if ($mustdeletepc) {
5746 quilt_fixup_delete_pc();
5750 sub quilt_fixup_editor () {
5751 my $descfn = $ENV{$fakeeditorenv};
5752 my $editing = $ARGV[$#ARGV];
5753 open I1, '<', $descfn or die "$descfn: $!";
5754 open I2, '<', $editing or die "$editing: $!";
5755 unlink $editing or die "$editing: $!";
5756 open O, '>', $editing or die "$editing: $!";
5757 while (<I1>) { print O or die $!; } I1->error and die $!;
5760 $copying ||= m/^\-\-\- /;
5761 next unless $copying;
5764 I2->error and die $!;
5769 sub maybe_apply_patches_dirtily () {
5770 return unless $quilt_mode =~ m/gbp|unapplied/;
5771 print STDERR <<END or die $!;
5773 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5774 dgit: Have to apply the patches - making the tree dirty.
5775 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5778 $patches_applied_dirtily = 01;
5779 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5780 runcmd qw(dpkg-source --before-build .);
5783 sub maybe_unapply_patches_again () {
5784 progress "dgit: Unapplying patches again to tidy up the tree."
5785 if $patches_applied_dirtily;
5786 runcmd qw(dpkg-source --after-build .)
5787 if $patches_applied_dirtily & 01;
5789 if $patches_applied_dirtily & 02;
5790 $patches_applied_dirtily = 0;
5793 #----- other building -----
5795 our $clean_using_builder;
5796 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5797 # clean the tree before building (perhaps invoked indirectly by
5798 # whatever we are using to run the build), rather than separately
5799 # and explicitly by us.
5802 return if $clean_using_builder;
5803 if ($cleanmode eq 'dpkg-source') {
5804 maybe_apply_patches_dirtily();
5805 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5806 } elsif ($cleanmode eq 'dpkg-source-d') {
5807 maybe_apply_patches_dirtily();
5808 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5809 } elsif ($cleanmode eq 'git') {
5810 runcmd_ordryrun_local @git, qw(clean -xdf);
5811 } elsif ($cleanmode eq 'git-ff') {
5812 runcmd_ordryrun_local @git, qw(clean -xdff);
5813 } elsif ($cleanmode eq 'check') {
5814 my $leftovers = cmdoutput @git, qw(clean -xdn);
5815 if (length $leftovers) {
5816 print STDERR $leftovers, "\n" or die $!;
5817 fail "tree contains uncommitted files and --clean=check specified";
5819 } elsif ($cleanmode eq 'none') {
5826 badusage "clean takes no additional arguments" if @ARGV;
5829 maybe_unapply_patches_again();
5832 sub build_prep_early () {
5833 our $build_prep_early_done //= 0;
5834 return if $build_prep_early_done++;
5835 badusage "-p is not allowed when building" if defined $package;
5836 my $clogp = parsechangelog();
5837 $isuite = getfield $clogp, 'Distribution';
5838 $package = getfield $clogp, 'Source';
5839 $version = getfield $clogp, 'Version';
5847 build_maybe_quilt_fixup();
5849 my $pat = changespat $version;
5850 foreach my $f (glob "$buildproductsdir/$pat") {
5852 unlink $f or fail "remove old changes file $f: $!";
5854 progress "would remove $f";
5860 sub changesopts_initial () {
5861 my @opts =@changesopts[1..$#changesopts];
5864 sub changesopts_version () {
5865 if (!defined $changes_since_version) {
5866 my @vsns = archive_query('archive_query');
5867 my @quirk = access_quirk();
5868 if ($quirk[0] eq 'backports') {
5869 local $isuite = $quirk[2];
5871 canonicalise_suite();
5872 push @vsns, archive_query('archive_query');
5875 @vsns = map { $_->[0] } @vsns;
5876 @vsns = sort { -version_compare($a, $b) } @vsns;
5877 $changes_since_version = $vsns[0];
5878 progress "changelog will contain changes since $vsns[0]";
5880 $changes_since_version = '_';
5881 progress "package seems new, not specifying -v<version>";
5884 if ($changes_since_version ne '_') {
5885 return ("-v$changes_since_version");
5891 sub changesopts () {
5892 return (changesopts_initial(), changesopts_version());
5895 sub massage_dbp_args ($;$) {
5896 my ($cmd,$xargs) = @_;
5899 # - if we're going to split the source build out so we can
5900 # do strange things to it, massage the arguments to dpkg-buildpackage
5901 # so that the main build doessn't build source (or add an argument
5902 # to stop it building source by default).
5904 # - add -nc to stop dpkg-source cleaning the source tree,
5905 # unless we're not doing a split build and want dpkg-source
5906 # as cleanmode, in which case we can do nothing
5909 # 0 - source will NOT need to be built separately by caller
5910 # +1 - source will need to be built separately by caller
5911 # +2 - source will need to be built separately by caller AND
5912 # dpkg-buildpackage should not in fact be run at all!
5913 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5914 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5915 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5916 $clean_using_builder = 1;
5919 # -nc has the side effect of specifying -b if nothing else specified
5920 # and some combinations of -S, -b, et al, are errors, rather than
5921 # later simply overriding earlie. So we need to:
5922 # - search the command line for these options
5923 # - pick the last one
5924 # - perhaps add our own as a default
5925 # - perhaps adjust it to the corresponding non-source-building version
5927 foreach my $l ($cmd, $xargs) {
5929 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5932 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5934 if ($need_split_build_invocation) {
5935 printdebug "massage split $dmode.\n";
5936 $r = $dmode =~ m/[S]/ ? +2 :
5937 $dmode =~ y/gGF/ABb/ ? +1 :
5938 $dmode =~ m/[ABb]/ ? 0 :
5941 printdebug "massage done $r $dmode.\n";
5943 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5949 my $wasdir = must_getcwd();
5955 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5956 my ($msg_if_onlyone) = @_;
5957 # If there is only one .changes file, fail with $msg_if_onlyone,
5958 # or if that is undef, be a no-op.
5959 # Returns the changes file to report to the user.
5960 my $pat = changespat $version;
5961 my @changesfiles = glob $pat;
5962 @changesfiles = sort {
5963 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5967 if (@changesfiles==1) {
5968 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5969 only one changes file from build (@changesfiles)
5971 $result = $changesfiles[0];
5972 } elsif (@changesfiles==2) {
5973 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5974 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5975 fail "$l found in binaries changes file $binchanges"
5978 runcmd_ordryrun_local @mergechanges, @changesfiles;
5979 my $multichanges = changespat $version,'multi';
5981 stat_exists $multichanges or fail "$multichanges: $!";
5982 foreach my $cf (glob $pat) {
5983 next if $cf eq $multichanges;
5984 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
5987 $result = $multichanges;
5989 fail "wrong number of different changes files (@changesfiles)";
5991 printdone "build successful, results in $result\n" or die $!;
5994 sub midbuild_checkchanges () {
5995 my $pat = changespat $version;
5996 return if $rmchanges;
5997 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
5998 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
6000 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
6001 Suggest you delete @unwanted.
6006 sub midbuild_checkchanges_vanilla ($) {
6008 midbuild_checkchanges() if $wantsrc == 1;
6011 sub postbuild_mergechanges_vanilla ($) {
6013 if ($wantsrc == 1) {
6015 postbuild_mergechanges(undef);
6018 printdone "build successful\n";
6024 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6025 my $wantsrc = massage_dbp_args \@dbp;
6028 midbuild_checkchanges_vanilla $wantsrc;
6033 push @dbp, changesopts_version();
6034 maybe_apply_patches_dirtily();
6035 runcmd_ordryrun_local @dbp;
6037 maybe_unapply_patches_again();
6038 postbuild_mergechanges_vanilla $wantsrc;
6042 $quilt_mode //= 'gbp';
6048 # gbp can make .origs out of thin air. In my tests it does this
6049 # even for a 1.0 format package, with no origs present. So I
6050 # guess it keys off just the version number. We don't know
6051 # exactly what .origs ought to exist, but let's assume that we
6052 # should run gbp if: the version has an upstream part and the main
6054 my $upstreamversion = upstreamversion $version;
6055 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6056 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6058 if ($gbp_make_orig) {
6060 $cleanmode = 'none'; # don't do it again
6061 $need_split_build_invocation = 1;
6064 my @dbp = @dpkgbuildpackage;
6066 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6068 if (!length $gbp_build[0]) {
6069 if (length executable_on_path('git-buildpackage')) {
6070 $gbp_build[0] = qw(git-buildpackage);
6072 $gbp_build[0] = 'gbp buildpackage';
6075 my @cmd = opts_opt_multi_cmd @gbp_build;
6077 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6079 if ($gbp_make_orig) {
6080 ensuredir '.git/dgit';
6081 my $ok = '.git/dgit/origs-gen-ok';
6082 unlink $ok or $!==&ENOENT or die $!;
6083 my @origs_cmd = @cmd;
6084 push @origs_cmd, qw(--git-cleaner=true);
6085 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6086 push @origs_cmd, @ARGV;
6088 debugcmd @origs_cmd;
6090 do { local $!; stat_exists $ok; }
6091 or failedcmd @origs_cmd;
6093 dryrun_report @origs_cmd;
6099 midbuild_checkchanges_vanilla $wantsrc;
6101 if (!$clean_using_builder) {
6102 push @cmd, '--git-cleaner=true';
6106 maybe_unapply_patches_again();
6108 push @cmd, changesopts();
6109 runcmd_ordryrun_local @cmd, @ARGV;
6111 postbuild_mergechanges_vanilla $wantsrc;
6113 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6117 my $our_cleanmode = $cleanmode;
6118 if ($need_split_build_invocation) {
6119 # Pretend that clean is being done some other way. This
6120 # forces us not to try to use dpkg-buildpackage to clean and
6121 # build source all in one go; and instead we run dpkg-source
6122 # (and build_prep() will do the clean since $clean_using_builder
6124 $our_cleanmode = 'ELSEWHERE';
6126 if ($our_cleanmode =~ m/^dpkg-source/) {
6127 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6128 $clean_using_builder = 1;
6131 $sourcechanges = changespat $version,'source';
6133 unlink "../$sourcechanges" or $!==ENOENT
6134 or fail "remove $sourcechanges: $!";
6136 $dscfn = dscfn($version);
6137 if ($our_cleanmode eq 'dpkg-source') {
6138 maybe_apply_patches_dirtily();
6139 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6141 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6142 maybe_apply_patches_dirtily();
6143 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6146 my @cmd = (@dpkgsource, qw(-b --));
6149 runcmd_ordryrun_local @cmd, "work";
6150 my @udfiles = <${package}_*>;
6151 changedir "../../..";
6152 foreach my $f (@udfiles) {
6153 printdebug "source copy, found $f\n";
6156 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6157 $f eq srcfn($version, $&));
6158 printdebug "source copy, found $f - renaming\n";
6159 rename "$ud/$f", "../$f" or $!==ENOENT
6160 or fail "put in place new source file ($f): $!";
6163 my $pwd = must_getcwd();
6164 my $leafdir = basename $pwd;
6166 runcmd_ordryrun_local @cmd, $leafdir;
6169 runcmd_ordryrun_local qw(sh -ec),
6170 'exec >$1; shift; exec "$@"','x',
6171 "../$sourcechanges",
6172 @dpkggenchanges, qw(-S), changesopts();
6176 sub cmd_build_source {
6178 badusage "build-source takes no additional arguments" if @ARGV;
6180 maybe_unapply_patches_again();
6181 printdone "source built, results in $dscfn and $sourcechanges";
6186 midbuild_checkchanges();
6189 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6190 stat_exists $sourcechanges
6191 or fail "$sourcechanges (in parent directory): $!";
6193 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6195 maybe_unapply_patches_again();
6197 postbuild_mergechanges(<<END);
6198 perhaps you need to pass -A ? (sbuild's default is to build only
6199 arch-specific binaries; dgit 1.4 used to override that.)
6204 sub cmd_quilt_fixup {
6205 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6208 build_maybe_quilt_fixup();
6211 sub import_dsc_result {
6212 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6213 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6215 check_gitattrs($newhash, "source tree");
6217 progress "dgit: import-dsc: $what_msg";
6220 sub cmd_import_dsc {
6224 last unless $ARGV[0] =~ m/^-/;
6227 if (m/^--require-valid-signature$/) {
6230 badusage "unknown dgit import-dsc sub-option \`$_'";
6234 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6235 my ($dscfn, $dstbranch) = @ARGV;
6237 badusage "dry run makes no sense with import-dsc" unless act_local();
6239 my $force = $dstbranch =~ s/^\+// ? +1 :
6240 $dstbranch =~ s/^\.\.// ? -1 :
6242 my $info = $force ? " $&" : '';
6243 $info = "$dscfn$info";
6245 my $specbranch = $dstbranch;
6246 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6247 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6249 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6250 my $chead = cmdoutput_errok @symcmd;
6251 defined $chead or $?==256 or failedcmd @symcmd;
6253 fail "$dstbranch is checked out - will not update it"
6254 if defined $chead and $chead eq $dstbranch;
6256 my $oldhash = git_get_ref $dstbranch;
6258 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6259 $dscdata = do { local $/ = undef; <D>; };
6260 D->error and fail "read $dscfn: $!";
6263 # we don't normally need this so import it here
6264 use Dpkg::Source::Package;
6265 my $dp = new Dpkg::Source::Package filename => $dscfn,
6266 require_valid_signature => $needsig;
6268 local $SIG{__WARN__} = sub {
6270 return unless $needsig;
6271 fail "import-dsc signature check failed";
6273 if (!$dp->is_signed()) {
6274 warn "$us: warning: importing unsigned .dsc\n";
6276 my $r = $dp->check_signature();
6277 die "->check_signature => $r" if $needsig && $r;
6283 $package = getfield $dsc, 'Source';
6285 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6286 unless forceing [qw(import-dsc-with-dgit-field)];
6287 parse_dsc_field_def_dsc_distro();
6289 $isuite = 'DGIT-IMPORT-DSC';
6290 $idistro //= $dsc_distro;
6294 if (defined $dsc_hash) {
6295 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6296 resolve_dsc_field_commit undef, undef;
6298 if (defined $dsc_hash) {
6299 my @cmd = (qw(sh -ec),
6300 "echo $dsc_hash | git cat-file --batch-check");
6301 my $objgot = cmdoutput @cmd;
6302 if ($objgot =~ m#^\w+ missing\b#) {
6304 .dsc contains Dgit field referring to object $dsc_hash
6305 Your git tree does not have that object. Try `git fetch' from a
6306 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6309 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6311 progress "Not fast forward, forced update.";
6313 fail "Not fast forward to $dsc_hash";
6316 import_dsc_result $dstbranch, $dsc_hash,
6317 "dgit import-dsc (Dgit): $info",
6318 "updated git ref $dstbranch";
6323 Branch $dstbranch already exists
6324 Specify ..$specbranch for a pseudo-merge, binding in existing history
6325 Specify +$specbranch to overwrite, discarding existing history
6327 if $oldhash && !$force;
6329 my @dfi = dsc_files_info();
6330 foreach my $fi (@dfi) {
6331 my $f = $fi->{Filename};
6333 next if lstat $here;
6334 fail "stat $here: $!" unless $! == ENOENT;
6336 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6338 } elsif ($dscfn =~ m#^/#) {
6341 fail "cannot import $dscfn which seems to be inside working tree!";
6343 $there =~ s#/+[^/]+$## or
6344 fail "cannot import $dscfn which seems to not have a basename";
6346 symlink $there, $here or fail "symlink $there to $here: $!";
6347 progress "made symlink $here -> $there";
6348 # print STDERR Dumper($fi);
6350 my @mergeinputs = generate_commits_from_dsc();
6351 die unless @mergeinputs == 1;
6353 my $newhash = $mergeinputs[0]{Commit};
6357 progress "Import, forced update - synthetic orphan git history.";
6358 } elsif ($force < 0) {
6359 progress "Import, merging.";
6360 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6361 my $version = getfield $dsc, 'Version';
6362 my $clogp = commit_getclogp $newhash;
6363 my $authline = clogp_authline $clogp;
6364 $newhash = make_commit_text <<END;
6371 Merge $package ($version) import into $dstbranch
6374 die; # caught earlier
6378 import_dsc_result $dstbranch, $newhash,
6379 "dgit import-dsc: $info",
6380 "results are in in git ref $dstbranch";
6383 sub cmd_archive_api_query {
6384 badusage "need only 1 subpath argument" unless @ARGV==1;
6385 my ($subpath) = @ARGV;
6386 my @cmd = archive_api_query_cmd($subpath);
6389 exec @cmd or fail "exec curl: $!\n";
6392 sub repos_server_url () {
6393 $package = '_dgit-repos-server';
6394 local $access_forpush = 1;
6395 local $isuite = 'DGIT-REPOS-SERVER';
6396 my $url = access_giturl();
6399 sub cmd_clone_dgit_repos_server {
6400 badusage "need destination argument" unless @ARGV==1;
6401 my ($destdir) = @ARGV;
6402 my $url = repos_server_url();
6403 my @cmd = (@git, qw(clone), $url, $destdir);
6405 exec @cmd or fail "exec git clone: $!\n";
6408 sub cmd_print_dgit_repos_server_source_url {
6409 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6411 my $url = repos_server_url();
6412 print $url, "\n" or die $!;
6415 sub cmd_setup_mergechangelogs {
6416 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6417 local $isuite = 'DGIT-SETUP-TREE';
6418 setup_mergechangelogs(1);
6421 sub cmd_setup_useremail {
6422 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6423 local $isuite = 'DGIT-SETUP-TREE';
6427 sub cmd_setup_gitattributes {
6428 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6429 local $isuite = 'DGIT-SETUP-TREE';
6433 sub cmd_setup_new_tree {
6434 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6435 local $isuite = 'DGIT-SETUP-TREE';
6439 #---------- argument parsing and main program ----------
6442 print "dgit version $our_version\n" or die $!;
6446 our (%valopts_long, %valopts_short);
6447 our (%funcopts_long);
6449 our (@modeopt_cfgs);
6451 sub defvalopt ($$$$) {
6452 my ($long,$short,$val_re,$how) = @_;
6453 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6454 $valopts_long{$long} = $oi;
6455 $valopts_short{$short} = $oi;
6456 # $how subref should:
6457 # do whatever assignemnt or thing it likes with $_[0]
6458 # if the option should not be passed on to remote, @rvalopts=()
6459 # or $how can be a scalar ref, meaning simply assign the value
6462 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6463 defvalopt '--distro', '-d', '.+', \$idistro;
6464 defvalopt '', '-k', '.+', \$keyid;
6465 defvalopt '--existing-package','', '.*', \$existing_package;
6466 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6467 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6468 defvalopt '--package', '-p', $package_re, \$package;
6469 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6471 defvalopt '', '-C', '.+', sub {
6472 ($changesfile) = (@_);
6473 if ($changesfile =~ s#^(.*)/##) {
6474 $buildproductsdir = $1;
6478 defvalopt '--initiator-tempdir','','.*', sub {
6479 ($initiator_tempdir) = (@_);
6480 $initiator_tempdir =~ m#^/# or
6481 badusage "--initiator-tempdir must be used specify an".
6482 " absolute, not relative, directory."
6485 sub defoptmodes ($@) {
6486 my ($varref, $cfgkey, $default, %optmap) = @_;
6488 while (my ($opt,$val) = each %optmap) {
6489 $funcopts_long{$opt} = sub { $$varref = $val; };
6490 $permit{$val} = $val;
6492 push @modeopt_cfgs, {
6495 Default => $default,
6500 defoptmodes \$dodep14tag, qw( dep14tag want
6503 --always-dep14tag always );
6508 if (defined $ENV{'DGIT_SSH'}) {
6509 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6510 } elsif (defined $ENV{'GIT_SSH'}) {
6511 @ssh = ($ENV{'GIT_SSH'});
6519 if (!defined $val) {
6520 badusage "$what needs a value" unless @ARGV;
6522 push @rvalopts, $val;
6524 badusage "bad value \`$val' for $what" unless
6525 $val =~ m/^$oi->{Re}$(?!\n)/s;
6526 my $how = $oi->{How};
6527 if (ref($how) eq 'SCALAR') {
6532 push @ropts, @rvalopts;
6536 last unless $ARGV[0] =~ m/^-/;
6540 if (m/^--dry-run$/) {
6543 } elsif (m/^--damp-run$/) {
6546 } elsif (m/^--no-sign$/) {
6549 } elsif (m/^--help$/) {
6551 } elsif (m/^--version$/) {
6553 } elsif (m/^--new$/) {
6556 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6557 ($om = $opts_opt_map{$1}) &&
6561 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6562 !$opts_opt_cmdonly{$1} &&
6563 ($om = $opts_opt_map{$1})) {
6566 } elsif (m/^--(gbp|dpm)$/s) {
6567 push @ropts, "--quilt=$1";
6569 } elsif (m/^--ignore-dirty$/s) {
6572 } elsif (m/^--no-quilt-fixup$/s) {
6574 $quilt_mode = 'nocheck';
6575 } elsif (m/^--no-rm-on-error$/s) {
6578 } elsif (m/^--no-chase-dsc-distro$/s) {
6580 $chase_dsc_distro = 0;
6581 } elsif (m/^--overwrite$/s) {
6583 $overwrite_version = '';
6584 } elsif (m/^--overwrite=(.+)$/s) {
6586 $overwrite_version = $1;
6587 } elsif (m/^--delayed=(\d+)$/s) {
6590 } elsif (m/^--dgit-view-save=(.+)$/s) {
6592 $split_brain_save = $1;
6593 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6594 } elsif (m/^--(no-)?rm-old-changes$/s) {
6597 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6599 push @deliberatelies, $&;
6600 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6604 } elsif (m/^--force-/) {
6606 "$us: warning: ignoring unknown force option $_\n";
6608 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6609 # undocumented, for testing
6611 $tagformat_want = [ $1, 'command line', 1 ];
6612 # 1 menas overrides distro configuration
6613 } elsif (m/^--always-split-source-build$/s) {
6614 # undocumented, for testing
6616 $need_split_build_invocation = 1;
6617 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6618 # undocumented, for testing
6620 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6621 # ^ it's supposed to be an array ref
6622 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6623 $val = $2 ? $' : undef; #';
6624 $valopt->($oi->{Long});
6625 } elsif ($funcopts_long{$_}) {
6627 $funcopts_long{$_}();
6629 badusage "unknown long option \`$_'";
6636 } elsif (s/^-L/-/) {
6639 } elsif (s/^-h/-/) {
6641 } elsif (s/^-D/-/) {
6645 } elsif (s/^-N/-/) {
6650 push @changesopts, $_;
6652 } elsif (s/^-wn$//s) {
6654 $cleanmode = 'none';
6655 } elsif (s/^-wg$//s) {
6658 } elsif (s/^-wgf$//s) {
6660 $cleanmode = 'git-ff';
6661 } elsif (s/^-wd$//s) {
6663 $cleanmode = 'dpkg-source';
6664 } elsif (s/^-wdd$//s) {
6666 $cleanmode = 'dpkg-source-d';
6667 } elsif (s/^-wc$//s) {
6669 $cleanmode = 'check';
6670 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6671 push @git, '-c', $&;
6672 $gitcfgs{cmdline}{$1} = [ $2 ];
6673 } elsif (s/^-c([^=]+)$//s) {
6674 push @git, '-c', $&;
6675 $gitcfgs{cmdline}{$1} = [ 'true' ];
6676 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6678 $val = undef unless length $val;
6679 $valopt->($oi->{Short});
6682 badusage "unknown short option \`$_'";
6689 sub check_env_sanity () {
6690 my $blocked = new POSIX::SigSet;
6691 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6694 foreach my $name (qw(PIPE CHLD)) {
6695 my $signame = "SIG$name";
6696 my $signum = eval "POSIX::$signame" // die;
6697 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6698 die "$signame is set to something other than SIG_DFL\n";
6699 $blocked->ismember($signum) and
6700 die "$signame is blocked\n";
6706 On entry to dgit, $@
6707 This is a bug produced by something in in your execution environment.
6713 sub parseopts_late_defaults () {
6714 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6715 if defined $idistro;
6716 $isuite //= cfg('dgit.default.default-suite');
6718 foreach my $k (keys %opts_opt_map) {
6719 my $om = $opts_opt_map{$k};
6721 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6723 badcfg "cannot set command for $k"
6724 unless length $om->[0];
6728 foreach my $c (access_cfg_cfgs("opts-$k")) {
6730 map { $_ ? @$_ : () }
6731 map { $gitcfgs{$_}{$c} }
6732 reverse @gitcfgsources;
6733 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6734 "\n" if $debuglevel >= 4;
6736 badcfg "cannot configure options for $k"
6737 if $opts_opt_cmdonly{$k};
6738 my $insertpos = $opts_cfg_insertpos{$k};
6739 @$om = ( @$om[0..$insertpos-1],
6741 @$om[$insertpos..$#$om] );
6745 if (!defined $rmchanges) {
6746 local $access_forpush;
6747 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6750 if (!defined $quilt_mode) {
6751 local $access_forpush;
6752 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6753 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6755 $quilt_mode =~ m/^($quilt_modes_re)$/
6756 or badcfg "unknown quilt-mode \`$quilt_mode'";
6760 foreach my $moc (@modeopt_cfgs) {
6761 local $access_forpush;
6762 my $vr = $moc->{Var};
6763 next if defined $$vr;
6764 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6765 my $v = $moc->{Vals}{$$vr};
6766 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6770 $need_split_build_invocation ||= quiltmode_splitbrain();
6772 if (!defined $cleanmode) {
6773 local $access_forpush;
6774 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6775 $cleanmode //= 'dpkg-source';
6777 badcfg "unknown clean-mode \`$cleanmode'" unless
6778 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6782 if ($ENV{$fakeeditorenv}) {
6784 quilt_fixup_editor();
6790 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6791 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6792 if $dryrun_level == 1;
6794 print STDERR $helpmsg or die $!;
6797 my $cmd = shift @ARGV;
6800 my $pre_fn = ${*::}{"pre_$cmd"};
6801 $pre_fn->() if $pre_fn;
6805 my $fn = ${*::}{"cmd_$cmd"};
6806 $fn or badusage "unknown operation $cmd";