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 ensuredir '.git/info';
3384 open GAO, "> $af.new" or die $!;
3385 print GAO <<END or die $!;
3387 [attr]dgit-defuse-attrs -text -eol -crlf -ident -filter
3388 # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
3390 my $gai = open_gitattrs();
3394 print GAO $_, "\n" or die $!;
3396 $gai->error and die $!;
3398 close GAO or die $!;
3399 rename "$af.new", "$af" or die "install $af: $!";
3402 sub setup_new_tree () {
3403 setup_mergechangelogs();
3408 sub check_gitattrs ($$) {
3409 my ($treeish, $what) = @_;
3411 return if is_gitattrs_setup;
3414 my @cmd = (@git, qw(ls-tree -lrz --), "${treeish}:");
3416 my $gafl = new IO::File;
3417 open $gafl, "-|", @cmd or die $!;
3420 s/^\d+\s+\w+\s+\w+\s+(\d+)\t// or die;
3422 next unless m{(?:^|/)\.gitattributes$};
3424 # oh dear, found one
3426 dgit: warning: $what contains .gitattributes
3427 dgit: .gitattributes have not been defused. Recommended: dgit setup-new-tree.
3432 # tree contains no .gitattributes files
3433 $?=0; $!=0; close $gafl or failedcmd @cmd;
3437 sub multisuite_suite_child ($$$) {
3438 my ($tsuite, $merginputs, $fn) = @_;
3439 # in child, sets things up, calls $fn->(), and returns undef
3440 # in parent, returns canonical suite name for $tsuite
3441 my $canonsuitefh = IO::File::new_tmpfile;
3442 my $pid = fork // die $!;
3446 $us .= " [$isuite]";
3447 $debugprefix .= " ";
3448 progress "fetching $tsuite...";
3449 canonicalise_suite();
3450 print $canonsuitefh $csuite, "\n" or die $!;
3451 close $canonsuitefh or die $!;
3455 waitpid $pid,0 == $pid or die $!;
3456 fail "failed to obtain $tsuite: ".waitstatusmsg() if $? && $?!=256*4;
3457 seek $canonsuitefh,0,0 or die $!;
3458 local $csuite = <$canonsuitefh>;
3459 die $! unless defined $csuite && chomp $csuite;
3461 printdebug "multisuite $tsuite missing\n";
3464 printdebug "multisuite $tsuite ok (canon=$csuite)\n";
3465 push @$merginputs, {
3472 sub fork_for_multisuite ($) {
3473 my ($before_fetch_merge) = @_;
3474 # if nothing unusual, just returns ''
3477 # returns 0 to caller in child, to do first of the specified suites
3478 # in child, $csuite is not yet set
3480 # returns 1 to caller in parent, to finish up anything needed after
3481 # in parent, $csuite is set to canonicalised portmanteau
3483 my $org_isuite = $isuite;
3484 my @suites = split /\,/, $isuite;
3485 return '' unless @suites > 1;
3486 printdebug "fork_for_multisuite: @suites\n";
3490 my $cbasesuite = multisuite_suite_child($suites[0], \@mergeinputs,
3492 return 0 unless defined $cbasesuite;
3494 fail "package $package missing in (base suite) $cbasesuite"
3495 unless @mergeinputs;
3497 my @csuites = ($cbasesuite);
3499 $before_fetch_merge->();
3501 foreach my $tsuite (@suites[1..$#suites]) {
3502 my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
3508 # xxx collecte the ref here
3510 $csubsuite =~ s/^\Q$cbasesuite\E-/-/;
3511 push @csuites, $csubsuite;
3514 foreach my $mi (@mergeinputs) {
3515 my $ref = git_get_ref $mi->{Ref};
3516 die "$mi->{Ref} ?" unless length $ref;
3517 $mi->{Commit} = $ref;
3520 $csuite = join ",", @csuites;
3522 my $previous = git_get_ref lrref;
3524 unshift @mergeinputs, {
3525 Commit => $previous,
3526 Info => "local combined tracking branch",
3528 "archive seems to have rewound: local tracking branch is ahead!",
3532 foreach my $ix (0..$#mergeinputs) {
3533 $mergeinputs[$ix]{Index} = $ix;
3536 @mergeinputs = sort {
3537 -version_compare(mergeinfo_version $a,
3538 mergeinfo_version $b) # highest version first
3540 $a->{Index} <=> $b->{Index}; # earliest in spec first
3546 foreach my $mi (@mergeinputs) {
3547 printdebug "multisuite merge check $mi->{Info}\n";
3548 foreach my $previous (@needed) {
3549 next unless is_fast_fwd $mi->{Commit}, $previous->{Commit};
3550 printdebug "multisuite merge un-needed $previous->{Info}\n";
3554 printdebug "multisuite merge this-needed\n";
3555 $mi->{Character} = '+';
3558 $needed[0]{Character} = '*';
3560 my $output = $needed[0]{Commit};
3563 printdebug "multisuite merge nontrivial\n";
3564 my $tree = cmdoutput qw(git rev-parse), $needed[0]{Commit}.':';
3566 my $commit = "tree $tree\n";
3567 my $msg = "Combine archive branches $csuite [dgit]\n\n".
3568 "Input branches:\n";
3570 foreach my $mi (sort { $a->{Index} <=> $b->{Index} } @mergeinputs) {
3571 printdebug "multisuite merge include $mi->{Info}\n";
3572 $mi->{Character} //= ' ';
3573 $commit .= "parent $mi->{Commit}\n";
3574 $msg .= sprintf " %s %-25s %s\n",
3576 (mergeinfo_version $mi),
3579 my $authline = clogp_authline mergeinfo_getclogp $needed[0];
3581 " * marks the highest version branch, which choose to use\n".
3582 " + marks each branch which was not already an ancestor\n\n".
3583 "[dgit multi-suite $csuite]\n";
3585 "author $authline\n".
3586 "committer $authline\n\n";
3587 $output = make_commit_text $commit.$msg;
3588 printdebug "multisuite merge generated $output\n";
3591 fetch_from_archive_record_1($output);
3592 fetch_from_archive_record_2($output);
3594 progress "calculated combined tracking suite $csuite";
3599 sub clone_set_head () {
3600 open H, "> .git/HEAD" or die $!;
3601 print H "ref: ".lref()."\n" or die $!;
3604 sub clone_finish ($) {
3606 runcmd @git, qw(reset --hard), lrref();
3607 runcmd qw(bash -ec), <<'END';
3609 git ls-tree -r --name-only -z HEAD | \
3610 xargs -0r touch -h -r . --
3612 printdone "ready for work in $dstdir";
3616 # in multisuite, returns twice!
3617 # once in parent after first suite fetched,
3618 # and then again in child after everything is finished
3620 badusage "dry run makes no sense with clone" unless act_local();
3622 my $multi_fetched = fork_for_multisuite(sub {
3623 printdebug "multi clone before fetch merge\n";
3626 if ($multi_fetched) {
3627 printdebug "multi clone after fetch merge\n";
3629 clone_finish($dstdir);
3632 printdebug "clone main body\n";
3634 canonicalise_suite();
3635 my $hasgit = check_for_git();
3636 mkdir $dstdir or fail "create \`$dstdir': $!";
3638 runcmd @git, qw(init -q);
3641 my $giturl = access_giturl(1);
3642 if (defined $giturl) {
3643 runcmd @git, qw(remote add), 'origin', $giturl;
3646 progress "fetching existing git history";
3648 runcmd_ordryrun_local @git, qw(fetch origin);
3650 progress "starting new git history";
3652 fetch_from_archive() or no_such_package;
3653 my $vcsgiturl = $dsc->{'Vcs-Git'};
3654 if (length $vcsgiturl) {
3655 $vcsgiturl =~ s/\s+-b\s+\S+//g;
3656 runcmd @git, qw(remote add vcs-git), $vcsgiturl;
3658 clone_finish($dstdir);
3662 canonicalise_suite();
3663 if (check_for_git()) {
3666 fetch_from_archive() or no_such_package();
3667 printdone "fetched into ".lrref();
3671 my $multi_fetched = fork_for_multisuite(sub { });
3672 fetch() unless $multi_fetched; # parent
3673 return if $multi_fetched eq '0'; # child
3674 runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
3676 printdone "fetched to ".lrref()." and merged into HEAD";
3679 sub check_not_dirty () {
3680 foreach my $f (qw(local-options local-patch-header)) {
3681 if (stat_exists "debian/source/$f") {
3682 fail "git tree contains debian/source/$f";
3686 return if $ignoredirty;
3688 my @cmd = (@git, qw(diff --quiet HEAD));
3690 $!=0; $?=-1; system @cmd;
3693 fail "working tree is dirty (does not match HEAD)";
3699 sub commit_admin ($) {
3702 runcmd_ordryrun_local @git, qw(commit -m), $m;
3705 sub commit_quilty_patch () {
3706 my $output = cmdoutput @git, qw(status --porcelain);
3708 foreach my $l (split /\n/, $output) {
3709 next unless $l =~ m/\S/;
3710 if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
3714 delete $adds{'.pc'}; # if there wasn't one before, don't add it
3716 progress "nothing quilty to commit, ok.";
3719 my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
3720 runcmd_ordryrun_local @git, qw(add -f), @adds;
3722 Commit Debian 3.0 (quilt) metadata
3724 [dgit ($our_version) quilt-fixup]
3728 sub get_source_format () {
3730 if (open F, "debian/source/options") {
3734 s/\s+$//; # ignore missing final newline
3736 my ($k, $v) = ($`, $'); #');
3737 $v =~ s/^"(.*)"$/$1/;
3743 F->error and die $!;
3746 die $! unless $!==&ENOENT;
3749 if (!open F, "debian/source/format") {
3750 die $! unless $!==&ENOENT;
3754 F->error and die $!;
3756 return ($_, \%options);
3759 sub madformat_wantfixup ($) {
3761 return 0 unless $format eq '3.0 (quilt)';
3762 our $quilt_mode_warned;
3763 if ($quilt_mode eq 'nocheck') {
3764 progress "Not doing any fixup of \`$format' due to".
3765 " ----no-quilt-fixup or --quilt=nocheck"
3766 unless $quilt_mode_warned++;
3769 progress "Format \`$format', need to check/update patch stack"
3770 unless $quilt_mode_warned++;
3774 sub maybe_split_brain_save ($$$) {
3775 my ($headref, $dgitview, $msg) = @_;
3776 # => message fragment "$saved" describing disposition of $dgitview
3777 return "commit id $dgitview" unless defined $split_brain_save;
3778 my @cmd = (shell_cmd "cd ../../../..",
3779 @git, qw(update-ref -m),
3780 "dgit --dgit-view-save $msg HEAD=$headref",
3781 $split_brain_save, $dgitview);
3783 return "and left in $split_brain_save";
3786 # An "infopair" is a tuple [ $thing, $what ]
3787 # (often $thing is a commit hash; $what is a description)
3789 sub infopair_cond_equal ($$) {
3791 $x->[0] eq $y->[0] or fail <<END;
3792 $x->[1] ($x->[0]) not equal to $y->[1] ($y->[0])
3796 sub infopair_lrf_tag_lookup ($$) {
3797 my ($tagnames, $what) = @_;
3798 # $tagname may be an array ref
3799 my @tagnames = ref $tagnames ? @$tagnames : ($tagnames);
3800 printdebug "infopair_lrfetchref_tag_lookup $what @tagnames\n";
3801 foreach my $tagname (@tagnames) {
3802 my $lrefname = lrfetchrefs."/tags/$tagname";
3803 my $tagobj = $lrfetchrefs_f{$lrefname};
3804 next unless defined $tagobj;
3805 printdebug "infopair_lrfetchref_tag_lookup $tagobj $tagname $what\n";
3806 return [ git_rev_parse($tagobj), $what ];
3808 fail @tagnames==1 ? <<END : <<END;
3809 Wanted tag $what (@tagnames) on dgit server, but not found
3811 Wanted tag $what (one of: @tagnames) on dgit server, but not found
3815 sub infopair_cond_ff ($$) {
3816 my ($anc,$desc) = @_;
3817 is_fast_fwd($anc->[0], $desc->[0]) or fail <<END;
3818 $anc->[1] ($anc->[0]) .. $desc->[1] ($desc->[0]) is not fast forward
3822 sub pseudomerge_version_check ($$) {
3823 my ($clogp, $archive_hash) = @_;
3825 my $arch_clogp = commit_getclogp $archive_hash;
3826 my $i_arch_v = [ (getfield $arch_clogp, 'Version'),
3827 'version currently in archive' ];
3828 if (defined $overwrite_version) {
3829 if (length $overwrite_version) {
3830 infopair_cond_equal([ $overwrite_version,
3831 '--overwrite= version' ],
3834 my $v = $i_arch_v->[0];
3835 progress "Checking package changelog for archive version $v ...";
3838 my @xa = ("-f$v", "-t$v");
3839 my $vclogp = parsechangelog @xa;
3842 [ (getfield $vclogp, $fn),
3843 "$fn field from dpkg-parsechangelog @xa" ];
3845 my $cv = $gf->('Version');
3846 infopair_cond_equal($i_arch_v, $cv);
3847 $cd = $gf->('Distribution');
3850 $@ =~ s/^dgit: //gm;
3852 "Perhaps debian/changelog does not mention $v ?";
3854 fail <<END if $cd->[0] =~ m/UNRELEASED/;
3855 $cd->[1] is $cd->[0]
3856 Your tree seems to based on earlier (not uploaded) $v.
3861 printdebug "pseudomerge_version_check i_arch_v @$i_arch_v\n";
3865 sub pseudomerge_make_commit ($$$$ $$) {
3866 my ($clogp, $dgitview, $archive_hash, $i_arch_v,
3867 $msg_cmd, $msg_msg) = @_;
3868 progress "Declaring that HEAD inciudes all changes in $i_arch_v->[0]...";
3870 my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
3871 my $authline = clogp_authline $clogp;
3875 !defined $overwrite_version ? ""
3876 : !length $overwrite_version ? " --overwrite"
3877 : " --overwrite=".$overwrite_version;
3880 my $pmf = ".git/dgit/pseudomerge";
3881 open MC, ">", $pmf or die "$pmf $!";
3882 print MC <<END or die $!;
3885 parent $archive_hash
3895 return make_commit($pmf);
3898 sub splitbrain_pseudomerge ($$$$) {
3899 my ($clogp, $maintview, $dgitview, $archive_hash) = @_;
3900 # => $merged_dgitview
3901 printdebug "splitbrain_pseudomerge...\n";
3903 # We: debian/PREVIOUS HEAD($maintview)
3904 # expect: o ----------------- o
3907 # a/d/PREVIOUS $dgitview
3910 # we do: `------------------ o
3914 return $dgitview unless defined $archive_hash;
3916 printdebug "splitbrain_pseudomerge...\n";
3918 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3920 if (!defined $overwrite_version) {
3921 progress "Checking that HEAD inciudes all changes in archive...";
3924 return $dgitview if is_fast_fwd $archive_hash, $dgitview;
3926 if (defined $overwrite_version) {
3928 my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_nomdistro;
3929 my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
3930 my $t_dgit = debiantag_new $i_arch_v->[0], access_nomdistro;
3931 my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
3932 my $i_archive = [ $archive_hash, "current archive contents" ];
3934 printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
3936 infopair_cond_equal($i_dgit, $i_archive);
3937 infopair_cond_ff($i_dep14, $i_dgit);
3938 infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
3942 $us: check failed (maybe --overwrite is needed, consult documentation)
3947 my $r = pseudomerge_make_commit
3948 $clogp, $dgitview, $archive_hash, $i_arch_v,
3949 "dgit --quilt=$quilt_mode",
3950 (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
3951 Declare fast forward from $i_arch_v->[0]
3953 Make fast forward from $i_arch_v->[0]
3956 maybe_split_brain_save $maintview, $r, "pseudomerge";
3958 progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
3962 sub plain_overwrite_pseudomerge ($$$) {
3963 my ($clogp, $head, $archive_hash) = @_;
3965 printdebug "plain_overwrite_pseudomerge...";
3967 my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
3969 return $head if is_fast_fwd $archive_hash, $head;
3971 my $m = "Declare fast forward from $i_arch_v->[0]";
3973 my $r = pseudomerge_make_commit
3974 $clogp, $head, $archive_hash, $i_arch_v,
3977 runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
3979 progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
3983 sub push_parse_changelog ($) {
3986 my $clogp = Dpkg::Control::Hash->new();
3987 $clogp->load($clogpfn) or die;
3989 my $clogpackage = getfield $clogp, 'Source';
3990 $package //= $clogpackage;
3991 fail "-p specified $package but changelog specified $clogpackage"
3992 unless $package eq $clogpackage;
3993 my $cversion = getfield $clogp, 'Version';
3995 if (!$we_are_initiator) {
3996 # rpush initiator can't do this because it doesn't have $isuite yet
3997 my $tag = debiantag($cversion, access_nomdistro);
3998 runcmd @git, qw(check-ref-format), $tag;
4001 my $dscfn = dscfn($cversion);
4003 return ($clogp, $cversion, $dscfn);
4006 sub push_parse_dsc ($$$) {
4007 my ($dscfn,$dscfnwhat, $cversion) = @_;
4008 $dsc = parsecontrol($dscfn,$dscfnwhat);
4009 my $dversion = getfield $dsc, 'Version';
4010 my $dscpackage = getfield $dsc, 'Source';
4011 ($dscpackage eq $package && $dversion eq $cversion) or
4012 fail "$dscfn is for $dscpackage $dversion".
4013 " but debian/changelog is for $package $cversion";
4016 sub push_tagwants ($$$$) {
4017 my ($cversion, $dgithead, $maintviewhead, $tfbase) = @_;
4020 TagFn => \&debiantag,
4025 if (defined $maintviewhead) {
4027 TagFn => \&debiantag_maintview,
4028 Objid => $maintviewhead,
4029 TfSuffix => '-maintview',
4032 } elsif ($dodep14tag eq 'no' ? 0
4033 : $dodep14tag eq 'want' ? access_cfg_tagformats_can_splitbrain
4034 : $dodep14tag eq 'always'
4035 ? (access_cfg_tagformats_can_splitbrain or fail <<END)
4036 --dep14tag-always (or equivalent in config) means server must support
4037 both "new" and "maint" tag formats, but config says it doesn't.
4039 : die "$dodep14tag ?") {
4041 TagFn => \&debiantag_maintview,
4043 TfSuffix => '-dgit',
4047 foreach my $tw (@tagwants) {
4048 $tw->{Tag} = $tw->{TagFn}($cversion, access_nomdistro);
4049 $tw->{Tfn} = sub { $tfbase.$tw->{TfSuffix}.$_[0]; };
4051 printdebug 'push_tagwants: ', Dumper(\@_, \@tagwants);
4055 sub push_mktags ($$ $$ $) {
4057 $changesfile,$changesfilewhat,
4060 die unless $tagwants->[0]{View} eq 'dgit';
4062 my $declaredistro = access_nomdistro();
4063 my $reader_giturl = do { local $access_forpush=0; access_giturl(); };
4064 $dsc->{$ourdscfield[0]} = join " ",
4065 $tagwants->[0]{Objid}, $declaredistro, $tagwants->[0]{Tag},
4067 $dsc->save("$dscfn.tmp") or die $!;
4069 my $changes = parsecontrol($changesfile,$changesfilewhat);
4070 foreach my $field (qw(Source Distribution Version)) {
4071 $changes->{$field} eq $clogp->{$field} or
4072 fail "changes field $field \`$changes->{$field}'".
4073 " does not match changelog \`$clogp->{$field}'";
4076 my $cversion = getfield $clogp, 'Version';
4077 my $clogsuite = getfield $clogp, 'Distribution';
4079 # We make the git tag by hand because (a) that makes it easier
4080 # to control the "tagger" (b) we can do remote signing
4081 my $authline = clogp_authline $clogp;
4082 my $delibs = join(" ", "",@deliberatelies);
4086 my $tfn = $tw->{Tfn};
4087 my $head = $tw->{Objid};
4088 my $tag = $tw->{Tag};
4090 open TO, '>', $tfn->('.tmp') or die $!;
4091 print TO <<END or die $!;
4098 if ($tw->{View} eq 'dgit') {
4099 print TO <<END or die $!;
4100 $package release $cversion for $clogsuite ($csuite) [dgit]
4101 [dgit distro=$declaredistro$delibs]
4103 foreach my $ref (sort keys %previously) {
4104 print TO <<END or die $!;
4105 [dgit previously:$ref=$previously{$ref}]
4108 } elsif ($tw->{View} eq 'maint') {
4109 print TO <<END or die $!;
4110 $package release $cversion for $clogsuite ($csuite)
4111 (maintainer view tag generated by dgit --quilt=$quilt_mode)
4114 die Dumper($tw)."?";
4119 my $tagobjfn = $tfn->('.tmp');
4121 if (!defined $keyid) {
4122 $keyid = access_cfg('keyid','RETURN-UNDEF');
4124 if (!defined $keyid) {
4125 $keyid = getfield $clogp, 'Maintainer';
4127 unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
4128 my @sign_cmd = (@gpg, qw(--detach-sign --armor));
4129 push @sign_cmd, qw(-u),$keyid if defined $keyid;
4130 push @sign_cmd, $tfn->('.tmp');
4131 runcmd_ordryrun @sign_cmd;
4133 $tagobjfn = $tfn->('.signed.tmp');
4134 runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
4135 $tfn->('.tmp'), $tfn->('.tmp.asc');
4141 my @r = map { $mktag->($_); } @$tagwants;
4145 sub sign_changes ($) {
4146 my ($changesfile) = @_;
4148 my @debsign_cmd = @debsign;
4149 push @debsign_cmd, "-k$keyid" if defined $keyid;
4150 push @debsign_cmd, "-p$gpg[0]" if $gpg[0] ne 'gpg';
4151 push @debsign_cmd, $changesfile;
4152 runcmd_ordryrun @debsign_cmd;
4157 printdebug "actually entering push\n";
4159 supplementary_message(<<'END');
4160 Push failed, while checking state of the archive.
4161 You can retry the push, after fixing the problem, if you like.
4163 if (check_for_git()) {
4166 my $archive_hash = fetch_from_archive();
4167 if (!$archive_hash) {
4169 fail "package appears to be new in this suite;".
4170 " if this is intentional, use --new";
4173 supplementary_message(<<'END');
4174 Push failed, while preparing your push.
4175 You can retry the push, after fixing the problem, if you like.
4178 need_tagformat 'new', "quilt mode $quilt_mode"
4179 if quiltmode_splitbrain;
4183 access_giturl(); # check that success is vaguely likely
4184 rpush_handle_protovsn_bothends() if $we_are_initiator;
4187 my $clogpfn = ".git/dgit/changelog.822.tmp";
4188 runcmd shell_cmd "exec >$clogpfn", qw(dpkg-parsechangelog);
4190 responder_send_file('parsed-changelog', $clogpfn);
4192 my ($clogp, $cversion, $dscfn) =
4193 push_parse_changelog("$clogpfn");
4195 my $dscpath = "$buildproductsdir/$dscfn";
4196 stat_exists $dscpath or
4197 fail "looked for .dsc $dscpath, but $!;".
4198 " maybe you forgot to build";
4200 responder_send_file('dsc', $dscpath);
4202 push_parse_dsc($dscpath, $dscfn, $cversion);
4204 my $format = getfield $dsc, 'Format';
4205 printdebug "format $format\n";
4207 my $actualhead = git_rev_parse('HEAD');
4208 my $dgithead = $actualhead;
4209 my $maintviewhead = undef;
4211 my $upstreamversion = upstreamversion $clogp->{Version};
4213 if (madformat_wantfixup($format)) {
4214 # user might have not used dgit build, so maybe do this now:
4215 if (quiltmode_splitbrain()) {
4217 quilt_make_fake_dsc($upstreamversion);
4219 ($dgithead, $cachekey) =
4220 quilt_check_splitbrain_cache($actualhead, $upstreamversion);
4222 "--quilt=$quilt_mode but no cached dgit view:
4223 perhaps tree changed since dgit build[-source] ?";
4225 $dgithead = splitbrain_pseudomerge($clogp,
4226 $actualhead, $dgithead,
4228 $maintviewhead = $actualhead;
4229 changedir '../../../..';
4230 prep_ud(); # so _only_subdir() works, below
4232 commit_quilty_patch();
4236 if (defined $overwrite_version && !defined $maintviewhead) {
4237 $dgithead = plain_overwrite_pseudomerge($clogp,
4245 if ($archive_hash) {
4246 if (is_fast_fwd($archive_hash, $dgithead)) {
4248 } elsif (deliberately_not_fast_forward) {
4251 fail "dgit push: HEAD is not a descendant".
4252 " of the archive's version.\n".
4253 "To overwrite the archive's contents,".
4254 " pass --overwrite[=VERSION].\n".
4255 "To rewind history, if permitted by the archive,".
4256 " use --deliberately-not-fast-forward.";
4261 progress "checking that $dscfn corresponds to HEAD";
4262 runcmd qw(dpkg-source -x --),
4263 $dscpath =~ m#^/# ? $dscpath : "../../../$dscpath";
4264 my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package");
4265 check_for_vendor_patches() if madformat($dsc->{format});
4266 changedir '../../../..';
4267 my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
4268 debugcmd "+",@diffcmd;
4270 my $r = system @diffcmd;
4273 my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
4275 HEAD specifies a different tree to $dscfn:
4277 Perhaps you forgot to build. Or perhaps there is a problem with your
4278 source tree (see dgit(7) for some hints). To see a full diff, run
4285 if (!$changesfile) {
4286 my $pat = changespat $cversion;
4287 my @cs = glob "$buildproductsdir/$pat";
4288 fail "failed to find unique changes file".
4289 " (looked for $pat in $buildproductsdir);".
4290 " perhaps you need to use dgit -C"
4292 ($changesfile) = @cs;
4294 $changesfile = "$buildproductsdir/$changesfile";
4297 # Check that changes and .dsc agree enough
4298 $changesfile =~ m{[^/]*$};
4299 my $changes = parsecontrol($changesfile,$&);
4300 files_compare_inputs($dsc, $changes)
4301 unless forceing [qw(dsc-changes-mismatch)];
4303 # Perhaps adjust .dsc to contain right set of origs
4304 changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
4306 unless forceing [qw(changes-origs-exactly)];
4308 # Checks complete, we're going to try and go ahead:
4310 responder_send_file('changes',$changesfile);
4311 responder_send_command("param head $dgithead");
4312 responder_send_command("param csuite $csuite");
4313 responder_send_command("param isuite $isuite");
4314 responder_send_command("param tagformat $tagformat");
4315 if (defined $maintviewhead) {
4316 die unless ($protovsn//4) >= 4;
4317 responder_send_command("param maint-view $maintviewhead");
4320 # Perhaps send buildinfo(s) for signing
4321 my $changes_files = getfield $changes, 'Files';
4322 my @buildinfos = ($changes_files =~ m/ .* (\S+\.buildinfo)$/mg);
4323 foreach my $bi (@buildinfos) {
4324 responder_send_command("param buildinfo-filename $bi");
4325 responder_send_file('buildinfo', "$buildproductsdir/$bi");
4328 if (deliberately_not_fast_forward) {
4329 git_for_each_ref(lrfetchrefs, sub {
4330 my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
4331 my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
4332 responder_send_command("previously $rrefname=$objid");
4333 $previously{$rrefname} = $objid;
4337 my @tagwants = push_tagwants($cversion, $dgithead, $maintviewhead,
4341 supplementary_message(<<'END');
4342 Push failed, while signing the tag.
4343 You can retry the push, after fixing the problem, if you like.
4345 # If we manage to sign but fail to record it anywhere, it's fine.
4346 if ($we_are_responder) {
4347 @tagobjfns = map { $_->{Tfn}('.signed-tmp') } @tagwants;
4348 responder_receive_files('signed-tag', @tagobjfns);
4350 @tagobjfns = push_mktags($clogp,$dscpath,
4351 $changesfile,$changesfile,
4354 supplementary_message(<<'END');
4355 Push failed, *after* signing the tag.
4356 If you want to try again, you should use a new version number.
4359 pairwise { $a->{TagObjFn} = $b } @tagwants, @tagobjfns;
4361 foreach my $tw (@tagwants) {
4362 my $tag = $tw->{Tag};
4363 my $tagobjfn = $tw->{TagObjFn};
4365 cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
4366 runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
4367 runcmd_ordryrun_local
4368 @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
4371 supplementary_message(<<'END');
4372 Push failed, while updating the remote git repository - see messages above.
4373 If you want to try again, you should use a new version number.
4375 if (!check_for_git()) {
4376 create_remote_git_repo();
4379 my @pushrefs = $forceflag.$dgithead.":".rrref();
4380 foreach my $tw (@tagwants) {
4381 push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
4384 runcmd_ordryrun @git,
4385 qw(-c push.followTags=false push), access_giturl(), @pushrefs;
4386 runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
4388 supplementary_message(<<'END');
4389 Push failed, while obtaining signatures on the .changes and .dsc.
4390 If it was just that the signature failed, you may try again by using
4391 debsign by hand to sign the changes
4393 and then dput to complete the upload.
4394 If you need to change the package, you must use a new version number.
4396 if ($we_are_responder) {
4397 my $dryrunsuffix = act_local() ? "" : ".tmp";
4398 my @rfiles = ($dscpath, $changesfile);
4399 push @rfiles, map { "$buildproductsdir/$_" } @buildinfos;
4400 responder_receive_files('signed-dsc-changes',
4401 map { "$_$dryrunsuffix" } @rfiles);
4404 rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
4406 progress "[new .dsc left in $dscpath.tmp]";
4408 sign_changes $changesfile;
4411 supplementary_message(<<END);
4412 Push failed, while uploading package(s) to the archive server.
4413 You can retry the upload of exactly these same files with dput of:
4415 If that .changes file is broken, you will need to use a new version
4416 number for your next attempt at the upload.
4418 my $host = access_cfg('upload-host','RETURN-UNDEF');
4419 my @hostarg = defined($host) ? ($host,) : ();
4420 runcmd_ordryrun @dput, @hostarg, $changesfile;
4421 printdone "pushed and uploaded $cversion";
4423 supplementary_message('');
4424 responder_send_command("complete");
4433 badusage "-p is not allowed with clone; specify as argument instead"
4434 if defined $package;
4437 } elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
4438 ($package,$isuite) = @ARGV;
4439 } elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
4440 ($package,$dstdir) = @ARGV;
4441 } elsif (@ARGV==3) {
4442 ($package,$isuite,$dstdir) = @ARGV;
4444 badusage "incorrect arguments to dgit clone";
4448 $dstdir ||= "$package";
4449 if (stat_exists $dstdir) {
4450 fail "$dstdir already exists";
4454 if ($rmonerror && !$dryrun_level) {
4455 $cwd_remove= getcwd();
4457 return unless defined $cwd_remove;
4458 if (!chdir "$cwd_remove") {
4459 return if $!==&ENOENT;
4460 die "chdir $cwd_remove: $!";
4462 printdebug "clone rmonerror removing $dstdir\n";
4464 rmtree($dstdir) or die "remove $dstdir: $!\n";
4465 } elsif (grep { $! == $_ }
4466 (ENOENT, ENOTDIR, EACCES, EPERM, ELOOP)) {
4468 print STDERR "check whether to remove $dstdir: $!\n";
4474 $cwd_remove = undef;
4477 sub branchsuite () {
4478 my @cmd = (@git, qw(symbolic-ref -q HEAD));
4479 my $branch = cmdoutput_errok @cmd;
4480 if (!defined $branch) {
4481 $?==256 or failedcmd @cmd;
4484 if ($branch =~ m#$lbranch_re#o) {
4491 sub fetchpullargs () {
4492 if (!defined $package) {
4493 my $sourcep = parsecontrol('debian/control','debian/control');
4494 $package = getfield $sourcep, 'Source';
4497 $isuite = branchsuite();
4499 my $clogp = parsechangelog();
4500 my $clogsuite = getfield $clogp, 'Distribution';
4501 $isuite= $clogsuite if $clogsuite ne 'UNRELEASED';
4503 } elsif (@ARGV==1) {
4506 badusage "incorrect arguments to dgit fetch or dgit pull";
4514 my $multi_fetched = fork_for_multisuite(sub { });
4515 exit 0 if $multi_fetched;
4522 if (quiltmode_splitbrain()) {
4523 my ($format, $fopts) = get_source_format();
4524 madformat($format) and fail <<END
4525 dgit pull not yet supported in split view mode (--quilt=$quilt_mode)
4533 badusage "-p is not allowed with dgit push" if defined $package;
4535 my $clogp = parsechangelog();
4536 $package = getfield $clogp, 'Source';
4539 } elsif (@ARGV==1) {
4540 ($specsuite) = (@ARGV);
4542 badusage "incorrect arguments to dgit push";
4544 $isuite = getfield $clogp, 'Distribution';
4547 local ($package) = $existing_package; # this is a hack
4548 canonicalise_suite();
4550 canonicalise_suite();
4552 if (defined $specsuite &&
4553 $specsuite ne $isuite &&
4554 $specsuite ne $csuite) {
4555 fail "dgit push: changelog specifies $isuite ($csuite)".
4556 " but command line specifies $specsuite";
4561 #---------- remote commands' implementation ----------
4563 sub pre_remote_push_build_host {
4564 my ($nrargs) = shift @ARGV;
4565 my (@rargs) = @ARGV[0..$nrargs-1];
4566 @ARGV = @ARGV[$nrargs..$#ARGV];
4568 my ($dir,$vsnwant) = @rargs;
4569 # vsnwant is a comma-separated list; we report which we have
4570 # chosen in our ready response (so other end can tell if they
4573 $we_are_responder = 1;
4574 $us .= " (build host)";
4576 open PI, "<&STDIN" or die $!;
4577 open STDIN, "/dev/null" or die $!;
4578 open PO, ">&STDOUT" or die $!;
4580 open STDOUT, ">&STDERR" or die $!;
4584 ($protovsn) = grep {
4585 $vsnwant =~ m{^(?:.*,)?$_(?:,.*)?$}
4586 } @rpushprotovsn_support;
4588 fail "build host has dgit rpush protocol versions ".
4589 (join ",", @rpushprotovsn_support).
4590 " but invocation host has $vsnwant"
4591 unless defined $protovsn;
4595 sub cmd_remote_push_build_host {
4596 responder_send_command("dgit-remote-push-ready $protovsn");
4600 sub pre_remote_push_responder { pre_remote_push_build_host(); }
4601 sub cmd_remote_push_responder { cmd_remote_push_build_host(); }
4602 # ... for compatibility with proto vsn.1 dgit (just so that user gets
4603 # a good error message)
4605 sub rpush_handle_protovsn_bothends () {
4606 if ($protovsn < 4) {
4607 need_tagformat 'old', "rpush negotiated protocol $protovsn";
4616 my $report = i_child_report();
4617 if (defined $report) {
4618 printdebug "($report)\n";
4619 } elsif ($i_child_pid) {
4620 printdebug "(killing build host child $i_child_pid)\n";
4621 kill 15, $i_child_pid;
4623 if (defined $i_tmp && !defined $initiator_tempdir) {
4625 eval { rmtree $i_tmp; };
4630 return unless forkcheck_mainprocess();
4635 my ($base,$selector,@args) = @_;
4636 $selector =~ s/\-/_/g;
4637 { no strict qw(refs); &{"${base}_${selector}"}(@args); }
4646 if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) {
4654 push @rargs, join ",", @rpushprotovsn_support;
4657 push @rdgit, @ropts;
4658 push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs;
4660 my @cmd = (@ssh, $host, shellquote @rdgit);
4663 $we_are_initiator=1;
4665 if (defined $initiator_tempdir) {
4666 rmtree $initiator_tempdir;
4667 mkdir $initiator_tempdir, 0700 or die "$initiator_tempdir: $!";
4668 $i_tmp = $initiator_tempdir;
4672 $i_child_pid = open2(\*RO, \*RI, @cmd);
4674 ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ };
4675 die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support;
4676 $supplementary_message = '' unless $protovsn >= 3;
4679 my ($icmd,$iargs) = initiator_expect {
4680 m/^(\S+)(?: (.*))?$/;
4683 i_method "i_resp", $icmd, $iargs;
4687 sub i_resp_progress ($) {
4689 my $msg = protocol_read_bytes \*RO, $rhs;
4693 sub i_resp_supplementary_message ($) {
4695 $supplementary_message = protocol_read_bytes \*RO, $rhs;
4698 sub i_resp_complete {
4699 my $pid = $i_child_pid;
4700 $i_child_pid = undef; # prevents killing some other process with same pid
4701 printdebug "waiting for build host child $pid...\n";
4702 my $got = waitpid $pid, 0;
4703 die $! unless $got == $pid;
4704 die "build host child failed $?" if $?;
4707 printdebug "all done\n";
4711 sub i_resp_file ($) {
4713 my $localname = i_method "i_localname", $keyword;
4714 my $localpath = "$i_tmp/$localname";
4715 stat_exists $localpath and
4716 badproto \*RO, "file $keyword ($localpath) twice";
4717 protocol_receive_file \*RO, $localpath;
4718 i_method "i_file", $keyword;
4723 sub i_resp_param ($) {
4724 $_[0] =~ m/^(\S+) (.*)$/ or badproto \*RO, "bad param spec";
4728 sub i_resp_previously ($) {
4729 $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
4730 or badproto \*RO, "bad previously spec";
4731 my $r = system qw(git check-ref-format), $1;
4732 die "bad previously ref spec ($r)" if $r;
4733 $previously{$1} = $2;
4738 sub i_resp_want ($) {
4740 die "$keyword ?" if $i_wanted{$keyword}++;
4742 defined $i_param{'csuite'} or badproto \*RO, "premature desire, no csuite";
4743 $isuite = $i_param{'isuite'} // $i_param{'csuite'};
4744 die unless $isuite =~ m/^$suite_re$/;
4747 rpush_handle_protovsn_bothends();
4749 fail "rpush negotiated protocol version $protovsn".
4750 " which does not support quilt mode $quilt_mode"
4751 if quiltmode_splitbrain;
4753 my @localpaths = i_method "i_want", $keyword;
4754 printdebug "[[ $keyword @localpaths\n";
4755 foreach my $localpath (@localpaths) {
4756 protocol_send_file \*RI, $localpath;
4758 print RI "files-end\n" or die $!;
4761 our ($i_clogp, $i_version, $i_dscfn, $i_changesfn, @i_buildinfos);
4763 sub i_localname_parsed_changelog {
4764 return "remote-changelog.822";
4766 sub i_file_parsed_changelog {
4767 ($i_clogp, $i_version, $i_dscfn) =
4768 push_parse_changelog "$i_tmp/remote-changelog.822";
4769 die if $i_dscfn =~ m#/|^\W#;
4772 sub i_localname_dsc {
4773 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4778 sub i_localname_buildinfo ($) {
4779 my $bi = $i_param{'buildinfo-filename'};
4780 defined $bi or badproto \*RO, "buildinfo before filename";
4781 defined $i_changesfn or badproto \*RO, "buildinfo before changes";
4782 $bi =~ m{^\Q$package\E_[!-.0-~]*\.buildinfo$}s
4783 or badproto \*RO, "improper buildinfo filename";
4786 sub i_file_buildinfo {
4787 my $bi = $i_param{'buildinfo-filename'};
4788 my $bd = parsecontrol "$i_tmp/$bi", $bi;
4789 my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes';
4790 if (!forceing [qw(buildinfo-changes-mismatch)]) {
4791 files_compare_inputs($bd, $ch);
4792 (getfield $bd, $_) eq (getfield $ch, $_) or
4793 fail "buildinfo mismatch $_"
4794 foreach qw(Source Version);
4795 !defined $bd->{$_} or
4796 fail "buildinfo contains $_"
4797 foreach qw(Changes Changed-by Distribution);
4799 push @i_buildinfos, $bi;
4800 delete $i_param{'buildinfo-filename'};
4803 sub i_localname_changes {
4804 defined $i_dscfn or badproto \*RO, "dsc (before parsed-changelog)";
4805 $i_changesfn = $i_dscfn;
4806 $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die;
4807 return $i_changesfn;
4809 sub i_file_changes { }
4811 sub i_want_signed_tag {
4812 printdebug Dumper(\%i_param, $i_dscfn);
4813 defined $i_param{'head'} && defined $i_dscfn && defined $i_clogp
4814 && defined $i_param{'csuite'}
4815 or badproto \*RO, "premature desire for signed-tag";
4816 my $head = $i_param{'head'};
4817 die if $head =~ m/[^0-9a-f]/ || $head !~ m/^../;
4819 my $maintview = $i_param{'maint-view'};
4820 die if defined $maintview && $maintview =~ m/[^0-9a-f]/;
4823 if ($protovsn >= 4) {
4824 my $p = $i_param{'tagformat'} // '<undef>';
4826 or badproto \*RO, "tag format mismatch: $p vs. $tagformat";
4829 die unless $i_param{'csuite'} =~ m/^$suite_re$/;
4831 push_parse_dsc $i_dscfn, 'remote dsc', $i_version;
4833 my @tagwants = push_tagwants $i_version, $head, $maintview, "tag";
4836 push_mktags $i_clogp, $i_dscfn,
4837 $i_changesfn, 'remote changes',
4841 sub i_want_signed_dsc_changes {
4842 rename "$i_dscfn.tmp","$i_dscfn" or die "$i_dscfn $!";
4843 sign_changes $i_changesfn;
4844 return ($i_dscfn, $i_changesfn, @i_buildinfos);
4847 #---------- building etc. ----------
4853 #----- `3.0 (quilt)' handling -----
4855 our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
4857 sub quiltify_dpkg_commit ($$$;$) {
4858 my ($patchname,$author,$msg, $xinfo) = @_;
4862 my $descfn = ".git/dgit/quilt-description.tmp";
4863 open O, '>', $descfn or die "$descfn: $!";
4864 $msg =~ s/\n+/\n\n/;
4865 print O <<END or die $!;
4867 ${xinfo}Subject: $msg
4874 local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
4875 local $ENV{'VISUAL'} = $ENV{'EDITOR'};
4876 local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
4877 runcmd @dpkgsource, qw(--commit --include-removal .), $patchname;
4881 sub quiltify_trees_differ ($$;$$$) {
4882 my ($x,$y,$finegrained,$ignorenamesr,$unrepres) = @_;
4883 # returns true iff the two tree objects differ other than in debian/
4884 # with $finegrained,
4885 # returns bitmask 01 - differ in upstream files except .gitignore
4886 # 02 - differ in .gitignore
4887 # if $ignorenamesr is defined, $ingorenamesr->{$fn}
4888 # is set for each modified .gitignore filename $fn
4889 # if $unrepres is defined, array ref to which is appeneded
4890 # a list of unrepresentable changes (removals of upstream files
4893 my @cmd = (@git, qw(diff-tree -z));
4894 push @cmd, qw(--name-only) unless $unrepres;
4895 push @cmd, qw(-r) if $finegrained || $unrepres;
4897 my $diffs= cmdoutput @cmd;
4900 foreach my $f (split /\0/, $diffs) {
4901 if ($unrepres && !@lmodes) {
4902 @lmodes = $f =~ m/^\:(\w+) (\w+) \w+ \w+ / or die "$_ ?";
4905 my ($oldmode,$newmode) = @lmodes;
4908 next if $f =~ m#^debian(?:/.*)?$#s;
4912 die "not a plain file\n"
4913 unless $newmode =~ m/^10\d{4}$/ ||
4914 $oldmode =~ m/^10\d{4}$/;
4915 if ($oldmode =~ m/[^0]/ &&
4916 $newmode =~ m/[^0]/) {
4917 die "mode changed\n" if $oldmode ne $newmode;
4919 die "non-default mode\n"
4920 unless $newmode =~ m/^100644$/ ||
4921 $oldmode =~ m/^100644$/;
4925 local $/="\n"; chomp $@;
4926 push @$unrepres, [ $f, "$@ ($oldmode->$newmode)" ];
4930 my $isignore = $f =~ m#^(?:.*/)?.gitignore$#s;
4931 $r |= $isignore ? 02 : 01;
4932 $ignorenamesr->{$f}=1 if $ignorenamesr && $isignore;
4934 printdebug "quiltify_trees_differ $x $y => $r\n";
4938 sub quiltify_tree_sentinelfiles ($) {
4939 # lists the `sentinel' files present in the tree
4941 my $r = cmdoutput @git, qw(ls-tree --name-only), $x,
4942 qw(-- debian/rules debian/control);
4947 sub quiltify_splitbrain_needed () {
4948 if (!$split_brain) {
4949 progress "dgit view: changes are required...";
4950 runcmd @git, qw(checkout -q -b dgit-view);
4955 sub quiltify_splitbrain ($$$$$$) {
4956 my ($clogp, $unapplied, $headref, $diffbits,
4957 $editedignores, $cachekey) = @_;
4958 if ($quilt_mode !~ m/gbp|dpm/) {
4959 # treat .gitignore just like any other upstream file
4960 $diffbits = { %$diffbits };
4961 $_ = !!$_ foreach values %$diffbits;
4963 # We would like any commits we generate to be reproducible
4964 my @authline = clogp_authline($clogp);
4965 local $ENV{GIT_COMMITTER_NAME} = $authline[0];
4966 local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
4967 local $ENV{GIT_COMMITTER_DATE} = $authline[2];
4968 local $ENV{GIT_AUTHOR_NAME} = $authline[0];
4969 local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
4970 local $ENV{GIT_AUTHOR_DATE} = $authline[2];
4972 if ($quilt_mode =~ m/gbp|unapplied/ &&
4973 ($diffbits->{O2H} & 01)) {
4975 "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n".
4976 " but git tree differs from orig in upstream files.";
4977 if (!stat_exists "debian/patches") {
4979 "\n ... debian/patches is missing; perhaps this is a patch queue branch?";
4983 if ($quilt_mode =~ m/dpm/ &&
4984 ($diffbits->{H2A} & 01)) {
4986 --quilt=$quilt_mode specified, implying patches-applied git tree
4987 but git tree differs from result of applying debian/patches to upstream
4990 if ($quilt_mode =~ m/gbp|unapplied/ &&
4991 ($diffbits->{O2A} & 01)) { # some patches
4992 quiltify_splitbrain_needed();
4993 progress "dgit view: creating patches-applied version using gbp pq";
4994 runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
4995 # gbp pq import creates a fresh branch; push back to dgit-view
4996 runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
4997 runcmd @git, qw(checkout -q dgit-view);
4999 if ($quilt_mode =~ m/gbp|dpm/ &&
5000 ($diffbits->{O2A} & 02)) {
5002 --quilt=$quilt_mode specified, implying that HEAD is for use with a
5003 tool which does not create patches for changes to upstream
5004 .gitignores: but, such patches exist in debian/patches.
5007 if (($diffbits->{O2H} & 02) && # user has modified .gitignore
5008 !($diffbits->{O2A} & 02)) { # patches do not change .gitignore
5009 quiltify_splitbrain_needed();
5010 progress "dgit view: creating patch to represent .gitignore changes";
5011 ensuredir "debian/patches";
5012 my $gipatch = "debian/patches/auto-gitignore";
5013 open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!";
5014 stat GIPATCH or die "$gipatch: $!";
5015 fail "$gipatch already exists; but want to create it".
5016 " to record .gitignore changes" if (stat _)[7];
5017 print GIPATCH <<END or die "$gipatch: $!";
5018 Subject: Update .gitignore from Debian packaging branch
5020 The Debian packaging git branch contains these updates to the upstream
5021 .gitignore file(s). This patch is autogenerated, to provide these
5022 updates to users of the official Debian archive view of the package.
5024 [dgit ($our_version) update-gitignore]
5027 close GIPATCH or die "$gipatch: $!";
5028 runcmd shell_cmd "exec >>$gipatch", @git, qw(diff),
5029 $unapplied, $headref, "--", sort keys %$editedignores;
5030 open SERIES, "+>>", "debian/patches/series" or die $!;
5031 defined seek SERIES, -1, 2 or $!==EINVAL or die $!;
5033 defined read SERIES, $newline, 1 or die $!;
5034 print SERIES "\n" or die $! unless $newline eq "\n";
5035 print SERIES "auto-gitignore\n" or die $!;
5036 close SERIES or die $!;
5037 runcmd @git, qw(add -- debian/patches/series), $gipatch;
5039 Commit patch to update .gitignore
5041 [dgit ($our_version) update-gitignore-quilt-fixup]
5045 my $dgitview = git_rev_parse 'HEAD';
5047 changedir '../../../..';
5048 # When we no longer need to support squeeze, use --create-reflog
5050 ensuredir ".git/logs/refs/dgit-intern";
5051 my $makelogfh = new IO::File ".git/logs/refs/$splitbraincache", '>>'
5054 my $oldcache = git_get_ref "refs/$splitbraincache";
5055 if ($oldcache eq $dgitview) {
5056 my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
5057 # git update-ref doesn't always update, in this case. *sigh*
5058 my $dummy = make_commit_text <<END;
5061 author Dgit <dgit\@example.com> 1000000000 +0000
5062 committer Dgit <dgit\@example.com> 1000000000 +0000
5064 Dummy commit - do not use
5066 runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
5067 "refs/$splitbraincache", $dummy;
5069 runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
5072 changedir '.git/dgit/unpack/work';
5074 my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
5075 progress "dgit view: created ($saved)";
5078 sub quiltify ($$$$) {
5079 my ($clogp,$target,$oldtiptree,$failsuggestion) = @_;
5081 # Quilt patchification algorithm
5083 # We search backwards through the history of the main tree's HEAD
5084 # (T) looking for a start commit S whose tree object is identical
5085 # to to the patch tip tree (ie the tree corresponding to the
5086 # current dpkg-committed patch series). For these purposes
5087 # `identical' disregards anything in debian/ - this wrinkle is
5088 # necessary because dpkg-source treates debian/ specially.
5090 # We can only traverse edges where at most one of the ancestors'
5091 # trees differs (in changes outside in debian/). And we cannot
5092 # handle edges which change .pc/ or debian/patches. To avoid
5093 # going down a rathole we avoid traversing edges which introduce
5094 # debian/rules or debian/control. And we set a limit on the
5095 # number of edges we are willing to look at.
5097 # If we succeed, we walk forwards again. For each traversed edge
5098 # PC (with P parent, C child) (starting with P=S and ending with
5099 # C=T) to we do this:
5101 # - dpkg-source --commit with a patch name and message derived from C
5102 # After traversing PT, we git commit the changes which
5103 # should be contained within debian/patches.
5105 # The search for the path S..T is breadth-first. We maintain a
5106 # todo list containing search nodes. A search node identifies a
5107 # commit, and looks something like this:
5109 # Commit => $git_commit_id,
5110 # Child => $c, # or undef if P=T
5111 # Whynot => $reason_edge_PC_unsuitable, # in @nots only
5112 # Nontrivial => true iff $p..$c has relevant changes
5119 my %considered; # saves being exponential on some weird graphs
5121 my $t_sentinels = quiltify_tree_sentinelfiles $target;
5124 my ($search,$whynot) = @_;
5125 printdebug " search NOT $search->{Commit} $whynot\n";
5126 $search->{Whynot} = $whynot;
5127 push @nots, $search;
5128 no warnings qw(exiting);
5137 my $c = shift @todo;
5138 next if $considered{$c->{Commit}}++;
5140 $not->($c, "maximum search space exceeded") if --$max_work <= 0;
5142 printdebug "quiltify investigate $c->{Commit}\n";
5145 if (!quiltify_trees_differ $c->{Commit}, $oldtiptree) {
5146 printdebug " search finished hooray!\n";
5151 if ($quilt_mode eq 'nofix') {
5152 fail "quilt fixup required but quilt mode is \`nofix'\n".
5153 "HEAD commit $c->{Commit} differs from tree implied by ".
5154 " debian/patches (tree object $oldtiptree)";
5156 if ($quilt_mode eq 'smash') {
5157 printdebug " search quitting smash\n";
5161 my $c_sentinels = quiltify_tree_sentinelfiles $c->{Commit};
5162 $not->($c, "has $c_sentinels not $t_sentinels")
5163 if $c_sentinels ne $t_sentinels;
5165 my $commitdata = cmdoutput @git, qw(cat-file commit), $c->{Commit};
5166 $commitdata =~ m/\n\n/;
5168 my @parents = ($commitdata =~ m/^parent (\w+)$/gm);
5169 @parents = map { { Commit => $_, Child => $c } } @parents;
5171 $not->($c, "root commit") if !@parents;
5173 foreach my $p (@parents) {
5174 $p->{Nontrivial}= quiltify_trees_differ $p->{Commit},$c->{Commit};
5176 my $ndiffers = grep { $_->{Nontrivial} } @parents;
5177 $not->($c, "merge ($ndiffers nontrivial parents)") if $ndiffers > 1;
5179 foreach my $p (@parents) {
5180 printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
5182 my @cmd= (@git, qw(diff-tree -r --name-only),
5183 $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
5184 my $patchstackchange = cmdoutput @cmd;
5185 if (length $patchstackchange) {
5186 $patchstackchange =~ s/\n/,/g;
5187 $not->($p, "changed $patchstackchange");
5190 printdebug " search queue P=$p->{Commit} ",
5191 ($p->{Nontrivial} ? "NT" : "triv"),"\n";
5197 printdebug "quiltify want to smash\n";
5200 my $x = $_[0]{Commit};
5201 $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
5204 my $reportnot = sub {
5206 my $s = $abbrev->($notp);
5207 my $c = $notp->{Child};
5208 $s .= "..".$abbrev->($c) if $c;
5209 $s .= ": ".$notp->{Whynot};
5212 if ($quilt_mode eq 'linear') {
5213 print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
5214 foreach my $notp (@nots) {
5215 print STDERR "$us: ", $reportnot->($notp), "\n";
5217 print STDERR "$us: $_\n" foreach @$failsuggestion;
5218 fail "quilt fixup naive history linearisation failed.\n".
5219 "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
5220 } elsif ($quilt_mode eq 'smash') {
5221 } elsif ($quilt_mode eq 'auto') {
5222 progress "quilt fixup cannot be linear, smashing...";
5224 die "$quilt_mode ?";
5227 my $time = $ENV{'GIT_COMMITTER_DATE'} || time;
5228 $time =~ s/\s.*//; # trim timezone from GIT_COMMITTER_DATE
5230 my $msg = cmdoutput @git, qw(log), "-n$ncommits";
5232 quiltify_dpkg_commit "auto-$version-$target-$time",
5233 (getfield $clogp, 'Maintainer'),
5234 "Automatically generated patch ($clogp->{Version})\n".
5235 "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
5239 progress "quiltify linearisation planning successful, executing...";
5241 for (my $p = $sref_S;
5242 my $c = $p->{Child};
5244 printdebug "quiltify traverse $p->{Commit}..$c->{Commit}\n";
5245 next unless $p->{Nontrivial};
5247 my $cc = $c->{Commit};
5249 my $commitdata = cmdoutput @git, qw(cat-file commit), $cc;
5250 $commitdata =~ m/\n\n/ or die "$c ?";
5253 $commitdata =~ m/^author (.*) \d+ [-+0-9]+$/m or die "$cc ?";
5256 my $commitdate = cmdoutput
5257 @git, qw(log -n1 --pretty=format:%aD), $cc;
5259 $msg =~ s/^(.*)\n*/$1\n/ or die "$cc $msg ?";
5261 my $strip_nls = sub { $msg =~ s/\n+$//; $msg .= "\n"; };
5268 my $gbp_check_suitable = sub {
5273 die "contains unexpected slashes\n" if m{//} || m{/$};
5274 die "contains leading punctuation\n" if m{^\W} || m{/\W};
5275 die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
5276 die "too long" if length > 200;
5278 return $_ unless $@;
5279 print STDERR "quiltifying commit $cc:".
5280 " ignoring/dropping Gbp-Pq $what: $@";
5284 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* name \s+ |
5286 (\S+) \s* \n //ixm) {
5287 $patchname = $gbp_check_suitable->($1, 'Name');
5289 if ($msg =~ s/^ (?: gbp(?:-pq)? : \s* topic \s+ |
5291 (\S+) \s* \n //ixm) {
5292 $patchdir = $gbp_check_suitable->($1, 'Topic');
5297 if (!defined $patchname) {
5298 $patchname = $title;
5299 $patchname =~ s/[.:]$//;
5302 my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
5303 my $translitname = $converter->convert($patchname);
5304 die unless defined $translitname;
5305 $patchname = $translitname;
5308 "dgit: patch title transliteration error: $@"
5310 $patchname =~ y/ A-Z/-a-z/;
5311 $patchname =~ y/-a-z0-9_.+=~//cd;
5312 $patchname =~ s/^\W/x-$&/;
5313 $patchname = substr($patchname,0,40);
5315 if (!defined $patchdir) {
5318 if (length $patchdir) {
5319 $patchname = "$patchdir/$patchname";
5321 if ($patchname =~ m{^(.*)/}) {
5322 mkpath "debian/patches/$1";
5327 stat "debian/patches/$patchname$index";
5329 $!==ENOENT or die "$patchname$index $!";
5331 runcmd @git, qw(checkout -q), $cc;
5333 # We use the tip's changelog so that dpkg-source doesn't
5334 # produce complaining messages from dpkg-parsechangelog. None
5335 # of the information dpkg-source gets from the changelog is
5336 # actually relevant - it gets put into the original message
5337 # which dpkg-source provides our stunt editor, and then
5339 runcmd @git, qw(checkout -q), $target, qw(debian/changelog);
5341 quiltify_dpkg_commit "$patchname$index", $author, $msg,
5342 "Date: $commitdate\n".
5343 "X-Dgit-Generated: $clogp->{Version} $cc\n";
5345 runcmd @git, qw(checkout -q), $cc, qw(debian/changelog);
5348 runcmd @git, qw(checkout -q master);
5351 sub build_maybe_quilt_fixup () {
5352 my ($format,$fopts) = get_source_format;
5353 return unless madformat_wantfixup $format;
5356 check_for_vendor_patches();
5358 if (quiltmode_splitbrain) {
5359 fail <<END unless access_cfg_tagformats_can_splitbrain;
5360 quilt mode $quilt_mode requires split view so server needs to support
5361 both "new" and "maint" tag formats, but config says it doesn't.
5365 my $clogp = parsechangelog();
5366 my $headref = git_rev_parse('HEAD');
5371 my $upstreamversion = upstreamversion $version;
5373 if ($fopts->{'single-debian-patch'}) {
5374 quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
5376 quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
5379 die 'bug' if $split_brain && !$need_split_build_invocation;
5381 changedir '../../../..';
5382 runcmd_ordryrun_local
5383 @git, qw(pull --ff-only -q .git/dgit/unpack/work master);
5386 sub quilt_fixup_mkwork ($) {
5389 mkdir "work" or die $!;
5391 mktree_in_ud_here();
5392 runcmd @git, qw(reset -q --hard), $headref;
5395 sub quilt_fixup_linkorigs ($$) {
5396 my ($upstreamversion, $fn) = @_;
5397 # calls $fn->($leafname);
5399 foreach my $f (<../../../../*>) { #/){
5400 my $b=$f; $b =~ s{.*/}{};
5402 local ($debuglevel) = $debuglevel-1;
5403 printdebug "QF linkorigs $b, $f ?\n";
5405 next unless is_orig_file_of_vsn $b, $upstreamversion;
5406 printdebug "QF linkorigs $b, $f Y\n";
5407 link_ltarget $f, $b or die "$b $!";
5412 sub quilt_fixup_delete_pc () {
5413 runcmd @git, qw(rm -rqf .pc);
5415 Commit removal of .pc (quilt series tracking data)
5417 [dgit ($our_version) upgrade quilt-remove-pc]
5421 sub quilt_fixup_singlepatch ($$$) {
5422 my ($clogp, $headref, $upstreamversion) = @_;
5424 progress "starting quiltify (single-debian-patch)";
5426 # dpkg-source --commit generates new patches even if
5427 # single-debian-patch is in debian/source/options. In order to
5428 # get it to generate debian/patches/debian-changes, it is
5429 # necessary to build the source package.
5431 quilt_fixup_linkorigs($upstreamversion, sub { });
5432 quilt_fixup_mkwork($headref);
5434 rmtree("debian/patches");
5436 runcmd @dpkgsource, qw(-b .);
5438 runcmd @dpkgsource, qw(-x), (srcfn $version, ".dsc");
5439 rename srcfn("$upstreamversion", "/debian/patches"),
5440 "work/debian/patches";
5443 commit_quilty_patch();
5446 sub quilt_make_fake_dsc ($) {
5447 my ($upstreamversion) = @_;
5449 my $fakeversion="$upstreamversion-~~DGITFAKE";
5451 my $fakedsc=new IO::File 'fake.dsc', '>' or die $!;
5452 print $fakedsc <<END or die $!;
5455 Version: $fakeversion
5459 my $dscaddfile=sub {
5462 my $md = new Digest::MD5;
5464 my $fh = new IO::File $b, '<' or die "$b $!";
5469 print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
5472 quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
5474 my @files=qw(debian/source/format debian/rules
5475 debian/control debian/changelog);
5476 foreach my $maybe (qw(debian/patches debian/source/options
5477 debian/tests/control)) {
5478 next unless stat_exists "../../../$maybe";
5479 push @files, $maybe;
5482 my $debtar= srcfn $fakeversion,'.debian.tar.gz';
5483 runcmd qw(env GZIP=-1n tar -zcf), "./$debtar", qw(-C ../../..), @files;
5485 $dscaddfile->($debtar);
5486 close $fakedsc or die $!;
5489 sub quilt_check_splitbrain_cache ($$) {
5490 my ($headref, $upstreamversion) = @_;
5491 # Called only if we are in (potentially) split brain mode.
5493 # Computes the cache key and looks in the cache.
5494 # Returns ($dgit_view_commitid, $cachekey) or (undef, $cachekey)
5496 my $splitbrain_cachekey;
5499 "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
5500 # we look in the reflog of dgit-intern/quilt-cache
5501 # we look for an entry whose message is the key for the cache lookup
5502 my @cachekey = (qw(dgit), $our_version);
5503 push @cachekey, $upstreamversion;
5504 push @cachekey, $quilt_mode;
5505 push @cachekey, $headref;
5507 push @cachekey, hashfile('fake.dsc');
5509 my $srcshash = Digest::SHA->new(256);
5510 my %sfs = ( %INC, '$0(dgit)' => $0 );
5511 foreach my $sfk (sort keys %sfs) {
5512 next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
5513 $srcshash->add($sfk," ");
5514 $srcshash->add(hashfile($sfs{$sfk}));
5515 $srcshash->add("\n");
5517 push @cachekey, $srcshash->hexdigest();
5518 $splitbrain_cachekey = "@cachekey";
5520 my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
5522 printdebug "splitbrain cachekey $splitbrain_cachekey\n";
5523 debugcmd "|(probably)",@cmd;
5524 my $child = open GC, "-|"; defined $child or die $!;
5526 chdir '../../..' or die $!;
5527 if (!stat ".git/logs/refs/$splitbraincache") {
5528 $! == ENOENT or die $!;
5529 printdebug ">(no reflog)\n";
5536 printdebug ">| ", $_, "\n" if $debuglevel > 1;
5537 next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
5540 quilt_fixup_mkwork($headref);
5541 my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
5542 if ($cachehit ne $headref) {
5543 progress "dgit view: found cached ($saved)";
5544 runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
5546 return ($cachehit, $splitbrain_cachekey);
5548 progress "dgit view: found cached, no changes required";
5549 return ($headref, $splitbrain_cachekey);
5551 die $! if GC->error;
5552 failedcmd unless close GC;
5554 printdebug "splitbrain cache miss\n";
5555 return (undef, $splitbrain_cachekey);
5558 sub quilt_fixup_multipatch ($$$) {
5559 my ($clogp, $headref, $upstreamversion) = @_;
5561 progress "examining quilt state (multiple patches, $quilt_mode mode)";
5564 # - honour any existing .pc in case it has any strangeness
5565 # - determine the git commit corresponding to the tip of
5566 # the patch stack (if there is one)
5567 # - if there is such a git commit, convert each subsequent
5568 # git commit into a quilt patch with dpkg-source --commit
5569 # - otherwise convert all the differences in the tree into
5570 # a single git commit
5574 # Our git tree doesn't necessarily contain .pc. (Some versions of
5575 # dgit would include the .pc in the git tree.) If there isn't
5576 # one, we need to generate one by unpacking the patches that we
5579 # We first look for a .pc in the git tree. If there is one, we
5580 # will use it. (This is not the normal case.)
5582 # Otherwise need to regenerate .pc so that dpkg-source --commit
5583 # can work. We do this as follows:
5584 # 1. Collect all relevant .orig from parent directory
5585 # 2. Generate a debian.tar.gz out of
5586 # debian/{patches,rules,source/format,source/options}
5587 # 3. Generate a fake .dsc containing just these fields:
5588 # Format Source Version Files
5589 # 4. Extract the fake .dsc
5590 # Now the fake .dsc has a .pc directory.
5591 # (In fact we do this in every case, because in future we will
5592 # want to search for a good base commit for generating patches.)
5594 # Then we can actually do the dpkg-source --commit
5595 # 1. Make a new working tree with the same object
5596 # store as our main tree and check out the main
5598 # 2. Copy .pc from the fake's extraction, if necessary
5599 # 3. Run dpkg-source --commit
5600 # 4. If the result has changes to debian/, then
5601 # - git add them them
5602 # - git add .pc if we had a .pc in-tree
5604 # 5. If we had a .pc in-tree, delete it, and git commit
5605 # 6. Back in the main tree, fast forward to the new HEAD
5607 # Another situation we may have to cope with is gbp-style
5608 # patches-unapplied trees.
5610 # We would want to detect these, so we know to escape into
5611 # quilt_fixup_gbp. However, this is in general not possible.
5612 # Consider a package with a one patch which the dgit user reverts
5613 # (with git revert or the moral equivalent).
5615 # That is indistinguishable in contents from a patches-unapplied
5616 # tree. And looking at the history to distinguish them is not
5617 # useful because the user might have made a confusing-looking git
5618 # history structure (which ought to produce an error if dgit can't
5619 # cope, not a silent reintroduction of an unwanted patch).
5621 # So gbp users will have to pass an option. But we can usually
5622 # detect their failure to do so: if the tree is not a clean
5623 # patches-applied tree, quilt linearisation fails, but the tree
5624 # _is_ a clean patches-unapplied tree, we can suggest that maybe
5625 # they want --quilt=unapplied.
5627 # To help detect this, when we are extracting the fake dsc, we
5628 # first extract it with --skip-patches, and then apply the patches
5629 # afterwards with dpkg-source --before-build. That lets us save a
5630 # tree object corresponding to .origs.
5632 my $splitbrain_cachekey;
5634 quilt_make_fake_dsc($upstreamversion);
5636 if (quiltmode_splitbrain()) {
5638 ($cachehit, $splitbrain_cachekey) =
5639 quilt_check_splitbrain_cache($headref, $upstreamversion);
5640 return if $cachehit;
5644 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null';
5646 my $fakexdir= $package.'-'.(stripepoch $upstreamversion);
5647 rename $fakexdir, "fake" or die "$fakexdir $!";
5651 remove_stray_gits("source package");
5652 mktree_in_ud_here();
5656 runcmd @git, qw(checkout -f), $headref, qw(-- debian);
5657 my $unapplied=git_add_write_tree();
5658 printdebug "fake orig tree object $unapplied\n";
5662 my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null');
5664 if (system @bbcmd) {
5665 failedcmd @bbcmd if $? < 0;
5667 failed to apply your git tree's patch stack (from debian/patches/) to
5668 the corresponding upstream tarball(s). Your source tree and .orig
5669 are probably too inconsistent. dgit can only fix up certain kinds of
5670 anomaly (depending on the quilt mode). See --quilt= in dgit(1).
5676 quilt_fixup_mkwork($headref);
5679 if (stat_exists ".pc") {
5681 progress "Tree already contains .pc - will use it then delete it.";
5684 rename '../fake/.pc','.pc' or die $!;
5687 changedir '../fake';
5689 my $oldtiptree=git_add_write_tree();
5690 printdebug "fake o+d/p tree object $unapplied\n";
5691 changedir '../work';
5694 # We calculate some guesswork now about what kind of tree this might
5695 # be. This is mostly for error reporting.
5701 # O = orig, without patches applied
5702 # A = "applied", ie orig with H's debian/patches applied
5703 O2H => quiltify_trees_differ($unapplied,$headref, 1,
5704 \%editedignores, \@unrepres),
5705 H2A => quiltify_trees_differ($headref, $oldtiptree,1),
5706 O2A => quiltify_trees_differ($unapplied,$oldtiptree,1),
5710 foreach my $b (qw(01 02)) {
5711 foreach my $v (qw(O2H O2A H2A)) {
5712 push @dl, ($diffbits->{$v} & $b) ? '##' : '==';
5715 printdebug "differences \@dl @dl.\n";
5718 "$us: base trees orig=%.20s o+d/p=%.20s",
5719 $unapplied, $oldtiptree;
5721 "$us: quilt differences: src: %s orig %s gitignores: %s orig %s\n".
5722 "$us: quilt differences: HEAD %s o+d/p HEAD %s o+d/p",
5723 $dl[0], $dl[1], $dl[3], $dl[4],
5727 print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n"
5729 forceable_fail [qw(unrepresentable)], <<END;
5730 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
5735 if (!($diffbits->{O2H} & $diffbits->{O2A})) {
5736 push @failsuggestion, "This might be a patches-unapplied branch.";
5737 } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
5738 push @failsuggestion, "This might be a patches-applied branch.";
5740 push @failsuggestion, "Maybe you need to specify one of".
5741 " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
5743 if (quiltmode_splitbrain()) {
5744 quiltify_splitbrain($clogp, $unapplied, $headref,
5745 $diffbits, \%editedignores,
5746 $splitbrain_cachekey);
5750 progress "starting quiltify (multiple patches, $quilt_mode mode)";
5751 quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
5753 if (!open P, '>>', ".pc/applied-patches") {
5754 $!==&ENOENT or die $!;
5759 commit_quilty_patch();
5761 if ($mustdeletepc) {
5762 quilt_fixup_delete_pc();
5766 sub quilt_fixup_editor () {
5767 my $descfn = $ENV{$fakeeditorenv};
5768 my $editing = $ARGV[$#ARGV];
5769 open I1, '<', $descfn or die "$descfn: $!";
5770 open I2, '<', $editing or die "$editing: $!";
5771 unlink $editing or die "$editing: $!";
5772 open O, '>', $editing or die "$editing: $!";
5773 while (<I1>) { print O or die $!; } I1->error and die $!;
5776 $copying ||= m/^\-\-\- /;
5777 next unless $copying;
5780 I2->error and die $!;
5785 sub maybe_apply_patches_dirtily () {
5786 return unless $quilt_mode =~ m/gbp|unapplied/;
5787 print STDERR <<END or die $!;
5789 dgit: Building, or cleaning with rules target, in patches-unapplied tree.
5790 dgit: Have to apply the patches - making the tree dirty.
5791 dgit: (Consider specifying --clean=git and (or) using dgit sbuild.)
5794 $patches_applied_dirtily = 01;
5795 $patches_applied_dirtily |= 02 unless stat_exists '.pc';
5796 runcmd qw(dpkg-source --before-build .);
5799 sub maybe_unapply_patches_again () {
5800 progress "dgit: Unapplying patches again to tidy up the tree."
5801 if $patches_applied_dirtily;
5802 runcmd qw(dpkg-source --after-build .)
5803 if $patches_applied_dirtily & 01;
5805 if $patches_applied_dirtily & 02;
5806 $patches_applied_dirtily = 0;
5809 #----- other building -----
5811 our $clean_using_builder;
5812 # ^ tree is to be cleaned by dpkg-source's builtin idea that it should
5813 # clean the tree before building (perhaps invoked indirectly by
5814 # whatever we are using to run the build), rather than separately
5815 # and explicitly by us.
5818 return if $clean_using_builder;
5819 if ($cleanmode eq 'dpkg-source') {
5820 maybe_apply_patches_dirtily();
5821 runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
5822 } elsif ($cleanmode eq 'dpkg-source-d') {
5823 maybe_apply_patches_dirtily();
5824 runcmd_ordryrun_local @dpkgbuildpackage, qw(-d -T clean);
5825 } elsif ($cleanmode eq 'git') {
5826 runcmd_ordryrun_local @git, qw(clean -xdf);
5827 } elsif ($cleanmode eq 'git-ff') {
5828 runcmd_ordryrun_local @git, qw(clean -xdff);
5829 } elsif ($cleanmode eq 'check') {
5830 my $leftovers = cmdoutput @git, qw(clean -xdn);
5831 if (length $leftovers) {
5832 print STDERR $leftovers, "\n" or die $!;
5833 fail "tree contains uncommitted files and --clean=check specified";
5835 } elsif ($cleanmode eq 'none') {
5842 badusage "clean takes no additional arguments" if @ARGV;
5845 maybe_unapply_patches_again();
5848 sub build_prep_early () {
5849 our $build_prep_early_done //= 0;
5850 return if $build_prep_early_done++;
5851 badusage "-p is not allowed when building" if defined $package;
5852 my $clogp = parsechangelog();
5853 $isuite = getfield $clogp, 'Distribution';
5854 $package = getfield $clogp, 'Source';
5855 $version = getfield $clogp, 'Version';
5863 build_maybe_quilt_fixup();
5865 my $pat = changespat $version;
5866 foreach my $f (glob "$buildproductsdir/$pat") {
5868 unlink $f or fail "remove old changes file $f: $!";
5870 progress "would remove $f";
5876 sub changesopts_initial () {
5877 my @opts =@changesopts[1..$#changesopts];
5880 sub changesopts_version () {
5881 if (!defined $changes_since_version) {
5882 my @vsns = archive_query('archive_query');
5883 my @quirk = access_quirk();
5884 if ($quirk[0] eq 'backports') {
5885 local $isuite = $quirk[2];
5887 canonicalise_suite();
5888 push @vsns, archive_query('archive_query');
5891 @vsns = map { $_->[0] } @vsns;
5892 @vsns = sort { -version_compare($a, $b) } @vsns;
5893 $changes_since_version = $vsns[0];
5894 progress "changelog will contain changes since $vsns[0]";
5896 $changes_since_version = '_';
5897 progress "package seems new, not specifying -v<version>";
5900 if ($changes_since_version ne '_') {
5901 return ("-v$changes_since_version");
5907 sub changesopts () {
5908 return (changesopts_initial(), changesopts_version());
5911 sub massage_dbp_args ($;$) {
5912 my ($cmd,$xargs) = @_;
5915 # - if we're going to split the source build out so we can
5916 # do strange things to it, massage the arguments to dpkg-buildpackage
5917 # so that the main build doessn't build source (or add an argument
5918 # to stop it building source by default).
5920 # - add -nc to stop dpkg-source cleaning the source tree,
5921 # unless we're not doing a split build and want dpkg-source
5922 # as cleanmode, in which case we can do nothing
5925 # 0 - source will NOT need to be built separately by caller
5926 # +1 - source will need to be built separately by caller
5927 # +2 - source will need to be built separately by caller AND
5928 # dpkg-buildpackage should not in fact be run at all!
5929 debugcmd '#massaging#', @$cmd if $debuglevel>1;
5930 #print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
5931 if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
5932 $clean_using_builder = 1;
5935 # -nc has the side effect of specifying -b if nothing else specified
5936 # and some combinations of -S, -b, et al, are errors, rather than
5937 # later simply overriding earlie. So we need to:
5938 # - search the command line for these options
5939 # - pick the last one
5940 # - perhaps add our own as a default
5941 # - perhaps adjust it to the corresponding non-source-building version
5943 foreach my $l ($cmd, $xargs) {
5945 @$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
5948 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
5950 if ($need_split_build_invocation) {
5951 printdebug "massage split $dmode.\n";
5952 $r = $dmode =~ m/[S]/ ? +2 :
5953 $dmode =~ y/gGF/ABb/ ? +1 :
5954 $dmode =~ m/[ABb]/ ? 0 :
5957 printdebug "massage done $r $dmode.\n";
5959 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
5965 my $wasdir = must_getcwd();
5971 sub postbuild_mergechanges ($) { # must run with CWD=.. (eg in in_parent)
5972 my ($msg_if_onlyone) = @_;
5973 # If there is only one .changes file, fail with $msg_if_onlyone,
5974 # or if that is undef, be a no-op.
5975 # Returns the changes file to report to the user.
5976 my $pat = changespat $version;
5977 my @changesfiles = glob $pat;
5978 @changesfiles = sort {
5979 ($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
5983 if (@changesfiles==1) {
5984 fail <<END.$msg_if_onlyone if defined $msg_if_onlyone;
5985 only one changes file from build (@changesfiles)
5987 $result = $changesfiles[0];
5988 } elsif (@changesfiles==2) {
5989 my $binchanges = parsecontrol($changesfiles[1], "binary changes file");
5990 foreach my $l (split /\n/, getfield $binchanges, 'Files') {
5991 fail "$l found in binaries changes file $binchanges"
5994 runcmd_ordryrun_local @mergechanges, @changesfiles;
5995 my $multichanges = changespat $version,'multi';
5997 stat_exists $multichanges or fail "$multichanges: $!";
5998 foreach my $cf (glob $pat) {
5999 next if $cf eq $multichanges;
6000 rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
6003 $result = $multichanges;
6005 fail "wrong number of different changes files (@changesfiles)";
6007 printdone "build successful, results in $result\n" or die $!;
6010 sub midbuild_checkchanges () {
6011 my $pat = changespat $version;
6012 return if $rmchanges;
6013 my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
6014 @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
6016 changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
6017 Suggest you delete @unwanted.
6022 sub midbuild_checkchanges_vanilla ($) {
6024 midbuild_checkchanges() if $wantsrc == 1;
6027 sub postbuild_mergechanges_vanilla ($) {
6029 if ($wantsrc == 1) {
6031 postbuild_mergechanges(undef);
6034 printdone "build successful\n";
6040 my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
6041 my $wantsrc = massage_dbp_args \@dbp;
6044 midbuild_checkchanges_vanilla $wantsrc;
6049 push @dbp, changesopts_version();
6050 maybe_apply_patches_dirtily();
6051 runcmd_ordryrun_local @dbp;
6053 maybe_unapply_patches_again();
6054 postbuild_mergechanges_vanilla $wantsrc;
6058 $quilt_mode //= 'gbp';
6064 # gbp can make .origs out of thin air. In my tests it does this
6065 # even for a 1.0 format package, with no origs present. So I
6066 # guess it keys off just the version number. We don't know
6067 # exactly what .origs ought to exist, but let's assume that we
6068 # should run gbp if: the version has an upstream part and the main
6070 my $upstreamversion = upstreamversion $version;
6071 my $origfnpat = srcfn $upstreamversion, '.orig.tar.*';
6072 my $gbp_make_orig = $version =~ m/-/ && !(() = glob "../$origfnpat");
6074 if ($gbp_make_orig) {
6076 $cleanmode = 'none'; # don't do it again
6077 $need_split_build_invocation = 1;
6080 my @dbp = @dpkgbuildpackage;
6082 my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
6084 if (!length $gbp_build[0]) {
6085 if (length executable_on_path('git-buildpackage')) {
6086 $gbp_build[0] = qw(git-buildpackage);
6088 $gbp_build[0] = 'gbp buildpackage';
6091 my @cmd = opts_opt_multi_cmd @gbp_build;
6093 push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
6095 if ($gbp_make_orig) {
6096 ensuredir '.git/dgit';
6097 my $ok = '.git/dgit/origs-gen-ok';
6098 unlink $ok or $!==&ENOENT or die $!;
6099 my @origs_cmd = @cmd;
6100 push @origs_cmd, qw(--git-cleaner=true);
6101 push @origs_cmd, "--git-prebuild=touch $ok .git/dgit/no-such-dir/ok";
6102 push @origs_cmd, @ARGV;
6104 debugcmd @origs_cmd;
6106 do { local $!; stat_exists $ok; }
6107 or failedcmd @origs_cmd;
6109 dryrun_report @origs_cmd;
6115 midbuild_checkchanges_vanilla $wantsrc;
6117 if (!$clean_using_builder) {
6118 push @cmd, '--git-cleaner=true';
6122 maybe_unapply_patches_again();
6124 push @cmd, changesopts();
6125 runcmd_ordryrun_local @cmd, @ARGV;
6127 postbuild_mergechanges_vanilla $wantsrc;
6129 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
6133 my $our_cleanmode = $cleanmode;
6134 if ($need_split_build_invocation) {
6135 # Pretend that clean is being done some other way. This
6136 # forces us not to try to use dpkg-buildpackage to clean and
6137 # build source all in one go; and instead we run dpkg-source
6138 # (and build_prep() will do the clean since $clean_using_builder
6140 $our_cleanmode = 'ELSEWHERE';
6142 if ($our_cleanmode =~ m/^dpkg-source/) {
6143 # dpkg-source invocation (below) will clean, so build_prep shouldn't
6144 $clean_using_builder = 1;
6147 $sourcechanges = changespat $version,'source';
6149 unlink "../$sourcechanges" or $!==ENOENT
6150 or fail "remove $sourcechanges: $!";
6152 $dscfn = dscfn($version);
6153 if ($our_cleanmode eq 'dpkg-source') {
6154 maybe_apply_patches_dirtily();
6155 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S),
6157 } elsif ($our_cleanmode eq 'dpkg-source-d') {
6158 maybe_apply_patches_dirtily();
6159 runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc -S -d),
6162 my @cmd = (@dpkgsource, qw(-b --));
6165 runcmd_ordryrun_local @cmd, "work";
6166 my @udfiles = <${package}_*>;
6167 changedir "../../..";
6168 foreach my $f (@udfiles) {
6169 printdebug "source copy, found $f\n";
6172 ($f =~ m/\.debian\.tar(?:\.\w+)$/ &&
6173 $f eq srcfn($version, $&));
6174 printdebug "source copy, found $f - renaming\n";
6175 rename "$ud/$f", "../$f" or $!==ENOENT
6176 or fail "put in place new source file ($f): $!";
6179 my $pwd = must_getcwd();
6180 my $leafdir = basename $pwd;
6182 runcmd_ordryrun_local @cmd, $leafdir;
6185 runcmd_ordryrun_local qw(sh -ec),
6186 'exec >$1; shift; exec "$@"','x',
6187 "../$sourcechanges",
6188 @dpkggenchanges, qw(-S), changesopts();
6192 sub cmd_build_source {
6194 badusage "build-source takes no additional arguments" if @ARGV;
6196 maybe_unapply_patches_again();
6197 printdone "source built, results in $dscfn and $sourcechanges";
6202 midbuild_checkchanges();
6205 stat_exists $dscfn or fail "$dscfn (in parent directory): $!";
6206 stat_exists $sourcechanges
6207 or fail "$sourcechanges (in parent directory): $!";
6209 runcmd_ordryrun_local @sbuild, qw(-d), $isuite, @ARGV, $dscfn;
6211 maybe_unapply_patches_again();
6213 postbuild_mergechanges(<<END);
6214 perhaps you need to pass -A ? (sbuild's default is to build only
6215 arch-specific binaries; dgit 1.4 used to override that.)
6220 sub cmd_quilt_fixup {
6221 badusage "incorrect arguments to dgit quilt-fixup" if @ARGV;
6224 build_maybe_quilt_fixup();
6227 sub import_dsc_result {
6228 my ($dstref, $newhash, $what_log, $what_msg) = @_;
6229 my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
6231 check_gitattrs($newhash, "source tree");
6233 progress "dgit: import-dsc: $what_msg";
6236 sub cmd_import_dsc {
6240 last unless $ARGV[0] =~ m/^-/;
6243 if (m/^--require-valid-signature$/) {
6246 badusage "unknown dgit import-dsc sub-option \`$_'";
6250 badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
6251 my ($dscfn, $dstbranch) = @ARGV;
6253 badusage "dry run makes no sense with import-dsc" unless act_local();
6255 my $force = $dstbranch =~ s/^\+// ? +1 :
6256 $dstbranch =~ s/^\.\.// ? -1 :
6258 my $info = $force ? " $&" : '';
6259 $info = "$dscfn$info";
6261 my $specbranch = $dstbranch;
6262 $dstbranch = "refs/heads/$dstbranch" unless $dstbranch =~ m#^refs/#;
6263 $dstbranch = cmdoutput @git, qw(check-ref-format --normalize), $dstbranch;
6265 my @symcmd = (@git, qw(symbolic-ref -q HEAD));
6266 my $chead = cmdoutput_errok @symcmd;
6267 defined $chead or $?==256 or failedcmd @symcmd;
6269 fail "$dstbranch is checked out - will not update it"
6270 if defined $chead and $chead eq $dstbranch;
6272 my $oldhash = git_get_ref $dstbranch;
6274 open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!";
6275 $dscdata = do { local $/ = undef; <D>; };
6276 D->error and fail "read $dscfn: $!";
6279 # we don't normally need this so import it here
6280 use Dpkg::Source::Package;
6281 my $dp = new Dpkg::Source::Package filename => $dscfn,
6282 require_valid_signature => $needsig;
6284 local $SIG{__WARN__} = sub {
6286 return unless $needsig;
6287 fail "import-dsc signature check failed";
6289 if (!$dp->is_signed()) {
6290 warn "$us: warning: importing unsigned .dsc\n";
6292 my $r = $dp->check_signature();
6293 die "->check_signature => $r" if $needsig && $r;
6299 $package = getfield $dsc, 'Source';
6301 parse_dsc_field($dsc, "Dgit metadata in .dsc")
6302 unless forceing [qw(import-dsc-with-dgit-field)];
6303 parse_dsc_field_def_dsc_distro();
6305 $isuite = 'DGIT-IMPORT-DSC';
6306 $idistro //= $dsc_distro;
6310 if (defined $dsc_hash) {
6311 progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
6312 resolve_dsc_field_commit undef, undef;
6314 if (defined $dsc_hash) {
6315 my @cmd = (qw(sh -ec),
6316 "echo $dsc_hash | git cat-file --batch-check");
6317 my $objgot = cmdoutput @cmd;
6318 if ($objgot =~ m#^\w+ missing\b#) {
6320 .dsc contains Dgit field referring to object $dsc_hash
6321 Your git tree does not have that object. Try `git fetch' from a
6322 plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
6325 if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
6327 progress "Not fast forward, forced update.";
6329 fail "Not fast forward to $dsc_hash";
6332 import_dsc_result $dstbranch, $dsc_hash,
6333 "dgit import-dsc (Dgit): $info",
6334 "updated git ref $dstbranch";
6339 Branch $dstbranch already exists
6340 Specify ..$specbranch for a pseudo-merge, binding in existing history
6341 Specify +$specbranch to overwrite, discarding existing history
6343 if $oldhash && !$force;
6345 my @dfi = dsc_files_info();
6346 foreach my $fi (@dfi) {
6347 my $f = $fi->{Filename};
6349 next if lstat $here;
6350 fail "stat $here: $!" unless $! == ENOENT;
6352 if ($dscfn =~ m#^(?:\./+)?\.\./+#) {
6354 } elsif ($dscfn =~ m#^/#) {
6357 fail "cannot import $dscfn which seems to be inside working tree!";
6359 $there =~ s#/+[^/]+$## or
6360 fail "cannot import $dscfn which seems to not have a basename";
6362 symlink $there, $here or fail "symlink $there to $here: $!";
6363 progress "made symlink $here -> $there";
6364 # print STDERR Dumper($fi);
6366 my @mergeinputs = generate_commits_from_dsc();
6367 die unless @mergeinputs == 1;
6369 my $newhash = $mergeinputs[0]{Commit};
6373 progress "Import, forced update - synthetic orphan git history.";
6374 } elsif ($force < 0) {
6375 progress "Import, merging.";
6376 my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
6377 my $version = getfield $dsc, 'Version';
6378 my $clogp = commit_getclogp $newhash;
6379 my $authline = clogp_authline $clogp;
6380 $newhash = make_commit_text <<END;
6387 Merge $package ($version) import into $dstbranch
6390 die; # caught earlier
6394 import_dsc_result $dstbranch, $newhash,
6395 "dgit import-dsc: $info",
6396 "results are in in git ref $dstbranch";
6399 sub pre_archive_api_query () {
6402 sub cmd_archive_api_query {
6403 badusage "need only 1 subpath argument" unless @ARGV==1;
6404 my ($subpath) = @ARGV;
6405 my @cmd = archive_api_query_cmd($subpath);
6408 exec @cmd or fail "exec curl: $!\n";
6411 sub repos_server_url () {
6412 $package = '_dgit-repos-server';
6413 local $access_forpush = 1;
6414 local $isuite = 'DGIT-REPOS-SERVER';
6415 my $url = access_giturl();
6418 sub pre_clone_dgit_repos_server () {
6421 sub cmd_clone_dgit_repos_server {
6422 badusage "need destination argument" unless @ARGV==1;
6423 my ($destdir) = @ARGV;
6424 my $url = repos_server_url();
6425 my @cmd = (@git, qw(clone), $url, $destdir);
6427 exec @cmd or fail "exec git clone: $!\n";
6430 sub pre_print_dgit_repos_server_source_url () {
6433 sub cmd_print_dgit_repos_server_source_url {
6434 badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
6436 my $url = repos_server_url();
6437 print $url, "\n" or die $!;
6440 sub cmd_setup_mergechangelogs {
6441 badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
6442 local $isuite = 'DGIT-SETUP-TREE';
6443 setup_mergechangelogs(1);
6446 sub cmd_setup_useremail {
6447 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6448 local $isuite = 'DGIT-SETUP-TREE';
6452 sub cmd_setup_gitattributes {
6453 badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
6454 local $isuite = 'DGIT-SETUP-TREE';
6458 sub cmd_setup_new_tree {
6459 badusage "no arguments allowed to dgit setup-tree" if @ARGV;
6460 local $isuite = 'DGIT-SETUP-TREE';
6464 #---------- argument parsing and main program ----------
6467 print "dgit version $our_version\n" or die $!;
6471 our (%valopts_long, %valopts_short);
6472 our (%funcopts_long);
6474 our (@modeopt_cfgs);
6476 sub defvalopt ($$$$) {
6477 my ($long,$short,$val_re,$how) = @_;
6478 my $oi = { Long => $long, Short => $short, Re => $val_re, How => $how };
6479 $valopts_long{$long} = $oi;
6480 $valopts_short{$short} = $oi;
6481 # $how subref should:
6482 # do whatever assignemnt or thing it likes with $_[0]
6483 # if the option should not be passed on to remote, @rvalopts=()
6484 # or $how can be a scalar ref, meaning simply assign the value
6487 defvalopt '--since-version', '-v', '[^_]+|_', \$changes_since_version;
6488 defvalopt '--distro', '-d', '.+', \$idistro;
6489 defvalopt '', '-k', '.+', \$keyid;
6490 defvalopt '--existing-package','', '.*', \$existing_package;
6491 defvalopt '--build-products-dir','','.*', \$buildproductsdir;
6492 defvalopt '--clean', '', $cleanmode_re, \$cleanmode;
6493 defvalopt '--package', '-p', $package_re, \$package;
6494 defvalopt '--quilt', '', $quilt_modes_re, \$quilt_mode;
6496 defvalopt '', '-C', '.+', sub {
6497 ($changesfile) = (@_);
6498 if ($changesfile =~ s#^(.*)/##) {
6499 $buildproductsdir = $1;
6503 defvalopt '--initiator-tempdir','','.*', sub {
6504 ($initiator_tempdir) = (@_);
6505 $initiator_tempdir =~ m#^/# or
6506 badusage "--initiator-tempdir must be used specify an".
6507 " absolute, not relative, directory."
6510 sub defoptmodes ($@) {
6511 my ($varref, $cfgkey, $default, %optmap) = @_;
6513 while (my ($opt,$val) = each %optmap) {
6514 $funcopts_long{$opt} = sub { $$varref = $val; };
6515 $permit{$val} = $val;
6517 push @modeopt_cfgs, {
6520 Default => $default,
6525 defoptmodes \$dodep14tag, qw( dep14tag want
6528 --always-dep14tag always );
6533 if (defined $ENV{'DGIT_SSH'}) {
6534 @ssh = string_to_ssh $ENV{'DGIT_SSH'};
6535 } elsif (defined $ENV{'GIT_SSH'}) {
6536 @ssh = ($ENV{'GIT_SSH'});
6544 if (!defined $val) {
6545 badusage "$what needs a value" unless @ARGV;
6547 push @rvalopts, $val;
6549 badusage "bad value \`$val' for $what" unless
6550 $val =~ m/^$oi->{Re}$(?!\n)/s;
6551 my $how = $oi->{How};
6552 if (ref($how) eq 'SCALAR') {
6557 push @ropts, @rvalopts;
6561 last unless $ARGV[0] =~ m/^-/;
6565 if (m/^--dry-run$/) {
6568 } elsif (m/^--damp-run$/) {
6571 } elsif (m/^--no-sign$/) {
6574 } elsif (m/^--help$/) {
6576 } elsif (m/^--version$/) {
6578 } elsif (m/^--new$/) {
6581 } elsif (m/^--([-0-9a-z]+)=(.+)/s &&
6582 ($om = $opts_opt_map{$1}) &&
6586 } elsif (m/^--([-0-9a-z]+):(.*)/s &&
6587 !$opts_opt_cmdonly{$1} &&
6588 ($om = $opts_opt_map{$1})) {
6591 } elsif (m/^--(gbp|dpm)$/s) {
6592 push @ropts, "--quilt=$1";
6594 } elsif (m/^--ignore-dirty$/s) {
6597 } elsif (m/^--no-quilt-fixup$/s) {
6599 $quilt_mode = 'nocheck';
6600 } elsif (m/^--no-rm-on-error$/s) {
6603 } elsif (m/^--no-chase-dsc-distro$/s) {
6605 $chase_dsc_distro = 0;
6606 } elsif (m/^--overwrite$/s) {
6608 $overwrite_version = '';
6609 } elsif (m/^--overwrite=(.+)$/s) {
6611 $overwrite_version = $1;
6612 } elsif (m/^--delayed=(\d+)$/s) {
6615 } elsif (m/^--dgit-view-save=(.+)$/s) {
6617 $split_brain_save = $1;
6618 $split_brain_save =~ s#^(?!refs/)#refs/heads/#;
6619 } elsif (m/^--(no-)?rm-old-changes$/s) {
6622 } elsif (m/^--deliberately-($deliberately_re)$/s) {
6624 push @deliberatelies, $&;
6625 } elsif (m/^--force-(.*)/ && defined $forceopts{$1}) {
6629 } elsif (m/^--force-/) {
6631 "$us: warning: ignoring unknown force option $_\n";
6633 } elsif (m/^--dgit-tag-format=(old|new)$/s) {
6634 # undocumented, for testing
6636 $tagformat_want = [ $1, 'command line', 1 ];
6637 # 1 menas overrides distro configuration
6638 } elsif (m/^--always-split-source-build$/s) {
6639 # undocumented, for testing
6641 $need_split_build_invocation = 1;
6642 } elsif (m/^--config-lookup-explode=(.+)$/s) {
6643 # undocumented, for testing
6645 $gitcfgs{cmdline}{$1} = 'CONFIG-LOOKUP-EXPLODE';
6646 # ^ it's supposed to be an array ref
6647 } elsif (m/^(--[-0-9a-z]+)(=|$)/ && ($oi = $valopts_long{$1})) {
6648 $val = $2 ? $' : undef; #';
6649 $valopt->($oi->{Long});
6650 } elsif ($funcopts_long{$_}) {
6652 $funcopts_long{$_}();
6654 badusage "unknown long option \`$_'";
6661 } elsif (s/^-L/-/) {
6664 } elsif (s/^-h/-/) {
6666 } elsif (s/^-D/-/) {
6670 } elsif (s/^-N/-/) {
6675 push @changesopts, $_;
6677 } elsif (s/^-wn$//s) {
6679 $cleanmode = 'none';
6680 } elsif (s/^-wg$//s) {
6683 } elsif (s/^-wgf$//s) {
6685 $cleanmode = 'git-ff';
6686 } elsif (s/^-wd$//s) {
6688 $cleanmode = 'dpkg-source';
6689 } elsif (s/^-wdd$//s) {
6691 $cleanmode = 'dpkg-source-d';
6692 } elsif (s/^-wc$//s) {
6694 $cleanmode = 'check';
6695 } elsif (s/^-c([^=]*)\=(.*)$//s) {
6696 push @git, '-c', $&;
6697 $gitcfgs{cmdline}{$1} = [ $2 ];
6698 } elsif (s/^-c([^=]+)$//s) {
6699 push @git, '-c', $&;
6700 $gitcfgs{cmdline}{$1} = [ 'true' ];
6701 } elsif (m/^-[a-zA-Z]/ && ($oi = $valopts_short{$&})) {
6703 $val = undef unless length $val;
6704 $valopt->($oi->{Short});
6707 badusage "unknown short option \`$_'";
6714 sub check_env_sanity () {
6715 my $blocked = new POSIX::SigSet;
6716 sigprocmask SIG_UNBLOCK, $blocked, $blocked or die $!;
6719 foreach my $name (qw(PIPE CHLD)) {
6720 my $signame = "SIG$name";
6721 my $signum = eval "POSIX::$signame" // die;
6722 ($SIG{$name} // 'DEFAULT') eq 'DEFAULT' or
6723 die "$signame is set to something other than SIG_DFL\n";
6724 $blocked->ismember($signum) and
6725 die "$signame is blocked\n";
6731 On entry to dgit, $@
6732 This is a bug produced by something in in your execution environment.
6738 sub parseopts_late_defaults () {
6739 $isuite //= cfg("dgit-distro.$idistro.default-suite", 'RETURN-UNDEF')
6740 if defined $idistro;
6741 $isuite //= cfg('dgit.default.default-suite');
6743 foreach my $k (keys %opts_opt_map) {
6744 my $om = $opts_opt_map{$k};
6746 my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
6748 badcfg "cannot set command for $k"
6749 unless length $om->[0];
6753 foreach my $c (access_cfg_cfgs("opts-$k")) {
6755 map { $_ ? @$_ : () }
6756 map { $gitcfgs{$_}{$c} }
6757 reverse @gitcfgsources;
6758 printdebug "CL $c ", (join " ", map { shellquote } @vl),
6759 "\n" if $debuglevel >= 4;
6761 badcfg "cannot configure options for $k"
6762 if $opts_opt_cmdonly{$k};
6763 my $insertpos = $opts_cfg_insertpos{$k};
6764 @$om = ( @$om[0..$insertpos-1],
6766 @$om[$insertpos..$#$om] );
6770 if (!defined $rmchanges) {
6771 local $access_forpush;
6772 $rmchanges = access_cfg_bool(0, 'rm-old-changes');
6775 if (!defined $quilt_mode) {
6776 local $access_forpush;
6777 $quilt_mode = cfg('dgit.force.quilt-mode', 'RETURN-UNDEF')
6778 // access_cfg('quilt-mode', 'RETURN-UNDEF')
6780 $quilt_mode =~ m/^($quilt_modes_re)$/
6781 or badcfg "unknown quilt-mode \`$quilt_mode'";
6785 foreach my $moc (@modeopt_cfgs) {
6786 local $access_forpush;
6787 my $vr = $moc->{Var};
6788 next if defined $$vr;
6789 $$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
6790 my $v = $moc->{Vals}{$$vr};
6791 badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
6795 $need_split_build_invocation ||= quiltmode_splitbrain();
6797 if (!defined $cleanmode) {
6798 local $access_forpush;
6799 $cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
6800 $cleanmode //= 'dpkg-source';
6802 badcfg "unknown clean-mode \`$cleanmode'" unless
6803 $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
6807 if ($ENV{$fakeeditorenv}) {
6809 quilt_fixup_editor();
6815 print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
6816 print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
6817 if $dryrun_level == 1;
6819 print STDERR $helpmsg or die $!;
6822 my $cmd = shift @ARGV;
6825 my $pre_fn = ${*::}{"pre_$cmd"};
6826 $pre_fn->() if $pre_fn;
6830 my $fn = ${*::}{"cmd_$cmd"};
6831 $fn or badusage "unknown operation $cmd";