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;
573 print $helpmsg or die $!;
577 our $td = $ENV{DGIT_TEST_DUMMY_DIR} || "DGIT_TEST_DUMMY_DIR-unset";
579 our %defcfg = ('dgit.default.distro' => 'debian',
580 'dgit.default.default-suite' => 'unstable',
581 'dgit.default.old-dsc-distro' => 'debian',
582 'dgit-suite.*-security.distro' => 'debian-security',
583 'dgit.default.username' => '',
584 'dgit.default.archive-query-default-component' => 'main',
585 'dgit.default.ssh' => 'ssh',
586 'dgit.default.archive-query' => 'madison:',
587 'dgit.default.sshpsql-dbname' => 'service=projectb',
588 'dgit.default.aptget-components' => 'main',
589 'dgit.default.dgit-tag-format' => 'new,old,maint',
590 'dgit.dsc-url-proto-ok.http' => 'true',
591 'dgit.dsc-url-proto-ok.https' => 'true',
592 'dgit.dsc-url-proto-ok.git' => 'true',
593 'dgit.default.dsc-url-proto-ok' => 'false',
594 # old means "repo server accepts pushes with old dgit tags"
595 # new means "repo server accepts pushes with new dgit tags"
596 # maint means "repo server accepts split brain pushes"
597 # hist means "repo server may have old pushes without new tag"
598 # ("hist" is implied by "old")
599 'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
600 'dgit-distro.debian.git-check' => 'url',
601 'dgit-distro.debian.git-check-suffix' => '/info/refs',
602 'dgit-distro.debian.new-private-pushers' => 't',
603 'dgit-distro.debian/push.git-url' => '',
604 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org',
605 'dgit-distro.debian/push.git-user-force' => 'dgit',
606 'dgit-distro.debian/push.git-proto' => 'git+ssh://',
607 'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
608 'dgit-distro.debian/push.git-create' => 'true',
609 'dgit-distro.debian/push.git-check' => 'ssh-cmd',
610 'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
611 # 'dgit-distro.debian.archive-query-tls-key',
612 # '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
613 # ^ this does not work because curl is broken nowadays
614 # Fixing #790093 properly will involve providing providing the key
615 # in some pacagke and maybe updating these paths.
617 # 'dgit-distro.debian.archive-query-tls-curl-args',
618 # '--ca-path=/etc/ssl/ca-debian',
619 # ^ this is a workaround but works (only) on DSA-administered machines
620 'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
621 'dgit-distro.debian.git-url-suffix' => '',
622 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
623 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
624 'dgit-distro.debian-security.archive-query' => 'aptget:',
625 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/',
626 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#',
627 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#',
628 'dgit-distro.debian-security.nominal-distro' => 'debian',
629 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*',
630 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
631 'dgit-distro.ubuntu.git-check' => 'false',
632 'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
633 'dgit-distro.test-dummy.ssh' => "$td/ssh",
634 'dgit-distro.test-dummy.username' => "alice",
635 'dgit-distro.test-dummy.git-check' => "ssh-cmd",
636 'dgit-distro.test-dummy.git-create' => "ssh-cmd",
637 'dgit-distro.test-dummy.git-url' => "$td/git",
638 'dgit-distro.test-dummy.git-host' => "git",
639 'dgit-distro.test-dummy.git-path' => "$td/git",
640 'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
641 'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
642 'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
643 'dgit-distro.test-dummy.upload-host' => 'test-dummy',
647 our @gitcfgsources = qw(cmdline local global system);
649 sub git_slurp_config () {
650 local ($debuglevel) = $debuglevel-2;
653 # This algoritm is a bit subtle, but this is needed so that for
654 # options which we want to be single-valued, we allow the
655 # different config sources to override properly. See #835858.
656 foreach my $src (@gitcfgsources) {
657 next if $src eq 'cmdline';
658 # we do this ourselves since git doesn't handle it
660 my @cmd = (@git, qw(config -z --get-regexp), "--$src", qw(.*));
663 open GITS, "-|", @cmd or die $!;
666 printdebug "=> ", (messagequote $_), "\n";
668 push @{ $gitcfgs{$src}{$`} }, $'; #';
672 or ($!==0 && $?==256)
677 sub git_get_config ($) {
679 foreach my $src (@gitcfgsources) {
680 my $l = $gitcfgs{$src}{$c};
681 confess "internal error ($l $c)" if $l && !ref $l;
682 printdebug"C $c ".(defined $l ?
683 join " ", map { messagequote "'$_'" } @$l :
687 @$l==1 or badcfg "multiple values for $c".
688 " (in $src git config)" if @$l > 1;
696 return undef if $c =~ /RETURN-UNDEF/;
697 printdebug "C? $c\n" if $debuglevel >= 5;
698 my $v = git_get_config($c);
699 return $v if defined $v;
700 my $dv = $defcfg{$c};
702 printdebug "CD $c $dv\n" if $debuglevel >= 4;
706 badcfg "need value for one of: @_\n".
707 "$us: distro or suite appears not to be (properly) supported";
710 sub no_local_git_cfg () {
711 # needs to be called from pre_*
712 @gitcfgsources = grep { $_ ne 'local' } @gitcfgsources;
715 sub access_basedistro__noalias () {
716 if (defined $idistro) {
719 my $def = cfg("dgit-suite.$isuite.distro", 'RETURN-UNDEF');
720 return $def if defined $def;
721 foreach my $src (@gitcfgsources, 'internal') {
722 my $kl = $src eq 'internal' ? \%defcfg : $gitcfgs{$src};
724 foreach my $k (keys %$kl) {
725 next unless $k =~ m#^dgit-suite\.(.*)\.distro$#;
727 next unless match_glob $dpat, $isuite;
731 return cfg("dgit.default.distro");
735 sub access_basedistro () {
736 my $noalias = access_basedistro__noalias();
737 my $canon = cfg("dgit-distro.$noalias.alias-canon",'RETURN-UNDEF');
738 return $canon // $noalias;
741 sub access_nomdistro () {
742 my $base = access_basedistro();
743 my $r = cfg("dgit-distro.$base.nominal-distro",'RETURN-UNDEF') // $base;
744 $r =~ m/^$distro_re$/ or badcfg
745 "bad syntax for (nominal) distro \`$r' (does not match /^$distro_re$/)";
749 sub access_quirk () {
750 # returns (quirk name, distro to use instead or undef, quirk-specific info)
751 my $basedistro = access_basedistro();
752 my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
754 if (defined $backports_quirk) {
755 my $re = $backports_quirk;
756 $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig;
758 $re =~ s/\%/([-0-9a-z_]+)/
759 or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )";
760 if ($isuite =~ m/^$re$/) {
761 return ('backports',"$basedistro-backports",$1);
764 return ('none',undef);
769 sub parse_cfg_bool ($$$) {
770 my ($what,$def,$v) = @_;
773 $v =~ m/^[ty1]/ ? 1 :
774 $v =~ m/^[fn0]/ ? 0 :
775 badcfg "$what needs t (true, y, 1) or f (false, n, 0) not \`$v'";
778 sub access_forpush_config () {
779 my $d = access_basedistro();
783 parse_cfg_bool('new-private-pushers', 0,
784 cfg("dgit-distro.$d.new-private-pushers",
787 my $v = cfg("dgit-distro.$d.readonly", 'RETURN-UNDEF');
790 $v =~ m/^[ty1]/ ? 0 : # force readonly, forpush = 0
791 $v =~ m/^[fn0]/ ? 1 : # force nonreadonly, forpush = 1
792 $v =~ m/^[a]/ ? '' : # auto, forpush = ''
793 badcfg "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)";
796 sub access_forpush () {
797 $access_forpush //= access_forpush_config();
798 return $access_forpush;
802 die "$access_forpush ?" if ($access_forpush // 1) ne 1;
803 badcfg "pushing but distro is configured readonly"
804 if access_forpush_config() eq '0';
806 $supplementary_message = <<'END' unless $we_are_responder;
807 Push failed, before we got started.
808 You can retry the push, after fixing the problem, if you like.
810 parseopts_late_defaults();
814 parseopts_late_defaults();
817 sub supplementary_message ($) {
819 if (!$we_are_responder) {
820 $supplementary_message = $msg;
822 } elsif ($protovsn >= 3) {
823 responder_send_command "supplementary-message ".length($msg)
825 print PO $msg or die $!;
829 sub access_distros () {
830 # Returns list of distros to try, in order
833 # 0. `instead of' distro name(s) we have been pointed to
834 # 1. the access_quirk distro, if any
835 # 2a. the user's specified distro, or failing that } basedistro
836 # 2b. the distro calculated from the suite }
837 my @l = access_basedistro();
839 my (undef,$quirkdistro) = access_quirk();
840 unshift @l, $quirkdistro;
841 unshift @l, $instead_distro;
842 @l = grep { defined } @l;
844 push @l, access_nomdistro();
846 if (access_forpush()) {
847 @l = map { ("$_/push", $_) } @l;
852 sub access_cfg_cfgs (@) {
855 # The nesting of these loops determines the search order. We put
856 # the key loop on the outside so that we search all the distros
857 # for each key, before going on to the next key. That means that
858 # if access_cfg is called with a more specific, and then a less
859 # specific, key, an earlier distro can override the less specific
860 # without necessarily overriding any more specific keys. (If the
861 # distro wants to override the more specific keys it can simply do
862 # so; whereas if we did the loop the other way around, it would be
863 # impossible to for an earlier distro to override a less specific
864 # key but not the more specific ones without restating the unknown
865 # values of the more specific keys.
868 # We have to deal with RETURN-UNDEF specially, so that we don't
869 # terminate the search prematurely.
871 if (m/RETURN-UNDEF/) { push @rundef, $_; last; }
874 foreach my $d (access_distros()) {
875 push @cfgs, map { "dgit-distro.$d.$_" } @realkeys;
877 push @cfgs, map { "dgit.default.$_" } @realkeys;
884 my (@cfgs) = access_cfg_cfgs(@keys);
885 my $value = cfg(@cfgs);
889 sub access_cfg_bool ($$) {
890 my ($def, @keys) = @_;
891 parse_cfg_bool($keys[0], $def, access_cfg(@keys, 'RETURN-UNDEF'));
894 sub string_to_ssh ($) {
896 if ($spec =~ m/\s/) {
897 return qw(sh -ec), 'exec '.$spec.' "$@"', 'x';
903 sub access_cfg_ssh () {
904 my $gitssh = access_cfg('ssh', 'RETURN-UNDEF');
905 if (!defined $gitssh) {
908 return string_to_ssh $gitssh;
912 sub access_runeinfo ($) {
914 return ": dgit ".access_basedistro()." $info ;";
917 sub access_someuserhost ($) {
919 my $user = access_cfg("$some-user-force", 'RETURN-UNDEF');
920 defined($user) && length($user) or
921 $user = access_cfg("$some-user",'username');
922 my $host = access_cfg("$some-host");
923 return length($user) ? "$user\@$host" : $host;
926 sub access_gituserhost () {
927 return access_someuserhost('git');
930 sub access_giturl (;$) {
932 my $url = access_cfg('git-url','RETURN-UNDEF');
935 my $proto = access_cfg('git-proto', 'RETURN-UNDEF');
936 return undef unless defined $proto;
939 access_gituserhost().
940 access_cfg('git-path');
942 $suffix = access_cfg('git-url-suffix','RETURN-UNDEF');
945 return "$url/$package$suffix";
948 sub parsecontrolfh ($$;$) {
949 my ($fh, $desc, $allowsigned) = @_;
950 our $dpkgcontrolhash_noissigned;
953 my %opts = ('name' => $desc);
954 $opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
955 $c = Dpkg::Control::Hash->new(%opts);
956 $c->parse($fh,$desc) or die "parsing of $desc failed";
957 last if $allowsigned;
958 last if $dpkgcontrolhash_noissigned;
959 my $issigned= $c->get_option('is_pgp_signed');
960 if (!defined $issigned) {
961 $dpkgcontrolhash_noissigned= 1;
962 seek $fh, 0,0 or die "seek $desc: $!";
963 } elsif ($issigned) {
964 fail "control file $desc is (already) PGP-signed. ".
965 " Note that dgit push needs to modify the .dsc and then".
966 " do the signature itself";
975 my ($file, $desc, $allowsigned) = @_;
976 my $fh = new IO::Handle;
977 open $fh, '<', $file or die "$file: $!";
978 my $c = parsecontrolfh($fh,$desc,$allowsigned);
979 $fh->error and die $!;
985 my ($dctrl,$field) = @_;
986 my $v = $dctrl->{$field};
987 return $v if defined $v;
988 fail "missing field $field in ".$dctrl->get_option('name');
992 my $c = Dpkg::Control::Hash->new(name => 'parsed changelog');
993 my $p = new IO::Handle;
994 my @cmd = (qw(dpkg-parsechangelog), @_);
995 open $p, '-|', @cmd or die $!;
997 $?=0; $!=0; close $p or failedcmd @cmd;
1001 sub commit_getclogp ($) {
1002 # Returns the parsed changelog hashref for a particular commit
1004 our %commit_getclogp_memo;
1005 my $memo = $commit_getclogp_memo{$objid};
1006 return $memo if $memo;
1008 my $mclog = ".git/dgit/clog-$objid";
1009 runcmd shell_cmd "exec >$mclog", @git, qw(cat-file blob),
1010 "$objid:debian/changelog";
1011 $commit_getclogp_memo{$objid} = parsechangelog("-l$mclog");
1014 sub must_getcwd () {
1016 defined $d or fail "getcwd failed: $!";
1020 sub parse_dscdata () {
1021 my $dscfh = new IO::File \$dscdata, '<' or die $!;
1022 printdebug Dumper($dscdata) if $debuglevel>1;
1023 $dsc = parsecontrolfh($dscfh,$dscurl,1);
1024 printdebug Dumper($dsc) if $debuglevel>1;
1029 sub archive_query ($;@) {
1030 my ($method) = shift @_;
1031 fail "this operation does not support multiple comma-separated suites"
1033 my $query = access_cfg('archive-query','RETURN-UNDEF');
1034 $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
1037 { no strict qw(refs); &{"${method}_${proto}"}($proto,$data,@_); }
1040 sub archive_query_prepend_mirror {
1041 my $m = access_cfg('mirror');
1042 return map { [ $_->[0], $m.$_->[1], @$_[2..$#$_] ] } @_;
1045 sub pool_dsc_subpath ($$) {
1046 my ($vsn,$component) = @_; # $package is implict arg
1047 my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
1048 return "/pool/$component/$prefix/$package/".dscfn($vsn);
1051 sub cfg_apply_map ($$$) {
1052 my ($varref, $what, $mapspec) = @_;
1053 return unless $mapspec;
1055 printdebug "config $what EVAL{ $mapspec; }\n";
1057 eval "package Dgit::Config; $mapspec;";
1062 #---------- `ftpmasterapi' archive query method (nascent) ----------
1064 sub archive_api_query_cmd ($) {
1066 my @cmd = (@curl, qw(-sS));
1067 my $url = access_cfg('archive-query-url');
1068 if ($url =~ m#^https://([-.0-9a-z]+)/#) {
1070 my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
1071 foreach my $key (split /\:/, $keys) {
1072 $key =~ s/\%HOST\%/$host/g;
1074 fail "for $url: stat $key: $!" unless $!==ENOENT;
1077 fail "config requested specific TLS key but do not know".
1078 " how to get curl to use exactly that EE key ($key)";
1079 # push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
1080 # # Sadly the above line does not work because of changes
1081 # # to gnutls. The real fix for #790093 may involve
1082 # # new curl options.
1085 # Fixing #790093 properly will involve providing a value
1086 # for this on clients.
1087 my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
1088 push @cmd, split / /, $kargs if defined $kargs;
1090 push @cmd, $url.$subpath;
1094 sub api_query ($$;$) {
1096 my ($data, $subpath, $ok404) = @_;
1097 badcfg "ftpmasterapi archive query method takes no data part"
1099 my @cmd = archive_api_query_cmd($subpath);
1100 my $url = $cmd[$#cmd];
1101 push @cmd, qw(-w %{http_code});
1102 my $json = cmdoutput @cmd;
1103 unless ($json =~ s/\d+\d+\d$//) {
1104 failedcmd_report_cmd undef, @cmd;
1105 fail "curl failed to print 3-digit HTTP code";
1108 return undef if $code eq '404' && $ok404;
1109 fail "fetch of $url gave HTTP code $code"
1110 unless $url =~ m#^file://# or $code =~ m/^2/;
1111 return decode_json($json);
1114 sub canonicalise_suite_ftpmasterapi {
1115 my ($proto,$data) = @_;
1116 my $suites = api_query($data, 'suites');
1118 foreach my $entry (@$suites) {
1120 my $v = $entry->{$_};
1121 defined $v && $v eq $isuite;
1122 } qw(codename name);
1123 push @matched, $entry;
1125 fail "unknown suite $isuite" unless @matched;
1128 @matched==1 or die "multiple matches for suite $isuite\n";
1129 $cn = "$matched[0]{codename}";
1130 defined $cn or die "suite $isuite info has no codename\n";
1131 $cn =~ m/^$suite_re$/ or die "suite $isuite maps to bad codename\n";
1133 die "bad ftpmaster api response: $@\n".Dumper(\@matched)
1138 sub archive_query_ftpmasterapi {
1139 my ($proto,$data) = @_;
1140 my $info = api_query($data, "dsc_in_suite/$isuite/$package");
1142 my $digester = Digest::SHA->new(256);
1143 foreach my $entry (@$info) {
1145 my $vsn = "$entry->{version}";
1146 my ($ok,$msg) = version_check $vsn;
1147 die "bad version: $msg\n" unless $ok;
1148 my $component = "$entry->{component}";
1149 $component =~ m/^$component_re$/ or die "bad component";
1150 my $filename = "$entry->{filename}";
1151 $filename && $filename !~ m#[^-+:._~0-9a-zA-Z/]|^[/.]|/[/.]#
1152 or die "bad filename";
1153 my $sha256sum = "$entry->{sha256sum}";
1154 $sha256sum =~ m/^[0-9a-f]+$/ or die "bad sha256sum";
1155 push @rows, [ $vsn, "/pool/$component/$filename",
1156 $digester, $sha256sum ];
1158 die "bad ftpmaster api response: $@\n".Dumper($entry)
1161 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1162 return archive_query_prepend_mirror @rows;
1165 sub file_in_archive_ftpmasterapi {
1166 my ($proto,$data,$filename) = @_;
1167 my $pat = $filename;
1170 $pat =~ s#[^-+_.0-9a-z/]# sprintf '%%%02x', ord $& #ge;
1171 my $info = api_query($data, "file_in_archive/$pat", 1);
1174 #---------- `aptget' archive query method ----------
1177 our $aptget_releasefile;
1178 our $aptget_configpath;
1180 sub aptget_aptget () { return @aptget, qw(-c), $aptget_configpath; }
1181 sub aptget_aptcache () { return @aptcache, qw(-c), $aptget_configpath; }
1183 sub aptget_cache_clean {
1184 runcmd_ordryrun_local qw(sh -ec),
1185 'cd "$1"; find -atime +30 -type f -print0 | xargs -0r rm --',
1189 sub aptget_lock_acquire () {
1190 my $lockfile = "$aptget_base/lock";
1191 open APTGET_LOCK, '>', $lockfile or die "open $lockfile: $!";
1192 flock APTGET_LOCK, LOCK_EX or die "lock $lockfile: $!";
1195 sub aptget_prep ($) {
1197 return if defined $aptget_base;
1199 badcfg "aptget archive query method takes no data part"
1202 my $cache = $ENV{XDG_CACHE_DIR} // "$ENV{HOME}/.cache";
1205 ensuredir "$cache/dgit";
1207 access_cfg('aptget-cachekey','RETURN-UNDEF')
1208 // access_nomdistro();
1210 $aptget_base = "$cache/dgit/aptget";
1211 ensuredir $aptget_base;
1213 my $quoted_base = $aptget_base;
1214 die "$quoted_base contains bad chars, cannot continue"
1215 if $quoted_base =~ m/["\\]/; # apt.conf(5) says no escaping :-/
1217 ensuredir $aptget_base;
1219 aptget_lock_acquire();
1221 aptget_cache_clean();
1223 $aptget_configpath = "$aptget_base/apt.conf#$cachekey";
1224 my $sourceslist = "source.list#$cachekey";
1226 my $aptsuites = $isuite;
1227 cfg_apply_map(\$aptsuites, 'suite map',
1228 access_cfg('aptget-suite-map', 'RETURN-UNDEF'));
1230 open SRCS, ">", "$aptget_base/$sourceslist" or die $!;
1231 printf SRCS "deb-src %s %s %s\n",
1232 access_cfg('mirror'),
1234 access_cfg('aptget-components')
1237 ensuredir "$aptget_base/cache";
1238 ensuredir "$aptget_base/lists";
1240 open CONF, ">", $aptget_configpath or die $!;
1242 Debug::NoLocking "true";
1243 APT::Get::List-Cleanup "false";
1244 #clear APT::Update::Post-Invoke-Success;
1245 Dir::Etc::SourceList "$quoted_base/$sourceslist";
1246 Dir::State::Lists "$quoted_base/lists";
1247 Dir::Etc::preferences "$quoted_base/preferences";
1248 Dir::Cache::srcpkgcache "$quoted_base/cache/srcs#$cachekey";
1249 Dir::Cache::pkgcache "$quoted_base/cache/pkgs#$cachekey";
1252 foreach my $key (qw(
1255 Dir::Cache::Archives
1256 Dir::Etc::SourceParts
1257 Dir::Etc::preferencesparts
1259 ensuredir "$aptget_base/$key";
1260 print CONF "$key \"$quoted_base/$key\";\n" or die $!;
1263 my $oldatime = (time // die $!) - 1;
1264 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1265 next unless stat_exists $oldlist;
1266 my ($mtime) = (stat _)[9];
1267 utime $oldatime, $mtime, $oldlist or die "$oldlist $!";
1270 runcmd_ordryrun_local aptget_aptget(), qw(update);
1273 foreach my $oldlist (<$aptget_base/lists/*Release>) {
1274 next unless stat_exists $oldlist;
1275 my ($atime) = (stat _)[8];
1276 next if $atime == $oldatime;
1277 push @releasefiles, $oldlist;
1279 my @inreleasefiles = grep { m#/InRelease$# } @releasefiles;
1280 @releasefiles = @inreleasefiles if @inreleasefiles;
1281 die "apt updated wrong number of Release files (@releasefiles), erk"
1282 unless @releasefiles == 1;
1284 ($aptget_releasefile) = @releasefiles;
1287 sub canonicalise_suite_aptget {
1288 my ($proto,$data) = @_;
1291 my $release = parsecontrol $aptget_releasefile, "Release file", 1;
1293 foreach my $name (qw(Codename Suite)) {
1294 my $val = $release->{$name};
1296 printdebug "release file $name: $val\n";
1297 $val =~ m/^$suite_re$/o or fail
1298 "Release file ($aptget_releasefile) specifies intolerable $name";
1299 cfg_apply_map(\$val, 'suite rmap',
1300 access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
1307 sub archive_query_aptget {
1308 my ($proto,$data) = @_;
1311 ensuredir "$aptget_base/source";
1312 foreach my $old (<$aptget_base/source/*.dsc>) {
1313 unlink $old or die "$old: $!";
1316 my $showsrc = cmdoutput aptget_aptcache(), qw(showsrc), $package;
1317 return () unless $showsrc =~ m/^package:\s*\Q$package\E\s*$/mi;
1318 # avoids apt-get source failing with ambiguous error code
1320 runcmd_ordryrun_local
1321 shell_cmd 'cd "$1"/source; shift', $aptget_base,
1322 aptget_aptget(), qw(--download-only --only-source source), $package;
1324 my @dscs = <$aptget_base/source/*.dsc>;
1325 fail "apt-get source did not produce a .dsc" unless @dscs;
1326 fail "apt-get source produced several .dscs (@dscs)" unless @dscs==1;
1328 my $pre_dsc = parsecontrol $dscs[0], $dscs[0], 1;
1331 my $uri = "file://". uri_escape $dscs[0];
1332 $uri =~ s{\%2f}{/}gi;
1333 return [ (getfield $pre_dsc, 'Version'), $uri ];
1336 sub file_in_archive_aptget () { return undef; }
1338 #---------- `dummyapicat' archive query method ----------
1340 sub archive_query_dummycatapi { archive_query_ftpmasterapi @_; }
1341 sub canonicalise_suite_dummycatapi { canonicalise_suite_ftpmasterapi @_; }
1343 sub file_in_archive_dummycatapi ($$$) {
1344 my ($proto,$data,$filename) = @_;
1345 my $mirror = access_cfg('mirror');
1346 $mirror =~ s#^file://#/# or die "$mirror ?";
1348 my @cmd = (qw(sh -ec), '
1350 find -name "$2" -print0 |
1352 ', qw(x), $mirror, $filename);
1353 debugcmd "-|", @cmd;
1354 open FIA, "-|", @cmd or die $!;
1357 printdebug "| $_\n";
1358 m/^(\w+) (\S+)$/ or die "$_ ?";
1359 push @out, { sha256sum => $1, filename => $2 };
1361 close FIA or die failedcmd @cmd;
1365 #---------- `madison' archive query method ----------
1367 sub archive_query_madison {
1368 return archive_query_prepend_mirror
1369 map { [ @$_[0..1] ] } madison_get_parse(@_);
1372 sub madison_get_parse {
1373 my ($proto,$data) = @_;
1374 die unless $proto eq 'madison';
1375 if (!length $data) {
1376 $data= access_cfg('madison-distro','RETURN-UNDEF');
1377 $data //= access_basedistro();
1379 $rmad{$proto,$data,$package} ||= cmdoutput
1380 qw(rmadison -asource),"-s$isuite","-u$data",$package;
1381 my $rmad = $rmad{$proto,$data,$package};
1384 foreach my $l (split /\n/, $rmad) {
1385 $l =~ m{^ \s*( [^ \t|]+ )\s* \|
1386 \s*( [^ \t|]+ )\s* \|
1387 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
1388 \s*( [^ \t|]+ )\s* }x or die "$rmad ?";
1389 $1 eq $package or die "$rmad $package ?";
1396 $component = access_cfg('archive-query-default-component');
1398 $5 eq 'source' or die "$rmad ?";
1399 push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
1401 return sort { -version_compare($a->[0],$b->[0]); } @out;
1404 sub canonicalise_suite_madison {
1405 # madison canonicalises for us
1406 my @r = madison_get_parse(@_);
1408 "unable to canonicalise suite using package $package".
1409 " which does not appear to exist in suite $isuite;".
1410 " --existing-package may help";
1414 sub file_in_archive_madison { return undef; }
1416 #---------- `sshpsql' archive query method ----------
1419 my ($data,$runeinfo,$sql) = @_;
1420 if (!length $data) {
1421 $data= access_someuserhost('sshpsql').':'.
1422 access_cfg('sshpsql-dbname');
1424 $data =~ m/:/ or badcfg "invalid sshpsql method string \`$data'";
1425 my ($userhost,$dbname) = ($`,$'); #';
1427 my @cmd = (access_cfg_ssh, $userhost,
1428 access_runeinfo("ssh-psql $runeinfo").
1429 " export LC_MESSAGES=C; export LC_CTYPE=C;".
1430 " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
1432 open P, "-|", @cmd or die $!;
1435 printdebug(">|$_|\n");
1438 $!=0; $?=0; close P or failedcmd @cmd;
1440 my $nrows = pop @rows;
1441 $nrows =~ s/^\((\d+) rows?\)$/$1/ or die "$nrows ?";
1442 @rows == $nrows+1 or die "$nrows ".(scalar @rows)." ?";
1443 @rows = map { [ split /\|/, $_ ] } @rows;
1444 my $ncols = scalar @{ shift @rows };
1445 die if grep { scalar @$_ != $ncols } @rows;
1449 sub sql_injection_check {
1450 foreach (@_) { die "$_ $& ?" if m{[^-+=:_.,/0-9a-zA-Z]}; }
1453 sub archive_query_sshpsql ($$) {
1454 my ($proto,$data) = @_;
1455 sql_injection_check $isuite, $package;
1456 my @rows = sshpsql($data, "archive-query $isuite $package", <<END);
1457 SELECT source.version, component.name, files.filename, files.sha256sum
1459 JOIN src_associations ON source.id = src_associations.source
1460 JOIN suite ON suite.id = src_associations.suite
1461 JOIN dsc_files ON dsc_files.source = source.id
1462 JOIN files_archive_map ON files_archive_map.file_id = dsc_files.file
1463 JOIN component ON component.id = files_archive_map.component_id
1464 JOIN files ON files.id = dsc_files.file
1465 WHERE ( suite.suite_name='$isuite' OR suite.codename='$isuite' )
1466 AND source.source='$package'
1467 AND files.filename LIKE '%.dsc';
1469 @rows = sort { -version_compare($a->[0],$b->[0]) } @rows;
1470 my $digester = Digest::SHA->new(256);
1472 my ($vsn,$component,$filename,$sha256sum) = @$_;
1473 [ $vsn, "/pool/$component/$filename",$digester,$sha256sum ];
1475 return archive_query_prepend_mirror @rows;
1478 sub canonicalise_suite_sshpsql ($$) {
1479 my ($proto,$data) = @_;
1480 sql_injection_check $isuite;
1481 my @rows = sshpsql($data, "canonicalise-suite $isuite", <<END);
1482 SELECT suite.codename
1483 FROM suite where suite_name='$isuite' or codename='$isuite';
1485 @rows = map { $_->[0] } @rows;
1486 fail "unknown suite $isuite" unless @rows;
1487 die "ambiguous $isuite: @rows ?" if @rows>1;
1491 sub file_in_archive_sshpsql ($$$) { return undef; }
1493 #---------- `dummycat' archive query method ----------
1495 sub canonicalise_suite_dummycat ($$) {
1496 my ($proto,$data) = @_;
1497 my $dpath = "$data/suite.$isuite";
1498 if (!open C, "<", $dpath) {
1499 $!==ENOENT or die "$dpath: $!";
1500 printdebug "dummycat canonicalise_suite $isuite $dpath ENOENT\n";
1504 chomp or die "$dpath: $!";
1506 printdebug "dummycat canonicalise_suite $isuite $dpath = $_\n";
1510 sub archive_query_dummycat ($$) {
1511 my ($proto,$data) = @_;
1512 canonicalise_suite();
1513 my $dpath = "$data/package.$csuite.$package";
1514 if (!open C, "<", $dpath) {
1515 $!==ENOENT or die "$dpath: $!";
1516 printdebug "dummycat query $csuite $package $dpath ENOENT\n";
1524 printdebug "dummycat query $csuite $package $dpath | $_\n";
1525 my @row = split /\s+/, $_;
1526 @row==2 or die "$dpath: $_ ?";
1529 C->error and die "$dpath: $!";
1531 return archive_query_prepend_mirror
1532 sort { -version_compare($a->[0],$b->[0]); } @rows;
1535 sub file_in_archive_dummycat () { return undef; }
1537 #---------- tag format handling ----------
1539 sub access_cfg_tagformats () {
1540 split /\,/, access_cfg('dgit-tag-format');
1543 sub access_cfg_tagformats_can_splitbrain () {
1544 my %y = map { $_ => 1 } access_cfg_tagformats;
1545 foreach my $needtf (qw(new maint)) {
1546 next if $y{$needtf};
1552 sub need_tagformat ($$) {
1553 my ($fmt, $why) = @_;
1554 fail "need to use tag format $fmt ($why) but also need".
1555 " to use tag format $tagformat_want->[0] ($tagformat_want->[1])".
1556 " - no way to proceed"
1557 if $tagformat_want && $tagformat_want->[0] ne $fmt;
1558 $tagformat_want = [$fmt, $why, $tagformat_want->[2] // 0];
1561 sub select_tagformat () {
1563 return if $tagformatfn && !$tagformat_want;
1564 die 'bug' if $tagformatfn && $tagformat_want;
1565 # ... $tagformat_want assigned after previous select_tagformat
1567 my (@supported) = grep { $_ =~ m/^(?:old|new)$/ } access_cfg_tagformats();
1568 printdebug "select_tagformat supported @supported\n";
1570 $tagformat_want //= [ $supported[0], "distro access configuration", 0 ];
1571 printdebug "select_tagformat specified @$tagformat_want\n";
1573 my ($fmt,$why,$override) = @$tagformat_want;
1575 fail "target distro supports tag formats @supported".
1576 " but have to use $fmt ($why)"
1578 or grep { $_ eq $fmt } @supported;
1580 $tagformat_want = undef;
1582 $tagformatfn = ${*::}{"debiantag_$fmt"};
1584 fail "trying to use unknown tag format \`$fmt' ($why) !"
1585 unless $tagformatfn;
1588 #---------- archive query entrypoints and rest of program ----------
1590 sub canonicalise_suite () {
1591 return if defined $csuite;
1592 fail "cannot operate on $isuite suite" if $isuite eq 'UNRELEASED';
1593 $csuite = archive_query('canonicalise_suite');
1594 if ($isuite ne $csuite) {
1595 progress "canonical suite name for $isuite is $csuite";
1597 progress "canonical suite name is $csuite";
1601 sub get_archive_dsc () {
1602 canonicalise_suite();
1603 my @vsns = archive_query('archive_query');
1604 foreach my $vinfo (@vsns) {
1605 my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
1606 $dscurl = $vsn_dscurl;
1607 $dscdata = url_get($dscurl);
1609 $skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
1614 $digester->add($dscdata);
1615 my $got = $digester->hexdigest();
1617 fail "$dscurl has hash $got but".
1618 " archive told us to expect $digest";
1621 my $fmt = getfield $dsc, 'Format';
1622 $format_ok{$fmt} or forceable_fail [qw(unsupported-source-format)],
1623 "unsupported source format $fmt, sorry";
1625 $dsc_checked = !!$digester;
1626 printdebug "get_archive_dsc: Version ".(getfield $dsc, 'Version')."\n";
1630 printdebug "get_archive_dsc: nothing in archive, returning undef\n";
1633 sub check_for_git ();
1634 sub check_for_git () {
1636 my $how = access_cfg('git-check');
1637 if ($how eq 'ssh-cmd') {
1639 (access_cfg_ssh, access_gituserhost(),
1640 access_runeinfo("git-check $package").
1641 " set -e; cd ".access_cfg('git-path').";".
1642 " if test -d $package.git; then echo 1; else echo 0; fi");
1643 my $r= cmdoutput @cmd;
1644 if (defined $r and $r =~ m/^divert (\w+)$/) {
1646 my ($usedistro,) = access_distros();
1647 # NB that if we are pushing, $usedistro will be $distro/push
1648 $instead_distro= cfg("dgit-distro.$usedistro.diverts.$divert");
1649 $instead_distro =~ s{^/}{ access_basedistro()."/" }e;
1650 progress "diverting to $divert (using config for $instead_distro)";
1651 return check_for_git();
1653 failedcmd @cmd unless defined $r and $r =~ m/^[01]$/;
1655 } elsif ($how eq 'url') {
1656 my $prefix = access_cfg('git-check-url','git-url');
1657 my $suffix = access_cfg('git-check-suffix','git-suffix',
1658 'RETURN-UNDEF') // '.git';
1659 my $url = "$prefix/$package$suffix";
1660 my @cmd = (@curl, qw(-sS -I), $url);
1661 my $result = cmdoutput @cmd;
1662 $result =~ s/^\S+ 200 .*\n\r?\n//;
1663 # curl -sS -I with https_proxy prints
1664 # HTTP/1.0 200 Connection established
1665 $result =~ m/^\S+ (404|200) /s or
1666 fail "unexpected results from git check query - ".
1667 Dumper($prefix, $result);
1669 if ($code eq '404') {
1671 } elsif ($code eq '200') {
1676 } elsif ($how eq 'true') {
1678 } elsif ($how eq 'false') {
1681 badcfg "unknown git-check \`$how'";
1685 sub create_remote_git_repo () {
1686 my $how = access_cfg('git-create');
1687 if ($how eq 'ssh-cmd') {
1689 (access_cfg_ssh, access_gituserhost(),
1690 access_runeinfo("git-create $package").
1691 "set -e; cd ".access_cfg('git-path').";".
1692 " cp -a _template $package.git");
1693 } elsif ($how eq 'true') {
1696 badcfg "unknown git-create \`$how'";
1700 our ($dsc_hash,$lastpush_mergeinput);
1701 our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
1703 our $ud = '.git/dgit/unpack';
1713 sub mktree_in_ud_here () {
1714 runcmd qw(git init -q);
1715 runcmd qw(git config gc.auto 0);
1716 foreach my $copy (qw(user.email user.name user.useConfigOnly
1717 core.sharedRepository
1718 core.compression core.looseCompression
1719 core.bigFileThreshold core.fsyncObjectFiles)) {
1720 my $v = $gitcfgs{local}{$copy};
1722 runcmd qw(git config), $copy, $_ foreach @$v;
1724 rmtree('.git/objects');
1725 symlink '../../../../objects','.git/objects' or die $!;
1729 sub git_write_tree () {
1730 my $tree = cmdoutput @git, qw(write-tree);
1731 $tree =~ m/^\w+$/ or die "$tree ?";
1735 sub git_add_write_tree () {
1736 runcmd @git, qw(add -Af .);
1737 return git_write_tree();
1740 sub remove_stray_gits ($) {
1742 my @gitscmd = qw(find -name .git -prune -print0);
1743 debugcmd "|",@gitscmd;
1744 open GITS, "-|", @gitscmd or die $!;
1749 print STDERR "$us: warning: removing from $what: ",
1750 (messagequote $_), "\n";
1754 $!=0; $?=0; close GITS or failedcmd @gitscmd;
1757 sub mktree_in_ud_from_only_subdir ($;$) {
1758 my ($what,$raw) = @_;
1760 # changes into the subdir
1762 die "expected one subdir but found @dirs ?" unless @dirs==1;
1763 $dirs[0] =~ m#^([^/]+)/\.$# or die;
1767 remove_stray_gits($what);
1768 mktree_in_ud_here();
1770 my ($format, $fopts) = get_source_format();
1771 if (madformat($format)) {
1776 my $tree=git_add_write_tree();
1777 return ($tree,$dir);
1780 our @files_csum_info_fields =
1781 (['Checksums-Sha256','Digest::SHA', 'new(256)', 'sha256sum'],
1782 ['Checksums-Sha1', 'Digest::SHA', 'new(1)', 'sha1sum'],
1783 ['Files', 'Digest::MD5', 'new()', 'md5sum']);
1785 sub dsc_files_info () {
1786 foreach my $csumi (@files_csum_info_fields) {
1787 my ($fname, $module, $method) = @$csumi;
1788 my $field = $dsc->{$fname};
1789 next unless defined $field;
1790 eval "use $module; 1;" or die $@;
1792 foreach (split /\n/, $field) {
1794 m/^(\w+) (\d+) (\S+)$/ or
1795 fail "could not parse .dsc $fname line \`$_'";
1796 my $digester = eval "$module"."->$method;" or die $@;
1801 Digester => $digester,
1806 fail "missing any supported Checksums-* or Files field in ".
1807 $dsc->get_option('name');
1811 map { $_->{Filename} } dsc_files_info();
1814 sub files_compare_inputs (@) {
1819 my $showinputs = sub {
1820 return join "; ", map { $_->get_option('name') } @$inputs;
1823 foreach my $in (@$inputs) {
1825 my $in_name = $in->get_option('name');
1827 printdebug "files_compare_inputs $in_name\n";
1829 foreach my $csumi (@files_csum_info_fields) {
1830 my ($fname) = @$csumi;
1831 printdebug "files_compare_inputs $in_name $fname\n";
1833 my $field = $in->{$fname};
1834 next unless defined $field;
1837 foreach (split /\n/, $field) {
1840 my ($info, $f) = m/^(\w+ \d+) (?:\S+ \S+ )?(\S+)$/ or
1841 fail "could not parse $in_name $fname line \`$_'";
1843 printdebug "files_compare_inputs $in_name $fname $f\n";
1847 my $re = \ $record{$f}{$fname};
1849 $fchecked{$f}{$in_name} = 1;
1851 fail "hash or size of $f varies in $fname fields".
1852 " (between: ".$showinputs->().")";
1857 @files = sort @files;
1858 $expected_files //= \@files;
1859 "@$expected_files" eq "@files" or
1860 fail "file list in $in_name varies between hash fields!";
1863 fail "$in_name has no files list field(s)";
1865 printdebug "files_compare_inputs ".Dumper(\%fchecked, \%record)
1868 grep { keys %$_ == @$inputs-1 } values %fchecked
1869 or fail "no file appears in all file lists".
1870 " (looked in: ".$showinputs->().")";
1873 sub is_orig_file_in_dsc ($$) {
1874 my ($f, $dsc_files_info) = @_;
1875 return 0 if @$dsc_files_info <= 1;
1876 # One file means no origs, and the filename doesn't have a "what
1877 # part of dsc" component. (Consider versions ending `.orig'.)
1878 return 0 unless $f =~ m/\.$orig_f_tail_re$/o;
1882 sub is_orig_file_of_vsn ($$) {
1883 my ($f, $upstreamvsn) = @_;
1884 my $base = srcfn $upstreamvsn, '';
1885 return 0 unless $f =~ m/^\Q$base\E\.$orig_f_tail_re$/;
1889 sub changes_update_origs_from_dsc ($$$$) {
1890 my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
1892 printdebug "checking origs needed ($upstreamvsn)...\n";
1893 $_ = getfield $changes, 'Files';
1894 m/^\w+ \d+ (\S+ \S+) \S+$/m or
1895 fail "cannot find section/priority from .changes Files field";
1896 my $placementinfo = $1;
1898 printdebug "checking origs needed placement '$placementinfo'...\n";
1899 foreach my $l (split /\n/, getfield $dsc, 'Files') {
1900 $l =~ m/\S+$/ or next;
1902 printdebug "origs $file | $l\n";
1903 next unless is_orig_file_of_vsn $file, $upstreamvsn;
1904 printdebug "origs $file is_orig\n";
1905 my $have = archive_query('file_in_archive', $file);
1906 if (!defined $have) {
1908 archive does not support .orig check; hope you used --ch:--sa/-sd if needed
1914 printdebug "origs $file \$#\$have=$#$have\n";
1915 foreach my $h (@$have) {
1918 foreach my $csumi (@files_csum_info_fields) {
1919 my ($fname, $module, $method, $archivefield) = @$csumi;
1920 next unless defined $h->{$archivefield};
1921 $_ = $dsc->{$fname};
1922 next unless defined;
1923 m/^(\w+) .* \Q$file\E$/m or
1924 fail ".dsc $fname missing entry for $file";
1925 if ($h->{$archivefield} eq $1) {
1929 "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
1932 die "$file ".Dumper($h)." ?!" if $same && @differ;
1935 push @found_differ, "archive $h->{filename}: ".join "; ", @differ
1938 printdebug "origs $file f.same=$found_same".
1939 " #f._differ=$#found_differ\n";
1940 if (@found_differ && !$found_same) {
1942 "archive contains $file with different checksum",
1945 # Now we edit the changes file to add or remove it
1946 foreach my $csumi (@files_csum_info_fields) {
1947 my ($fname, $module, $method, $archivefield) = @$csumi;
1948 next unless defined $changes->{$fname};
1950 # in archive, delete from .changes if it's there
1951 $changed{$file} = "removed" if
1952 $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
1953 } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
1954 # not in archive, but it's here in the .changes
1956 my $dsc_data = getfield $dsc, $fname;
1957 $dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
1959 $extra =~ s/ \d+ /$&$placementinfo /
1960 or die "$fname $extra >$dsc_data< ?"
1961 if $fname eq 'Files';
1962 $changes->{$fname} .= "\n". $extra;
1963 $changed{$file} = "added";
1968 foreach my $file (keys %changed) {
1970 "edited .changes for archive .orig contents: %s %s",
1971 $changed{$file}, $file;
1973 my $chtmp = "$changesfile.tmp";
1974 $changes->save($chtmp);
1976 rename $chtmp,$changesfile or die "$changesfile $!";
1978 progress "[new .changes left in $changesfile]";
1981 progress "$changesfile already has appropriate .orig(s) (if any)";
1985 sub make_commit ($) {
1987 return cmdoutput @git, qw(hash-object -w -t commit), $file;
1990 sub make_commit_text ($) {
1993 my @cmd = (@git, qw(hash-object -w -t commit --stdin));
1995 print Dumper($text) if $debuglevel > 1;
1996 my $child = open2($out, $in, @cmd) or die $!;
1999 print $in $text or die $!;
2000 close $in or die $!;
2002 $h =~ m/^\w+$/ or die;
2004 printdebug "=> $h\n";
2007 waitpid $child, 0 == $child or die "$child $!";
2008 $? and failedcmd @cmd;
2012 sub clogp_authline ($) {
2014 my $author = getfield $clogp, 'Maintainer';
2015 if ($author =~ m/^[^"\@]+\,/) {
2016 # single entry Maintainer field with unquoted comma
2017 $author = ($& =~ y/,//rd).$'; # strip the comma
2019 # git wants a single author; any remaining commas in $author
2020 # are by now preceded by @ (or "). It seems safer to punt on
2021 # "..." for now rather than attempting to dequote or something.
2022 $author =~ s#,.*##ms unless $author =~ m/"/;
2023 my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
2024 my $authline = "$author $date";
2025 $authline =~ m/$git_authline_re/o or
2026 fail "unexpected commit author line format \`$authline'".
2027 " (was generated from changelog Maintainer field)";
2028 return ($1,$2,$3) if wantarray;
2032 sub vendor_patches_distro ($$) {
2033 my ($checkdistro, $what) = @_;
2034 return unless defined $checkdistro;
2036 my $series = "debian/patches/\L$checkdistro\E.series";
2037 printdebug "checking for vendor-specific $series ($what)\n";
2039 if (!open SERIES, "<", $series) {
2040 die "$series $!" unless $!==ENOENT;
2049 Unfortunately, this source package uses a feature of dpkg-source where
2050 the same source package unpacks to different source code on different
2051 distros. dgit cannot safely operate on such packages on affected
2052 distros, because the meaning of source packages is not stable.
2054 Please ask the distro/maintainer to remove the distro-specific series
2055 files and use a different technique (if necessary, uploading actually
2056 different packages, if different distros are supposed to have
2060 fail "Found active distro-specific series file for".
2061 " $checkdistro ($what): $series, cannot continue";
2063 die "$series $!" if SERIES->error;
2067 sub check_for_vendor_patches () {
2068 # This dpkg-source feature doesn't seem to be documented anywhere!
2069 # But it can be found in the changelog (reformatted):
2071 # commit 4fa01b70df1dc4458daee306cfa1f987b69da58c
2072 # Author: Raphael Hertzog <hertzog@debian.org>
2073 # Date: Sun Oct 3 09:36:48 2010 +0200
2075 # dpkg-source: correctly create .pc/.quilt_series with alternate
2078 # If you have debian/patches/ubuntu.series and you were
2079 # unpacking the source package on ubuntu, quilt was still
2080 # directed to debian/patches/series instead of
2081 # debian/patches/ubuntu.series.
2083 # debian/changelog | 3 +++
2084 # scripts/Dpkg/Source/Package/V3/quilt.pm | 4 +++-
2085 # 2 files changed, 6 insertions(+), 1 deletion(-)
2088 vendor_patches_distro($ENV{DEB_VENDOR}, "DEB_VENDOR");
2089 vendor_patches_distro(Dpkg::Vendor::get_current_vendor(),
2090 "Dpkg::Vendor \`current vendor'");
2091 vendor_patches_distro(access_basedistro(),
2092 "(base) distro being accessed");
2093 vendor_patches_distro(access_nomdistro(),
2094 "(nominal) distro being accessed");
2097 sub generate_commits_from_dsc () {
2098 # See big comment in fetch_from_archive, below.
2099 # See also README.dsc-import.
2103 my @dfi = dsc_files_info();
2104 foreach my $fi (@dfi) {
2105 my $f = $fi->{Filename};
2106 die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
2107 my $upper_f = "../../../../$f";
2109 printdebug "considering reusing $f: ";
2111 if (link_ltarget "$upper_f,fetch", $f) {
2112 printdebug "linked (using ...,fetch).\n";
2113 } elsif ((printdebug "($!) "),
2115 fail "accessing ../$f,fetch: $!";
2116 } elsif (link_ltarget $upper_f, $f) {
2117 printdebug "linked.\n";
2118 } elsif ((printdebug "($!) "),
2120 fail "accessing ../$f: $!";
2122 printdebug "absent.\n";
2126 complete_file_from_dsc('.', $fi, \$refetched)
2129 printdebug "considering saving $f: ";
2131 if (link $f, $upper_f) {
2132 printdebug "linked.\n";
2133 } elsif ((printdebug "($!) "),
2135 fail "saving ../$f: $!";
2136 } elsif (!$refetched) {
2137 printdebug "no need.\n";
2138 } elsif (link $f, "$upper_f,fetch") {
2139 printdebug "linked (using ...,fetch).\n";
2140 } elsif ((printdebug "($!) "),
2142 fail "saving ../$f,fetch: $!";
2144 printdebug "cannot.\n";
2148 # We unpack and record the orig tarballs first, so that we only
2149 # need disk space for one private copy of the unpacked source.
2150 # But we can't make them into commits until we have the metadata
2151 # from the debian/changelog, so we record the tree objects now and
2152 # make them into commits later.
2154 my $upstreamv = upstreamversion $dsc->{version};
2155 my $orig_f_base = srcfn $upstreamv, '';
2157 foreach my $fi (@dfi) {
2158 # We actually import, and record as a commit, every tarball
2159 # (unless there is only one file, in which case there seems
2162 my $f = $fi->{Filename};
2163 printdebug "import considering $f ";
2164 (printdebug "only one dfi\n"), next if @dfi == 1;
2165 (printdebug "not tar\n"), next unless $f =~ m/\.tar(\.\w+)?$/;
2166 (printdebug "signature\n"), next if $f =~ m/$orig_f_sig_re$/o;
2170 $f =~ m/^\Q$orig_f_base\E\.([^._]+)?\.tar(?:\.\w+)?$/;
2172 printdebug "Y ", (join ' ', map { $_//"(none)" }
2173 $compr_ext, $orig_f_part
2176 my $input = new IO::File $f, '<' or die "$f $!";
2180 if (defined $compr_ext) {
2182 Dpkg::Compression::compression_guess_from_filename $f;
2183 fail "Dpkg::Compression cannot handle file $f in source package"
2184 if defined $compr_ext && !defined $cname;
2186 new Dpkg::Compression::Process compression => $cname;
2187 @compr_cmd = $compr_proc->get_uncompress_cmdline();
2188 my $compr_fh = new IO::Handle;
2189 my $compr_pid = open $compr_fh, "-|" // die $!;
2191 open STDIN, "<&", $input or die $!;
2193 die "dgit (child): exec $compr_cmd[0]: $!\n";
2198 rmtree "_unpack-tar";
2199 mkdir "_unpack-tar" or die $!;
2200 my @tarcmd = qw(tar -x -f -
2201 --no-same-owner --no-same-permissions
2202 --no-acls --no-xattrs --no-selinux);
2203 my $tar_pid = fork // die $!;
2205 chdir "_unpack-tar" or die $!;
2206 open STDIN, "<&", $input or die $!;
2208 die "dgit (child): exec $tarcmd[0]: $!";
2210 $!=0; (waitpid $tar_pid, 0) == $tar_pid or die $!;
2211 !$? or failedcmd @tarcmd;
2214 (@compr_cmd ? ($?==SIGPIPE || failedcmd @compr_cmd)
2216 # finally, we have the results in "tarball", but maybe
2217 # with the wrong permissions
2219 runcmd qw(chmod -R +rwX _unpack-tar);
2220 changedir "_unpack-tar";
2221 remove_stray_gits($f);
2222 mktree_in_ud_here();
2224 my ($tree) = git_add_write_tree();
2225 my $tentries = cmdoutput @git, qw(ls-tree -z), $tree;
2226 if ($tentries =~ m/^\d+ tree (\w+)\t[^\000]+\000$/s) {
2228 printdebug "one subtree $1\n";
2230 printdebug "multiple subtrees\n";
2233 rmtree "_unpack-tar";
2235 my $ent = [ $f, $tree ];
2237 Orig => !!$orig_f_part,
2238 Sort => (!$orig_f_part ? 2 :
2239 $orig_f_part =~ m/-/g ? 1 :
2247 # put any without "_" first (spec is not clear whether files
2248 # are always in the usual order). Tarballs without "_" are
2249 # the main orig or the debian tarball.
2250 $a->{Sort} <=> $b->{Sort} or
2254 my $any_orig = grep { $_->{Orig} } @tartrees;
2256 my $dscfn = "$package.dsc";
2258 my $treeimporthow = 'package';
2260 open D, ">", $dscfn or die "$dscfn: $!";
2261 print D $dscdata or die "$dscfn: $!";
2262 close D or die "$dscfn: $!";
2263 my @cmd = qw(dpkg-source);
2264 push @cmd, '--no-check' if $dsc_checked;
2265 if (madformat $dsc->{format}) {
2266 push @cmd, '--skip-patches';
2267 $treeimporthow = 'unpatched';
2269 push @cmd, qw(-x --), $dscfn;
2272 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
2273 if (madformat $dsc->{format}) {
2274 check_for_vendor_patches();
2278 if (madformat $dsc->{format}) {
2279 my @pcmd = qw(dpkg-source --before-build .);
2280 runcmd shell_cmd 'exec >/dev/null', @pcmd;
2282 $dappliedtree = git_add_write_tree();
2285 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all);
2286 debugcmd "|",@clogcmd;
2287 open CLOGS, "-|", @clogcmd or die $!;
2292 printdebug "import clog search...\n";
2295 my $stanzatext = do { local $/=""; <CLOGS>; };
2296 printdebug "import clogp ".Dumper($stanzatext) if $debuglevel>1;
2297 last if !defined $stanzatext;
2299 my $desc = "package changelog, entry no.$.";
2300 open my $stanzafh, "<", \$stanzatext or die;
2301 my $thisstanza = parsecontrolfh $stanzafh, $desc, 1;
2302 $clogp //= $thisstanza;
2304 printdebug "import clog $thisstanza->{version} $desc...\n";
2306 last if !$any_orig; # we don't need $r1clogp
2308 # We look for the first (most recent) changelog entry whose
2309 # version number is lower than the upstream version of this
2310 # package. Then the last (least recent) previous changelog
2311 # entry is treated as the one which introduced this upstream
2312 # version and used for the synthetic commits for the upstream
2315 # One might think that a more sophisticated algorithm would be
2316 # necessary. But: we do not want to scan the whole changelog
2317 # file. Stopping when we see an earlier version, which
2318 # necessarily then is an earlier upstream version, is the only
2319 # realistic way to do that. Then, either the earliest
2320 # changelog entry we have seen so far is indeed the earliest
2321 # upload of this upstream version; or there are only changelog
2322 # entries relating to later upstream versions (which is not
2323 # possible unless the changelog and .dsc disagree about the
2324 # version). Then it remains to choose between the physically
2325 # last entry in the file, and the one with the lowest version
2326 # number. If these are not the same, we guess that the
2327 # versions were created in a non-monotic order rather than
2328 # that the changelog entries have been misordered.
2330 printdebug "import clog $thisstanza->{version} vs $upstreamv...\n";
2332 last if version_compare($thisstanza->{version}, $upstreamv) < 0;
2333 $r1clogp = $thisstanza;
2335 printdebug "import clog $r1clogp->{version} becomes r1\n";
2337 die $! if CLOGS->error;
2338 close CLOGS or $?==SIGPIPE or failedcmd @clogcmd;
2340 $clogp or fail "package changelog has no entries!";
2342 my $authline = clogp_authline $clogp;
2343 my $changes = getfield $clogp, 'Changes';
2344 $changes =~ s/^\n//; # Changes: \n
2345 my $cversion = getfield $clogp, 'Version';
2348 $r1clogp //= $clogp; # maybe there's only one entry;
2349 my $r1authline = clogp_authline $r1clogp;
2350 # Strictly, r1authline might now be wrong if it's going to be
2351 # unused because !$any_orig. Whatever.
2353 printdebug "import tartrees authline $authline\n";
2354 printdebug "import tartrees r1authline $r1authline\n";
2356 foreach my $tt (@tartrees) {
2357 printdebug "import tartree $tt->{F} $tt->{Tree}\n";
2359 $tt->{Commit} = make_commit_text($tt->{Orig} ? <<END_O : <<END_T);
2362 committer $r1authline
2366 [dgit import orig $tt->{F}]
2374 [dgit import tarball $package $cversion $tt->{F}]
2379 printdebug "import main commit\n";
2381 open C, ">../commit.tmp" or die $!;
2382 print C <<END or die $!;
2385 print C <<END or die $! foreach @tartrees;
2388 print C <<END or die $!;
2394 [dgit import $treeimporthow $package $cversion]
2398 my $rawimport_hash = make_commit qw(../commit.tmp);
2400 if (madformat $dsc->{format}) {
2401 printdebug "import apply patches...\n";
2403 # regularise the state of the working tree so that
2404 # the checkout of $rawimport_hash works nicely.
2405 my $dappliedcommit = make_commit_text(<<END);
2412 runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
2414 runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
2416 # We need the answers to be reproducible
2417 my @authline = clogp_authline($clogp);
2418 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
2419 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
2420 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
2421 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
2422 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
2423 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
2425 my $path = $ENV{PATH} or die;
2427 foreach my $use_absurd (qw(0 1)) {
2428 runcmd @git, qw(checkout -q unpa);
2429 runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
2430 local $ENV{PATH} = $path;
2433 progress "warning: $@";
2434 $path = "$absurdity:$path";
2435 progress "$us: trying slow absurd-git-apply...";
2436 rename "../../gbp-pq-output","../../gbp-pq-output.0"
2441 die "forbid absurd git-apply\n" if $use_absurd
2442 && forceing [qw(import-gitapply-no-absurd)];
2443 die "only absurd git-apply!\n" if !$use_absurd
2444 && forceing [qw(import-gitapply-absurd)];
2446 local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd;
2447 local $ENV{PATH} = $path if $use_absurd;
2449 my @showcmd = (gbp_pq, qw(import));
2450 my @realcmd = shell_cmd
2451 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd;
2452 debugcmd "+",@realcmd;
2453 if (system @realcmd) {
2454 die +(shellquote @showcmd).
2456 failedcmd_waitstatus()."\n";
2459 my $gapplied = git_rev_parse('HEAD');
2460 my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
2461 $gappliedtree eq $dappliedtree or
2463 gbp-pq import and dpkg-source disagree!
2464 gbp-pq import gave commit $gapplied
2465 gbp-pq import gave tree $gappliedtree
2466 dpkg-source --before-build gave tree $dappliedtree
2468 $rawimport_hash = $gapplied;
2473 { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
2478 progress "synthesised git commit from .dsc $cversion";
2480 my $rawimport_mergeinput = {
2481 Commit => $rawimport_hash,
2482 Info => "Import of source package",
2484 my @output = ($rawimport_mergeinput);
2486 if ($lastpush_mergeinput) {
2487 my $oldclogp = mergeinfo_getclogp($lastpush_mergeinput);
2488 my $oversion = getfield $oldclogp, 'Version';
2490 version_compare($oversion, $cversion);
2492 @output = ($rawimport_mergeinput, $lastpush_mergeinput,
2493 { Message => <<END, ReverseParents => 1 });
2494 Record $package ($cversion) in archive suite $csuite
2496 } elsif ($vcmp > 0) {
2497 print STDERR <<END or die $!;
2499 Version actually in archive: $cversion (older)
2500 Last version pushed with dgit: $oversion (newer or same)
2503 @output = $lastpush_mergeinput;
2505 # Same version. Use what's in the server git branch,
2506 # discarding our own import. (This could happen if the
2507 # server automatically imports all packages into git.)
2508 @output = $lastpush_mergeinput;
2511 changedir '../../../..';
2516 sub complete_file_from_dsc ($$;$) {
2517 our ($dstdir, $fi, $refetched) = @_;
2518 # Ensures that we have, in $dstdir, the file $fi, with the correct
2519 # contents. (Downloading it from alongside $dscurl if necessary.)
2520 # If $refetched is defined, can overwrite "$dstdir/$fi->{Filename}"
2521 # and will set $$refetched=1 if it did so (or tried to).
2523 my $f = $fi->{Filename};
2524 my $tf = "$dstdir/$f";
2528 my $checkhash = sub {
2529 open F, "<", "$tf" or die "$tf: $!";
2530 $fi->{Digester}->reset();
2531 $fi->{Digester}->addfile(*F);
2532 F->error and die $!;
2533 $got = $fi->{Digester}->hexdigest();
2534 return $got eq $fi->{Hash};
2537 if (stat_exists $tf) {
2538 if ($checkhash->()) {
2539 progress "using existing $f";
2543 fail "file $f has hash $got but .dsc".
2544 " demands hash $fi->{Hash} ".
2545 "(perhaps you should delete this file?)";
2547 progress "need to fetch correct version of $f";
2548 unlink $tf or die "$tf $!";
2551 printdebug "$tf does not exist, need to fetch\n";
2555 $furl =~ s{/[^/]+$}{};
2557 die "$f ?" unless $f =~ m/^\Q${package}\E_/;
2558 die "$f ?" if $f =~ m#/#;
2559 runcmd_ordryrun_local @curl,qw(-f -o),$tf,'--',"$furl";
2560 return 0 if !act_local();
2563 fail "file $f has hash $got but .dsc".
2564 " demands hash $fi->{Hash} ".
2565 "(got wrong file from archive!)";
2570 sub ensure_we_have_orig () {
2571 my @dfi = dsc_files_info();
2572 foreach my $fi (@dfi) {
2573 my $f = $fi->{Filename};
2574 next unless is_orig_file_in_dsc($f, \@dfi);
2575 complete_file_from_dsc('..', $fi)
2580 #---------- git fetch ----------
2582 sub lrfetchrefs () { return "refs/dgit-fetch/".access_basedistro(); }
2583 sub lrfetchref () { return lrfetchrefs.'/'.server_branch($csuite); }
2585 # We fetch some parts of lrfetchrefs/*. Ideally we delete these
2586 # locally fetched refs because they have unhelpful names and clutter
2587 # up gitk etc. So we track whether we have "used up" head ref (ie,
2588 # whether we have made another local ref which refers to this object).
2590 # (If we deleted them unconditionally, then we might end up
2591 # re-fetching the same git objects each time dgit fetch was run.)
2593 # So, each use of lrfetchrefs needs to be accompanied by arrangements
2594 # in git_fetch_us to fetch the refs in question, and possibly a call
2595 # to lrfetchref_used.
2597 our (%lrfetchrefs_f, %lrfetchrefs_d);
2598 # $lrfetchrefs_X{lrfetchrefs."/heads/whatever"} = $objid
2600 sub lrfetchref_used ($) {
2601 my ($fullrefname) = @_;
2602 my $objid = $lrfetchrefs_f{$fullrefname};
2603 $lrfetchrefs_d{$fullrefname} = $objid if defined $objid;
2606 sub git_lrfetch_sane {
2607 my ($url, $supplementary, @specs) = @_;
2608 # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
2609 # at least as regards @specs. Also leave the results in
2610 # %lrfetchrefs_f, and arrange for lrfetchref_used to be
2611 # able to clean these up.
2613 # With $supplementary==1, @specs must not contain wildcards
2614 # and we add to our previous fetches (non-atomically).
2616 # This is rather miserable:
2617 # When git fetch --prune is passed a fetchspec ending with a *,
2618 # it does a plausible thing. If there is no * then:
2619 # - it matches subpaths too, even if the supplied refspec
2620 # starts refs, and behaves completely madly if the source
2621 # has refs/refs/something. (See, for example, Debian #NNNN.)
2622 # - if there is no matching remote ref, it bombs out the whole
2624 # We want to fetch a fixed ref, and we don't know in advance
2625 # if it exists, so this is not suitable.
2627 # Our workaround is to use git ls-remote. git ls-remote has its
2628 # own qairks. Notably, it has the absurd multi-tail-matching
2629 # behaviour: git ls-remote R refs/foo can report refs/foo AND
2630 # refs/refs/foo etc.
2632 # Also, we want an idempotent snapshot, but we have to make two
2633 # calls to the remote: one to git ls-remote and to git fetch. The
2634 # solution is use git ls-remote to obtain a target state, and
2635 # git fetch to try to generate it. If we don't manage to generate
2636 # the target state, we try again.
2638 printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
2640 my $specre = join '|', map {
2643 my $wildcard = $x =~ s/\\\*$/.*/;
2644 die if $wildcard && $supplementary;
2647 printdebug "git_lrfetch_sane specre=$specre\n";
2648 my $wanted_rref = sub {
2650 return m/^(?:$specre)$/;
2653 my $fetch_iteration = 0;
2656 printdebug "git_lrfetch_sane iteration $fetch_iteration\n";
2657 if (++$fetch_iteration > 10) {
2658 fail "too many iterations trying to get sane fetch!";
2661 my @look = map { "refs/$_" } @specs;
2662 my @lcmd = (@git, qw(ls-remote -q --refs), $url, @look);
2666 open GITLS, "-|", @lcmd or die $!;
2668 printdebug "=> ", $_;
2669 m/^(\w+)\s+(\S+)\n/ or die "ls-remote $_ ?";
2670 my ($objid,$rrefname) = ($1,$2);
2671 if (!$wanted_rref->($rrefname)) {
2673 warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
2677 $wantr{$rrefname} = $objid;
2680 close GITLS or failedcmd @lcmd;
2682 # OK, now %want is exactly what we want for refs in @specs
2684 !m/\*$/ && !exists $wantr{"refs/$_"} ? () :
2685 "+refs/$_:".lrfetchrefs."/$_";
2688 printdebug "git_lrfetch_sane fspecs @fspecs\n";
2690 my @fcmd = (@git, qw(fetch -p -n -q), $url, @fspecs);
2691 runcmd_ordryrun_local @fcmd if @fspecs;
2693 if (!$supplementary) {
2694 %lrfetchrefs_f = ();
2698 git_for_each_ref(lrfetchrefs, sub {
2699 my ($objid,$objtype,$lrefname,$reftail) = @_;
2700 $lrfetchrefs_f{$lrefname} = $objid;
2701 $objgot{$objid} = 1;
2704 if ($supplementary) {
2708 foreach my $lrefname (sort keys %lrfetchrefs_f) {
2709 my $rrefname = 'refs'.substr($lrefname, length lrfetchrefs);
2710 if (!exists $wantr{$rrefname}) {
2711 if ($wanted_rref->($rrefname)) {
2713 git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
2717 warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
2720 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2721 delete $lrfetchrefs_f{$lrefname};
2725 foreach my $rrefname (sort keys %wantr) {
2726 my $lrefname = lrfetchrefs.substr($rrefname, 4);
2727 my $got = $lrfetchrefs_f{$lrefname} // '<none>';
2728 my $want = $wantr{$rrefname};
2729 next if $got eq $want;
2730 if (!defined $objgot{$want}) {
2732 warning: git ls-remote suggests we want $lrefname
2733 warning: and it should refer to $want
2734 warning: but git fetch didn't fetch that object to any relevant ref.
2735 warning: This may be due to a race with someone updating the server.
2736 warning: Will try again...
2738 next FETCH_ITERATION;
2741 git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
2743 runcmd_ordryrun_local @git, qw(update-ref -m),
2744 "dgit fetch git fetch fixup", $lrefname, $want;
2745 $lrfetchrefs_f{$lrefname} = $want;
2750 if (defined $csuite) {
2751 printdebug "git_lrfetch_sane: tidying any old suite lrfetchrefs\n";
2752 git_for_each_ref("refs/dgit-fetch/$csuite", sub {
2753 my ($objid,$objtype,$lrefname,$reftail) = @_;
2754 next if $lrfetchrefs_f{$lrefname}; # $csuite eq $distro ?
2755 runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
2759 printdebug "git_lrfetch_sane: git fetch --no-insane emulation complete\n",
2760 Dumper(\%lrfetchrefs_f);
2763 sub git_fetch_us () {
2764 # Want to fetch only what we are going to use, unless
2765 # deliberately-not-ff, in which case we must fetch everything.
2767 my @specs = deliberately_not_fast_forward ? qw(tags/*) :
2769 (quiltmode_splitbrain
2770 ? (map { $_->('*',access_nomdistro) }
2771 \&debiantag_new, \&debiantag_maintview)
2772 : debiantags('*',access_nomdistro));
2773 push @specs, server_branch($csuite);
2774 push @specs, $rewritemap;
2775 push @specs, qw(heads/*) if deliberately_not_fast_forward;
2777 my $url = access_giturl();
2778 git_lrfetch_sane $url, 0, @specs;
2781 my @tagpats = debiantags('*',access_nomdistro);
2783 git_for_each_ref([map { "refs/tags/$_" } @tagpats], sub {
2784 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2785 printdebug "currently $fullrefname=$objid\n";
2786 $here{$fullrefname} = $objid;
2788 git_for_each_ref([map { lrfetchrefs."/tags/".$_ } @tagpats], sub {
2789 my ($objid,$objtype,$fullrefname,$reftail) = @_;
2790 my $lref = "refs".substr($fullrefname, length(lrfetchrefs));
2791 printdebug "offered $lref=$objid\n";
2792 if (!defined $here{$lref}) {
2793 my @upd = (@git, qw(update-ref), $lref, $objid, '');
2794 runcmd_ordryrun_local @upd;
2795 lrfetchref_used $fullrefname;
2796 } elsif ($here{$lref} eq $objid) {
2797 lrfetchref_used $fullrefname;
2800 "Not updating $lref from $here{$lref} to $objid.\n";
2805 #---------- dsc and archive handling ----------
2807 sub mergeinfo_getclogp ($) {
2808 # Ensures thit $mi->{Clogp} exists and returns it
2810 $mi->{Clogp} = commit_getclogp($mi->{Commit});
2813 sub mergeinfo_version ($) {
2814 return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
2817 sub fetch_from_archive_record_1 ($) {
2819 runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
2820 'DGIT_ARCHIVE', $hash;
2821 cmdoutput @git, qw(log -n2), $hash;
2822 # ... gives git a chance to complain if our commit is malformed
2825 sub fetch_from_archive_record_2 ($) {
2827 my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
2831 dryrun_report @upd_cmd;
2835 sub parse_dsc_field_def_dsc_distro () {
2836 $dsc_distro //= cfg qw(dgit.default.old-dsc-distro
2837 dgit.default.distro);
2840 sub parse_dsc_field ($$) {
2841 my ($dsc, $what) = @_;
2843 foreach my $field (@ourdscfield) {
2844 $f = $dsc->{$field};
2849 progress "$what: NO git hash";
2850 parse_dsc_field_def_dsc_distro();
2851 } elsif (($dsc_hash, $dsc_distro, $dsc_hint_tag, $dsc_hint_url)
2852 = $f =~ m/^(\w+)\s+($distro_re)\s+($versiontag_re)\s+(\S+)(?:\s|$)/) {
2853 progress "$what: specified git info ($dsc_distro)";
2854 $dsc_hint_tag = [ $dsc_hint_tag ];
2855 } elsif ($f =~ m/^\w+\s*$/) {
2857 parse_dsc_field_def_dsc_distro();
2858 $dsc_hint_tag = [ debiantags +(getfield $dsc, 'Version'),
2860 progress "$what: specified git hash";
2862 fail "$what: invalid Dgit info";
2866 sub resolve_dsc_field_commit ($$) {
2867 my ($already_distro, $already_mapref) = @_;
2869 return unless defined $dsc_hash;
2872 defined $already_mapref &&
2873 ($already_distro eq $dsc_distro || !$chase_dsc_distro)
2874 ? $already_mapref : undef;
2878 my ($what, @fetch) = @_;
2880 local $idistro = $dsc_distro;
2881 my $lrf = lrfetchrefs;
2883 if (!$chase_dsc_distro) {
2885 "not chasing .dsc distro $dsc_distro: not fetching $what";
2890 ".dsc names distro $dsc_distro: fetching $what";
2892 my $url = access_giturl();
2893 if (!defined $url) {
2894 defined $dsc_hint_url or fail <<END;
2895 .dsc Dgit metadata is in context of distro $dsc_distro
2896 for which we have no configured url and .dsc provides no hint
2899 $dsc_hint_url =~ m#^([-+0-9a-zA-Z]+):# ? $1 :
2900 $dsc_hint_url =~ m#^/# ? 'file' : 'bad-syntax';
2901 parse_cfg_bool "dsc-url-proto-ok", 'false',
2902 cfg("dgit.dsc-url-proto-ok.$proto",
2903 "dgit.default.dsc-url-proto-ok")
2905 .dsc Dgit metadata is in context of distro $dsc_distro
2906 for which we have no configured url;
2907 .dsc provides hinted url with protocol $proto which is unsafe.
2908 (can be overridden by config - consult documentation)
2910 $url = $dsc_hint_url;
2913 git_lrfetch_sane $url, 1, @fetch;
2918 my $rewrite_enable = do {
2919 local $idistro = $dsc_distro;
2920 access_cfg('rewrite-map-enable', 'RETURN-UNDEF');
2923 if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
2924 if (!defined $mapref) {
2925 my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
2926 $mapref = $lrf.'/'.$rewritemap;
2928 my $rewritemapdata = git_cat_file $mapref.':map';
2929 if (defined $rewritemapdata
2930 && $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
2932 "server's git history rewrite map contains a relevant entry!";
2935 if (defined $dsc_hash) {
2936 progress "using rewritten git hash in place of .dsc value";
2938 progress "server data says .dsc hash is to be disregarded";
2943 if (!defined git_cat_file $dsc_hash) {
2944 my @tags = map { "tags/".$_ } @$dsc_hint_tag;
2945 my $lrf = $do_fetch->("additional commits", @tags) &&
2946 defined git_cat_file $dsc_hash
2948 .dsc Dgit metadata requires commit $dsc_hash
2949 but we could not obtain that object anywhere.
2951 foreach my $t (@tags) {
2952 my $fullrefname = $lrf.'/'.$t;
2953 # print STDERR "CHK $t $fullrefname ".Dumper(\%lrfetchrefs_f);
2954 next unless $lrfetchrefs_f{$fullrefname};
2955 next unless is_fast_fwd "$fullrefname~0", $dsc_hash;
2956 lrfetchref_used $fullrefname;
2961 sub fetch_from_archive () {
2962 ensure_setup_existing_tree();
2964 # Ensures that lrref() is what is actually in the archive, one way
2965 # or another, according to us - ie this client's
2966 # appropritaely-updated archive view. Also returns the commit id.
2967 # If there is nothing in the archive, leaves lrref alone and
2968 # returns undef. git_fetch_us must have already been called.
2972 parse_dsc_field($dsc, 'last upload to archive');
2973 resolve_dsc_field_commit access_basedistro,
2974 lrfetchrefs."/".$rewritemap
2976 progress "no version available from the archive";
2979 # If the archive's .dsc has a Dgit field, there are three
2980 # relevant git commitids we need to choose between and/or merge
2982 # 1. $dsc_hash: the Dgit field from the archive
2983 # 2. $lastpush_hash: the suite branch on the dgit git server
2984 # 3. $lastfetch_hash: our local tracking brach for the suite
2986 # These may all be distinct and need not be in any fast forward
2989 # If the dsc was pushed to this suite, then the server suite
2990 # branch will have been updated; but it might have been pushed to
2991 # a different suite and copied by the archive. Conversely a more
2992 # recent version may have been pushed with dgit but not appeared
2993 # in the archive (yet).
2995 # $lastfetch_hash may be awkward because archive imports
2996 # (particularly, imports of Dgit-less .dscs) are performed only as
2997 # needed on individual clients, so different clients may perform a
2998 # different subset of them - and these imports are only made
2999 # public during push. So $lastfetch_hash may represent a set of
3000 # imports different to a subsequent upload by a different dgit
3003 # Our approach is as follows:
3005 # As between $dsc_hash and $lastpush_hash: if $lastpush_hash is a
3006 # descendant of $dsc_hash, then it was pushed by a dgit user who
3007 # had based their work on $dsc_hash, so we should prefer it.
3008 # Otherwise, $dsc_hash was installed into this suite in the
3009 # archive other than by a dgit push, and (necessarily) after the
3010 # last dgit push into that suite (since a dgit push would have
3011 # been descended from the dgit server git branch); thus, in that
3012 # case, we prefer the archive's version (and produce a
3013 # pseudo-merge to overwrite the dgit server git branch).
3015 # (If there is no Dgit field in the archive's .dsc then
3016 # generate_commit_from_dsc uses the version numbers to decide
3017 # whether the suite branch or the archive is newer. If the suite
3018 # branch is newer it ignores the archive's .dsc; otherwise it
3019 # generates an import of the .dsc, and produces a pseudo-merge to
3020 # overwrite the suite branch with the archive contents.)
3022 # The outcome of that part of the algorithm is the `public view',
3023 # and is same for all dgit clients: it does not depend on any
3024 # unpublished history in the local tracking branch.
3026 # As between the public view and the local tracking branch: The
3027 # local tracking branch is only updated by dgit fetch, and
3028 # whenever dgit fetch runs it includes the public view in the
3029 # local tracking branch. Therefore if the public view is not
3030 # descended from the local tracking branch, the local tracking
3031 # branch must contain history which was imported from the archive
3032 # but never pushed; and, its tip is now out of date. So, we make
3033 # a pseudo-merge to overwrite the old imports and stitch the old
3036 # Finally: we do not necessarily reify the public view (as
3037 # described above). This is so that we do not end up stacking two
3038 # pseudo-merges. So what we actually do is figure out the inputs
3039 # to any public view pseudo-merge and put them in @mergeinputs.
3042 # $mergeinputs[]{Commit}
3043 # $mergeinputs[]{Info}
3044 # $mergeinputs[0] is the one whose tree we use
3045 # @mergeinputs is in the order we use in the actual commit)
3048 # $mergeinputs[]{Message} is a commit message to use
3049 # $mergeinputs[]{ReverseParents} if def specifies that parent
3050 # list should be in opposite order
3051 # Such an entry has no Commit or Info. It applies only when found
3052 # in the last entry. (This ugliness is to support making
3053 # identical imports to previous dgit versions.)
3055 my $lastpush_hash = git_get_ref(lrfetchref());
3056 printdebug "previous reference hash=$lastpush_hash\n";
3057 $lastpush_mergeinput = $lastpush_hash && {
3058 Commit => $lastpush_hash,
3059 Info => "dgit suite branch on dgit git server",
3062 my $lastfetch_hash = git_get_ref(lrref());
3063 printdebug "fetch_from_archive: lastfetch=$lastfetch_hash\n";
3064 my $lastfetch_mergeinput = $lastfetch_hash && {
3065 Commit => $lastfetch_hash,
3066 Info => "dgit client's archive history view",
3069 my $dsc_mergeinput = $dsc_hash && {
3070 Commit => $dsc_hash,
3071 Info => "Dgit field in .dsc from archive",
3075 my $del_lrfetchrefs = sub {
3078 printdebug "del_lrfetchrefs...\n";
3079 foreach my $fullrefname (sort keys %lrfetchrefs_d) {
3080 my $objid = $lrfetchrefs_d{$fullrefname};
3081 printdebug "del_lrfetchrefs: $objid $fullrefname\n";
3083 $gur ||= new IO::Handle;
3084 open $gur, "|-", qw(git update-ref --stdin) or die $!;
3086 printf $gur "delete %s %s\n", $fullrefname, $objid;
3089 close $gur or failedcmd "git update-ref delete lrfetchrefs";
3093 if (defined $dsc_hash) {
3094 ensure_we_have_orig();
3095 if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
3096 @mergeinputs = $dsc_mergeinput
3097 } elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
3098 print STDERR <<END or die $!;
3100 Git commit in archive is behind the last version allegedly pushed/uploaded.
3101 Commit referred to by archive: $dsc_hash
3102 Last version pushed with dgit: $lastpush_hash
3105 @mergeinputs = ($lastpush_mergeinput);
3107 # Archive has .dsc which is not a descendant of the last dgit
3108 # push. This can happen if the archive moves .dscs about.
3109 # Just follow its lead.
3110 if (is_fast_fwd($lastpush_hash,$dsc_hash)) {
3111 progress "archive .dsc names newer git commit";
3112 @mergeinputs = ($dsc_mergeinput);
3114 progress "archive .dsc names other git commit, fixing up";
3115 @mergeinputs = ($dsc_mergeinput, $lastpush_mergeinput);
3119 @mergeinputs = generate_commits_from_dsc();
3120 # We have just done an import. Now, our import algorithm might
3121 # have been improved. But even so we do not want to generate
3122 # a new different import of the same package. So if the
3123 # version numbers are the same, just use our existing version.
3124 # If the version numbers are different, the archive has changed
3125 # (perhaps, rewound).
3126 if ($lastfetch_mergeinput &&
3127 !version_compare( (mergeinfo_version $lastfetch_mergeinput),
3128 (mergeinfo_version $mergeinputs[0]) )) {
3129 @mergeinputs = ($lastfetch_mergeinput);
3131 } elsif ($lastpush_hash) {
3132 # only in git, not in the archive yet
3133 @mergeinputs = ($lastpush_mergeinput);
3134 print STDERR <<END or die $!;
3136 Package not found in the archive, but has allegedly been pushed using dgit.
3140 printdebug "nothing found!\n";
3141 if (defined $skew_warning_vsn) {
3142 print STDERR <<END or die $!;
3144 Warning: relevant archive skew detected.
3145 Archive allegedly contains $skew_warning_vsn
3146 But we were not able to obtain any version from the archive or git.
3150 unshift @end, $del_lrfetchrefs;
3154 if ($lastfetch_hash &&
3156 my $h = $_->{Commit};
3157 $h and is_fast_fwd($lastfetch_hash, $h);
3158 # If true, one of the existing parents of this commit
3159 # is a descendant of the $lastfetch_hash, so we'll
3160 # be ff from that automatically.
3164 push @mergeinputs, $lastfetch_mergeinput;
3167 printdebug "fetch mergeinfos:\n";
3168 foreach my $mi (@mergeinputs) {
3170 printdebug " commit $mi->{Commit} $mi->{Info}\n";
3172 printdebug sprintf " ReverseParents=%d Message=%s",
3173 $mi->{ReverseParents}, $mi->{Message};
3177 my $compat_info= pop @mergeinputs
3178 if $mergeinputs[$#mergeinputs]{Message};
3180 @mergeinputs = grep { defined $_->{Commit} } @mergeinputs;
3183 if (@mergeinputs > 1) {
3185 my $tree_commit = $mergeinputs[0]{Commit};
3187 my $tree = cmdoutput @git, qw(cat-file commit), $tree_commit;
3188 $tree =~ m/\n\n/; $tree = $`;
3189 $tree =~ m/^tree (\w+)$/m or die "$dsc_hash tree ?";
3192 # We use the changelog author of the package in question the
3193 # author of this pseudo-merge. This is (roughly) correct if
3194 # this commit is simply representing aa non-dgit upload.
3195 # (Roughly because it does not record sponsorship - but we
3196 # don't have sponsorship info because that's in the .changes,
3197 # which isn't in the archivw.)
3199 # But, it might be that we are representing archive history
3200 # updates (including in-archive copies). These are not really
3201 # the responsibility of the person who created the .dsc, but
3202 # there is no-one whose name we should better use. (The
3203 # author of the .dsc-named commit is clearly worse.)
3205 my $useclogp = mergeinfo_getclogp $mergeinputs[0];
3206 my $author = clogp_authline $useclogp;
3207 my $cversion = getfield $useclogp, 'Version';
3209 my $mcf = ".git/dgit/mergecommit";
3210 open MC, ">", $mcf or die "$mcf $!";
3211 print MC <<END or die $!;
3215 my @parents = grep { $_->{Commit} } @mergeinputs;
3216 @parents = reverse @parents if $compat_info->{ReverseParents};
3217 print MC <<END or die $! foreach @parents;
3221 print MC <<END or die $!;
3227 if (defined $compat_info->{Message}) {
3228 print MC $compat_info->{Message} or die $!;
3230 print MC <<END or die $!;
3231 Record $package ($cversion) in archive suite $csuite
3235 my $message_add_info = sub {
3237 my $mversion = mergeinfo_version $mi;
3238 printf MC " %-20s %s\n", $mversion, $mi->{Info}
3242 $message_add_info->($mergeinputs[0]);
3243 print MC <<END or die $!;
3244 should be treated as descended from
3246 $message_add_info->($_) foreach @mergeinputs[1..$#mergeinputs];
3250 $hash = make_commit $mcf;
3252 $hash = $mergeinputs[0]{Commit};
3254 printdebug "fetch hash=$hash\n";
3257 my ($lasth, $what) = @_;
3258 return unless $lasth;
3259 die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
3262 $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
3264 $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
3266 fetch_from_archive_record_1($hash);
3268 if (defined $skew_warning_vsn) {
3270 printdebug "SKEW CHECK WANT $skew_warning_vsn\n";
3271 my $gotclogp = commit_getclogp($hash);
3272 my $got_vsn = getfield $gotclogp, 'Version';
3273 printdebug "SKEW CHECK GOT $got_vsn\n";
3274 if (version_compare($got_vsn, $skew_warning_vsn) < 0) {
3275 print STDERR <<END or die $!;
3277 Warning: archive skew detected. Using the available version:
3278 Archive allegedly contains $skew_warning_vsn
3279 We were able to obtain only $got_vsn
3285 if ($lastfetch_hash ne $hash) {
3286 fetch_from_archive_record_2($hash);
3289 lrfetchref_used lrfetchref();
3291 check_gitattrs($hash, "fetched source tree");
3293 unshift @end, $del_lrfetchrefs;
3297 sub set_local_git_config ($$) {
3299 runcmd @git, qw(config), $k, $v;
3302 sub setup_mergechangelogs (;$) {
3304 return unless $always || access_cfg_bool(1, 'setup-mergechangelogs');
3306 my $driver = 'dpkg-mergechangelogs';
3307 my $cb = "merge.$driver";
3308 my $attrs = '.git/info/attributes';
3309 ensuredir '.git/info';
3311 open NATTRS, ">", "$attrs.new" or die "$attrs.new $!";
3312 if (!open ATTRS, "<", $attrs) {
3313 $!==ENOENT or die "$attrs: $!";
3317 next if m{^debian/changelog\s};
3318 print NATTRS $_, "\n" or die $!;
3320 ATTRS->error and die $!;
3323 print NATTRS "debian/changelog merge=$driver\n" or die $!;
3326 set_local_git_config "$cb.name", 'debian/changelog merge driver';
3327 set_local_git_config "$cb.driver", 'dpkg-mergechangelogs -m %O %A %B %A';
3329 rename "$attrs.new", "$attrs" or die "$attrs: $!";
3332 sub setup_useremail (;$) {
3334 return unless $always || access_cfg_bool(1, 'setup-useremail');
3337 my ($k, $envvar) = @_;
3338 my $v = access_cfg("user-$k", 'RETURN-UNDEF') // $ENV{$envvar};
3339 return unless defined $v;
3340 set_local_git_config "user.$k", $v;
3343 $setup->('email', 'DEBEMAIL');
3344 $setup->('name', 'DEBFULLNAME');
3347 sub ensure_setup_existing_tree () {
3348 my $k = "remote.$remotename.skipdefaultupdate";
3349 my $c = git_get_config $k;
3350 return if defined $c;
3351 set_local_git_config $k, 'true';
3354 sub open_gitattrs () {
3355 my $gai = new IO::File ".git/info/attributes"
3357 or die "open .git/info/attributes: $!";
3361 sub is_gitattrs_setup () {
3362 my $gai = open_gitattrs();
3363 return 0 unless $gai;
3365 return 1 if m{^\[attr\]dgit-defuse-attrs\s};
3367 $gai->error and die $!;
3371 sub setup_gitattrs (;$) {
3373 return unless $always || access_cfg_bool(1, 'setup-gitattributes');
3375 if (is_gitattrs_setup()) {
3377 [attr]dgit-defuse-attrs already found in .git/info/attributes
3378 not doing further gitattributes setup
3382 my $af = ".git/info/attributes";
3383 open GAO, "> $af.new" or die $!;
3384 print GAO <<END or die $!;
3386 [attr]dgit-defuse-attrs -text -eol -crlf -ident -filter
3387 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3389 my $gai = open_gitattrs();
3393 print GAO $_, "\n" or die $!;
3395 $gai->error and die $!;
3397 close GAO or die $!;
3398 rename "$af.new", "$af" or die "install $af: $!";
3401 sub setup_new_tree () {
3402 setup_mergechangelogs();
3407 sub check_gitattrs ($$) {
3408 my ($treeish, $what) = @_;
3410 return if is_gitattrs_setup;
3413 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3415 my $gafl = new IO::File;
3416 open $gafl, "-|", @cmd or die $!;
3419 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3421 next unless m{(?:^|/)\.gitattributes$};
3423 # oh dear, found one
3425 dgit: warning: $what contains .gitattributes
3426 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3431 # tree contains no .gitattributes files
3432 $?=0; $!=0; close $gafl or failedcmd @cmd;
3436 sub multisuite_suite_child ($$$) {
3437 my ($tsuite, $merginputs, $fn) = @_;
3438 # in child, sets things up, calls $fn->(), and returns undef
3439 # in parent, returns canonical suite name for $tsuite
3440 my $canonsuitefh = IO::File::new_tmpfile;
3441 my $pid = fork // die $!;
3445 $us .= " [$isuite]";
3446 $debugprefix .= " ";
3447 progress "fetching $tsuite...";
3448 canonicalise_suite();
3449 print $canonsuitefh $csuite, "\n" or die $!;
3450 close $canonsuitefh or die $!;
3454 waitpid $pid,0 == $pid or die $!;
3455 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3456 seek $canonsuitefh,0,0 or die $!;
3457 local $csuite = <$canonsuitefh>;
3458 die $! unless defined $csuite && chomp $csuite;
3460 printdebug "multisuite $tsuite missing\n";
3463 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3464 push @$merginputs, {
3471 sub fork_for_multisuite ($) {
3472 my ($before_fetch_merge) = @_;
3473 # if nothing unusual, just returns ''
3476 # returns 0 to caller in child, to do first of the specified suites
3477 # in child, $csuite is not yet set
3479 # returns 1 to caller in parent, to finish up anything needed after
3480 # in parent, $csuite is set to canonicalised portmanteau
3482 my $org_isuite = $isuite;
3483 my @suites = split /\,/, $isuite;
3484 return '' unless @suites > 1;
3485 printdebug "fork_for_multisuite: @suites\n";
3489 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3491 return 0 unless defined $cbasesuite;
3493 fail "package $package missing in (base suite) $cbasesuite"
3494 unless @mergeinputs;
3496 my @csuites = ($cbasesuite);
3498 $before_fetch_merge->();
3500 foreach my $tsuite (@suites[1..$#suites]) {
3501 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3507 # xxx collecte the ref here
3509 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3510 push @csuites, $csubsuite;
3513 foreach my $mi (@mergeinputs) {
3514 my $ref = git_get_ref $mi->{Ref};
3515 die "$mi->{Ref} ?" unless length $ref;
3516 $mi->{Commit} = $ref;
3519 $csuite = join ",", @csuites;
3521 my $previous = git_get_ref lrref;
3523 unshift @mergeinputs, {
3524 Commit => $previous,
3525 Info => "local combined tracking branch",
3527 "archive seems to have rewound: local tracking branch is ahead!",
3531 foreach my $ix (0..$#mergeinputs) {
3532 $mergeinputs[$ix]{Index} = $ix;
3535 @mergeinputs = sort {
3536 -version_compare(mergeinfo_version $a,
3537 mergeinfo_version $b) # highest version first
3539 $a->{Index} <=> $b->{Index}; # earliest in spec first
3545 foreach my $mi (@mergeinputs) {
3546 printdebug "multisuite merge check $mi->{Info}\n";
3547 foreach my $previous (@needed) {
3548 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3549 printdebug "multisuite merge un-needed $previous->{Info}\n";
3553 printdebug "multisuite merge this-needed\n";
3554 $mi->{Character} = '+';
3557 $needed[0]{Character} = '*';
3559 my $output = $needed[0]{Commit};
3562 printdebug "multisuite merge nontrivial\n";
3563 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3565 my $commit = "tree $tree\n";
3566 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3567 "Input branches:\n";
3569 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3570 printdebug "multisuite merge include $mi->{Info}\n";
3571 $mi->{Character} //= ' ';
3572 $commit .= "parent $mi->{Commit}\n";
3573 $msg .= sprintf " %s %-25s %s\n",
3575 (mergeinfo_version $mi),
3578 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3580 " * marks the highest version branch, which choose to use\n".
3581 " + marks each branch which was not already an ancestor\n\n".
3582 "[dgit multi-suite $csuite]\n";
3584 "author $authline\n".
3585 "committer $authline\n\n";
3586 $output = make_commit_text $commit.$msg;
3587 printdebug "multisuite merge generated $output\n";
3590 fetch_from_archive_record_1($output);
3591 fetch_from_archive_record_2($output);
3593 progress "calculated combined tracking suite $csuite";
3598 sub clone_set_head () {
3599 open H, "> .git/HEAD" or die $!;
3600 print H "ref: ".lref()."\n" or die $!;
3603 sub clone_finish ($) {
3605 runcmd @git, qw(reset --hard), lrref();
3606 runcmd qw(bash -ec), <<'END';
3608 git ls-tree -r --name-only -z HEAD | \
3609 xargs -0r touch -h -r . --
3611 printdone "ready for work in $dstdir";
3615 # in multisuite, returns twice!
3616 # once in parent after first suite fetched,
3617 # and then again in child after everything is finished
3619 badusage "dry run makes no sense with clone" unless act_local();
3621 my $multi_fetched = fork_for_multisuite(sub {
3622 printdebug "multi clone before fetch merge\n";
3625 if ($multi_fetched) {
3626 printdebug "multi clone after fetch merge\n";
3628 clone_finish($dstdir);
3631 printdebug "clone main body\n";
3633 canonicalise_suite();
3634 my $hasgit = check_for_git();
3635 mkdir $dstdir or fail "create \`$dstdir': $!";
3637 runcmd @git, qw(init -q);
3640 my $giturl = access_giturl(1);
3641 if (defined $giturl) {
3642 runcmd @git, qw(remote add), 'origin', $giturl;
3645 progress "fetching existing git history";
3647 runcmd_ordryrun_local @git, qw(fetch origin);
3649 progress "starting new git history";
3651 fetch_from_archive() or no_such_package;
3652 my $vcsgiturl = $dsc->{'Vcs-Git'};
3653 if (length $vcsgiturl) {
3654 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3655 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3657 clone_finish($dstdir);
3661 canonicalise_suite();
3662 if (check_for_git()) {
3665 fetch_from_archive() or no_such_package();
3666 printdone "fetched into ".lrref();
3670 my $multi_fetched = fork_for_multisuite(sub { });
3671 fetch() unless $multi_fetched; # parent
3672 return if $multi_fetched eq '0'; # child
3673 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3675 printdone "fetched to ".lrref()." and merged into HEAD";
3678 sub check_not_dirty () {
3679 foreach my $f (qw(local-options local-patch-header)) {
3680 if (stat_exists "debian/source/$f") {
3681 fail "git tree contains debian/source/$f";
3685 return if $ignoredirty;
3687 my @cmd = (@git, qw(diff --quiet HEAD));
3689 $!=0; $?=-1; system @cmd;
3692 fail "working tree is dirty (does not match HEAD)";
3698 sub commit_admin ($) {
3701 runcmd_ordryrun_local @git, qw(commit -m), $m;
3704 sub commit_quilty_patch () {
3705 my $output = cmdoutput @git, qw(status --porcelain);
3707 foreach my $l (split /\n/, $output) {
3708 next unless $l =~ m/\S/;
3709 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3713 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3715 progress "nothing quilty to commit, ok.";
3718 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3719 runcmd_ordryrun_local @git, qw(add -f), @adds;
3721 Commit Debian 3.0 (quilt) metadata
3723 [dgit ($our_version) quilt-fixup]
3727 sub get_source_format () {
3729 if (open F, "debian/source/options") {
3733 s/\s+$//; # ignore missing final newline
3735 my ($k, $v) = ($`, $'); #');
3736 $v =~ s/^"(.*)"$/$1/;
3742 F->error and die $!;
3745 die $! unless $!==&ENOENT;
3748 if (!open F, "debian/source/format") {
3749 die $! unless $!==&ENOENT;
3753 F->error and die $!;
3755 return ($_, \%options);
3758 sub madformat_wantfixup ($) {
3760 return 0 unless $format eq '3.0 (quilt)';
3761 our $quilt_mode_warned;
3762 if ($quilt_mode eq 'nocheck') {
3763 progress "Not doing any fixup of \`$format' due to".
3764 " ----no-quilt-fixup or --quilt=nocheck"
3765 unless $quilt_mode_warned++;
3768 progress "Format \`$format', need to check/update patch stack"
3769 unless $quilt_mode_warned++;
3773 sub maybe_split_brain_save ($$$) {
3774 my ($headref, $dgitview, $msg) = @_;
3775 # => message fragment "$saved" describing disposition of $dgitview
3776 return "commit id $dgitview" unless defined $split_brain_save;
3777 my @cmd = (shell_cmd "cd ../../../..",
3778 @git, qw(update-ref -m),
3779 "dgit --dgit-view-save $msg HEAD=$headref",
3780 $split_brain_save, $dgitview);
3782 return "and left in $split_brain_save";
3785 # An "infopair" is a tuple [ $thing, $what ]
3786 # (often $thing is a commit hash; $what is a description)
3788 sub infopair_cond_equal ($$) {
3790 $x->[0] eq $y->[0] or fail <<END;
3791 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3795 sub infopair_lrf_tag_lookup ($$) {
3796 my ($tagnames, $what) = @_;
3797 # $tagname may be an array ref
3798 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3799 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3800 foreach my $tagname (@tagnames) {
3801 my $lrefname = lrfetchrefs."/tags/$tagname";
3802 my $tagobj = $lrfetchrefs_f{$lrefname};
3803 next unless defined $tagobj;
3804 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3805 return [ git_rev_parse($tagobj), $what ];
3807 fail @tagnames==1 ? <<END : <<END;
3808 Wanted tag $what (@tagnames) on dgit server, but not found
3810 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3814 sub infopair_cond_ff ($$) {
3815 my ($anc,$desc) = @_;
3816 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3817 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3821 sub pseudomerge_version_check ($$) {
3822 my ($clogp, $archive_hash) = @_;
3824 my $arch_clogp = commit_getclogp $archive_hash;
3825 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3826 'version currently in archive' ];
3827 if (defined $overwrite_version) {
3828 if (length $overwrite_version) {
3829 infopair_cond_equal([ $overwrite_version,
3830 '--overwrite= version' ],
3833 my $v = $i_arch_v->[0];
3834 progress "Checking package changelog for archive version $v ...";
3837 my @xa = ("-f$v", "-t$v");
3838 my $vclogp = parsechangelog @xa;
3841 [ (getfield $vclogp, $fn),
3842 "$fn field from dpkg-parsechangelog @xa" ];
3844 my $cv = $gf->('Version');
3845 infopair_cond_equal($i_arch_v, $cv);
3846 $cd = $gf->('Distribution');
3849 $@ =~ s/^dgit: //gm;
3851 "Perhaps debian/changelog does not mention $v ?";
3853 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3854 $cd->[1] is $cd->[0]
3855 Your tree seems to based on earlier (not uploaded) $v.
3860 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3864 sub pseudomerge_make_commit ($$$$ $$) {
3865 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3866 $msg_cmd, $msg_msg) = @_;
3867 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3869 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3870 my $authline = clogp_authline $clogp;
3874 !defined $overwrite_version ? ""
3875 : !length $overwrite_version ? " --overwrite"
3876 : " --overwrite=".$overwrite_version;
3879 my $pmf = ".git/dgit/pseudomerge";
3880 open MC, ">", $pmf or die "$pmf $!";
3881 print MC <<END or die $!;
3884 parent $archive_hash
3894 return make_commit($pmf);
3897 sub splitbrain_pseudomerge ($$$$) {
3898 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3899 # => $merged_dgitview
3900 printdebug "splitbrain_pseudomerge...\n";
3902 # We: debian/PREVIOUS HEAD($maintview)
3903 # expect: o ----------------- o
3906 # a/d/PREVIOUS $dgitview
3909 # we do: `------------------ o
3913 return $dgitview unless defined $archive_hash;
3915 printdebug "splitbrain_pseudomerge...\n";
3917 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3919 if (!defined $overwrite_version) {
3920 progress "Checking that HEAD inciudes all changes in archive...";
3923 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3925 if (defined $overwrite_version) {
3927 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3928 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3929 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3930 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3931 my $i_archive = [ $archive_hash, "current archive contents" ];
3933 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3935 infopair_cond_equal($i_dgit, $i_archive);
3936 infopair_cond_ff($i_dep14, $i_dgit);
3937 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3941 $us: check failed (maybe --overwrite is needed, consult documentation)
3946 my $r = pseudomerge_make_commit
3947 $clogp, $dgitview, $archive_hash, $i_arch_v,
3948 "dgit --quilt=$quilt_mode",
3949 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3950 Declare fast forward from $i_arch_v->[0]
3952 Make fast forward from $i_arch_v->[0]
3955 maybe_split_brain_save $maintview, $r, "pseudomerge";
3957 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3961 sub plain_overwrite_pseudomerge ($$$) {
3962 my ($clogp, $head, $archive_hash) = @_;
3964 printdebug "plain_overwrite_pseudomerge...";
3966 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3968 return $head if is_fast_fwd $archive_hash, $head;
3970 my $m = "Declare fast forward from $i_arch_v->[0]";
3972 my $r = pseudomerge_make_commit
3973 $clogp, $head, $archive_hash, $i_arch_v,
3976 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3978 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3982 sub push_parse_changelog ($) {
3985 my $clogp = Dpkg::Control::Hash->new();
3986 $clogp->load($clogpfn) or die;
3988 my $clogpackage = getfield $clogp, 'Source';
3989 $package //= $clogpackage;
3990 fail "-p specified $package but changelog specified $clogpackage"
3991 unless $package eq $clogpackage;
3992 my $cversion = getfield $clogp, 'Version';
3994 if (!$we_are_initiator) {
3995 # rpush initiator can't do this because it doesn't have $isuite yet
3996 my $tag = debiantag($cversion, access_nomdistro);
3997 runcmd @git, qw(check-ref-format), $tag;
4000 my $dscfn = dscfn($cversion);
4002 return ($clogp, $cversion, $dscfn);
4005 sub push_parse_dsc ($$$) {
4006 my ($dscfn,$dscfnwhat, $cversion) = @_;
4007 $dsc = parsecontrol($dscfn,$dscfnwhat);
4008 my $dversion = getfield $dsc, 'Version';
4009 my $dscpackage = getfield $dsc, 'Source';
4010 ($dscpackage eq $package && $dversion eq $cversion) or
4011 fail "$dscfn is for $dscpackage $dversion".
4012 " but debian/changelog is for $package $cversion";
4015 sub push_tagwants ($$$$) {
4016 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4019 TagFn => \&debiantag,
4024 if (defined $maintviewhead) {
4026 TagFn => \&debiantag_maintview,
4027 Objid => $maintviewhead,
4028 TfSuffix => '-maintview',
4031 } elsif ($dodep14tag eq 'no' ? 0
4032 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4033 : $dodep14tag eq 'always'
4034 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4035 --dep14tag-always (or equivalent in config) means server must support
4036 both "new" and "maint" tag formats, but config says it doesn't.
4038 : die "$dodep14tag ?") {
4040 TagFn => \&debiantag_maintview,
4042 TfSuffix => '-dgit',
4046 foreach my $tw (@tagwants) {
4047 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4048 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4050 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4054 sub push_mktags ($$ $$ $) {
4056 $changesfile,$changesfilewhat,
4059 die unless $tagwants->[0]{View} eq 'dgit';
4061 my $declaredistro = access_nomdistro();
4062 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4063 $dsc->{$ourdscfield[0]} = join " ",
4064 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4066 $dsc->save("$dscfn.tmp") or die $!;
4068 my $changes = parsecontrol($changesfile,$changesfilewhat);
4069 foreach my $field (qw(Source Distribution Version)) {
4070 $changes->{$field} eq $clogp->{$field} or
4071 fail "changes field $field \`$changes->{$field}'".
4072 " does not match changelog \`$clogp->{$field}'";
4075 my $cversion = getfield $clogp, 'Version';
4076 my $clogsuite = getfield $clogp, 'Distribution';
4078 # We make the git tag by hand because (a) that makes it easier
4079 # to control the "tagger" (b) we can do remote signing
4080 my $authline = clogp_authline $clogp;
4081 my $delibs = join(" ", "",@deliberatelies);
4085 my $tfn = $tw->{Tfn};
4086 my $head = $tw->{Objid};
4087 my $tag = $tw->{Tag};
4089 open TO, '>', $tfn->('.tmp') or die $!;
4090 print TO <<END or die $!;
4097 if ($tw->{View} eq 'dgit') {
4098 print TO <<END or die $!;
4099 $package release $cversion for $clogsuite ($csuite) [dgit]
4100 [dgit distro=$declaredistro$delibs]
4102 foreach my $ref (sort keys %previously) {
4103 print TO <<END or die $!;
4104 [dgit previously:$ref=$previously{$ref}]
4107 } elsif ($tw->{View} eq 'maint') {
4108 print TO <<END or die $!;
4109 $package release $cversion for $clogsuite ($csuite)
4110 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4113 die Dumper($tw)."?";
4118 my $tagobjfn = $tfn->('.tmp');
4120 if (!defined $keyid) {
4121 $keyid = access_cfg('keyid','RETURN-UNDEF');
4123 if (!defined $keyid) {
4124 $keyid = getfield $clogp, 'Maintainer';
4126 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4127 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4128 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4129 push @sign_cmd, $tfn->('.tmp');
4130 runcmd_ordryrun @sign_cmd;
4132 $tagobjfn = $tfn->('.signed.tmp');
4133 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4134 $tfn->('.tmp'), $tfn->('.tmp.asc');
4140 my @r = map { $mktag->($_); } @$tagwants;
4144 sub sign_changes ($) {
4145 my ($changesfile) = @_;
4147 my @debsign_cmd = @debsign;
4148 push @debsign_cmd, "-k$keyid" if defined $keyid;
4149 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4150 push @debsign_cmd, $changesfile;
4151 runcmd_ordryrun @debsign_cmd;
4156 printdebug "actually entering push\n";
4158 supplementary_message(<<'END');
4159 Push failed, while checking state of the archive.
4160 You can retry the push, after fixing the problem, if you like.
4162 if (check_for_git()) {
4165 my $archive_hash = fetch_from_archive();
4166 if (!$archive_hash) {
4168 fail "package appears to be new in this suite;".
4169 " if this is intentional, use --new";
4172 supplementary_message(<<'END');
4173 Push failed, while preparing your push.
4174 You can retry the push, after fixing the problem, if you like.
4177 need_tagformat 'new', "quilt mode $quilt_mode"
4178 if quiltmode_splitbrain;
4182 access_giturl(); # check that success is vaguely likely
4183 rpush_handle_protovsn_bothends() if $we_are_initiator;
4186 my $clogpfn = ".git/dgit/changelog.822.tmp";
4187 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4189 responder_send_file('parsed-changelog', $clogpfn);
4191 my ($clogp, $cversion, $dscfn) =
4192 push_parse_changelog("$clogpfn");
4194 my $dscpath = "$buildproductsdir/$dscfn";
4195 stat_exists $dscpath or
4196 fail "looked for .dsc $dscpath, but $!;".
4197 " maybe you forgot to build";
4199 responder_send_file('dsc', $dscpath);
4201 push_parse_dsc($dscpath, $dscfn, $cversion);
4203 my $format = getfield $dsc, 'Format';
4204 printdebug "format $format\n";
4206 my $actualhead = git_rev_parse('HEAD');
4207 my $dgithead = $actualhead;
4208 my $maintviewhead = undef;
4210 my $upstreamversion = upstreamversion $clogp->{Version};
4212 if (madformat_wantfixup($format)) {
4213 # user might have not used dgit build, so maybe do this now:
4214 if (quiltmode_splitbrain()) {
4216 quilt_make_fake_dsc($upstreamversion);
4218 ($dgithead, $cachekey) =
4219 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4221 "--quilt=$quilt_mode but no cached dgit view:
4222 perhaps tree changed since dgit build[-source] ?";
4224 $dgithead = splitbrain_pseudomerge($clogp,
4225 $actualhead, $dgithead,
4227 $maintviewhead = $actualhead;
4228 changedir '../../../..';
4229 prep_ud(); # so _only_subdir() works, below
4231 commit_quilty_patch();
4235 if (defined $overwrite_version && !defined $maintviewhead) {
4236 $dgithead = plain_overwrite_pseudomerge($clogp,
4244 if ($archive_hash) {
4245 if (is_fast_fwd($archive_hash, $dgithead)) {
4247 } elsif (deliberately_not_fast_forward) {
4250 fail "dgit push: HEAD is not a descendant".
4251 " of the archive's version.\n".
4252 "To overwrite the archive's contents,".
4253 " pass --overwrite[=VERSION].\n".
4254 "To rewind history, if permitted by the archive,".
4255 " use --deliberately-not-fast-forward.";
4260 progress "checking that $dscfn corresponds to HEAD";
4261 runcmd qw(dpkg-source -x --),
4262 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4263 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4264 check_for_vendor_patches() if madformat($dsc->{format});
4265 changedir '../../../..';
4266 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4267 debugcmd "+",@diffcmd;
4269 my $r = system @diffcmd;
4272 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4274 HEAD specifies a different tree to $dscfn:
4276 Perhaps you forgot to build. Or perhaps there is a problem with your
4277 source tree (see dgit(7) for some hints). To see a full diff, run
4284 if (!$changesfile) {
4285 my $pat = changespat $cversion;
4286 my @cs = glob "$buildproductsdir/$pat";
4287 fail "failed to find unique changes file".
4288 " (looked for $pat in $buildproductsdir);".
4289 " perhaps you need to use dgit -C"
4291 ($changesfile) = @cs;
4293 $changesfile = "$buildproductsdir/$changesfile";
4296 # Check that changes and .dsc agree enough
4297 $changesfile =~ m{[^/]*$};
4298 my $changes = parsecontrol($changesfile,$&);
4299 files_compare_inputs($dsc, $changes)
4300 unless forceing [qw(dsc-changes-mismatch)];
4302 # Perhaps adjust .dsc to contain right set of origs
4303 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4305 unless forceing [qw(changes-origs-exactly)];
4307 # Checks complete, we're going to try and go ahead:
4309 responder_send_file('changes',$changesfile);
4310 responder_send_command("param head $dgithead");
4311 responder_send_command("param csuite $csuite");
4312 responder_send_command("param isuite $isuite");
4313 responder_send_command("param tagformat $tagformat");
4314 if (defined $maintviewhead) {
4315 die unless ($protovsn//4) >= 4;
4316 responder_send_command("param maint-view $maintviewhead");
4319 # Perhaps send buildinfo(s) for signing
4320 my $changes_files = getfield $changes, 'Files';
4321 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4322 foreach my $bi (@buildinfos) {
4323 responder_send_command("param buildinfo-filename $bi");
4324 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4327 if (deliberately_not_fast_forward) {
4328 git_for_each_ref(lrfetchrefs, sub {
4329 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4330 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4331 responder_send_command("previously $rrefname=$objid");
4332 $previously{$rrefname} = $objid;
4336 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4340 supplementary_message(<<'END');
4341 Push failed, while signing the tag.
4342 You can retry the push, after fixing the problem, if you like.
4344 # If we manage to sign but fail to record it anywhere, it's fine.
4345 if ($we_are_responder) {
4346 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4347 responder_receive_files('signed-tag', @tagobjfns);
4349 @tagobjfns = push_mktags($clogp,$dscpath,
4350 $changesfile,$changesfile,
4353 supplementary_message(<<'END');
4354 Push failed, *after* signing the tag.
4355 If you want to try again, you should use a new version number.
4358 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4360 foreach my $tw (@tagwants) {
4361 my $tag = $tw->{Tag};
4362 my $tagobjfn = $tw->{TagObjFn};
4364 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4365 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4366 runcmd_ordryrun_local
4367 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4370 supplementary_message(<<'END');
4371 Push failed, while updating the remote git repository - see messages above.
4372 If you want to try again, you should use a new version number.
4374 if (!check_for_git()) {
4375 create_remote_git_repo();
4378 my @pushrefs = $forceflag.$dgithead.":".rrref();
4379 foreach my $tw (@tagwants) {
4380 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4383 runcmd_ordryrun @git,
4384 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4385 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4387 supplementary_message(<<'END');
4388 Push failed, while obtaining signatures on the .changes and .dsc.
4389 If it was just that the signature failed, you may try again by using
4390 debsign by hand to sign the changes
4392 and then dput to complete the upload.
4393 If you need to change the package, you must use a new version number.
4395 if ($we_are_responder) {
4396 my $dryrunsuffix = act_local() ? "" : ".tmp";
4397 my @rfiles = ($dscpath, $changesfile);
4398 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4399 responder_receive_files('signed-dsc-changes',
4400 map { "$_$dryrunsuffix" } @rfiles);
4403 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4405 progress "[new .dsc left in $dscpath.tmp]";
4407 sign_changes $changesfile;
4410 supplementary_message(<<END);
4411 Push failed, while uploading package(s) to the archive server.
4412 You can retry the upload of exactly these same files with dput of:
4414 If that .changes file is broken, you will need to use a new version
4415 number for your next attempt at the upload.
4417 my $host = access_cfg('upload-host','RETURN-UNDEF');
4418 my @hostarg = defined($host) ? ($host,) : ();
4419 runcmd_ordryrun @dput, @hostarg, $changesfile;
4420 printdone "pushed and uploaded $cversion";
4422 supplementary_message('');
4423 responder_send_command("complete");
4432 badusage "-p is not allowed with clone; specify as argument instead"
4433 if defined $package;
4436 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4437 ($package,$isuite) = @ARGV;
4438 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4439 ($package,$dstdir) = @ARGV;
4440 } elsif (@ARGV==3) {
4441 ($package,$isuite,$dstdir) = @ARGV;
4443 badusage "incorrect arguments to dgit clone";
4447 $dstdir ||= "$package";
4448 if (stat_exists $dstdir) {
4449 fail "$dstdir already exists";
4453 if ($rmonerror && !$dryrun_level) {
4454 $cwd_remove= getcwd();
4456 return unless defined $cwd_remove;
4457 if (!chdir "$cwd_remove") {
4458 return if $!==&ENOENT;
4459 die "chdir $cwd_remove: $!";
4461 printdebug "clone rmonerror removing $dstdir\n";
4463 rmtree($dstdir) or die "remove $dstdir: $!\n";
4464 } elsif (grep { $! == $_ }
4465 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4467 print STDERR "check whether to remove $dstdir: $!\n";
4473 $cwd_remove = undef;
4476 sub branchsuite () {
4477 my @cmd = (@git, qw(symbolic-ref -q HEAD));
4478 my $branch = cmdoutput_errok @cmd;
4479 if (!defined $branch) {
4480 $?==256 or failedcmd @cmd;
4483 if ($branch =~ m#$lbranch_re#o) {
4490 sub fetchpullargs () {
4491 if (!defined $package) {
4492 my $sourcep = parsecontrol('debian/control','debian/control');
4493 $package = getfield $sourcep, 'Source';
4496 $isuite = branchsuite();
4498 my $clogp = parsechangelog();
4499 my $clogsuite = getfield $clogp, 'Distribution';
4500 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4502 } elsif (@ARGV==1) {
4505 badusage "incorrect arguments to dgit fetch or dgit pull";
4513 my $multi_fetched = fork_for_multisuite(sub { });
4514 exit 0 if $multi_fetched;
4521 if (quiltmode_splitbrain()) {
4522 my ($format, $fopts) = get_source_format();
4523 madformat($format) and fail <<END
4524 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4532 badusage "-p is not allowed with dgit push" if defined $package;
4534 my $clogp = parsechangelog();
4535 $package = getfield $clogp, 'Source';
4538 } elsif (@ARGV==1) {
4539 ($specsuite) = (@ARGV);
4541 badusage "incorrect arguments to dgit push";
4543 $isuite = getfield $clogp, 'Distribution';
4546 local ($package) = $existing_package; # this is a hack
4547 canonicalise_suite();
4549 canonicalise_suite();
4551 if (defined $specsuite &&
4552 $specsuite ne $isuite &&
4553 $specsuite ne $csuite) {
4554 fail "dgit push: changelog specifies $isuite ($csuite)".
4555 " but command line specifies $specsuite";
4560 #---------- remote commands' implementation ----------
4562 sub pre_remote_push_build_host {
4563 my ($nrargs) = shift @ARGV;
4564 my (@rargs) = @ARGV[0..$nrargs-1];
4565 @ARGV = @ARGV[$nrargs..$#ARGV];
4567 my ($dir,$vsnwant) = @rargs;
4568 # vsnwant is a comma-separated list; we report which we have
4569 # chosen in our ready response (so other end can tell if they
4572 $we_are_responder = 1;
4573 $us .= " (build host)";
4575 open PI, "<&STDIN" or die $!;
4576 open STDIN, "/dev/null" or die $!;
4577 open PO, ">&STDOUT" or die $!;
4579 open STDOUT, ">&STDERR" or die $!;
4583 ($protovsn) = grep {
4584 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4585 } @rpushprotovsn_support;
4587 fail "build host has dgit rpush protocol versions ".
4588 (join ",", @rpushprotovsn_support).
4589 " but invocation host has $vsnwant"
4590 unless defined $protovsn;
4594 sub cmd_remote_push_build_host {
4595 responder_send_command("dgit-remote-push-ready $protovsn");
4599 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4600 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4601 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4602 # a good error message)
4604 sub rpush_handle_protovsn_bothends () {
4605 if ($protovsn < 4) {
4606 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4615 my $report = i_child_report();
4616 if (defined $report) {
4617 printdebug "($report)\n";
4618 } elsif ($i_child_pid) {
4619 printdebug "(killing build host child $i_child_pid)\n";
4620 kill 15, $i_child_pid;
4622 if (defined $i_tmp && !defined $initiator_tempdir) {
4624 eval { rmtree $i_tmp; };
4629 return unless forkcheck_mainprocess();
4634 my ($base,$selector,@args) = @_;
4635 $selector =~ s/\-/_/g;
4636 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4645 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4653 push @rargs, join ",", @rpushprotovsn_support;
4656 push @rdgit, @ropts;
4657 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4659 my @cmd = (@ssh, $host, shellquote @rdgit);
4662 $we_are_initiator=1;
4664 if (defined $initiator_tempdir) {
4665 rmtree $initiator_tempdir;
4666 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4667 $i_tmp = $initiator_tempdir;
4671 $i_child_pid = open2(\*RO, \*RI, @cmd);
4673 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4674 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4675 $supplementary_message = '' unless $protovsn >= 3;
4678 my ($icmd,$iargs) = initiator_expect {
4679 m/^(\S+)(?: (.*))?$/;
4682 i_method "i_resp", $icmd, $iargs;
4686 sub i_resp_progress ($) {
4688 my $msg = protocol_read_bytes \*RO, $rhs;
4692 sub i_resp_supplementary_message ($) {
4694 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4697 sub i_resp_complete {
4698 my $pid = $i_child_pid;
4699 $i_child_pid = undef; # prevents killing some other process with same pid
4700 printdebug "waiting for build host child $pid...\n";
4701 my $got = waitpid $pid, 0;
4702 die $! unless $got == $pid;
4703 die "build host child failed $?" if $?;
4706 printdebug "all done\n";
4710 sub i_resp_file ($) {
4712 my $localname = i_method "i_localname", $keyword;
4713 my $localpath = "$i_tmp/$localname";
4714 stat_exists $localpath and
4715 badproto \*RO, "file $keyword ($localpath) twice";
4716 protocol_receive_file \*RO, $localpath;
4717 i_method "i_file", $keyword;
4722 sub i_resp_param ($) {
4723 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4727 sub i_resp_previously ($) {
4728 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4729 or badproto \*RO, "bad previously spec";
4730 my $r = system qw(git check-ref-format), $1;
4731 die "bad previously ref spec ($r)" if $r;
4732 $previously{$1} = $2;
4737 sub i_resp_want ($) {
4739 die "$keyword ?" if $i_wanted{$keyword}++;
4741 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4742 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4743 die unless $isuite =~ m/^$suite_re$/;
4746 rpush_handle_protovsn_bothends();
4748 fail "rpush negotiated protocol version $protovsn".
4749 " which does not support quilt mode $quilt_mode"
4750 if quiltmode_splitbrain;
4752 my @localpaths = i_method "i_want", $keyword;
4753 printdebug "[[ $keyword @localpaths\n";
4754 foreach my $localpath (@localpaths) {
4755 protocol_send_file \*RI, $localpath;
4757 print RI "files-end\n" or die $!;
4760 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4762 sub i_localname_parsed_changelog {
4763 return "remote-changelog.822";
4765 sub i_file_parsed_changelog {
4766 ($i_clogp, $i_version, $i_dscfn) =
4767 push_parse_changelog "$i_tmp/remote-changelog.822";
4768 die if $i_dscfn =~ m#/|^\W#;
4771 sub i_localname_dsc {
4772 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4777 sub i_localname_buildinfo ($) {
4778 my $bi = $i_param{'buildinfo-filename'};
4779 defined $bi or badproto \*RO, "buildinfo before filename";
4780 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4781 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4782 or badproto \*RO, "improper buildinfo filename";
4785 sub i_file_buildinfo {
4786 my $bi = $i_param{'buildinfo-filename'};
4787 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4788 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4789 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4790 files_compare_inputs($bd, $ch);
4791 (getfield $bd, $_) eq (getfield $ch, $_) or
4792 fail "buildinfo mismatch $_"
4793 foreach qw(Source Version);
4794 !defined $bd->{$_} or
4795 fail "buildinfo contains $_"
4796 foreach qw(Changes Changed-by Distribution);
4798 push @i_buildinfos, $bi;
4799 delete $i_param{'buildinfo-filename'};
4802 sub i_localname_changes {
4803 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4804 $i_changesfn = $i_dscfn;
4805 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4806 return $i_changesfn;
4808 sub i_file_changes { }
4810 sub i_want_signed_tag {
4811 printdebug Dumper(\%i_param, $i_dscfn);
4812 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4813 && defined $i_param{'csuite'}
4814 or badproto \*RO, "premature desire for signed-tag";
4815 my $head = $i_param{'head'};
4816 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4818 my $maintview = $i_param{'maint-view'};
4819 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4822 if ($protovsn >= 4) {
4823 my $p = $i_param{'tagformat'} // '<undef>';
4825 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4828 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4830 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4832 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4835 push_mktags $i_clogp, $i_dscfn,
4836 $i_changesfn, 'remote changes',
4840 sub i_want_signed_dsc_changes {
4841 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4842 sign_changes $i_changesfn;
4843 return ($i_dscfn, $i_changesfn, @i_buildinfos);
4846 #---------- building etc. ----------
4852 #----- `3.0 (quilt)' handling -----
4854 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4856 sub quiltify_dpkg_commit ($$$;$) {
4857 my ($patchname,$author,$msg, $xinfo) = @_;
4861 my $descfn = ".git/dgit/quilt-description.tmp";
4862 open O, '>', $descfn or die "$descfn: $!";
4863 $msg =~ s/\n+/\n\n/;
4864 print O <<END or die $!;
4866 ${xinfo}Subject: $msg
4873 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4874 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4875 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4876 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4880 sub quiltify_trees_differ ($$;$$$) {
4881 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4882 # returns true iff the two tree objects differ other than in debian/
4883 # with $finegrained,
4884 # returns bitmask 01 - differ in upstream files except .gitignore
4885 # 02 - differ in .gitignore
4886 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4887 # is set for each modified .gitignore filename $fn
4888 # if $unrepres is defined, array ref to which is appeneded
4889 # a list of unrepresentable changes (removals of upstream files
4892 my @cmd = (@git, qw(diff-tree -z));
4893 push @cmd, qw(--name-only) unless $unrepres;
4894 push @cmd, qw(-r) if $finegrained || $unrepres;
4896 my $diffs= cmdoutput @cmd;
4899 foreach my $f (split /\0/, $diffs) {
4900 if ($unrepres && !@lmodes) {
4901 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4904 my ($oldmode,$newmode) = @lmodes;
4907 next if $f =~ m#^debian(?:/.*)?$#s;
4911 die "not a plain file\n"
4912 unless $newmode =~ m/^10\d{4}$/ ||
4913 $oldmode =~ m/^10\d{4}$/;
4914 if ($oldmode =~ m/[^0]/ &&
4915 $newmode =~ m/[^0]/) {
4916 die "mode changed\n" if $oldmode ne $newmode;
4918 die "non-default mode\n"
4919 unless $newmode =~ m/^100644$/ ||
4920 $oldmode =~ m/^100644$/;
4924 local $/="\n"; chomp $@;
4925 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4929 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4930 $r |= $isignore ? 02 : 01;
4931 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4933 printdebug "quiltify_trees_differ $x $y => $r\n";
4937 sub quiltify_tree_sentinelfiles ($) {
4938 # lists the `sentinel' files present in the tree
4940 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4941 qw(-- debian/rules debian/control);
4946 sub quiltify_splitbrain_needed () {
4947 if (!$split_brain) {
4948 progress "dgit view: changes are required...";
4949 runcmd @git, qw(checkout -q -b dgit-view);
4954 sub quiltify_splitbrain ($$$$$$) {
4955 my ($clogp, $unapplied, $headref, $diffbits,
4956 $editedignores, $cachekey) = @_;
4957 if ($quilt_mode !~ m/gbp|dpm/) {
4958 # treat .gitignore just like any other upstream file
4959 $diffbits = { %$diffbits };
4960 $_ = !!$_ foreach values %$diffbits;
4962 # We would like any commits we generate to be reproducible
4963 my @authline = clogp_authline($clogp);
4964 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4965 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4966 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4967 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4968 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4969 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4971 if ($quilt_mode =~ m/gbp|unapplied/ &&
4972 ($diffbits->{O2H} & 01)) {
4974 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4975 " but git tree differs from orig in upstream files.";
4976 if (!stat_exists "debian/patches") {
4978 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4982 if ($quilt_mode =~ m/dpm/ &&
4983 ($diffbits->{H2A} & 01)) {
4985 --quilt=$quilt_mode specified, implying patches-applied git tree
4986 but git tree differs from result of applying debian/patches to upstream
4989 if ($quilt_mode =~ m/gbp|unapplied/ &&
4990 ($diffbits->{O2A} & 01)) { # some patches
4991 quiltify_splitbrain_needed();
4992 progress "dgit view: creating patches-applied version using gbp pq";
4993 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4994 # gbp pq import creates a fresh branch; push back to dgit-view
4995 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4996 runcmd @git, qw(checkout -q dgit-view);
4998 if ($quilt_mode =~ m/gbp|dpm/ &&
4999 ($diffbits->{O2A} & 02)) {
5001 --quilt=$quilt_mode specified, implying that HEAD is for use with a
5002 tool which does not create patches for changes to upstream
5003 .gitignores: but, such patches exist in debian/patches.
5006 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5007 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5008 quiltify_splitbrain_needed();
5009 progress "dgit view: creating patch to represent .gitignore changes";
5010 ensuredir "debian/patches";
5011 my $gipatch = "debian/patches/auto-gitignore";
5012 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
5013 stat GIPATCH or die "$gipatch: $!";
5014 fail "$gipatch already exists; but want to create it".
5015 " to record .gitignore changes" if (stat _)[7];
5016 print GIPATCH <<END or die "$gipatch: $!";
5017 Subject: Update .gitignore from Debian packaging branch
5019 The Debian packaging git branch contains these updates to the upstream
5020 .gitignore file(s). This patch is autogenerated, to provide these
5021 updates to users of the official Debian archive view of the package.
5023 [dgit ($our_version) update-gitignore]
5026 close GIPATCH or die "$gipatch: $!";
5027 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5028 $unapplied, $headref, "--", sort keys %$editedignores;
5029 open SERIES, "+>>", "debian/patches/series" or die $!;
5030 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5032 defined read SERIES, $newline, 1 or die $!;
5033 print SERIES "\n" or die $! unless $newline eq "\n";
5034 print SERIES "auto-gitignore\n" or die $!;
5035 close SERIES or die $!;
5036 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5038 Commit patch to update .gitignore
5040 [dgit ($our_version) update-gitignore-quilt-fixup]
5044 my $dgitview = git_rev_parse 'HEAD';
5046 changedir '../../../..';
5047 # When we no longer need to support squeeze, use --create-reflog
5049 ensuredir ".git/logs/refs/dgit-intern";
5050 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
5053 my $oldcache = git_get_ref "refs/$splitbraincache";
5054 if ($oldcache eq $dgitview) {
5055 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5056 # git update-ref doesn't always update, in this case. *sigh*
5057 my $dummy = make_commit_text <<END;
5060 author Dgit <dgit\@example.com> 1000000000 +0000
5061 committer Dgit <dgit\@example.com> 1000000000 +0000
5063 Dummy commit - do not use
5065 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5066 "refs/$splitbraincache", $dummy;
5068 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5071 changedir '.git/dgit/unpack/work';
5073 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5074 progress "dgit view: created ($saved)";
5077 sub quiltify ($$$$) {
5078 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5080 # Quilt patchification algorithm
5082 # We search backwards through the history of the main tree's HEAD
5083 # (T) looking for a start commit S whose tree object is identical
5084 # to to the patch tip tree (ie the tree corresponding to the
5085 # current dpkg-committed patch series). For these purposes
5086 # `identical' disregards anything in debian/ - this wrinkle is
5087 # necessary because dpkg-source treates debian/ specially.
5089 # We can only traverse edges where at most one of the ancestors'
5090 # trees differs (in changes outside in debian/). And we cannot
5091 # handle edges which change .pc/ or debian/patches. To avoid
5092 # going down a rathole we avoid traversing edges which introduce
5093 # debian/rules or debian/control. And we set a limit on the
5094 # number of edges we are willing to look at.
5096 # If we succeed, we walk forwards again. For each traversed edge
5097 # PC (with P parent, C child) (starting with P=S and ending with
5098 # C=T) to we do this:
5100 # - dpkg-source --commit with a patch name and message derived from C
5101 # After traversing PT, we git commit the changes which
5102 # should be contained within debian/patches.
5104 # The search for the path S..T is breadth-first. We maintain a
5105 # todo list containing search nodes. A search node identifies a
5106 # commit, and looks something like this:
5108 # Commit => $git_commit_id,
5109 # Child => $c, # or undef if P=T
5110 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5111 # Nontrivial => true iff $p..$c has relevant changes
5118 my %considered; # saves being exponential on some weird graphs
5120 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5123 my ($search,$whynot) = @_;
5124 printdebug " search NOT $search->{Commit} $whynot\n";
5125 $search->{Whynot} = $whynot;
5126 push @nots, $search;
5127 no warnings qw(exiting);
5136 my $c = shift @todo;
5137 next if $considered{$c->{Commit}}++;
5139 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5141 printdebug "quiltify investigate $c->{Commit}\n";
5144 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5145 printdebug " search finished hooray!\n";
5150 if ($quilt_mode eq 'nofix') {
5151 fail "quilt fixup required but quilt mode is \`nofix'\n".
5152 "HEAD commit $c->{Commit} differs from tree implied by ".
5153 " debian/patches (tree object $oldtiptree)";
5155 if ($quilt_mode eq 'smash') {
5156 printdebug " search quitting smash\n";
5160 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5161 $not->($c, "has $c_sentinels not $t_sentinels")
5162 if $c_sentinels ne $t_sentinels;
5164 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5165 $commitdata =~ m/\n\n/;
5167 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5168 @parents = map { { Commit => $_, Child => $c } } @parents;
5170 $not->($c, "root commit") if !@parents;
5172 foreach my $p (@parents) {
5173 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5175 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5176 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5178 foreach my $p (@parents) {
5179 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5181 my @cmd= (@git, qw(diff-tree -r --name-only),
5182 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5183 my $patchstackchange = cmdoutput @cmd;
5184 if (length $patchstackchange) {
5185 $patchstackchange =~ s/\n/,/g;
5186 $not->($p, "changed $patchstackchange");
5189 printdebug " search queue P=$p->{Commit} ",
5190 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5196 printdebug "quiltify want to smash\n";
5199 my $x = $_[0]{Commit};
5200 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5203 my $reportnot = sub {
5205 my $s = $abbrev->($notp);
5206 my $c = $notp->{Child};
5207 $s .= "..".$abbrev->($c) if $c;
5208 $s .= ": ".$notp->{Whynot};
5211 if ($quilt_mode eq 'linear') {
5212 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5213 foreach my $notp (@nots) {
5214 print STDERR "$us: ", $reportnot->($notp), "\n";
5216 print STDERR "$us: $_\n" foreach @$failsuggestion;
5217 fail "quilt fixup naive history linearisation failed.\n".
5218 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5219 } elsif ($quilt_mode eq 'smash') {
5220 } elsif ($quilt_mode eq 'auto') {
5221 progress "quilt fixup cannot be linear, smashing...";
5223 die "$quilt_mode ?";
5226 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5227 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5229 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5231 quiltify_dpkg_commit "auto-$version-$target-$time",
5232 (getfield $clogp, 'Maintainer'),
5233 "Automatically generated patch ($clogp->{Version})\n".
5234 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5238 progress "quiltify linearisation planning successful, executing...";
5240 for (my $p = $sref_S;
5241 my $c = $p->{Child};
5243 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5244 next unless $p->{Nontrivial};
5246 my $cc = $c->{Commit};
5248 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5249 $commitdata =~ m/\n\n/ or die "$c ?";
5252 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5255 my $commitdate = cmdoutput
5256 @git, qw(log -n1 --pretty=format:%aD), $cc;
5258 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5260 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5267 my $gbp_check_suitable = sub {
5272 die "contains unexpected slashes\n" if m{//} || m{/$};
5273 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5274 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5275 die "too long" if length > 200;
5277 return $_ unless $@;
5278 print STDERR "quiltifying commit $cc:".
5279 " ignoring/dropping Gbp-Pq $what: $@";
5283 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5285 (\S+) \s* \n //ixm) {
5286 $patchname = $gbp_check_suitable->($1, 'Name');
5288 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5290 (\S+) \s* \n //ixm) {
5291 $patchdir = $gbp_check_suitable->($1, 'Topic');
5296 if (!defined $patchname) {
5297 $patchname = $title;
5298 $patchname =~ s/[.:]$//;
5301 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5302 my $translitname = $converter->convert($patchname);
5303 die unless defined $translitname;
5304 $patchname = $translitname;
5307 "dgit: patch title transliteration error: $@"
5309 $patchname =~ y/ A-Z/-a-z/;
5310 $patchname =~ y/-a-z0-9_.+=~//cd;
5311 $patchname =~ s/^\W/x-$&/;
5312 $patchname = substr($patchname,0,40);
5314 if (!defined $patchdir) {
5317 if (length $patchdir) {
5318 $patchname = "$patchdir/$patchname";
5320 if ($patchname =~ m{^(.*)/}) {
5321 mkpath "debian/patches/$1";
5326 stat "debian/patches/$patchname$index";
5328 $!==ENOENT or die "$patchname$index $!";
5330 runcmd @git, qw(checkout -q), $cc;
5332 # We use the tip's changelog so that dpkg-source doesn't
5333 # produce complaining messages from dpkg-parsechangelog. None
5334 # of the information dpkg-source gets from the changelog is
5335 # actually relevant - it gets put into the original message
5336 # which dpkg-source provides our stunt editor, and then
5338 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5340 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5341 "Date: $commitdate\n".
5342 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5344 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5347 runcmd @git, qw(checkout -q master);
5350 sub build_maybe_quilt_fixup () {
5351 my ($format,$fopts) = get_source_format;
5352 return unless madformat_wantfixup $format;
5355 check_for_vendor_patches();
5357 if (quiltmode_splitbrain) {
5358 fail <<END unless access_cfg_tagformats_can_splitbrain;
5359 quilt mode $quilt_mode requires split view so server needs to support
5360 both "new" and "maint" tag formats, but config says it doesn't.
5364 my $clogp = parsechangelog();
5365 my $headref = git_rev_parse('HEAD');
5370 my $upstreamversion = upstreamversion $version;
5372 if ($fopts->{'single-debian-patch'}) {
5373 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5375 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5378 die 'bug' if $split_brain && !$need_split_build_invocation;
5380 changedir '../../../..';
5381 runcmd_ordryrun_local
5382 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5385 sub quilt_fixup_mkwork ($) {
5388 mkdir "work" or die $!;
5390 mktree_in_ud_here();
5391 runcmd @git, qw(reset -q --hard), $headref;
5394 sub quilt_fixup_linkorigs ($$) {
5395 my ($upstreamversion, $fn) = @_;
5396 # calls $fn->($leafname);
5398 foreach my $f (<../../../../*>) { #/){
5399 my $b=$f; $b =~ s{.*/}{};
5401 local ($debuglevel) = $debuglevel-1;
5402 printdebug "QF linkorigs $b, $f ?\n";
5404 next unless is_orig_file_of_vsn $b, $upstreamversion;
5405 printdebug "QF linkorigs $b, $f Y\n";
5406 link_ltarget $f, $b or die "$b $!";
5411 sub quilt_fixup_delete_pc () {
5412 runcmd @git, qw(rm -rqf .pc);
5414 Commit removal of .pc (quilt series tracking data)
5416 [dgit ($our_version) upgrade quilt-remove-pc]
5420 sub quilt_fixup_singlepatch ($$$) {
5421 my ($clogp, $headref, $upstreamversion) = @_;
5423 progress "starting quiltify (single-debian-patch)";
5425 # dpkg-source --commit generates new patches even if
5426 # single-debian-patch is in debian/source/options. In order to
5427 # get it to generate debian/patches/debian-changes, it is
5428 # necessary to build the source package.
5430 quilt_fixup_linkorigs($upstreamversion, sub { });
5431 quilt_fixup_mkwork($headref);
5433 rmtree("debian/patches");
5435 runcmd @dpkgsource, qw(-b .);
5437 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5438 rename srcfn("$upstreamversion", "/debian/patches"),
5439 "work/debian/patches";
5442 commit_quilty_patch();
5445 sub quilt_make_fake_dsc ($) {
5446 my ($upstreamversion) = @_;
5448 my $fakeversion="$upstreamversion-~~DGITFAKE";
5450 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5451 print $fakedsc <<END or die $!;
5454 Version: $fakeversion
5458 my $dscaddfile=sub {
5461 my $md = new Digest::MD5;
5463 my $fh = new IO::File $b, '<' or die "$b $!";
5468 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5471 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5473 my @files=qw(debian/source/format debian/rules
5474 debian/control debian/changelog);
5475 foreach my $maybe (qw(debian/patches debian/source/options
5476 debian/tests/control)) {
5477 next unless stat_exists "../../../$maybe";
5478 push @files, $maybe;
5481 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5482 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5484 $dscaddfile->($debtar);
5485 close $fakedsc or die $!;
5488 sub quilt_check_splitbrain_cache ($$) {
5489 my ($headref, $upstreamversion) = @_;
5490 # Called only if we are in (potentially) split brain mode.
5492 # Computes the cache key and looks in the cache.
5493 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5495 my $splitbrain_cachekey;
5498 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5499 # we look in the reflog of dgit-intern/quilt-cache
5500 # we look for an entry whose message is the key for the cache lookup
5501 my @cachekey = (qw(dgit), $our_version);
5502 push @cachekey, $upstreamversion;
5503 push @cachekey, $quilt_mode;
5504 push @cachekey, $headref;
5506 push @cachekey, hashfile('fake.dsc');
5508 my $srcshash = Digest::SHA->new(256);
5509 my %sfs = ( %INC, '$0(dgit)' => $0 );
5510 foreach my $sfk (sort keys %sfs) {
5511 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5512 $srcshash->add($sfk," ");
5513 $srcshash->add(hashfile($sfs{$sfk}));
5514 $srcshash->add("\n");
5516 push @cachekey, $srcshash->hexdigest();
5517 $splitbrain_cachekey = "@cachekey";
5519 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5521 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5522 debugcmd "|(probably)",@cmd;
5523 my $child = open GC, "-|"; defined $child or die $!;
5525 chdir '../../..' or die $!;
5526 if (!stat ".git/logs/refs/$splitbraincache") {
5527 $! == ENOENT or die $!;
5528 printdebug ">(no reflog)\n";
5535 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5536 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5539 quilt_fixup_mkwork($headref);
5540 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5541 if ($cachehit ne $headref) {
5542 progress "dgit view: found cached ($saved)";
5543 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5545 return ($cachehit, $splitbrain_cachekey);
5547 progress "dgit view: found cached, no changes required";
5548 return ($headref, $splitbrain_cachekey);
5550 die $! if GC->error;
5551 failedcmd unless close GC;
5553 printdebug "splitbrain cache miss\n";
5554 return (undef, $splitbrain_cachekey);
5557 sub quilt_fixup_multipatch ($$$) {
5558 my ($clogp, $headref, $upstreamversion) = @_;
5560 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5563 # - honour any existing .pc in case it has any strangeness
5564 # - determine the git commit corresponding to the tip of
5565 # the patch stack (if there is one)
5566 # - if there is such a git commit, convert each subsequent
5567 # git commit into a quilt patch with dpkg-source --commit
5568 # - otherwise convert all the differences in the tree into
5569 # a single git commit
5573 # Our git tree doesn't necessarily contain .pc. (Some versions of
5574 # dgit would include the .pc in the git tree.) If there isn't
5575 # one, we need to generate one by unpacking the patches that we
5578 # We first look for a .pc in the git tree. If there is one, we
5579 # will use it. (This is not the normal case.)
5581 # Otherwise need to regenerate .pc so that dpkg-source --commit
5582 # can work. We do this as follows:
5583 # 1. Collect all relevant .orig from parent directory
5584 # 2. Generate a debian.tar.gz out of
5585 # debian/{patches,rules,source/format,source/options}
5586 # 3. Generate a fake .dsc containing just these fields:
5587 # Format Source Version Files
5588 # 4. Extract the fake .dsc
5589 # Now the fake .dsc has a .pc directory.
5590 # (In fact we do this in every case, because in future we will
5591 # want to search for a good base commit for generating patches.)
5593 # Then we can actually do the dpkg-source --commit
5594 # 1. Make a new working tree with the same object
5595 # store as our main tree and check out the main
5597 # 2. Copy .pc from the fake's extraction, if necessary
5598 # 3. Run dpkg-source --commit
5599 # 4. If the result has changes to debian/, then
5600 # - git add them them
5601 # - git add .pc if we had a .pc in-tree
5603 # 5. If we had a .pc in-tree, delete it, and git commit
5604 # 6. Back in the main tree, fast forward to the new HEAD
5606 # Another situation we may have to cope with is gbp-style
5607 # patches-unapplied trees.
5609 # We would want to detect these, so we know to escape into
5610 # quilt_fixup_gbp. However, this is in general not possible.
5611 # Consider a package with a one patch which the dgit user reverts
5612 # (with git revert or the moral equivalent).
5614 # That is indistinguishable in contents from a patches-unapplied
5615 # tree. And looking at the history to distinguish them is not
5616 # useful because the user might have made a confusing-looking git
5617 # history structure (which ought to produce an error if dgit can't
5618 # cope, not a silent reintroduction of an unwanted patch).
5620 # So gbp users will have to pass an option. But we can usually
5621 # detect their failure to do so: if the tree is not a clean
5622 # patches-applied tree, quilt linearisation fails, but the tree
5623 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5624 # they want --quilt=unapplied.
5626 # To help detect this, when we are extracting the fake dsc, we
5627 # first extract it with --skip-patches, and then apply the patches
5628 # afterwards with dpkg-source --before-build. That lets us save a
5629 # tree object corresponding to .origs.
5631 my $splitbrain_cachekey;
5633 quilt_make_fake_dsc($upstreamversion);
5635 if (quiltmode_splitbrain()) {
5637 ($cachehit, $splitbrain_cachekey) =
5638 quilt_check_splitbrain_cache($headref, $upstreamversion);
5639 return if $cachehit;
5643 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5645 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5646 rename $fakexdir, "fake" or die "$fakexdir $!";
5650 remove_stray_gits("source package");
5651 mktree_in_ud_here();
5655 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5656 my $unapplied=git_add_write_tree();
5657 printdebug "fake orig tree object $unapplied\n";
5661 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5663 if (system @bbcmd) {
5664 failedcmd @bbcmd if $? < 0;
5666 failed to apply your git tree's patch stack (from debian/patches/) to
5667 the corresponding upstream tarball(s). Your source tree and .orig
5668 are probably too inconsistent. dgit can only fix up certain kinds of
5669 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5675 quilt_fixup_mkwork($headref);
5678 if (stat_exists ".pc") {
5680 progress "Tree already contains .pc - will use it then delete it.";
5683 rename '../fake/.pc','.pc' or die $!;
5686 changedir '../fake';
5688 my $oldtiptree=git_add_write_tree();
5689 printdebug "fake o+d/p tree object $unapplied\n";
5690 changedir '../work';
5693 # We calculate some guesswork now about what kind of tree this might
5694 # be. This is mostly for error reporting.
5700 # O = orig, without patches applied
5701 # A = "applied", ie orig with H's debian/patches applied
5702 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5703 \%editedignores, \@unrepres),
5704 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5705 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5709 foreach my $b (qw(01 02)) {
5710 foreach my $v (qw(O2H O2A H2A)) {
5711 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5714 printdebug "differences \@dl @dl.\n";
5717 "$us: base trees orig=%.20s o+d/p=%.20s",
5718 $unapplied, $oldtiptree;
5720 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5721 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5722 $dl[0], $dl[1], $dl[3], $dl[4],
5726 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5728 forceable_fail [qw(unrepresentable)], <<END;
5729 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5734 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5735 push @failsuggestion, "This might be a patches-unapplied branch.";
5736 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5737 push @failsuggestion, "This might be a patches-applied branch.";
5739 push @failsuggestion, "Maybe you need to specify one of".
5740 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5742 if (quiltmode_splitbrain()) {
5743 quiltify_splitbrain($clogp, $unapplied, $headref,
5744 $diffbits, \%editedignores,
5745 $splitbrain_cachekey);
5749 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5750 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5752 if (!open P, '>>', ".pc/applied-patches") {
5753 $!==&ENOENT or die $!;
5758 commit_quilty_patch();
5760 if ($mustdeletepc) {
5761 quilt_fixup_delete_pc();
5765 sub quilt_fixup_editor () {
5766 my $descfn = $ENV{$fakeeditorenv};
5767 my $editing = $ARGV[$#ARGV];
5768 open I1, '<', $descfn or die "$descfn: $!";
5769 open I2, '<', $editing or die "$editing: $!";
5770 unlink $editing or die "$editing: $!";
5771 open O, '>', $editing or die "$editing: $!";
5772 while (<I1>) { print O or die $!; } I1->error and die $!;
5775 $copying ||= m/^\-\-\- /;
5776 next unless $copying;
5779 I2->error and die $!;
5784 sub maybe_apply_patches_dirtily () {
5785 return unless $quilt_mode =~ m/gbp|unapplied/;
5786 print STDERR <<END or die $!;
5788 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5789 dgit: Have to apply the patches - making the tree dirty.
5790 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5793 $patches_applied_dirtily = 01;
5794 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5795 runcmd qw(dpkg-source --before-build .);
5798 sub maybe_unapply_patches_again () {
5799 progress "dgit: Unapplying patches again to tidy up the tree."
5800 if $patches_applied_dirtily;
5801 runcmd qw(dpkg-source --after-build .)
5802 if $patches_applied_dirtily & 01;
5804 if $patches_applied_dirtily & 02;
5805 $patches_applied_dirtily = 0;
5808 #----- other building -----
5810 our $clean_using_builder;
5811 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5812 # clean the tree before building (perhaps invoked indirectly by
5813 # whatever we are using to run the build), rather than separately
5814 # and explicitly by us.
5817 return if $clean_using_builder;
5818 if ($cleanmode eq 'dpkg-source') {
5819 maybe_apply_patches_dirtily();
5820 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5821 } elsif ($cleanmode eq 'dpkg-source-d') {
5822 maybe_apply_patches_dirtily();
5823 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5824 } elsif ($cleanmode eq 'git') {
5825 runcmd_ordryrun_local @git, qw(clean -xdf);
5826 } elsif ($cleanmode eq 'git-ff') {
5827 runcmd_ordryrun_local @git, qw(clean -xdff);
5828 } elsif ($cleanmode eq 'check') {
5829 my $leftovers = cmdoutput @git, qw(clean -xdn);
5830 if (length $leftovers) {
5831 print STDERR $leftovers, "\n" or die $!;
5832 fail "tree contains uncommitted files and --clean=check specified";
5834 } elsif ($cleanmode eq 'none') {
5841 badusage "clean takes no additional arguments" if @ARGV;
5844 maybe_unapply_patches_again();
5847 sub build_prep_early () {
5848 our $build_prep_early_done //= 0;
5849 return if $build_prep_early_done++;
5850 badusage "-p is not allowed when building" if defined $package;
5851 my $clogp = parsechangelog();
5852 $isuite = getfield $clogp, 'Distribution';
5853 $package = getfield $clogp, 'Source';
5854 $version = getfield $clogp, 'Version';
5862 build_maybe_quilt_fixup();
5864 my $pat = changespat $version;
5865 foreach my $f (glob "$buildproductsdir/$pat") {
5867 unlink $f or fail "remove old changes file $f: $!";
5869 progress "would remove $f";
5875 sub changesopts_initial () {
5876 my @opts =@changesopts[1..$#changesopts];
5879 sub changesopts_version () {
5880 if (!defined $changes_since_version) {
5881 my @vsns = archive_query('archive_query');
5882 my @quirk = access_quirk();
5883 if ($quirk[0] eq 'backports') {
5884 local $isuite = $quirk[2];
5886 canonicalise_suite();
5887 push @vsns, archive_query('archive_query');
5890 @vsns = map { $_->[0] } @vsns;
5891 @vsns = sort { -version_compare($a, $b) } @vsns;
5892 $changes_since_version = $vsns[0];
5893 progress "changelog will contain changes since $vsns[0]";
5895 $changes_since_version = '_';
5896 progress "package seems new, not specifying -v<version>";
5899 if ($changes_since_version ne '_') {
5900 return ("-v$changes_since_version");
5906 sub changesopts () {
5907 return (changesopts_initial(), changesopts_version());
5910 sub massage_dbp_args ($;$) {
5911 my ($cmd,$xargs) = @_;
5914 # - if we're going to split the source build out so we can
5915 # do strange things to it, massage the arguments to dpkg-buildpackage
5916 # so that the main build doessn't build source (or add an argument
5917 # to stop it building source by default).
5919 # - add -nc to stop dpkg-source cleaning the source tree,
5920 # unless we're not doing a split build and want dpkg-source
5921 # as cleanmode, in which case we can do nothing
5924 # 0 - source will NOT need to be built separately by caller
5925 # +1 - source will need to be built separately by caller
5926 # +2 - source will need to be built separately by caller AND
5927 # dpkg-buildpackage should not in fact be run at all!
5928 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5929 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5930 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5931 $clean_using_builder = 1;
5934 # -nc has the side effect of specifying -b if nothing else specified
5935 # and some combinations of -S, -b, et al, are errors, rather than
5936 # later simply overriding earlie. So we need to:
5937 # - search the command line for these options
5938 # - pick the last one
5939 # - perhaps add our own as a default
5940 # - perhaps adjust it to the corresponding non-source-building version
5942 foreach my $l ($cmd, $xargs) {
5944 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5947 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5949 if ($need_split_build_invocation) {
5950 printdebug "massage split $dmode.\n";
5951 $r = $dmode =~ m/[S]/ ? +2 :
5952 $dmode =~ y/gGF/ABb/ ? +1 :
5953 $dmode =~ m/[ABb]/ ? 0 :
5956 printdebug "massage done $r $dmode.\n";
5958 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5964 my $wasdir = must_getcwd();
5970 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5971 my ($msg_if_onlyone) = @_;
5972 # If there is only one .changes file, fail with $msg_if_onlyone,
5973 # or if that is undef, be a no-op.
5974 # Returns the changes file to report to the user.
5975 my $pat = changespat $version;
5976 my @changesfiles = glob $pat;
5977 @changesfiles = sort {
5978 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5982 if (@changesfiles==1) {
5983 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5984 only one changes file from build (@changesfiles)
5986 $result = $changesfiles[0];
5987 } elsif (@changesfiles==2) {
5988 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5989 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5990 fail "$l found in binaries changes file $binchanges"
5993 runcmd_ordryrun_local @mergechanges, @changesfiles;
5994 my $multichanges = changespat $version,'multi';
5996 stat_exists $multichanges or fail "$multichanges: $!";
5997 foreach my $cf (glob $pat) {
5998 next if $cf eq $multichanges;
5999 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
6002 $result = $multichanges;
6004 fail "wrong number of different changes files (@changesfiles)";
6006 printdone "build successful, results in $result\n" or die $!;
6009 sub midbuild_checkchanges () {
6010 my $pat = changespat $version;
6011 return if $rmchanges;
6012 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
6013 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
6015 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
6016 Suggest you delete @unwanted.
6021 sub midbuild_checkchanges_vanilla ($) {
6023 midbuild_checkchanges() if $wantsrc == 1;
6026 sub postbuild_mergechanges_vanilla ($) {
6028 if ($wantsrc == 1) {
6030 postbuild_mergechanges(undef);
6033 printdone "build successful\n";
6039 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6040 my $wantsrc = massage_dbp_args \@dbp;
6043 midbuild_checkchanges_vanilla $wantsrc;
6048 push @dbp, changesopts_version();
6049 maybe_apply_patches_dirtily();
6050 runcmd_ordryrun_local @dbp;
6052 maybe_unapply_patches_again();
6053 postbuild_mergechanges_vanilla $wantsrc;
6057 $quilt_mode //= 'gbp';
6063 # gbp can make .origs out of thin air. In my tests it does this
6064 # even for a 1.0 format package, with no origs present. So I
6065 # guess it keys off just the version number. We don't know
6066 # exactly what .origs ought to exist, but let's assume that we
6067 # should run gbp if: the version has an upstream part and the main
6069 my $upstreamversion = upstreamversion $version;
6070 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6071 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6073 if ($gbp_make_orig) {
6075 $cleanmode = 'none'; # don't do it again
6076 $need_split_build_invocation = 1;
6079 my @dbp = @dpkgbuildpackage;
6081 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6083 if (!length $gbp_build[0]) {
6084 if (length executable_on_path('git-buildpackage')) {
6085 $gbp_build[0] = qw(git-buildpackage);
6087 $gbp_build[0] = 'gbp buildpackage';
6090 my @cmd = opts_opt_multi_cmd @gbp_build;
6092 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6094 if ($gbp_make_orig) {
6095 ensuredir '.git/dgit';
6096 my $ok = '.git/dgit/origs-gen-ok';
6097 unlink $ok or $!==&ENOENT or die $!;
6098 my @origs_cmd = @cmd;
6099 push @origs_cmd, qw(--git-cleaner=true);
6100 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6101 push @origs_cmd, @ARGV;
6103 debugcmd @origs_cmd;
6105 do { local $!; stat_exists $ok; }
6106 or failedcmd @origs_cmd;
6108 dryrun_report @origs_cmd;
6114 midbuild_checkchanges_vanilla $wantsrc;
6116 if (!$clean_using_builder) {
6117 push @cmd, '--git-cleaner=true';
6121 maybe_unapply_patches_again();
6123 push @cmd, changesopts();
6124 runcmd_ordryrun_local @cmd, @ARGV;
6126 postbuild_mergechanges_vanilla $wantsrc;
6128 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6132 my $our_cleanmode = $cleanmode;
6133 if ($need_split_build_invocation) {
6134 # Pretend that clean is being done some other way. This
6135 # forces us not to try to use dpkg-buildpackage to clean and
6136 # build source all in one go; and instead we run dpkg-source
6137 # (and build_prep() will do the clean since $clean_using_builder
6139 $our_cleanmode = 'ELSEWHERE';
6141 if ($our_cleanmode =~ m/^dpkg-source/) {
6142 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6143 $clean_using_builder = 1;
6146 $sourcechanges = changespat $version,'source';
6148 unlink "../$sourcechanges" or $!==ENOENT
6149 or fail "remove $sourcechanges: $!";
6151 $dscfn = dscfn($version);
6152 if ($our_cleanmode eq 'dpkg-source') {
6153 maybe_apply_patches_dirtily();
6154 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6156 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6157 maybe_apply_patches_dirtily();
6158 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6161 my @cmd = (@dpkgsource, qw(-b --));
6164 runcmd_ordryrun_local @cmd, "work";
6165 my @udfiles = <${package}_*>;
6166 changedir "../../..";
6167 foreach my $f (@udfiles) {
6168 printdebug "source copy, found $f\n";
6171 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6172 $f eq srcfn($version, $&));
6173 printdebug "source copy, found $f - renaming\n";
6174 rename "$ud/$f", "../$f" or $!==ENOENT
6175 or fail "put in place new source file ($f): $!";
6178 my $pwd = must_getcwd();
6179 my $leafdir = basename $pwd;
6181 runcmd_ordryrun_local @cmd, $leafdir;
6184 runcmd_ordryrun_local qw(sh -ec),
6185 'exec >$1; shift; exec "$@"','x',
6186 "../$sourcechanges",
6187 @dpkggenchanges, qw(-S), changesopts();
6191 sub cmd_build_source {
6193 badusage "build-source takes no additional arguments" if @ARGV;
6195 maybe_unapply_patches_again();
6196 printdone "source built, results in $dscfn and $sourcechanges";
6201 midbuild_checkchanges();
6204 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6205 stat_exists $sourcechanges
6206 or fail "$sourcechanges (in parent directory): $!";
6208 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6210 maybe_unapply_patches_again();
6212 postbuild_mergechanges(<<END);
6213 perhaps you need to pass -A ? (sbuild's default is to build only
6214 arch-specific binaries; dgit 1.4 used to override that.)
6219 sub cmd_quilt_fixup {
6220 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6223 build_maybe_quilt_fixup();
6226 sub import_dsc_result {
6227 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6228 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6230 check_gitattrs($newhash, "source tree");
6232 progress "dgit: import-dsc: $what_msg";
6235 sub cmd_import_dsc {
6239 last unless $ARGV[0] =~ m/^-/;
6242 if (m/^--require-valid-signature$/) {
6245 badusage "unknown dgit import-dsc sub-option \`$_'";
6249 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6250 my ($dscfn, $dstbranch) = @ARGV;
6252 badusage "dry run makes no sense with import-dsc" unless act_local();
6254 my $force = $dstbranch =~ s/^\+// ? +1 :
6255 $dstbranch =~ s/^\.\.// ? -1 :
6257 my $info = $force ? " $&" : '';
6258 $info = "$dscfn$info";
6260 my $specbranch = $dstbranch;
6261 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6262 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6264 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6265 my $chead = cmdoutput_errok @symcmd;
6266 defined $chead or $?==256 or failedcmd @symcmd;
6268 fail "$dstbranch is checked out - will not update it"
6269 if defined $chead and $chead eq $dstbranch;
6271 my $oldhash = git_get_ref $dstbranch;
6273 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6274 $dscdata = do { local $/ = undef; <D>; };
6275 D->error and fail "read $dscfn: $!";
6278 # we don't normally need this so import it here
6279 use Dpkg::Source::Package;
6280 my $dp = new Dpkg::Source::Package filename => $dscfn,
6281 require_valid_signature => $needsig;
6283 local $SIG{__WARN__} = sub {
6285 return unless $needsig;
6286 fail "import-dsc signature check failed";
6288 if (!$dp->is_signed()) {
6289 warn "$us: warning: importing unsigned .dsc\n";
6291 my $r = $dp->check_signature();
6292 die "->check_signature => $r" if $needsig && $r;
6298 $package = getfield $dsc, 'Source';
6300 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6301 unless forceing [qw(import-dsc-with-dgit-field)];
6302 parse_dsc_field_def_dsc_distro();
6304 $isuite = 'DGIT-IMPORT-DSC';
6305 $idistro //= $dsc_distro;
6309 if (defined $dsc_hash) {
6310 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6311 resolve_dsc_field_commit undef, undef;
6313 if (defined $dsc_hash) {
6314 my @cmd = (qw(sh -ec),
6315 "echo $dsc_hash | git cat-file --batch-check");
6316 my $objgot = cmdoutput @cmd;
6317 if ($objgot =~ m#^\w+ missing\b#) {
6319 .dsc contains Dgit field referring to object $dsc_hash
6320 Your git tree does not have that object. Try `git fetch' from a
6321 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6324 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6326 progress "Not fast forward, forced update.";
6328 fail "Not fast forward to $dsc_hash";
6331 import_dsc_result $dstbranch, $dsc_hash,
6332 "dgit import-dsc (Dgit): $info",
6333 "updated git ref $dstbranch";
6338 Branch $dstbranch already exists
6339 Specify ..$specbranch for a pseudo-merge, binding in existing history
6340 Specify +$specbranch to overwrite, discarding existing history
6342 if $oldhash && !$force;
6344 my @dfi = dsc_files_info();
6345 foreach my $fi (@dfi) {
6346 my $f = $fi->{Filename};
6348 next if lstat $here;
6349 fail "stat $here: $!" unless $! == ENOENT;
6351 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6353 } elsif ($dscfn =~ m#^/#) {
6356 fail "cannot import $dscfn which seems to be inside working tree!";
6358 $there =~ s#/+[^/]+$## or
6359 fail "cannot import $dscfn which seems to not have a basename";
6361 symlink $there, $here or fail "symlink $there to $here: $!";
6362 progress "made symlink $here -> $there";
6363 # print STDERR Dumper($fi);
6365 my @mergeinputs = generate_commits_from_dsc();
6366 die unless @mergeinputs == 1;
6368 my $newhash = $mergeinputs[0]{Commit};
6372 progress "Import, forced update - synthetic orphan git history.";
6373 } elsif ($force < 0) {
6374 progress "Import, merging.";
6375 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6376 my $version = getfield $dsc, 'Version';
6377 my $clogp = commit_getclogp $newhash;
6378 my $authline = clogp_authline $clogp;
6379 $newhash = make_commit_text <<END;
6386 Merge $package ($version) import into $dstbranch
6389 die; # caught earlier
6393 import_dsc_result $dstbranch, $newhash,
6394 "dgit import-dsc: $info",
6395 "results are in in git ref $dstbranch";
6398 sub pre_archive_api_query () {
6401 sub cmd_archive_api_query {
6402 badusage "need only 1 subpath argument" unless @ARGV==1;
6403 my ($subpath) = @ARGV;
6404 my @cmd = archive_api_query_cmd($subpath);
6407 exec @cmd or fail "exec curl: $!\n";
6410 sub repos_server_url () {
6411 $package = '_dgit-repos-server';
6412 local $access_forpush = 1;
6413 local $isuite = 'DGIT-REPOS-SERVER';
6414 my $url = access_giturl();
6417 sub pre_clone_dgit_repos_server () {
6420 sub cmd_clone_dgit_repos_server {
6421 badusage "need destination argument" unless @ARGV==1;
6422 my ($destdir) = @ARGV;
6423 my $url = repos_server_url();
6424 my @cmd = (@git, qw(clone), $url, $destdir);
6426 exec @cmd or fail "exec git clone: $!\n";
6429 sub pre_print_dgit_repos_server_source_url () {
6432 sub cmd_print_dgit_repos_server_source_url {
6433 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6435 my $url = repos_server_url();
6436 print $url, "\n" or die $!;
6439 sub cmd_setup_mergechangelogs {
6440 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6441 local $isuite = 'DGIT-SETUP-TREE';
6442 setup_mergechangelogs(1);
6445 sub cmd_setup_useremail {
6446 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6447 local $isuite = 'DGIT-SETUP-TREE';
6451 sub cmd_setup_gitattributes {
6452 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6453 local $isuite = 'DGIT-SETUP-TREE';
6457 sub cmd_setup_new_tree {
6458 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6459 local $isuite = 'DGIT-SETUP-TREE';
6463 #---------- argument parsing and main program ----------
6466 print "dgit version $our_version\n" or die $!;
6470 our (%valopts_long, %valopts_short);
6471 our (%funcopts_long);
6473 our (@modeopt_cfgs);
6475 sub defvalopt ($$$$) {
6476 my ($long,$short,$val_re,$how) = @_;
6477 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6478 $valopts_long{$long} = $oi;
6479 $valopts_short{$short} = $oi;
6480 # $how subref should:
6481 # do whatever assignemnt or thing it likes with $_[0]
6482 # if the option should not be passed on to remote, @rvalopts=()
6483 # or $how can be a scalar ref, meaning simply assign the value
6486 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6487 defvalopt '--distro', '-d', '.+', \$idistro;
6488 defvalopt '', '-k', '.+', \$keyid;
6489 defvalopt '--existing-package','', '.*', \$existing_package;
6490 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6491 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6492 defvalopt '--package', '-p', $package_re, \$package;
6493 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6495 defvalopt '', '-C', '.+', sub {
6496 ($changesfile) = (@_);
6497 if ($changesfile =~ s#^(.*)/##) {
6498 $buildproductsdir = $1;
6502 defvalopt '--initiator-tempdir','','.*', sub {
6503 ($initiator_tempdir) = (@_);
6504 $initiator_tempdir =~ m#^/# or
6505 badusage "--initiator-tempdir must be used specify an".
6506 " absolute, not relative, directory."
6509 sub defoptmodes ($@) {
6510 my ($varref, $cfgkey, $default, %optmap) = @_;
6512 while (my ($opt,$val) = each %optmap) {
6513 $funcopts_long{$opt} = sub { $$varref = $val; };
6514 $permit{$val} = $val;
6516 push @modeopt_cfgs, {
6519 Default => $default,
6524 defoptmodes \$dodep14tag, qw( dep14tag want
6527 --always-dep14tag always );
6532 if (defined $ENV{'DGIT_SSH'}) {
6533 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6534 } elsif (defined $ENV{'GIT_SSH'}) {
6535 @ssh = ($ENV{'GIT_SSH'});
6543 if (!defined $val) {
6544 badusage "$what needs a value" unless @ARGV;
6546 push @rvalopts, $val;
6548 badusage "bad value \`$val' for $what" unless
6549 $val =~ m/^$oi->{Re}$(?!\n)/s;
6550 my $how = $oi->{How};
6551 if (ref($how) eq 'SCALAR') {
6556 push @ropts, @rvalopts;
6560 last unless $ARGV[0] =~ m/^-/;
6564 if (m/^--dry-run$/) {
6567 } elsif (m/^--damp-run$/) {
6570 } elsif (m/^--no-sign$/) {
6573 } elsif (m/^--help$/) {
6575 } elsif (m/^--version$/) {
6577 } elsif (m/^--new$/) {
6580 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6581 ($om = $opts_opt_map{$1}) &&
6585 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6586 !$opts_opt_cmdonly{$1} &&
6587 ($om = $opts_opt_map{$1})) {
6590 } elsif (m/^--(gbp|dpm)$/s) {
6591 push @ropts, "--quilt=$1";
6593 } elsif (m/^--ignore-dirty$/s) {
6596 } elsif (m/^--no-quilt-fixup$/s) {
6598 $quilt_mode = 'nocheck';
6599 } elsif (m/^--no-rm-on-error$/s) {
6602 } elsif (m/^--no-chase-dsc-distro$/s) {
6604 $chase_dsc_distro = 0;
6605 } elsif (m/^--overwrite$/s) {
6607 $overwrite_version = '';
6608 } elsif (m/^--overwrite=(.+)$/s) {
6610 $overwrite_version = $1;
6611 } elsif (m/^--delayed=(\d+)$/s) {
6614 } elsif (m/^--dgit-view-save=(.+)$/s) {
6616 $split_brain_save = $1;
6617 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6618 } elsif (m/^--(no-)?rm-old-changes$/s) {
6621 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6623 push @deliberatelies, $&;
6624 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6628 } elsif (m/^--force-/) {
6630 "$us: warning: ignoring unknown force option $_\n";
6632 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6633 # undocumented, for testing
6635 $tagformat_want = [ $1, 'command line', 1 ];
6636 # 1 menas overrides distro configuration
6637 } elsif (m/^--always-split-source-build$/s) {
6638 # undocumented, for testing
6640 $need_split_build_invocation = 1;
6641 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6642 # undocumented, for testing
6644 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6645 # ^ it's supposed to be an array ref
6646 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6647 $val = $2 ? $' : undef; #';
6648 $valopt->($oi->{Long});
6649 } elsif ($funcopts_long{$_}) {
6651 $funcopts_long{$_}();
6653 badusage "unknown long option \`$_'";
6660 } elsif (s/^-L/-/) {
6663 } elsif (s/^-h/-/) {
6665 } elsif (s/^-D/-/) {
6669 } elsif (s/^-N/-/) {
6674 push @changesopts, $_;
6676 } elsif (s/^-wn$//s) {
6678 $cleanmode = 'none';
6679 } elsif (s/^-wg$//s) {
6682 } elsif (s/^-wgf$//s) {
6684 $cleanmode = 'git-ff';
6685 } elsif (s/^-wd$//s) {
6687 $cleanmode = 'dpkg-source';
6688 } elsif (s/^-wdd$//s) {
6690 $cleanmode = 'dpkg-source-d';
6691 } elsif (s/^-wc$//s) {
6693 $cleanmode = 'check';
6694 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6695 push @git, '-c', $&;
6696 $gitcfgs{cmdline}{$1} = [ $2 ];
6697 } elsif (s/^-c([^=]+)$//s) {
6698 push @git, '-c', $&;
6699 $gitcfgs{cmdline}{$1} = [ 'true' ];
6700 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6702 $val = undef unless length $val;
6703 $valopt->($oi->{Short});
6706 badusage "unknown short option \`$_'";
6713 sub check_env_sanity () {
6714 my $blocked = new POSIX::SigSet;
6715 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6718 foreach my $name (qw(PIPE CHLD)) {
6719 my $signame = "SIG$name";
6720 my $signum = eval "POSIX::$signame" // die;
6721 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6722 die "$signame is set to something other than SIG_DFL\n";
6723 $blocked->ismember($signum) and
6724 die "$signame is blocked\n";
6730 On entry to dgit, $@
6731 This is a bug produced by something in in your execution environment.
6737 sub parseopts_late_defaults () {
6738 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6739 if defined $idistro;
6740 $isuite //= cfg('dgit.default.default-suite');
6742 foreach my $k (keys %opts_opt_map) {
6743 my $om = $opts_opt_map{$k};
6745 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6747 badcfg "cannot set command for $k"
6748 unless length $om->[0];
6752 foreach my $c (access_cfg_cfgs("opts-$k")) {
6754 map { $_ ? @$_ : () }
6755 map { $gitcfgs{$_}{$c} }
6756 reverse @gitcfgsources;
6757 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6758 "\n" if $debuglevel >= 4;
6760 badcfg "cannot configure options for $k"
6761 if $opts_opt_cmdonly{$k};
6762 my $insertpos = $opts_cfg_insertpos{$k};
6763 @$om = ( @$om[0..$insertpos-1],
6765 @$om[$insertpos..$#$om] );
6769 if (!defined $rmchanges) {
6770 local $access_forpush;
6771 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6774 if (!defined $quilt_mode) {
6775 local $access_forpush;
6776 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6777 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6779 $quilt_mode =~ m/^($quilt_modes_re)$/
6780 or badcfg "unknown quilt-mode \`$quilt_mode'";
6784 foreach my $moc (@modeopt_cfgs) {
6785 local $access_forpush;
6786 my $vr = $moc->{Var};
6787 next if defined $$vr;
6788 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6789 my $v = $moc->{Vals}{$$vr};
6790 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6794 $need_split_build_invocation ||= quiltmode_splitbrain();
6796 if (!defined $cleanmode) {
6797 local $access_forpush;
6798 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6799 $cleanmode //= 'dpkg-source';
6801 badcfg "unknown clean-mode \`$cleanmode'" unless
6802 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6806 if ($ENV{$fakeeditorenv}) {
6808 quilt_fixup_editor();
6814 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6815 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6816 if $dryrun_level == 1;
6818 print STDERR $helpmsg or die $!;
6821 my $cmd = shift @ARGV;
6824 my $pre_fn = ${*::}{"pre_$cmd"};
6825 $pre_fn->() if $pre_fn;
6829 my $fn = ${*::}{"cmd_$cmd"};
6830 $fn or badusage "unknown operation $cmd";